@carbon/ibm-products 2.48.0-rc.0 → 2.49.0-rc.0

package/es/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/ItemOptionForValueField.d.ts

@@ -1,13 +1,33 @@
-export function ItemOptionForValueField({ conditionState, config, onChange, }: {
-    conditionState?: {} | undefined;
-    config?: {} | undefined;
-    onChange: any;
-}): import("react/jsx-runtime").JSX.Element;
-export namespace ItemOptionForValueField {
-    namespace propTypes {
-        let conditionState: PropTypes.Requireable<object>;
-        let config: PropTypes.Requireable<object>;
-        let onChange: PropTypes.Requireable<(...args: any[]) => any>;
-    }
-}
+/**
+ * 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 { Condition, PropertyConfigOption } from '../../ConditionBuilder.types';
+interface ItemOptionForValueFieldProps {
+    conditionState: Condition & {
+        label?: string;
+    };
+    config: PropertyConfigOption['config'];
+    onChange: (value: any, e?: Event) => void;
+}
+export declare const ItemOptionForValueField: {
+    ({ conditionState, config, onChange, }: ItemOptionForValueFieldProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * current condition object
+         */
+        conditionState: PropTypes.Requireable<object>;
+        /**
+         * current config object that this property is part of
+         */
+        config: PropTypes.Requireable<object>;
+        /**
+         * callback to update state oin date change
+         */
+        onChange: PropTypes.Requireable<(...args: any[]) => any>;
+    };
+};
+export {};

package/es/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/ItemOptionForValueField.js

@@ -11,8 +11,8 @@ import { SelectSkeleton, Search, Button } from '@carbon/react';
 import { CheckboxCheckedFilled, Checkbox, Checkmark } from '@carbon/react/icons';
 import PropTypes from '../../../../node_modules/prop-types/index.js';
 import { ConditionBuilderContext } from '../../ConditionBuilderContext/ConditionBuilderProvider.js';
-import { blockClass } from '../../ConditionBuilderContext/DataConfigs.js';
 import { useTranslations } from '../../utils/useTranslations.js';
+import { blockClass } from '../../utils/util.js';
 
 var _SelectSkeleton, _CheckboxCheckedFille, _Checkbox;
 var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
@@ -30,7 +30,7 @@ var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
     _useTranslations2 = _slicedToArray(_useTranslations, 2),
     propertyText = _useTranslations2[0],
     clearSearchText = _useTranslations2[1];
-  var contentRef = useRef();
+  var contentRef = useRef(null);
   var _useState = useState(config.options),
     _useState2 = _slicedToArray(_useState, 2),
     allOptions = _useState2[0],
@@ -97,7 +97,7 @@ var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
     if (contentRef.current) {
       var firstFocusableElement = contentRef.current.querySelector('input, button,li');
       if (firstFocusableElement) {
-        firstFocusableElement.focus();
+        firstFocusableElement === null || firstFocusableElement === void 0 || firstFocusableElement.focus();
       }
     }
   }, [allOptions]);
@@ -138,7 +138,7 @@ var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
   return /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__item-option"),
     ref: contentRef
