@carbon/ibm-products 2.43.2-canary.19 → 2.43.2-canary.194

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemTime/ConditionBuilderItemTime.js

@@ -13,7 +13,7 @@ var _rollupPluginBabelHelpers = require('../../../../_virtual/_rollupPluginBabel
 var React = require('react');
 var react = require('@carbon/react');
 var index = require('../../../../node_modules/prop-types/index.js');
-var DataConfigs = require('../../ConditionBuilderContext/DataConfigs.js');
+var util = require('../../utils/util.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -51,7 +51,7 @@ var ConditionBuilderItemTime = function ConditionBuilderItemTime(_ref) {
     setTimeValue(evt.target.value);
   };
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__item-time")
+    className: "".concat(util.blockClass, "__item-time")
   }, /*#__PURE__*/React__default["default"].createElement(react.TimePicker, {
     id: "time-picker",
     labelText: "Select a time",
@@ -66,7 +66,7 @@ var ConditionBuilderItemTime = function ConditionBuilderItemTime(_ref) {
     value: "PM",
     text: "PM"
   }))), /*#__PURE__*/React__default["default"].createElement(react.TimePickerSelect, {
-    id: "time-picker-select-2",
+    id: "time-picker-time-zone",
     onChange: setTimeZone
   }, config === null || config === void 0 || (_config$timeZones2 = config.timeZones) === null || _config$timeZones2 === void 0 ? void 0 : _config$timeZones2.map(function (timeZone, index) {
     return /*#__PURE__*/React__default["default"].createElement(react.SelectItem, {

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

@@ -1,26 +1,51 @@
-export default ConditionGroupBuilder;
+/**
+ * Copyright IBM Corp. 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.
+ */
+import PropTypes from 'prop-types';
+import { ConditionGroup } from '../ConditionBuilder.types';
 /**
  *
  *  state - this is the current group that is being rendered . This can be a inner group or outer group
  * All the inner components of group are called from here.
  * @returns
  */
-declare function ConditionGroupBuilder({ group, aria, onRemove, onChange, conditionBuilderRef, className, }: {
-    group: any;
-    aria: any;
-    onRemove: any;
-    onChange: any;
-    conditionBuilderRef: any;
-    className: any;
-}): import("react/jsx-runtime").JSX.Element;
-declare namespace ConditionGroupBuilder {
-    namespace propTypes {
-        let aria: PropTypes.Requireable<object>;
-        let className: PropTypes.Requireable<string>;
-        let conditionBuilderRef: PropTypes.Requireable<object>;
-        let group: PropTypes.Requireable<object>;
-        let onChange: PropTypes.Requireable<(...args: any[]) => any>;
-        let onRemove: PropTypes.Requireable<(...args: any[]) => any>;
-    }
+interface ConditionGroupBuilderProps {
+    group: ConditionGroup;
+    onRemove: (e: Event) => void;
+    onChange: (group: ConditionGroup) => void;
+    className?: string;
+    aria: {
+        level: number;
+        posinset: number;
+        setsize: number;
+    };
 }
-import PropTypes from 'prop-types';
+declare const ConditionGroupBuilder: {
+    ({ group, aria, onRemove, onChange, className, }: ConditionGroupBuilderProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * object contains the aria attributes
+         */
+        aria: PropTypes.Requireable<object>;
+        /**
+         * state defines the current group
+         */
+        /**
+         * Provide an optional class to be applied to the containing node.
+         */
+        className: PropTypes.Requireable<string>;
+        group: PropTypes.Requireable<object>;
+        /**
+         * callback to update the current condition of the state tree
+         */
+        onChange: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * call back to remove the particular group from the state tree
+         */
+        onRemove: PropTypes.Requireable<(...args: any[]) => any>;
+    };
+};
+export default ConditionGroupBuilder;

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

@@ -14,22 +14,21 @@ 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');
+var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
+var useTranslations = require('../utils/useTranslations.js');
+var useDataConfigs = require('../utils/useDataConfigs.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;
-
 /**
  *
  *  state - this is the current group that is being rendered . This can be a inner group or outer group
@@ -38,14 +37,22 @@ var _ConditionPreview, _ConditionPreview2;
  */
 
 var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
+  var _ConditionPreview, _ConditionPreview2;
   var group = _ref.group,
     aria = _ref.aria,
     onRemove = _ref.onRemove,
     onChange = _ref.onChange,
-    conditionBuilderRef = _ref.conditionBuilderRef,
     className = _ref.className;
+  var _useTranslations = useTranslations.useTranslations(['conditionBuilderGroupText', 'conditionText', 'conditionBuilderText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 3),
+    conditionBuilderGroupText = _useTranslations2[0],
+    conditionText = _useTranslations2[1],
+    conditionBuilderText = _useTranslations2[2];
+  var _useDataConfigs = useDataConfigs.useDataConfigs(),
+    statementConfig = _useDataConfigs.statementConfig;
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useState = React.useState(-1),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     showConditionPreview = _useState2[0],
@@ -54,22 +61,59 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     _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), {}, {
-        conditions: group.conditions.filter(function (condition) {
+  React.useState(false);
+  var conditionBuilderContentRef = React.useRef(null);
+  var onRemoveHandler = function onRemoveHandler(conditionId, evt, conditionIndex) {
+    if (group && group.conditions && group.conditions.length > 1) {
+      variant == util.HIERARCHICAL_VARIANT ? handleFocusOnCloseHierarchical(evt) : handleFocusOnClose(evt, conditionIndex);
+      if (!checkGroupHaveCondition(group.conditions, conditionId)) {
+        var _group$conditions;
+        //when we delete the last  condition of a group without deleting  the subgroup, we need to restructure the group.
+        //we will shift the group one level up. The subgroups will open up as conditions.
+
+        //spreading out the condition inside the subgroup
+        var allConditions = group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.reduce(function (acc, condition) {
+          var _condition = condition;
+          if (_condition.conditions) {
+            //this is a subgroup
+            return acc.concat(_condition.conditions);
+          }
+          return acc;
+        }, []);
+        onChange === null || onChange === void 0 || onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+          conditions: allConditions
+        }));
+      } else {
+        var filteredConditions = group.conditions.filter(function (condition) {
           return conditionId !== condition.id;
-        })
-      }));
-      handleFocusOnClose(evt);
+        });
+        //This is to handle a edge case.
+        //When a group has structure as 1 condition,1 subgroup, 1 condition and if we delete first condition,
+        //the group will start with a subgroup. To avoid this,opening up that subgroup.
+        if ((filteredConditions === null || filteredConditions === void 0 ? void 0 : filteredConditions[0]).conditions) {
+          var firstFilteredConditions = filteredConditions[0];
+          filteredConditions.splice.apply(filteredConditions, [0, 1].concat(_rollupPluginBabelHelpers.toConsumableArray(firstFilteredConditions === null || firstFilteredConditions === void 0 ? void 0 : firstFilteredConditions.conditions)));
+        }
+        onChange === null || onChange === void 0 || onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+          conditions: filteredConditions
+        }));
+      }
     } else {
-      onRemove(evt);
+      onRemove === null || onRemove === void 0 || onRemove(evt);
     }
   };
