@carbon/ibm-products 2.43.2-canary.27 → 2.43.2-canary.270

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

@@ -9,7 +9,7 @@ import { slicedToArray as _slicedToArray } from '../../../../_virtual/_rollupPlu
 import React__default, { useState, useEffect } from 'react';
 import { TimePicker, TimePickerSelect, SelectItem } from '@carbon/react';
 import PropTypes from '../../../../node_modules/prop-types/index.js';
-import { blockClass } from '../../ConditionBuilderContext/DataConfigs.js';
+import { blockClass } from '../../utils/util.js';
 
 var _SelectItem, _SelectItem2;
 var ConditionBuilderItemTime = function ConditionBuilderItemTime(_ref) {
@@ -58,7 +58,7 @@ var ConditionBuilderItemTime = function ConditionBuilderItemTime(_ref) {
     value: "PM",
     text: "PM"
   }))), /*#__PURE__*/React__default.createElement(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.createElement(SelectItem, {

package/es/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/es/components/ConditionBuilder/ConditionGroupBuilder/ConditionGroupBuilder.js

@@ -6,20 +6,20 @@
  */
 
 import { slicedToArray as _slicedToArray, defineProperty as _defineProperty, objectSpread2 as _objectSpread2, toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useContext, useState, Fragment } from 'react';
+import React__default, { useContext, useState, useRef, Fragment } from 'react';
 import ConditionBlock from '../ConditionBlock/ConditionBlock.js';
 import PropTypes from '../../../node_modules/prop-types/index.js';
 import cx from 'classnames';
-import { blockClass, translateWithId, statementConfig } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
-import { focusThisField } from '../utils/util.js';
+import { HIERARCHICAL_VARIANT, NON_HIERARCHICAL_VARIANT, blockClass, focusThisField, manageTabIndexAndFocus } from '../utils/util.js';
 import ConditionConnector from '../ConditionBuilderConnector/ConditionConnector.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
 import uuidv4 from '../../../global/js/utils/uuidv4.js';
 import ConditionPreview from '../ConditionPreview/ConditionPreview.js';
 import { ItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js';
+import { useTranslations } from '../utils/useTranslations.js';
+import { useDataConfigs } from '../utils/useDataConfigs.js';
 
-var _ConditionPreview, _ConditionPreview2;
 /**
  *
  *  state - this is the current group that is being rendered . This can be a inner group or outer group
@@ -28,14 +28,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(['conditionBuilderGroupText', 'conditionText', 'conditionBuilderText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 3),
+    conditionBuilderGroupText = _useTranslations2[0],
+    conditionText = _useTranslations2[1],
+    conditionBuilderText = _useTranslations2[2];
+  var _useDataConfigs = useDataConfigs(),
+    statementConfig = _useDataConfigs.statementConfig;
   var _useContext = useContext(ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useState = useState(-1),
     _useState2 = _slicedToArray(_useState, 2),
     showConditionPreview = _useState2[0],
@@ -44,22 +52,59 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     showConditionSubGroupPreview = _useState4[0],
     setShowConditionSubGroupPreview = _useState4[1];
-  var onRemoveHandler = function onRemoveHandler(conditionId, evt) {
-    if (group.conditions.length > 1) {
-      onChange(_objectSpread2(_objectSpread2({}, group), {}, {
-        conditions: group.conditions.filter(function (condition) {
+  useState(false);
+  var conditionBuilderContentRef = useRef(null);
+  var onRemoveHandler = function onRemoveHandler(conditionId, evt, conditionIndex) {
+    if (group && group.conditions && group.conditions.length > 1) {
+      variant == 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(_objectSpread2(_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(_toConsumableArray(firstFilteredConditions === null || firstFilteredConditions === void 0 ? void 0 : firstFilteredConditions.conditions)));
+        }
+        onChange === null || onChange === void 0 || onChange(_objectSpread2(_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(_toConsumableArray(group.conditions.slice(0, conditionIndex)), [updatedCondition], _toConsumableArray(group.conditions.slice(conditionIndex + 1)));
-    onChange(_objectSpread2(_objectSpread2({}, group), {}, {
-      conditions: updatedConditions
+    var _group$id;
+    var updatedConditions = [].concat(_toConsumableArray(group !== null && group !== void 0 && group.conditions ? group.conditions.slice(0, conditionIndex) : []), [updatedCondition], _toConsumableArray(group !== null && group !== void 0 && group.conditions ? group.conditions.slice(conditionIndex + 1) : []));
+    onChange === null || onChange === void 0 || onChange(_objectSpread2(_objectSpread2({}, group), {}, {
+      conditions: updatedConditions,
+      id: (_group$id = group === null || group === void 0 ? void 0 : group.id) !== null && _group$id !== void 0 ? _group$id : uuidv4()
     }));
   };
   var addConditionHandler = function addConditionHandler(conditionIndex) {
@@ -70,22 +115,67 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       popoverToOpen: 'propertyField',
       id: uuidv4()
     };
-    onChange(_objectSpread2(_objectSpread2({}, group), {}, {
-      conditions: [].concat(_toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [newCondition], _toConsumableArray(group.conditions.slice(conditionIndex + 1)))
+    onChange === null || onChange === void 0 || onChange(_objectSpread2(_objectSpread2({}, group), {}, {
+      conditions: [].concat(_toConsumableArray(group.conditions ? group.conditions.slice(0, conditionIndex + 1) : []), [newCondition], _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(blockClass, "__group"))) === null || _e$currentTarget$clos === void 0 ? void 0 : _e$currentTarget$clos.querySelectorAll('[data-name="closeCondition"]');
+    if (conditionIndex == currentGroupCloseButtons.length - 1) {
+      manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex - 1], conditionBuilderRef);
+    } else {
+      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(blockClass, "__condition-block"))) {
+      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(blockClass, "__condition-block"))) {
+      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, "\"]"));
+          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;
+        manageTabIndexAndFocus((_prevRows = prevRows[prevRows.length - 2]) === null || _prevRows === void 0 ? void 0 : _prevRows.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+      }
     }
   };
   var addConditionSubGroupHandler = function addConditionSubGroupHandler(conditionIndex) {
     onChange(_objectSpread2(_objectSpread2({}, group), {}, {
-      conditions: [].concat(_toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [{
+      conditions: [].concat(_toConsumableArray(group.conditions ? group.conditions.slice(0, conditionIndex + 1) : []), [{
+        statement: 'ifAll',
         groupOperator: 'and',
-        statement: 'if',
         conditions: [{
           property: undefined,
           operator: '',
@@ -94,7 +184,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           id: uuidv4()
         }],
         id: uuidv4()
-      }], _toConsumableArray(group.conditions.slice(conditionIndex + 1)))
+      }], _toConsumableArray(group.conditions ? group.conditions.slice(conditionIndex + 1) : []))
     }));
   };
   var isLastCondition = function isLastCondition(conditionIndex, conditionArr) {
@@ -113,7 +203,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(_objectSpread2(_objectSpread2({}, group), {}, {
+      groupOperator: groupOperator,
       statement: updatedStatement
     }));
   };
@@ -122,15 +217,16 @@ 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.createElement("div", {
       className: "".concat(className, "  eachGroup")
     }, /*#__PURE__*/React__default.createElement("div", {
       className: "".concat(blockClass, "__condition-wrapper"),
       role: "grid",
-      "aria-label": 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.createElement("div", {
         key: eachCondition.id,
         className: "".concat(blockClass, "__group-wrapper")
@@ -139,7 +235,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         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,
@@ -150,7 +246,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,
@@ -158,12 +254,13 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       }));
     })));
   };