-  }, allOptions.length > popOverSearchThreshold && /*#__PURE__*/React__default.createElement("div", {
+  }, popOverSearchThreshold && allOptions.length > popOverSearchThreshold && /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__item-option__search")
   }, /*#__PURE__*/React__default.createElement(Search, {
     size: "sm",

package/es/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemText/ConditionBuilderItemText.d.ts

@@ -1,15 +1,36 @@
-export function ConditionBuilderItemText({ conditionState, onChange, config, type, }: {
-    conditionState: any;
-    onChange: any;
-    config: any;
-    type: any;
-}): import("react/jsx-runtime").JSX.Element;
-export namespace ConditionBuilderItemText {
-    namespace propTypes {
-        let conditionState: PropTypes.Requireable<object>;
-        let config: PropTypes.Requireable<object>;
-        let onChange: PropTypes.Requireable<(...args: any[]) => any>;
-        let type: 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 { Condition, PropertyConfigText, PropertyConfigTextArea } from '../../ConditionBuilder.types';
+interface ConditionBuilderItemTextProps {
+    conditionState: Condition;
+    config: PropertyConfigText | PropertyConfigTextArea;
+    onChange: (value: string) => void;
+    type: 'textarea' | 'text';
+}
+export declare const ConditionBuilderItemText: {
+    ({ conditionState, onChange, config, type, }: ConditionBuilderItemTextProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * current condition object
+         */
+        conditionState: PropTypes.Requireable<object>;
+        /**
+         * config of the current property
+         */
+        config: PropTypes.Requireable<object>;
+        /**
+         * callback to update state oin date change
+         */
+        onChange: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * current input type
+         */
+        type: PropTypes.Requireable<string>;
+    };
+};
+export {};

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

@@ -9,8 +9,7 @@ import { objectSpread2 as _objectSpread2 } from '../../../../_virtual/_rollupPlu
 import React__default from 'react';
 import { TextArea, TextInput } from '@carbon/react';
 import PropTypes from '../../../../node_modules/prop-types/index.js';
-import { blockClass } from '../../ConditionBuilderContext/DataConfigs.js';
-import { checkIsValid } from '../../utils/util.js';
+import { checkIsValid, blockClass } from '../../utils/util.js';
 
 var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
   var _conditionState$prope;
@@ -18,15 +17,15 @@ var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
     _onChange = _ref.onChange,
     config = _ref.config,
     type = _ref.type;
-  var inputProps = _objectSpread2({
-    labelText: conditionState.property,
+  var inputProps = _objectSpread2(_objectSpread2({}, config), {}, {
     hideLabel: true,
     value: checkIsValid(conditionState.value) ? conditionState.value : '',
     id: (_conditionState$prope = conditionState.property) === null || _conditionState$prope === void 0 ? void 0 : _conditionState$prope.replace(/\s/g, ''),
     onChange: function onChange(evt) {
       _onChange(evt.target.value);
-    }
-  }, config);
+    },
+    labelText: conditionState.property
+  });
   return /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__item-text")
   }, type == 'textarea' ? /*#__PURE__*/React__default.createElement(TextArea, inputProps) : /*#__PURE__*/React__default.createElement(TextInput, inputProps));

package/es/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemTime/ConditionBuilderItemTime.d.ts

@@ -1,11 +1,26 @@
-export function ConditionBuilderItemTime({ onChange, config }: {
-    onChange: any;
-    config: any;
-}): import("react/jsx-runtime").JSX.Element;
-export namespace ConditionBuilderItemTime {
-    namespace propTypes {
-        let config: PropTypes.Requireable<object>;
-        let onChange: PropTypes.Requireable<(...args: any[]) => any>;
-    }
-}
+/**
+ * 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 { PropertyConfigTime } from '../../ConditionBuilder.types';
+interface ConditionBuilderItemTime {
+    onChange: (value: string | undefined) => void;
+    config: PropertyConfigTime['config'];
+}
+export declare const ConditionBuilderItemTime: {
+    ({ onChange, config, }: ConditionBuilderItemTime): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * current config object that this property is part of
+         */
+        config: PropTypes.Requireable<object>;
+        /**
+         * callback to update state oin date change
+         */
+        onChange: PropTypes.Requireable<(...args: any[]) => any>;
+    };
+};
+export {};

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) {

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

@@ -1,24 +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, className, }: {
-    group: any;
-    aria: any;
-    onRemove: any;
-    onChange: 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 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

@@ -10,15 +10,15 @@ 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, statementConfig } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
-import { focusThisField, manageTabIndexAndFocus } 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';
 
 /**
  *
@@ -39,6 +39,8 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     conditionBuilderGroupText = _useTranslations2[0],
     conditionText = _useTranslations2[1],
     conditionBuilderText = _useTranslations2[2];
+  var _useDataConfigs = useDataConfigs(),
+    statementConfig = _useDataConfigs.statementConfig;
   var _useContext = useContext(ConditionBuilderContext),
     variant = _useContext.variant,
     conditionBuilderRef = _useContext.conditionBuilderRef;
@@ -51,23 +53,25 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     showConditionSubGroupPreview = _useState4[0],
     setShowConditionSubGroupPreview = _useState4[1];
   useState(false);
-  var conditionBuilderContentRef = useRef();
+  var conditionBuilderContentRef = useRef(null);
   var onRemoveHandler = function onRemoveHandler(conditionId, evt, conditionIndex) {
-    if (group.conditions.length > 1) {
-      variant == 'tree' ? handleFocusOnCloseTree(evt) : handleFocusOnClose(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.conditions.reduce(function (acc, condition) {
-          if (condition.conditions) {
+        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.concat(_condition.conditions);
           }
           return acc;
         }, []);
-        onChange(_objectSpread2(_objectSpread2({}, group), {}, {
+        onChange === null || onChange === void 0 || onChange(_objectSpread2(_objectSpread2({}, group), {}, {
           conditions: allConditions
         }));
       } else {
@@ -77,15 +81,16 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         //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 && filteredConditions[0].conditions) {
-          filteredConditions.splice.apply(filteredConditions, [0, 1].concat(_toConsumableArray(filteredConditions[0].conditions)));
+        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(_objectSpread2(_objectSpread2({}, group), {}, {
+        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
@@ -95,9 +100,11 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     });
   };
   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) {
@@ -108,8 +115,8 @@ 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, conditionIndex) {
@@ -124,7 +131,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex + 1], conditionBuilderRef);
     }
   };
-  var handleFocusOnCloseTree = function handleFocusOnCloseTree(evt) {
+  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');
@@ -154,10 +161,11 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           ariaPosInSet: nextRow.ariaPosInSet
         };
         setTimeout(function () {
-          var currentRowToFocus = conditionBuilderContentRef.current.querySelector("[role=\"row\"][aria-level=\"".concat(rowIdentity.ariaLevel, "\"][aria-posinset=\"").concat(rowIdentity.ariaPosInSet, "\"]"));
+          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 ? void 0 : prevRows.length) > 1) {
+      } 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);
       }
@@ -165,9 +173,9 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
   };
   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: '',
@@ -176,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) {
@@ -209,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": conditionBuilderText
-    }, group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.map(function (eachCondition, conditionIndex) {
+    }, 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")
@@ -226,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,
@@ -245,8 +254,8 @@ 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,
@@ -274,13 +283,15 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         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, "__gap-bottom ").concat(blockClass, "__groupConnector"),
         operator: group.groupOperator,
@@ -289,7 +300,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         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,
@@ -297,14 +308,14 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           onChangeHandler(updatedConditions, conditionIndex);
         },
         onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e);
+          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,
@@ -316,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,
@@ -338,9 +349,8 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       }))));
     }));
   };
-  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
@@ -364,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,14 +1,31 @@
-export default ConditionPreview;
-declare function ConditionPreview({ previewType, group, colorIndex }: {
-    previewType: any;
-    group: any;
-    colorIndex: any;
-}): import("react/jsx-runtime").JSX.Element;
-declare namespace ConditionPreview {
-    namespace propTypes {
-        let colorIndex: PropTypes.Requireable<number>;
-        let group: PropTypes.Requireable<object>;
-        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,11 +9,11 @@ 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 } 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 _ConditionBuilderItem, _ConditionBuilderItem2, _ConditionBuilderItem3;
@@ -82,7 +82,6 @@ var ConditionPreview = function ConditionPreview(_ref) {
     popOverClassName: "".concat(blockClass, "__gap")
   }), getConditionSection())));
 };
-var ConditionPreview$1 = ConditionPreview;
 ConditionPreview.propTypes = {
   /**
    * index of the color for next group
@@ -98,4 +97,4 @@ ConditionPreview.propTypes = {
   previewType: PropTypes.oneOf(['condition', 'subGroup', 'newGroup'])
 };
 
-export { ConditionPreview$1 as default };
+export { ConditionPreview as default };