@carbon/ibm-products 2.42.1-canary.2 → 2.42.1-canary.22

package/lib/components/ConditionBuilder/ConditionGroupBuilder/ConditionGroupBuilder.js

@@ -13,12 +13,22 @@ var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHel
 var React = require('react');
 var ConditionBlock = require('../ConditionBlock/ConditionBlock.js');
 var index = require('../../../node_modules/prop-types/index.js');
+var cx = require('classnames');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
+var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
+var util = require('../utils/util.js');
+var ConditionConnector = require('../ConditionBuilderConnector/ConditionConnector.js');
+var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
 var uuidv4 = require('../../../global/js/utils/uuidv4.js');
+var ConditionPreview = require('../ConditionPreview/ConditionPreview.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
+
+var _ConditionPreview, _ConditionPreview2;
 
 /**
  *
@@ -26,14 +36,24 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
  * All the inner components of group are called from here.
  * @returns
  */
+
 var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
-  var _group$conditions;
   var group = _ref.group,
     aria = _ref.aria,
     onRemove = _ref.onRemove,
     onChange = _ref.onChange,
     conditionBuilderRef = _ref.conditionBuilderRef,
     className = _ref.className;
+  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
+    variant = _useContext.variant;
+  var _useState = React.useState(-1),
+    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
+    showConditionPreview = _useState2[0],
+    setShowConditionPreview = _useState2[1];
+  var _useState3 = React.useState(-1),
+    _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
+    showConditionSubGroupPreview = _useState4[0],
+    setShowConditionSubGroupPreview = _useState4[1];
   var onRemoveHandler = function onRemoveHandler(conditionId, evt) {
     if (group.conditions.length > 1) {
       onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
@@ -64,72 +84,183 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [newCondition], _rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(conditionIndex + 1)))
     }));
   };
-  var isLastCondition = function isLastCondition(conditionIndex, conditionArr) {
-    return conditionIndex + 1 >= conditionArr.length || conditionArr.length - 1 != conditionIndex && conditionArr[conditionIndex + 1].conditions;
-  };
-  var handleFocusOnClose = function handleFocusOnClose(evt) {
-    var _evt$currentTarget;
-    var previousClose = (_evt$currentTarget = evt.currentTarget) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.closest('[role="row"]')) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.parentElement) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.previousSibling) === null || _evt$currentTarget === void 0 ? void 0 : _evt$currentTarget.querySelector('[data-name="closeCondition"]');
+  var handleFocusOnClose = function handleFocusOnClose(e) {
+    var _e$currentTarget;
+    var previousClose = (_e$currentTarget = e.currentTarget) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.closest('[role="row"]')) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.previousSibling) === null || _e$currentTarget === void 0 ? void 0 : _e$currentTarget.querySelector('[data-name="closeCondition"]');
     if (previousClose) {
       previousClose.focus();
     }
   };