-  var getTreeVariant = function getTreeVariant() {
-    var _group$conditions2;
+  var getHierarchicalVariant = function getHierarchicalVariant() {
+    var _group$conditions4;
     return /*#__PURE__*/React__default.createElement("div", {
       className: "".concat(className, " ").concat(blockClass, "__condition-wrapper"),
       role: aria.level === 1 ? 'rowgroup' : undefined,
-      "aria-label": aria.level == 1 ? translateWithId('condition_builder_group') : undefined
+      "aria-label": aria.level == 1 ? conditionBuilderGroupText : undefined,
+      ref: conditionBuilderContentRef
     }, /*#__PURE__*/React__default.createElement("div", {
       tabIndex: 0,
       role: "row",
@@ -172,36 +269,38 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       "aria-setsize": aria.setsize
     }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
       label: group.statement,
-      title: translateWithId('condition'),
+      title: conditionText,
       "data-name": "connectorField",
       popOverClassName: "".concat(blockClass, "__gap"),
       className: "".concat(blockClass, "__statement-button")
     }, /*#__PURE__*/React__default.createElement(ItemOption, {
       conditionState: {
         value: group.statement,
-        label: translateWithId('condition')
+        label: conditionText
       },
       onChange: function onChange(v, evt) {
-        focusThisField(evt);
+        focusThisField(evt, conditionBuilderRef);
         onStatementChangeHandler(v);
       },
       config: {
-        options: 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.createElement(Fragment, {
         key: eachCondition.id
       }, eachCondition.conditions ? /*#__PURE__*/React__default.createElement("div", {
-        className: cx("".concat(blockClass, "__condition-block subgroup  ").concat(blockClass, "__gap"), _defineProperty({}, "".concat(blockClass, "__gap-bottom"), group.conditions.length < conditionIndex + 1))
+        className: cx("".concat(blockClass, "__condition-block subgroup  ").concat(blockClass, "__gap"), _defineProperty({}, "".concat(blockClass, "__gap-bottom"), group && group.conditions && group.conditions.length < conditionIndex + 1), {})
       }, /*#__PURE__*/React__default.createElement(ConditionConnector, {
-        className: "".concat(blockClass, "__gap ").concat(blockClass, "__groupConnector"),
+        className: "".concat(blockClass, "__gap ").concat(blockClass, "__gap-bottom ").concat(blockClass, "__groupConnector"),
         operator: group.groupOperator,
         "aria-hidden": true
       }), /*#__PURE__*/React__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(blockClass, "__group"),
         group: eachCondition,
@@ -209,15 +308,14 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           onChangeHandler(updatedConditions, conditionIndex);
         },
         onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e);
-        },
-        conditionBuilderRef: conditionBuilderRef
+          onRemoveHandler(eachCondition.id, e, conditionIndex);
+        }
       })) : /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(ConditionBlock, {
         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,
@@ -229,7 +327,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,
@@ -243,15 +341,16 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         hideConditionPreviewHandler: hideConditionPreviewHandler,
         isLastCondition: isLastCondition
       })), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default.createElement(ConditionPreview, {
-        previewType: "subGroup"
+        previewType: "subGroup",
+        group: group
       }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React__default.createElement(ConditionPreview, {
-        previewType: "condition"
+        previewType: "condition",
+        group: group
       }))));
     }));
   };
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, variant == 'tree' && getTreeVariant(), variant == 'sentence' && getSentenceVariant());
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, variant == HIERARCHICAL_VARIANT && getHierarchicalVariant(), variant == NON_HIERARCHICAL_VARIANT && getNonHierarchicalVariant());
 };
