fix(DataGrid): column customisation not unselect locked columns (carb…

…on-design-system#4191) * fix(DataGrid): column customisation not unselect locked columns * chore(DataGrid): remove unwanted map
lee-chase · Feb 1, 2024 · 566aa31 · 566aa31
1 parent 633de43
commit 566aa31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/ibm-products/src/components/Datagrid/Datagrid/addons/CustomizeColumns/Columns.js b/packages/ibm-products/src/components/Datagrid/Datagrid/addons/CustomizeColumns/Columns.js
@@ -47,6 +47,7 @@ const Columns = ({
     [columns, setColumnsObject]
   );
 
+  const filteredStickyColumn = columns?.filter((item) => !item.sticky);
   return (
     <div
       className={`${blockClass}__customize-columns-column-list`}
@@ -89,7 +90,7 @@ const Columns = ({
             }
             onChange={() => {
               onSelectColumn(
-                columns,
+                filteredStickyColumn,
                 getVisibleColumnsCount() !== columns.length
               );
             }}

diff --git a/...cts/src/components/Datagrid/Datagrid/addons/CustomizeColumns/CustomizeColumnsTearsheet.js b/...cts/src/components/Datagrid/Datagrid/addons/CustomizeColumns/CustomizeColumnsTearsheet.js
@@ -69,7 +69,7 @@ const CustomizeColumnsTearsheet = ({
   const onCheckboxCheck = (col, value) => {
     const changedDefinitions = columnObjects.map((definition) => {
       if (
-        (Array.isArray(col) && col.indexOf(definition) != null) ||
+        (Array.isArray(col) && col.indexOf(definition) != -1) ||
         definition.id === col.id
       ) {
         return { ...definition, isVisible: value };