@carbon/ibm-products 2.42.1-canary.17 → 2.42.1-canary.18

package/es/components/Datagrid/Datagrid/addons/CustomizeColumns/CustomizeColumnsTearsheet.js

@@ -74,7 +74,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   };
   var onCheckboxCheck = function onCheckboxCheck(col, value) {
     var changedDefinitions = columnObjects.map(function (definition) {
-      if (Array.isArray(col) && col.indexOf(definition) != -1 || definition.id === col.id) {
+      if ((Array.isArray(col) && col.indexOf(definition) != -1 || definition.id === col.id) && definition.canFilter && !definition.disabled) {
         return _objectSpread2(_objectSpread2({}, definition), {}, {
           isVisible: value
         });
@@ -98,9 +98,12 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   useEffect(function () {
     var notFilterableCount = columnObjects.filter(function (col) {
       return !col.canFilter;
-    });
-    setVisibleColumnsCount(getVisibleColumnsCount() - notFilterableCount.length);
-    setTotalColumns(columnObjects.length - notFilterableCount.length);
+    }).length;
+    var actionCount = columnObjects.filter(function (col) {
+      return col.id === 'actions';
+    }).length;
+    setVisibleColumnsCount(getVisibleColumnsCount() - notFilterableCount - actionCount);
+    setTotalColumns(columnObjects.length - notFilterableCount - actionCount);
   }, [getVisibleColumnsCount, columnObjects]);
   return /*#__PURE__*/React__default.createElement(TearsheetNarrow, {
     className: "".concat(blockClass, "__customize-columns-tearsheet"),

package/lib/components/Datagrid/Datagrid/addons/CustomizeColumns/CustomizeColumnsTearsheet.js

@@ -82,7 +82,7 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   };
   var onCheckboxCheck = function onCheckboxCheck(col, value) {
     var changedDefinitions = columnObjects.map(function (definition) {
-      if (Array.isArray(col) && col.indexOf(definition) != -1 || definition.id === col.id) {
+      if ((Array.isArray(col) && col.indexOf(definition) != -1 || definition.id === col.id) && definition.canFilter && !definition.disabled) {
         return _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, definition), {}, {
           isVisible: value
         });
@@ -106,9 +106,12 @@ var CustomizeColumnsTearsheet = function CustomizeColumnsTearsheet(_ref) {
   React.useEffect(function () {
     var notFilterableCount = columnObjects.filter(function (col) {
       return !col.canFilter;
-    });
-    setVisibleColumnsCount(getVisibleColumnsCount() - notFilterableCount.length);
-    setTotalColumns(columnObjects.length - notFilterableCount.length);
+    }).length;
+    var actionCount = columnObjects.filter(function (col) {
+      return col.id === 'actions';
+    }).length;
+    setVisibleColumnsCount(getVisibleColumnsCount() - notFilterableCount - actionCount);
+    setTotalColumns(columnObjects.length - notFilterableCount - actionCount);
   }, [getVisibleColumnsCount, columnObjects]);
   return /*#__PURE__*/React__default["default"].createElement(TearsheetNarrow.TearsheetNarrow, {
     className: "".concat(blockClass, "__customize-columns-tearsheet"),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.42.1-canary.17+cc36a9e2d",
+  "version": "2.42.1-canary.18+07b412455",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -121,5 +121,5 @@
     "react": "^16.8.6 || ^17.0.1 || ^18.2.0",
     "react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
   },
-  "gitHead": "cc36a9e2d4a35d3126451fc611e3e717eaf74c23"
+  "gitHead": "07b4124551093f8dc2f4db978201feecdace2e22"
 }