-var ConditionGroupBuilder$1 = ConditionGroupBuilder;
 ConditionGroupBuilder.propTypes = {
   /**
    * object contains the aria attributes
@@ -264,11 +363,6 @@ ConditionGroupBuilder.propTypes = {
    * Provide an optional class to be applied to the containing node.
    */
   className: PropTypes.string,
-  /**
-  className: PropTypes.string,
-   * ref of condition builder
-   */
-  conditionBuilderRef: PropTypes.object,
   group: PropTypes.object,
   /**
    * callback to update the current condition of the state tree
@@ -280,4 +374,4 @@ ConditionGroupBuilder.propTypes = {
   onRemove: PropTypes.func
 };
 
-export { ConditionGroupBuilder$1 as default };
+export { ConditionGroupBuilder as default };

package/es/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;

package/es/components/ConditionBuilder/ConditionPreview/ConditionPreview.js

@@ -9,70 +9,92 @@ import { slicedToArray as _slicedToArray, defineProperty as _defineProperty } fr
 import React__default, { useState, useEffect } from 'react';
 import cx from 'classnames';
 import PropTypes from '../../../node_modules/prop-types/index.js';
-import { blockClass, translateWithId } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
 import ConditionConnector from '../ConditionBuilderConnector/ConditionConnector.js';
+import { useTranslations } from '../utils/useTranslations.js';
+import { Bee } from '@carbon/react/icons';
+import { blockClass } from '../utils/util.js';
 
 var ConditionPreview = function ConditionPreview(_ref) {
-  var previewType = _ref.previewType;
+  var _ConditionBuilderItem, _ConditionBuilderItem2, _ConditionBuilderItem3;
+  var previewType = _ref.previewType,
+    group = _ref.group,
+    colorIndex = _ref.colorIndex;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     animate = _useState2[0],
     setAnimate = _useState2[1];
+  var _useTranslations = useTranslations(['valueText', 'operatorText', 'propertyText', 'ifText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 4),
+    propertyText = _useTranslations2[0],
+    operatorText = _useTranslations2[1],
+    valueText = _useTranslations2[2],
+    ifText = _useTranslations2[3];
   useEffect(function () {
     setAnimate(true);
   }, []);
   var getConditionSection = function getConditionSection() {
-    return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-      label: translateWithId('property')
-    }), /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-      label: translateWithId('operator')
-    }), /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-      label: translateWithId('value')
-    }));
+    return /*#__PURE__*/React__default.createElement("div", {
+      className: "".concat(blockClass, "__preview-condition")
+    }, _ConditionBuilderItem || (_ConditionBuilderItem = /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
+      label: propertyText,
+      renderIcon: Bee
+    })), _ConditionBuilderItem2 || (_ConditionBuilderItem2 = /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
+      label: operatorText
+    })), _ConditionBuilderItem3 || (_ConditionBuilderItem3 = /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
+      label: valueText
+    })));
   };
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, previewType == 'newGroup' && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
     className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
     className: "".concat(blockClass, "__statement-button"),