-  return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(className, "  eachGroup")
-  }, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__condition-wrapper"),
-    role: "grid",
-    "aria-label": DataConfigs.translateWithId('condition_builder_group')
-  }, group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.map(function (eachCondition, conditionIndex) {
+  var addConditionSubGroupHandler = function addConditionSubGroupHandler(conditionIndex) {
+    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+      conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [{
+        groupSeparateOperator: null,
+        groupOperator: 'and',
+        statement: 'if',
+        conditions: [{
+          property: undefined,
+          operator: '',
+          value: '',
+          popoverToOpen: 'propertyField',
+          id: uuidv4["default"]()
+        }],
+        id: uuidv4["default"]()
+      }], _rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(conditionIndex + 1)))
+    }));
+  };
+  var isLastCondition = function isLastCondition(conditionIndex, conditionArr) {
+    return conditionIndex + 1 >= conditionArr.length || conditionArr.length - 1 != conditionIndex && conditionArr[conditionIndex + 1].conditions;
+  };
+  var _showConditionSubGroupPreviewHandler = function showConditionSubGroupPreviewHandler(conditionIndex) {
+    setShowConditionSubGroupPreview(conditionIndex);
+  };
+  var hideConditionSubGroupPreviewHandler = function hideConditionSubGroupPreviewHandler() {
+    setShowConditionSubGroupPreview(-1);
+  };
+  var _showConditionPreviewHandler = function showConditionPreviewHandler(conditionIndex) {
+    setShowConditionPreview(conditionIndex);
+  };
+  var hideConditionPreviewHandler = function hideConditionPreviewHandler() {
+    setShowConditionPreview(-1);
+  };
+  var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
+    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+      statement: updatedStatement
+    }));
+  };
+  var onConnectorOperatorChange = function onConnectorOperatorChange(op) {
+    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+      groupOperator: op
+    }));
+  };
+  var getSentenceVariant = function getSentenceVariant() {
+    var _group$conditions;
     return /*#__PURE__*/React__default["default"].createElement("div", {
-      key: eachCondition.id
-    }, eachCondition.conditions && /*#__PURE__*/React__default["default"].createElement(ConditionGroupBuilder, {
-      className: "".concat(DataConfigs.blockClass, "__group"),
-      aria: {
-        level: aria.level + 1,
-        posinset: conditionIndex + 1,
-        setsize: group.conditions.length
-      },
-      group: eachCondition,
-      onChange: function onChange(updatedCondition) {
-        onChangeHandler(updatedCondition, conditionIndex);
-      },
-      onRemove: function onRemove(evt) {
-        onRemoveHandler(eachCondition.id, evt);
-      },
-      conditionBuilderRef: conditionBuilderRef
-    }), !eachCondition.conditions && /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
-      conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
-      aria: {
-        level: aria.level + 1,
-        posinset: conditionIndex + 1,
-        setsize: group.conditions.length
-      },
-      isStatement: conditionIndex == 0,
-      condition: eachCondition,
-      group: group,
-      conditionIndex: conditionIndex,
-      className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom"),
-      onChange: function onChange(updatedConditions) {
-        onChangeHandler(updatedConditions, conditionIndex);
-      },
-      addConditionHandler: addConditionHandler,
-      onRemove: function onRemove(evt) {
-        onRemoveHandler(eachCondition.id, evt);
-      },
-      onConnectorOperatorChange: function onConnectorOperatorChange(op) {
-        onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-          groupOperator: op
-        }));
+      className: "".concat(className, "  eachGroup")
+    }, /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "".concat(DataConfigs.blockClass, "__condition-wrapper"),
+      role: "grid",
+      "aria-label": DataConfigs.translateWithId('condition_builder_group')
+    }, group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.map(function (eachCondition, conditionIndex) {
+      return /*#__PURE__*/React__default["default"].createElement("div", {
+        key: eachCondition.id,
+        className: "".concat(DataConfigs.blockClass, "__group-wrapper")
+      }, /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
+        conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
+        aria: {
+          level: aria.level + 1,
+          posinset: conditionIndex + 1,
+          setsize: group.conditions.length
+        },
+        isStatement: conditionIndex == 0,
+        condition: eachCondition,
+        group: group,
+        conditionIndex: conditionIndex,
+        onChange: function onChange(updatedConditions) {
+          onChangeHandler(updatedConditions, conditionIndex);
+        },
+        addConditionHandler: addConditionHandler,
+        onRemove: function onRemove(e) {
+          onRemoveHandler(eachCondition.id, e);
+        },
+        onConnectorOperatorChange: onConnectorOperatorChange,
+        onStatementChange: onStatementChangeHandler,
+        isLastCondition: isLastCondition
+      }));
+    })));
+  };
+  var getTreeVariant = function getTreeVariant() {
+    var _group$conditions2;
+    return /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "".concat(className, " ").concat(DataConfigs.blockClass, "__condition-wrapper"),
+      role: aria.level === 1 ? 'rowgroup' : undefined,
+      "aria-label": aria.level == 1 ? DataConfigs.translateWithId('condition_builder_group') : undefined
+    }, /*#__PURE__*/React__default["default"].createElement("div", {
+      tabIndex: 0,
+      role: "row",
+      "aria-level": aria.level,
+      "aria-posinset": aria.posinset,
+      "aria-setsize": aria.setsize
+    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      label: group.statement,
+      title: DataConfigs.translateWithId('condition'),
+      "data-name": "connectorField",
+      popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
+      className: "".concat(DataConfigs.blockClass, "__statement-button")
+    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+      conditionState: {
+        value: group.statement,
+        label: DataConfigs.translateWithId('condition')
       },
-      onStatementChange: function onStatementChange(updatedStatement) {
-        onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-          statement: updatedStatement
-        }));
+      onChange: function onChange(v, evt) {
+        util.focusThisField(evt);
+        onStatementChangeHandler(v);
       },