+  //check to identify a group without a plain condition
+  var checkGroupHaveCondition = function checkGroupHaveCondition(conditions, conditionId) {
+    return conditions.find(function (eachCondition) {
+      return !eachCondition.conditions && eachCondition.id !== conditionId;
+    });
+  };
   var onChangeHandler = function onChangeHandler(updatedCondition, conditionIndex) {
-    var updatedConditions = [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex)), [updatedCondition], _rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(conditionIndex + 1)));
-    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-      conditions: updatedConditions
+    var _group$id;
+    var updatedConditions = [].concat(_rollupPluginBabelHelpers.toConsumableArray(group !== null && group !== void 0 && group.conditions ? group.conditions.slice(0, conditionIndex) : []), [updatedCondition], _rollupPluginBabelHelpers.toConsumableArray(group !== null && group !== void 0 && group.conditions ? group.conditions.slice(conditionIndex + 1) : []));
+    onChange === null || onChange === void 0 || onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+      conditions: updatedConditions,
+      id: (_group$id = group === null || group === void 0 ? void 0 : group.id) !== null && _group$id !== void 0 ? _group$id : uuidv4["default"]()
     }));
   };
   var addConditionHandler = function addConditionHandler(conditionIndex) {
@@ -80,23 +124,67 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       popoverToOpen: 'propertyField',
       id: uuidv4["default"]()
     };
-    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-      conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [newCondition], _rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(conditionIndex + 1)))
+    onChange === null || onChange === void 0 || onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+      conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions ? group.conditions.slice(0, conditionIndex + 1) : []), [newCondition], _rollupPluginBabelHelpers.toConsumableArray(group.conditions ? group.conditions.slice(conditionIndex + 1) : []))
     }));
   };