-    label: translateWithId('and')
+    label: group.groupOperator
   })), /*#__PURE__*/React__default.createElement("div", {
+    "data-color-index": colorIndex,
     "aria-hidden": true,
     className: cx(["".concat(blockClass, "__group ").concat(blockClass, "__condition-wrapper ").concat(blockClass, "__group-preview ").concat(blockClass, "__group-wrapper "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__gap")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
     className: "".concat(blockClass, "__statement-button"),
-    label: translateWithId('if')
+    label: ifText
   })), getConditionSection())), previewType == 'subGroup' && /*#__PURE__*/React__default.createElement("div", {
-    className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
+    className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview ").concat(blockClass, "__gap-bottom"), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__condition-block  ").concat(blockClass, "__gap")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-    label: translateWithId('and'),
+    label: group.groupOperator,
     className: "".concat(blockClass, "__statement-button"),
     popOverClassName: "".concat(blockClass, "__gap")
   }), /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__group ").concat(blockClass, "__condition-wrapper")
   }, /*#__PURE__*/React__default.createElement(ConditionConnector, {
     className: "".concat(blockClass, "__gap ").concat(blockClass, "__groupConnector"),
-    operator: translateWithId('if')
+    operator: ifText
   }), getConditionSection()))), previewType == 'condition' && /*#__PURE__*/React__default.createElement("div", {
-    className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
+    className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview ").concat(blockClass, "__gap-bottom"), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__condition-block  ").concat(blockClass, "__gap")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-    label: translateWithId('and'),
+    label: group.groupOperator,
     className: "".concat(blockClass, "__statement-button"),
     popOverClassName: "".concat(blockClass, "__gap")
   }), getConditionSection())));
 };
-var ConditionPreview$1 = ConditionPreview;
 ConditionPreview.propTypes = {
+  /**
+   * index of the color for next group
+   */
+  colorIndex: PropTypes.number,
+  /**
+   * current conditional group
+   */
+  group: PropTypes.object,
   /**
    * type of review to be displayed
    */
   previewType: PropTypes.oneOf(['condition', 'subGroup', 'newGroup'])
 };
 
-export { ConditionPreview$1 as default };
+export { ConditionPreview as default };

package/es/components/ConditionBuilder/utils/handleKeyboardEvents.d.ts

@@ -1 +1,2 @@
-export function handleKeyDown(evt: any, conditionBuilderRef: any): void;
+export function handleKeyDown(evt: any, conditionBuilderRef: any, variant: any): void;
+export function handleKeyDownForPopover(evt: any, conditionBuilderRef: any, popoverRef: any): void;