-      isLastCondition: isLastCondition
+      config: {
+        options: DataConfigs.statementConfig
+      }
+    }))), group === null || group === void 0 || (_group$conditions2 = group.conditions) === null || _group$conditions2 === void 0 ? void 0 : _group$conditions2.map(function (eachCondition, conditionIndex) {
+      return /*#__PURE__*/React__default["default"].createElement(React.Fragment, {
+        key: eachCondition.id
+      }, eachCondition.conditions ? /*#__PURE__*/React__default["default"].createElement("div", {
+        className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block subgroup  ").concat(DataConfigs.blockClass, "__gap"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap-bottom"), group.conditions.length < conditionIndex + 1))
+      }, /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
+        className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__groupConnector"),
+        operator: group.groupOperator,
+        "aria-hidden": true
+      }), /*#__PURE__*/React__default["default"].createElement(ConditionGroupBuilder, {
+        aria: {
+          level: aria.level + 1,
+          posinset: conditionIndex + 1,
+          setsize: group.conditions.length
+        },
+        className: "".concat(DataConfigs.blockClass, "__group"),
+        group: eachCondition,
+        onChange: function onChange(updatedConditions) {
+          onChangeHandler(updatedConditions, conditionIndex);
+        },
+        onRemove: function onRemove(e) {
+          onRemoveHandler(eachCondition.id, e);
+        },
+        conditionBuilderRef: conditionBuilderRef
+      })) : /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
+        conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
+        aria: {
+          level: aria.level + 1,
+          posinset: conditionIndex + 1,
+          setsize: group.conditions.length
+        },
+        isStatement: false,
+        condition: eachCondition,
+        group: group,
+        conditionIndex: conditionIndex,
+        addConditionHandler: addConditionHandler,
+        addConditionSubGroupHandler: addConditionSubGroupHandler,
+        onChange: function onChange(updatedConditions) {
+          onChangeHandler(updatedConditions, conditionIndex);
+        },
+        onRemove: function onRemove(e) {
+          onRemoveHandler(eachCondition.id, e);
+        },
+        onConnectorOperatorChange: onConnectorOperatorChange,
+        onStatementChange: onStatementChangeHandler,
+        showConditionSubGroupPreviewHandler: function showConditionSubGroupPreviewHandler() {
+          _showConditionSubGroupPreviewHandler(conditionIndex);
+        },
+        hideConditionSubGroupPreviewHandler: hideConditionSubGroupPreviewHandler,
+        showConditionPreviewHandler: function showConditionPreviewHandler() {
+          _showConditionPreviewHandler(conditionIndex);
+        },
+        hideConditionPreviewHandler: hideConditionPreviewHandler,
+        isLastCondition: isLastCondition
+      }), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
+        previewType: "subGroup"
+      }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
+        previewType: "condition"
+      }))));
     }));