-  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();
+  var handleFocusOnClose = function handleFocusOnClose(e, conditionIndex) {
+    var _e$currentTarget$clos;
+    //get all close buttons.
+    //if the last condition is closing, focus the second last one.
+    //or focus the next one.
+    var currentGroupCloseButtons = (_e$currentTarget$clos = e.currentTarget.closest(".".concat(util.blockClass, "__group"))) === null || _e$currentTarget$clos === void 0 ? void 0 : _e$currentTarget$clos.querySelectorAll('[data-name="closeCondition"]');
+    if (conditionIndex == currentGroupCloseButtons.length - 1) {
+      util.manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex - 1], conditionBuilderRef);
+    } else {
+      util.manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex + 1], conditionBuilderRef);
+    }
+  };
+  var handleFocusOnCloseHierarchical = function handleFocusOnCloseHierarchical(evt) {
+    var _evt$currentTarget, _evt$currentTarget2, _conditionBuilderCont, _conditionBuilderCont2;
+    //getting the current aria-level and aria-posinset.
+    var currentLevel = (_evt$currentTarget = evt.currentTarget) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.closest('[role="row"]')) === null || _evt$currentTarget === void 0 ? void 0 : _evt$currentTarget.getAttribute('aria-level');
+    var currentPos = (_evt$currentTarget2 = evt.currentTarget) === null || _evt$currentTarget2 === void 0 || (_evt$currentTarget2 = _evt$currentTarget2.closest('[role="row"]')) === null || _evt$currentTarget2 === void 0 ? void 0 : _evt$currentTarget2.getAttribute('aria-posinset');
+
+    //finding the next and previous items in same level
+    var nextElement = (_conditionBuilderCont = conditionBuilderContentRef.current) === null || _conditionBuilderCont === void 0 ? void 0 : _conditionBuilderCont.querySelector("[aria-level=\"".concat(currentLevel, "\"][aria-posinset=\"").concat(Number(currentPos) + 1, "\"]"));
+    var prevElement = (_conditionBuilderCont2 = conditionBuilderContentRef.current) === null || _conditionBuilderCont2 === void 0 ? void 0 : _conditionBuilderCont2.querySelector("[aria-level=\"".concat(currentLevel, "\"][aria-posinset=\"").concat(Number(currentPos) - 1, "\"]"));
+    //checking if next level is a valid condition. If then, focus the close button inside that condition
+    //Otherwise , check the previous item is a valid condition
+
+    if (nextElement !== null && nextElement !== void 0 && nextElement.classList.contains("".concat(util.blockClass, "__condition-block"))) {
+      util.manageTabIndexAndFocus(nextElement === null || nextElement === void 0 ? void 0 : nextElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+    } else if (prevElement !== null && prevElement !== void 0 && prevElement.classList.contains("".concat(util.blockClass, "__condition-block"))) {
+      util.manageTabIndexAndFocus(prevElement === null || prevElement === void 0 ? void 0 : prevElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+    }
+    //If there are no valid condition in this group, focus next or previous row
+    else {
+      var _conditionBuilderCont3, _conditionBuilderCont4;
+      var prevRows = (_conditionBuilderCont3 = conditionBuilderContentRef.current) === null || _conditionBuilderCont3 === void 0 ? void 0 : _conditionBuilderCont3.querySelectorAll("[aria-level=\"".concat(Number(currentLevel) - 1, "\"][role=\"row\"]"));
+      var nextRow = (_conditionBuilderCont4 = conditionBuilderContentRef.current) === null || _conditionBuilderCont4 === void 0 ? void 0 : _conditionBuilderCont4.querySelector("[aria-level=\"".concat(Number(currentLevel) + 1, "\"][role=\"row\"]"));
+      if (nextRow) {
+        //since there are no condition in current group, this group will move one level up
+
+        var rowIdentity = {
+          ariaLevel: Number(nextRow.ariaLevel) - 1,
+          ariaPosInSet: nextRow.ariaPosInSet
+        };
+        setTimeout(function () {
+          var _conditionBuilderCont5;
+          var currentRowToFocus = (_conditionBuilderCont5 = conditionBuilderContentRef.current) === null || _conditionBuilderCont5 === void 0 ? void 0 : _conditionBuilderCont5.querySelector("[role=\"row\"][aria-level=\"".concat(rowIdentity.ariaLevel, "\"][aria-posinset=\"").concat(rowIdentity.ariaPosInSet, "\"]"));
+          util.manageTabIndexAndFocus(currentRowToFocus === null || currentRowToFocus === void 0 ? void 0 : currentRowToFocus.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+        }, 0);
+      } else if (prevRows !== null && prevRows !== void 0 && prevRows.length && prevRows.length > 1) {
+        var _prevRows;
+        util.manageTabIndexAndFocus((_prevRows = prevRows[prevRows.length - 2]) === null || _prevRows === void 0 ? void 0 : _prevRows.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+      }
     }
   };
   var addConditionSubGroupHandler = function addConditionSubGroupHandler(conditionIndex) {
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-      conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [{
-        groupSeparateOperator: null,
+      conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions ? group.conditions.slice(0, conditionIndex + 1) : []), [{
+        statement: 'ifAll',
         groupOperator: 'and',
-        statement: 'if',
         conditions: [{
           property: undefined,
           operator: '',
@@ -105,7 +193,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           id: uuidv4["default"]()
         }],
         id: uuidv4["default"]()
-      }], _rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(conditionIndex + 1)))
+      }], _rollupPluginBabelHelpers.toConsumableArray(group.conditions ? group.conditions.slice(conditionIndex + 1) : []))
     }));
   };
   var isLastCondition = function isLastCondition(conditionIndex, conditionArr) {
@@ -124,7 +212,12 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     setShowConditionPreview(-1);
   };
   var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
