From 56bcf8c8e9755324ed0b554d8116183fa219419e Mon Sep 17 00:00:00 2001 From: Austin Turner Date: Mon, 30 Jan 2023 20:26:12 -0700 Subject: [PATCH] Fix table scrolling Fixed invalid getRowId that was generating new ids for rows resolves #92 --- libs/ui/src/lib/data-table/SalesforceRecordDataTable.tsx | 5 ++++- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libs/ui/src/lib/data-table/SalesforceRecordDataTable.tsx b/libs/ui/src/lib/data-table/SalesforceRecordDataTable.tsx index 20697bb07..da5aebafd 100644 --- a/libs/ui/src/lib/data-table/SalesforceRecordDataTable.tsx +++ b/libs/ui/src/lib/data-table/SalesforceRecordDataTable.tsx @@ -26,11 +26,14 @@ type ContextAction = 'COPY_ROW' | 'COPY_ROW_NO_HEADER' | 'COPY_COL' | 'COPY_COL_ const SFDC_EMPTY_ID = '000000000000000AAA'; function getRowId(data: any): string { + if (data._key) { + return data._key; + } if (data?.attributes?.type === 'AggregateResult') { return uniqueId('query-results-node-id'); } let nodeId = data?.attributes?.url || data.Id; - if (!nodeId || nodeId.endsWith(SFDC_EMPTY_ID) || data.Id === SFDC_EMPTY_ID) { + if (!nodeId || data.Id === SFDC_EMPTY_ID || nodeId.endsWith(SFDC_EMPTY_ID)) { nodeId = uniqueId('query-results-node-id'); } return nodeId; diff --git a/package.json b/package.json index 4865fd8b5..3a06242c1 100644 --- a/package.json +++ b/package.json @@ -321,7 +321,7 @@ "quill": "^1.3.7", "quill-delta": "^3.6.3", "react": "18.2.0", - "react-data-grid": "^7.0.0-beta.20", + "react-data-grid": "^7.0.0-beta.22", "react-dnd": "^16.0.1", "react-dnd-html5-backend": "^16.0.1", "react-dom": "18.2.0", diff --git a/yarn.lock b/yarn.lock index 2fbb1c46f..38c1574b6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22103,10 +22103,10 @@ react-colorful@^5.1.2: resolved "https://registry.npmjs.org/react-colorful/-/react-colorful-5.5.1.tgz" integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg== -react-data-grid@^7.0.0-beta.20: - version "7.0.0-beta.20" - resolved "https://registry.yarnpkg.com/react-data-grid/-/react-data-grid-7.0.0-beta.20.tgz#8a130b7387b0b09fd3f3b1d57a45efd74966ead4" - integrity sha512-SJr425WjXGuiZBr3mCRSv9Fwwmd6MEBrBBtGuWPx8GS4FuhomQWgJHYsfXOGJPBmuayICJ1l/87Cjqri0E0ncA== +react-data-grid@^7.0.0-beta.22: + version "7.0.0-beta.22" + resolved "https://registry.yarnpkg.com/react-data-grid/-/react-data-grid-7.0.0-beta.22.tgz#8ee3b55c511d3bf006c304b8355a6f83c441b8c7" + integrity sha512-uEzT0u8lnSmqh4Cxogy3Z/0L/z5aI4oDLWKyeyc1SVNIEw46KXWTOGin+SRuQg+hJOXY6UnzNreYMWHIF6z8hQ== dependencies: clsx "^1.1.1"