fix(Datagrid): use selectedRowIds to set selected rows (#3123)

* fix(Datagrid): use selectedRowIds to set selected rows * chore: remove comment
carbon-design-system · Jun 13, 2023 · 426b8b4 · 426b8b4
1 parent 32a25a3
commit 426b8b4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/packages/ibm-products/src/components/Datagrid/Datagrid.stories.js b/packages/ibm-products/src/components/Datagrid/Datagrid.stories.js
@@ -444,7 +444,8 @@ export const SelectItemsInAllPages = () => {
       },
       DatagridPagination,
       DatagridActions,
-      DatagridBatchActions,
+      batchActions: true,
+      toolbarBatchActions: getBatchActions(),
     },
     useSelectRows,
     useSelectAllWithToggle

diff --git a/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js b/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridSelectAllWithToggle.js
@@ -30,6 +30,7 @@ const SelectAllWithToggle = ({
   columns,
   withStickyColumn,
 }) => {
+  const { onSelectAllRows, labels } = selectAllToggle || {};
   const [selectAllMode, setSelectAllMode] = useState(SELECT_ALL_PAGE_ROWS);
   useEffect(() => {
     if (onSelectAllRows) {
@@ -46,7 +47,6 @@ const SelectAllWithToggle = ({
     return () => window.removeEventListener('resize', updateSize);
   }, []);
 
-  const { onSelectAllRows, labels } = selectAllToggle || {};
   if (labels) {
     allPageRowsLabel = labels.allPageRows || allPageRowsLabel;
     allRowsLabel = labels.allRows || allRowsLabel;

diff --git a/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridToolbar.js b/packages/ibm-products/src/components/Datagrid/Datagrid/DatagridToolbar.js
@@ -24,12 +24,12 @@ const DatagridBatchActionsToolbar = (datagridState, width, ref) => {
   const [initialListWidth, setInitialListWidth] = useState(null);
   const [receivedInitialWidth, setReceivedInitialWidth] = useState(false);
   const {
-    selectedFlatRows,
+    state: { selectedRowIds },
     toggleAllRowsSelected,
     toolbarBatchActions,
     setGlobalFilter,
   } = datagridState;
-  const totalSelected = selectedFlatRows && selectedFlatRows.length;
+  const totalSelected = Object.keys(selectedRowIds || {})?.length;
 
   // Get initial width of batch actions container,
   // used to measure when all items are put inside

diff --git a/packages/ibm-products/src/components/Datagrid/_storybook-styles.scss b/packages/ibm-products/src/components/Datagrid/_storybook-styles.scss
@@ -20,7 +20,7 @@ $block-class: #{c4p-settings.$pkg-prefix}--datagrid;
   height: 100vh;
 }
 
-.sb-show-main.sb-main-centered #root {
+.sb-show-main.sb-main-centered #storybook-root {
   width: 100%;
   height: 100vh;
   padding: $spacing-07;