+    var _statementConfig$find;
+    var groupOperator = (_statementConfig$find = statementConfig.find(function (statement) {
+      return statement.id == updatedStatement;
+    })) === null || _statementConfig$find === void 0 ? void 0 : _statementConfig$find.connector;
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+      groupOperator: groupOperator,
       statement: updatedStatement
     }));
   };
@@ -133,24 +226,25 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       groupOperator: op
     }));
   };
-  var getSentenceVariant = function getSentenceVariant() {
-    var _group$conditions;
+  var getNonHierarchicalVariant = function getNonHierarchicalVariant() {
+    var _group$conditions2;
     return /*#__PURE__*/React__default["default"].createElement("div", {
       className: "".concat(className, "  eachGroup")
     }, /*#__PURE__*/React__default["default"].createElement("div", {
-      className: "".concat(DataConfigs.blockClass, "__condition-wrapper"),
+      className: "".concat(util.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) {
+      "aria-label": conditionBuilderText
+    }, group === null || group === void 0 || (_group$conditions2 = group.conditions) === null || _group$conditions2 === void 0 ? void 0 : _group$conditions2.map(function (eachCondition, conditionIndex) {
+      var _group$conditions3;
       return /*#__PURE__*/React__default["default"].createElement("div", {
         key: eachCondition.id,
-        className: "".concat(DataConfigs.blockClass, "__group-wrapper")
+        className: "".concat(util.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
+          setsize: group === null || group === void 0 || (_group$conditions3 = group.conditions) === null || _group$conditions3 === void 0 ? void 0 : _group$conditions3.length
         },
         isStatement: conditionIndex == 0,
         condition: eachCondition,
@@ -161,7 +255,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         addConditionHandler: addConditionHandler,
         onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e);
+          onRemoveHandler(eachCondition.id, e, conditionIndex);
         },
         onConnectorOperatorChange: onConnectorOperatorChange,
         onStatementChange: onStatementChangeHandler,
@@ -169,12 +263,13 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       }));
     })));
   };
-  var getTreeVariant = function getTreeVariant() {
-    var _group$conditions2;
+  var getHierarchicalVariant = function getHierarchicalVariant() {
+    var _group$conditions4;
     return /*#__PURE__*/React__default["default"].createElement("div", {
-      className: "".concat(className, " ").concat(DataConfigs.blockClass, "__condition-wrapper"),
+      className: "".concat(className, " ").concat(util.blockClass, "__condition-wrapper"),
       role: aria.level === 1 ? 'rowgroup' : undefined,
-      "aria-label": aria.level == 1 ? DataConfigs.translateWithId('condition_builder_group') : undefined
+      "aria-label": aria.level == 1 ? conditionBuilderGroupText : undefined,
+      ref: conditionBuilderContentRef
     }, /*#__PURE__*/React__default["default"].createElement("div", {
       tabIndex: 0,
       role: "row",
@@ -183,52 +278,53 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       "aria-setsize": aria.setsize
     }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
       label: group.statement,
-      title: DataConfigs.translateWithId('condition'),
+      title: conditionText,
       "data-name": "connectorField",
-      popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
-      className: "".concat(DataConfigs.blockClass, "__statement-button")
-    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+      popOverClassName: "".concat(util.blockClass, "__gap"),
+      className: "".concat(util.blockClass, "__statement-button")
+    }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
       conditionState: {
         value: group.statement,
-        label: DataConfigs.translateWithId('condition')
+        label: conditionText
       },
       onChange: function onChange(v, evt) {
-        util.focusThisField(evt);
+        util.focusThisField(evt, conditionBuilderRef);
         onStatementChangeHandler(v);
       },
       config: {
-        options: DataConfigs.statementConfig
+        options: statementConfig,
+        isStatement: true
       }
-    }))), group === null || group === void 0 || (_group$conditions2 = group.conditions) === null || _group$conditions2 === void 0 ? void 0 : _group$conditions2.map(function (eachCondition, conditionIndex) {
+    }))), group === null || group === void 0 || (_group$conditions4 = group.conditions) === null || _group$conditions4 === void 0 ? void 0 : _group$conditions4.map(function (eachCondition, conditionIndex) {
+      var _group$conditions$len, _group$conditions5, _group$conditions$len2, _group$conditions6;
       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))