-  })));
+  };
+  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, variant == 'tree' && getTreeVariant(), variant == 'sentence' && getSentenceVariant());
 };
 var ConditionGroupBuilder$1 = ConditionGroupBuilder;
 ConditionGroupBuilder.propTypes = {
@@ -138,19 +269,19 @@ ConditionGroupBuilder.propTypes = {
    */
   aria: index["default"].object,
   /**
-   * Provide an  class to be applied to the containing node.
+   * state defines the current group
+   */
+  /**
+   * Provide an optional class to be applied to the containing node.
    */
   className: index["default"].string,
   /**
+  className: PropTypes.string,
    * ref of condition builder
    */
   conditionBuilderRef: index["default"].object,
-  /**
-   * group defines the current group
-   */
   group: index["default"].object,
   /**
-  
    * callback to update the current condition of the state tree
    */
   onChange: index["default"].func,

package/lib/components/ConditionBuilder/ConditionPreview/ConditionPreview.d.ts

@@ -0,0 +1,10 @@
+export default ConditionPreview;
+declare function ConditionPreview({ previewType }: {
+    previewType: any;
+}): import("react/jsx-runtime").JSX.Element;
+declare namespace ConditionPreview {
+    namespace propTypes {
+        let previewType: PropTypes.Requireable<string>;
+    }
+}
+import PropTypes from 'prop-types';

package/lib/components/ConditionBuilder/ConditionPreview/ConditionPreview.js

@@ -0,0 +1,77 @@
+/**
+ * Copyright IBM Corp. 2020, 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var index = require('../../../node_modules/prop-types/index.js');
+var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
+var ConditionConnector = require('../ConditionBuilderConnector/ConditionConnector.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+var ConditionPreview = function ConditionPreview(_ref) {
+  var previewType = _ref.previewType;
+  var getConditionSection = function getConditionSection() {
+    return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      label: DataConfigs.translateWithId('property')
+    }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      label: DataConfigs.translateWithId('operator')
+    }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      label: DataConfigs.translateWithId('value')
+    }));
+  };
+  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, previewType == 'newGroup' && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__group__row ").concat(DataConfigs.blockClass, "__group-preview  ")
+  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+    className: "".concat(DataConfigs.blockClass, "__statement-button"),
+    label: DataConfigs.translateWithId('and')
+  })), /*#__PURE__*/React__default["default"].createElement("div", {
+    "aria-hidden": true,
+    className: "".concat(DataConfigs.blockClass, "__group ").concat(DataConfigs.blockClass, "__condition-wrapper ").concat(DataConfigs.blockClass, "__group-preview ").concat(DataConfigs.blockClass, "__group-wrapper")
+  }, /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__gap")
+  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+    className: "".concat(DataConfigs.blockClass, "__statement-button"),
+    label: DataConfigs.translateWithId('if')
+  })), getConditionSection())), previewType == 'subGroup' && /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__group-preview")
+  }, /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__condition-block  ").concat(DataConfigs.blockClass, "__gap")
+  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+    label: DataConfigs.translateWithId('and'),
+    className: "".concat(DataConfigs.blockClass, "__statement-button"),
+    popOverClassName: "".concat(DataConfigs.blockClass, "__gap")
+  }), /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__group ").concat(DataConfigs.blockClass, "__condition-wrapper")
+  }, /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
+    className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__groupConnector"),
+    operator: DataConfigs.translateWithId('if')
+  }), getConditionSection()))), previewType == 'condition' && /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__group-preview")
+  }, /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__condition-block  ").concat(DataConfigs.blockClass, "__gap")
+  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+    label: DataConfigs.translateWithId('and'),
+    className: "".concat(DataConfigs.blockClass, "__statement-button"),
+    popOverClassName: "".concat(DataConfigs.blockClass, "__gap")
+  }), getConditionSection())));
+};
+var ConditionPreview$1 = ConditionPreview;
+ConditionPreview.propTypes = {
+  /**
+   * type of review to be displayed
+   */
+  previewType: index["default"].oneOf(['condition', 'subGroup', 'newGroup'])
+};
+
+exports["default"] = ConditionPreview$1;

package/lib/components/ConditionBuilder/utils/util.d.ts