+        className: cx__default["default"]("".concat(util.blockClass, "__condition-block subgroup  ").concat(util.blockClass, "__gap"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(util.blockClass, "__gap-bottom"), group && group.conditions && group.conditions.length < conditionIndex + 1), {})
       }, /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
-        className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__groupConnector"),
+        className: "".concat(util.blockClass, "__gap ").concat(util.blockClass, "__gap-bottom ").concat(util.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
+          setsize: (_group$conditions$len = (_group$conditions5 = group.conditions) === null || _group$conditions5 === void 0 ? void 0 : _group$conditions5.length) !== null && _group$conditions$len !== void 0 ? _group$conditions$len : 0
         },
-        className: "".concat(DataConfigs.blockClass, "__group"),
+        className: "".concat(util.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"], {
+          onRemoveHandler(eachCondition.id, e, conditionIndex);
+        }
+      })) : /*#__PURE__*/React__default["default"].createElement("div", null, /*#__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
+          setsize: (_group$conditions$len2 = (_group$conditions6 = group.conditions) === null || _group$conditions6 === void 0 ? void 0 : _group$conditions6.length) !== null && _group$conditions$len2 !== void 0 ? _group$conditions$len2 : 0
         },
         isStatement: false,
         condition: eachCondition,
@@ -240,7 +336,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           onChangeHandler(updatedConditions, conditionIndex);
         },
         onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e);
+          onRemoveHandler(eachCondition.id, e, conditionIndex);
         },
         onConnectorOperatorChange: onConnectorOperatorChange,
         onStatementChange: onStatementChangeHandler,
@@ -253,16 +349,17 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         hideConditionPreviewHandler: hideConditionPreviewHandler,
         isLastCondition: isLastCondition
-      }), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
-        previewType: "subGroup"
+      })), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
+        previewType: "subGroup",
+        group: group
       }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
-        previewType: "condition"
+        previewType: "condition",
+        group: group
       }))));
     }));
   };
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, variant == 'tree' && getTreeVariant(), variant == 'sentence' && getSentenceVariant());
+  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, variant == util.HIERARCHICAL_VARIANT && getHierarchicalVariant(), variant == util.NON_HIERARCHICAL_VARIANT && getNonHierarchicalVariant());
 };
-var ConditionGroupBuilder$1 = ConditionGroupBuilder;
 ConditionGroupBuilder.propTypes = {
   /**
    * object contains the aria attributes
@@ -275,11 +372,6 @@ ConditionGroupBuilder.propTypes = {
    * 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: index["default"].object,
   /**
    * callback to update the current condition of the state tree
@@ -291,4 +383,4 @@ ConditionGroupBuilder.propTypes = {
   onRemove: index["default"].func
 };
 
-exports["default"] = ConditionGroupBuilder$1;
+exports["default"] = ConditionGroupBuilder;

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

@@ -1,10 +1,31 @@
-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>;
-    }
-}
+/**
+ * Copyright IBM Corp. 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.
+ */
 import PropTypes from 'prop-types';
+import { ConditionGroup } from '../ConditionBuilder.types';
+interface ConditionPreviewProps {
+    previewType: 'newGroup' | 'subGroup' | 'condition';
+    group: ConditionGroup;
+    colorIndex?: number;
+}
+declare const ConditionPreview: {
+    ({ previewType, group, colorIndex, }: ConditionPreviewProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * index of the color for next group
+         */
+        colorIndex: PropTypes.Requireable<number>;
+        /**
+         * current conditional group
+         */
+        group: PropTypes.Requireable<object>;
+        /**
+         * type of review to be displayed
+         */
+        previewType: PropTypes.Requireable<string>;
+    };
+};
+export default ConditionPreview;