@@ -2,3 +2,4 @@ export function focusThisField(evt: any): void;
 export function focusThisItem(currentElement: any): void;
 export function traverseClockVise(eachElem: any, index: any, allElements: any, rotate: any, trapFocus: any): void;
 export function traverseReverse(eachElem: any, index: any, allElements: any, rotate: any, trapFocus: any): void;
+export function checkForHoldingKey(evt: any, key: any): any;

package/lib/components/Datagrid/Datagrid/DatagridHeaderRow.js

@@ -194,7 +194,7 @@ var HeaderRow = function HeaderRow(datagridState, headRef, headerGroup) {
       headerProps = _rollupPluginBabelHelpers["extends"]({}, (_rollupPluginBabelHelpers.objectDestructuringEmpty(_header$getHeaderProp), _header$getHeaderProp));
     var resizerProps = header === null || header === void 0 || (_header$getResizerPro = header.getResizerProps) === null || _header$getResizerPro === void 0 ? void 0 : _header$getResizerPro.call(header);
     return /*#__PURE__*/React__default["default"].createElement(react.TableHeader, _rollupPluginBabelHelpers["extends"]({}, headerProps, {
-      className: cx__default["default"](header === null || header === void 0 ? void 0 : header.className, _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__resizableColumn"), resizerProps), "".concat(blockClass, "__isResizing"), header === null || header === void 0 ? void 0 : header.isResizing), "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable && header.id !== 'spacer'), "".concat(blockClass, "__isSorted"), header === null || header === void 0 ? void 0 : header.isSorted), "".concat(blockClass, "__header-actions-column"), header === null || header === void 0 ? void 0 : header.isAction), "".concat(blockClass, "__with-slug"), header.slug && /*#__PURE__*/React__default["default"].isValidElement(header === null || header === void 0 ? void 0 : header.slug))),
+      className: cx__default["default"](header === null || header === void 0 ? void 0 : header.className, _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__resizableColumn"), resizerProps), "".concat(blockClass, "__isResizing"), header === null || header === void 0 ? void 0 : header.isResizing), "".concat(blockClass, "__sortableColumn"), datagridState.isTableSortable && header.id !== 'spacer'), "".concat(blockClass, "__isSorted"), header === null || header === void 0 ? void 0 : header.isSorted), "".concat(blockClass, "__header-actions-column"), header === null || header === void 0 ? void 0 : header.isAction), "".concat(blockClass, "__with-slug"), header.slug && /*#__PURE__*/React__default["default"].isValidElement(header === null || header === void 0 ? void 0 : header.slug)), headerProps.className),
       key: header.id,
       "aria-hidden": header.id === 'spacer' && 'true'
     }, getAccessibilityProps(header)), header.render('Header'), renderSlug(header.slug), resizerProps && !header.isAction && /*#__PURE__*/React__default["default"].createElement(ResizeHeader, {

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/lib/components/Datagrid/Datagrid/addons/Filtering/hooks/useFilterContext.d.ts

@@ -1,2 +1,8 @@
+/**
+ * Copyright IBM Corp. 2023, 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+declare const useFilterContext: () => any;
 export default useFilterContext;
-declare function useFilterContext(): any;

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.d.ts

@@ -20,6 +20,7 @@ export namespace InlineEditCell {
             rows: PropTypes.Requireable<(object | null | undefined)[]>;
             rowSize: PropTypes.Requireable<string>;
             tableId: PropTypes.Requireable<string>;
+            cellEditing: PropTypes.Requireable<object>;
         }>>;
         let nonEditCell: PropTypes.Requireable<boolean>;
         let placeholder: PropTypes.Requireable<string>;

package/lib/components/Datagrid/Datagrid/addons/InlineEdit/InlineEditCell/InlineEditCell.js

@@ -45,7 +45,8 @@ var InlineEditCell = function InlineEditCell(_ref) {
   var columnIndex = instance.columns.findIndex(function (col) {
     return col.id === columnId;
   });
-  var cellId = "column-".concat(columnIndex, "-row-").concat(cell.row.index);
+  var rowIndex = cell.row.index;
+  var cellId = "column-".concat(columnIndex, "-row-").concat(rowIndex);
   var _useContext = React.useContext(InlineEditContext.InlineEditContext),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -81,6 +82,14 @@ var InlineEditCell = function InlineEditCell(_ref) {
   var rowSize = instance.rowSize,
     onDataUpdate = instance.onDataUpdate;
   var saveCellData;
+  if (inEditMode) {
+    instance.cellEditing = {
+      cellId: cellId,
+      columnIndex: columnIndex,
+      rowIndex: rowIndex,
+      curCellValue: cellValue
+    };
+  }
   React.useEffect(function () {
     setInitialValue(value);
     var columnId = cell.column.id;
@@ -454,7 +463,7 @@ var InlineEditCell = function InlineEditCell(_ref) {
       "data-inline-type": type,
       onClick: !nonEditCell ? handleInlineCellClick : addActiveState,
       onKeyDown: !nonEditCell ? handleKeyDown : null,
-      className: cx__default["default"]("".concat(blockClass, "__inline-edit--outer-cell-button"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--invalid"), config === null || config === void 0 || (_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, cellValue)), "".concat(blockClass, "__static--outer-cell"), !disabledCell))
+      className: cx__default["default"]("".concat(blockClass, "__inline-edit--outer-cell-button"), _rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty(_rollupPluginBabelHelpers.defineProperty({}, "".concat(blockClass, "__inline-edit--outer-cell-button--").concat(rowSize), rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--lg"), !rowSize), "".concat(blockClass, "__inline-edit--outer-cell-button--invalid"), inEditMode && (config === null || config === void 0 || (_config$validator = config.validator) === null || _config$validator === void 0 ? void 0 : _config$validator.call(config, cellValue))), "".concat(blockClass, "__static--outer-cell"), !disabledCell))
     }, !nonEditCell && !disabledCell && renderRegularCell(), (!inEditMode || disabledCell) && /*#__PURE__*/React__default["default"].createElement(InlineEditButton.InlineEditButton, {
       isActiveCell: cellId === activeCellId,
       renderIcon: setRenderIcon(),
@@ -478,7 +487,8 @@ InlineEditCell.propTypes = {
     onDataUpdate: index["default"].func,
     rows: index["default"].arrayOf(index["default"].object),
     rowSize: index["default"].string,
-    tableId: index["default"].string
+    tableId: index["default"].string,
+    cellEditing: index["default"].object
   }),
   nonEditCell: index["default"].bool,
   placeholder: index["default"].string,

package/lib/components/Datagrid/types/index.d.ts

@@ -192,6 +192,8 @@ export interface DataGridState<T extends object = any> extends TableCommonProps,
     onVirtualScroll?: (evt?: boolean) => void;
     fetchMoreData?: () => void;
     loadMoreThreshold?: number;
+    onRowClick?: (row: any, event: any) => void;
+    onSort?: boolean;
 }
 export interface ResizeHeaderProps {
     resizerProps?: ResizerProps;

package/lib/components/Datagrid/useColumnOrder.d.ts

@@ -1,2 +1,8 @@
-export default useColumnOrder;
+/**
+ * Copyright IBM Corp. 2022, 2022
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import { useColumnOrder } from 'react-table';
+export default useColumnOrder;

package/lib/components/Datagrid/useNestedRows.js

@@ -23,6 +23,23 @@ var blockClass = "".concat(settings.pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
   useNestedRowExpander["default"](hooks);
   var useInstance = function useInstance(instance) {
+    React.useEffect(function () {
+      var rows = instance.rows;
+      var defaultExpandedRows = rows.filter(function (row) {
+        var _row$original;
+        return row === null || row === void 0 || (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.defaultExpanded;
+      });
+      if (defaultExpandedRows !== null && defaultExpandedRows !== void 0 && defaultExpandedRows.length) {
+        defaultExpandedRows.map(function (defaultExpandedRow) {
+          if (!defaultExpandedRow.isExpanded && !defaultExpandedRow.hasExpanded) {
+            var _defaultExpandedRow$t;
+            defaultExpandedRow === null || defaultExpandedRow === void 0 || (_defaultExpandedRow$t = defaultExpandedRow.toggleRowExpanded) === null || _defaultExpandedRow$t === void 0 || _defaultExpandedRow$t.call(defaultExpandedRow);
+            defaultExpandedRow.hasExpanded = true;
+            return;
+          }
+        });
+      }
+    }, [instance, instance.rows]);
     // This useEffect will expand rows if they exist in the initialState obj
     React.useEffect(function () {
       var rows = instance.rows,
@@ -54,16 +71,21 @@ var useNestedRows = function useNestedRows(hooks) {
         }
       }];
     };
+    var getIndentation = function getIndentation(depth) {
+      return 32 * depth + 16;
+    }; // row indentation padding
     var getCellProps = function getCellProps(props, _ref3) {
       var cell = _ref3.cell,
         instance = _ref3.instance;
-      // reduce the "first cell"s width to compensate added (left) margin
+      // we add a dynamic -ve margin right only if the cell is resized below minimum width i.e 50px, else we set the width based on indentation at different levels
       var isFirstCell = instance.columns.findIndex(function (c) {
         return c.id === cell.column.id;
       }) === 0;
       return [props, {
         style: {
-          marginRight: "".concat(isFirstCell && cell.row.depth > 0 ? "".concat(-32 * cell.row.depth - 18, "px") : '')
+          marginRight: isFirstCell && cell.row.depth > 0 && parseInt(props.style.width, 10) <= getIndentation(cell.row.depth) + 50 // indentation padding + expander cell or empty cell width
+          ? "".concat(parseInt(props.style.width, 10) - (getIndentation(cell.row.depth) + 50), "px") : '',
+          width: isFirstCell && cell.row.depth > 0 ? parseInt(props.style.width, 10) - getIndentation(cell.row.depth) : props.style.width
         }
       }];
     };

package/lib/components/Datagrid/useOnRowClick.d.ts

@@ -1,2 +1,9 @@
+/**
+ * Copyright IBM Corp. 2020, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { Hooks } from 'react-table';
+declare const useOnRowClick: (hooks: Hooks) => void;
 export default useOnRowClick;
-declare function useOnRowClick(hooks: any): void;

package/lib/components/Datagrid/useOnRowClick.js

@@ -13,7 +13,8 @@ var settings = require('../../settings.js');
 
 var useOnRowClick = function useOnRowClick(hooks) {
   var useInstance = function useInstance(rowInstance) {
-    var onRowClick = rowInstance.onRowClick;
+    var _ref = rowInstance,
+      onRowClick = _ref.onRowClick;
     var getRowProps = function getRowProps(props, datagridState) {
       var isFetching = datagridState.isFetching,
         row = datagridState.row,

package/lib/components/Datagrid/useRowIsMouseOver.d.ts

@@ -1,2 +1,3 @@
+import { Hooks } from 'react-table';
+declare const useRowIsMouseOver: (hooks: Hooks) => void;
 export default useRowIsMouseOver;
-declare function useRowIsMouseOver(hooks: any): void;

package/lib/components/Datagrid/useRowIsMouseOver.js

@@ -25,7 +25,7 @@ var useRowIsMouseOver = function useRowIsMouseOver(hooks) {
       setMouseOverRowIndex = _useState2[1];
     var onMouseChange = useDebounce(function (datagridState) {
       var row = datagridState.row;
-      setMouseOverRowIndex(row.index);
+      setMouseOverRowIndex(row === null || row === void 0 ? void 0 : row.index);
     }, 100);
     var getRowProps = function getRowProps(props, datagridState) {
       var onMouseOver = function onMouseOver() {