@carbon/ibm-products 2.43.2-canary.11 → 2.43.2-canary.111

package/es/components/ConditionBuilder/ConditionBuilderAdd/ConditionBuilderAdd.js

@@ -5,12 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { slicedToArray as _slicedToArray, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+import { slicedToArray as _slicedToArray, extends as _extends, defineProperty as _defineProperty } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useState } from 'react';
+import cx from 'classnames';
 import { AddAlt, TextNewLine } from '@carbon/react/icons';
 import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 import PropTypes from '../../../node_modules/prop-types/index.js';
-import { translateWithId, blockClass } from '../ConditionBuilderContext/DataConfigs.js';
+import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
 var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
   var className = _ref.className,
@@ -21,11 +23,17 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
     showConditionPreviewHandler = _ref.showConditionPreviewHandler,
     hideConditionPreviewHandler = _ref.hideConditionPreviewHandler,
     enableSubGroup = _ref.enableSubGroup,
-    buttonLabel = _ref.buttonLabel;
+    buttonLabel = _ref.buttonLabel,
+    tabIndex = _ref.tabIndex;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isAddSubgroup = _useState2[0],
     setIsAddSubgroup = _useState2[1];
+  var _useTranslations = useTranslations(['addConditionText', 'addConditionRowText', 'addSubgroupText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 3),
+    addConditionText = _useTranslations2[0],
+    addConditionRowText = _useTranslations2[1],
+    addSubgroupText = _useTranslations2[2];
   var showAddSubGroup = function showAddSubGroup() {
     setIsAddSubgroup(true);
   };
@@ -52,14 +60,16 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
       onBlur: hideConditionSubGroupPreviewHandler
     };
   };
+  var getAriaLabel = function getAriaLabel() {
+    return buttonLabel ? buttonLabel : !enableSubGroup ? addConditionRowText : undefined;
+  };
   var wrapperProps = enableSubGroup ? {
-    role: 'gridcell',
-    'aria-label': translateWithId('add-condition')
+    role: 'gridcell'
   } : {};
   return /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(className, " ").concat(blockClass, "__add-button-wrapper"),
     role: !enableSubGroup ? 'gridcell' : 'none',
-    "aria-label": !enableSubGroup ? translateWithId('add_condition_row') : undefined,
+    "aria-label": getAriaLabel(),
     onMouseEnter: showAddSubGroup,
     onMouseLeave: hideAddSubGroup,
     onFocus: showAddSubGroup,
@@ -68,18 +78,20 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
     renderIcon: AddAlt,
     onClick: onClickHandler
   }, previewHandlers(), {
+    wrapperProps: wrapperProps,
     className: "".concat(blockClass, "__add-button"),
     hideLabel: true,
     "data-name": "addButton",
-    label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : translateWithId('add-condition'),
-    wrapperProps: wrapperProps
-  })), isAddSubgroup && enableSubGroup && /*#__PURE__*/React__default.createElement(ConditionBuilderButton, _extends({
+    label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : addConditionText,
+    tabIndex: tabIndex
+  })), enableSubGroup && /*#__PURE__*/React__default.createElement(ConditionBuilderButton, _extends({
     renderIcon: TextNewLine,
     onClick: addConditionSubGroupHandler,
-    className: "".concat(blockClass, "__add-condition-group ").concat(blockClass, "__gap-left"),
+    className: cx("".concat(blockClass, "__add-condition-sub-group")),
     hideLabel: true,
-    label: translateWithId('add-condition'),
-    wrapperProps: wrapperProps
+    label: addSubgroupText,
+    wrapperProps: wrapperProps,
+    wrapperClassName: cx("".concat(blockClass, "__add-condition-sub-group-wrapper ").concat(blockClass, "__gap-left"), _defineProperty({}, "".concat(blockClass, "__add-condition-sub-group-wrapper--show"), isAddSubgroup))
   }, previewHandlersForSubgroup())));
 };
 var ConditionBuilderAdd$1 = ConditionBuilderAdd;
@@ -114,10 +126,14 @@ ConditionBuilderAdd.propTypes = {
       */
   onClick: PropTypes.func,
   showConditionPreviewHandler: PropTypes.func,
-  showConditionSubGroupPreviewHandler: PropTypes.func
+  showConditionSubGroupPreviewHandler: PropTypes.func,
   /**
    * handler for hiding sub group preview
    */
+  /**
+   * Tab index
+   */
+  tabIndex: PropTypes.number
 };
 
 export { ConditionBuilderAdd$1 as default };

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

@@ -1,4 +1,5 @@
-export function ConditionBuilderButton({ className, label, hideLabel, tooltipAlign, renderIcon: Icon, onClick, showToolTip, wrapperProps, onBlur, onFocus, onMouseEnter, onMouseLeave, }: {
+export function ConditionBuilderButton({ className, label, hideLabel, tooltipAlign, renderIcon: Icon, onClick, showToolTip, wrapperProps, onBlur, onFocus, onMouseEnter, onMouseLeave, isInvalid, wrapperClassName, tabIndex, ...rest }: {
+    [x: string]: any;
     className: any;
     label: any;
     hideLabel: any;
@@ -11,11 +12,15 @@ export function ConditionBuilderButton({ className, label, hideLabel, tooltipAli
     onFocus: any;
     onMouseEnter: any;
     onMouseLeave: any;
+    isInvalid: any;
+    wrapperClassName: any;
+    tabIndex: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace ConditionBuilderButton {
     namespace propTypes {
         let className: PropTypes.Requireable<string>;
         let hideLabel: PropTypes.Requireable<boolean>;
+        let isInvalid: PropTypes.Requireable<boolean>;
         let label: PropTypes.Requireable<string>;
         let onBlur: PropTypes.Requireable<(...args: any[]) => any>;
         let onClick: PropTypes.Requireable<(...args: any[]) => any>;
@@ -24,7 +29,9 @@ export namespace ConditionBuilderButton {
         let onMouseLeave: PropTypes.Requireable<(...args: any[]) => any>;
         let renderIcon: PropTypes.Requireable<object>;
         let showToolTip: PropTypes.Requireable<boolean>;
+        let tabIndex: PropTypes.Requireable<number>;
         let tooltipAlign: PropTypes.Requireable<string>;
+        let wrapperClassName: PropTypes.Requireable<string>;
         let wrapperProps: PropTypes.Requireable<object>;
     }
 }

package/es/components/ConditionBuilder/ConditionBuilderButton/ConditionBuilderButton.js

@@ -5,13 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { extends as _extends, defineProperty as _defineProperty } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectWithoutProperties as _objectWithoutProperties, extends as _extends, defineProperty as _defineProperty } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default from 'react';
 import cx from 'classnames';
 import PropTypes from '../../../node_modules/prop-types/index.js';
-import { Tooltip } from '@carbon/react';
+import { usePrefix, Tooltip } from '@carbon/react';
 import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
+import { WarningAltFilled } from '@carbon/react/icons';
 
+var _WarningAltFilled;
+var _excluded = ["className", "label", "hideLabel", "tooltipAlign", "renderIcon", "onClick", "showToolTip", "wrapperProps", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "isInvalid", "wrapperClassName", "tabIndex"];
 var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
   var _Icon, _span;
   var className = _ref.className,
@@ -25,25 +28,34 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
     onBlur = _ref.onBlur,
     onFocus = _ref.onFocus,
     onMouseEnter = _ref.onMouseEnter,
-    onMouseLeave = _ref.onMouseLeave;
+    onMouseLeave = _ref.onMouseLeave,
+    isInvalid = _ref.isInvalid,
+    wrapperClassName = _ref.wrapperClassName,
+    tabIndex = _ref.tabIndex,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var carbonPrefix = usePrefix();
   var Button = function Button() {
-    return /*#__PURE__*/React__default.createElement("button", {
-      // role={'gridcell'}
-      tabIndex: -1,
-      className: cx([className, "".concat(blockClass, "__button"), _defineProperty({}, "".concat(blockClass, "__text-ellipsis"), showToolTip && !hideLabel)]),
+    var _rest$dataName;
+    var dataName = (_rest$dataName = rest['data-name']) !== null && _rest$dataName !== void 0 ? _rest$dataName : '';
+    return /*#__PURE__*/React__default.createElement("button", _extends({
+      tabIndex: tabIndex != undefined ? tabIndex : -1,
+      className: cx([className, "".concat(blockClass, "__button"), _defineProperty({}, "".concat(blockClass, "__text-ellipsis"), showToolTip && !hideLabel && !isInvalid), _defineProperty({}, "".concat(blockClass, "__invalid-input"), isInvalid)]),
       type: "button",
       onClick: onClick,
       onBlur: onBlur,
       onFocus: onFocus,
       onMouseEnter: onMouseEnter,
-      onMouseLeave: onMouseLeave
-    }, Icon && (_Icon || (_Icon = /*#__PURE__*/React__default.createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default.createElement("span", null, label))));
+      onMouseLeave: onMouseLeave,
+      "data-name": dataName
+    }, rest), Icon && (_Icon || (_Icon = /*#__PURE__*/React__default.createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default.createElement("span", null, label))), isInvalid && (_WarningAltFilled || (_WarningAltFilled = /*#__PURE__*/React__default.createElement(WarningAltFilled, null))));
   };
   return hideLabel || showToolTip ? /*#__PURE__*/React__default.createElement(Tooltip, _extends({
     label: label,
     align: tooltipAlign,
-    className: "".concat(blockClass, "__con-tooltip")
-  }, wrapperProps), Button()) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, Button());
+    className: "".concat(wrapperClassName, " ").concat(blockClass, "__tooltip ").concat(carbonPrefix, "--icon-tooltip")
+  }, wrapperProps, {
+    leaveDelayMs: 0
+  }), Button()) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, Button());
 };
 ConditionBuilderButton.propTypes = {
   /**
@@ -54,6 +66,10 @@ ConditionBuilderButton.propTypes = {
    * decides if label and tooltip to be hidden
    */
   hideLabel: PropTypes.bool,
+  /**
+   * boolean to know the updated value in not valid
+   */
+  isInvalid: PropTypes.bool,
   /**
    * label of the button
    */
@@ -79,10 +95,18 @@ ConditionBuilderButton.propTypes = {
    *decides if  tooltip to be shown
    */
   showToolTip: PropTypes.bool,
+  /**
+   * Tab index
+   */
+  tabIndex: PropTypes.number,
   /**
    * tooltip position
    */
   tooltipAlign: PropTypes.string,
+  /**
+   * classname applies to the wrapper of popover
+   */
+  wrapperClassName: PropTypes.string,
   /**
    * optional props for tree grid to add role and aria-label to wrapper span
    */

package/es/components/ConditionBuilder/ConditionBuilderConnector/ConditionConnector.js

@@ -5,14 +5,16 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useContext, useCallback } from 'react';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
-import { ConditionBuilderItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js';
-import { blockClass, translateWithId, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
+import { ItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js';
+import { blockClass, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
 import PropTypes from '../../../node_modules/prop-types/index.js';
 import { focusThisField } from '../utils/util.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
+import { useTranslations } from '../utils/useTranslations.js';
+import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 
 var _excluded = ["operator", "className", "onChange"];
 var ConditionConnector = function ConditionConnector(_ref) {
@@ -21,7 +23,11 @@ var ConditionConnector = function ConditionConnector(_ref) {
     onChange = _ref.onChange,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useContext = useContext(ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
+  var _useTranslations = useTranslations(['connectorText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 1),
+    connectorText = _useTranslations2[0];
   var handleConnectorHover = useCallback(function (parentGroup, isHover) {
     if (isHover) {
       parentGroup.classList.add('hoveredConnector');
@@ -39,16 +45,18 @@ var ConditionConnector = function ConditionConnector(_ref) {
   };
   var onChangeHandler = function onChangeHandler(op, evt) {
     onChange(op);
-    focusThisField(evt);
+    focusThisField(evt, conditionBuilderRef);
   };
   return variant == 'tree' ? /*#__PURE__*/React__default.createElement("span", {
-    className: "".concat(className, " ").concat(blockClass, "__connector-disabled")
-  }, operator) :
+    className: "".concat(className, " ").concat(blockClass, "__connector--disabled")
+  }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, {
+    label: operator
+  })) :
   /*#__PURE__*/
   // <div className={className} {...rest}>
   React__default.createElement(ConditionBuilderItem, _extends({
     label: operator,
-    title: translateWithId('connector'),
+    title: connectorText,
     "data-name": "connectorField",
     onMouseEnter: activeConnectorHandler,
     onMouseLeave: inActiveConnectorHandler,
@@ -57,13 +65,13 @@ var ConditionConnector = function ConditionConnector(_ref) {
   }, rest, {
     popOverClassName: className,
     className: "".concat(blockClass, "__connector-button ")
-  }), /*#__PURE__*/React__default.createElement(ConditionBuilderItemOption, {
+  }), /*#__PURE__*/React__default.createElement(ItemOption, {
     config: {
       options: connectorConfig
     },
     conditionState: {
       value: operator,
-      label: translateWithId('connector')
+      label: connectorText
     },
     onChange: onChangeHandler
   }))

package/es/components/ConditionBuilder/ConditionBuilderConnector/GroupConnector.js

@@ -5,35 +5,43 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2 } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useContext } from 'react';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
-import { blockClass, translateWithId, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
-import { ConditionBuilderItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js';
-import { focusThisField } from '../utils/util.js';
+import { blockClass, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
+import { ItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
 var GroupConnector = function GroupConnector() {
   var _useContext = useContext(ConditionBuilderContext),
-    rootState = _useContext.rootState;
+    rootState = _useContext.rootState,
+    setRootState = _useContext.setRootState;
+  var _useTranslations = useTranslations(['conditionText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 1),
+    conditionText = _useTranslations2[0];
+  var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
+    setRootState(_objectSpread2(_objectSpread2({}, rootState), {}, {
+      operator: updatedStatement
+    }));
+  };
   return /*#__PURE__*/React__default.createElement("div", {
-    className: "".concat(blockClass, "__group-separator"),
+    className: "".concat(blockClass, "__group-separator ").concat(blockClass, "__group-separator-row"),
     role: "row",
     tabIndex: -1,
     "aria-level": 1
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
     label: rootState.operator,
-    title: translateWithId('condition'),
+    title: conditionText,
     "data-name": "connectorField",
     popOverClassName: "".concat(blockClass, "__gap"),
     className: "".concat(blockClass, "__statement-button")
-  }, /*#__PURE__*/React__default.createElement(ConditionBuilderItemOption, {
+  }, /*#__PURE__*/React__default.createElement(ItemOption, {
     conditionState: {
       value: rootState.operator,
-      label: translateWithId('condition')
-    },
-    onChange: function onChange(v, e) {
-      focusThisField(e);
+      label: conditionText
     },
+    onChange: onStatementChangeHandler,
     config: {
       options: connectorConfig
     }

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

@@ -1,30 +1,26 @@
 export default ConditionBuilderContent;
-declare function ConditionBuilderContent({ startConditionLabel, conditionBuilderRef, getConditionState, initialState, }: {
+declare function ConditionBuilderContent({ startConditionLabel, getConditionState, getActionsState, initialState, actions, }: {
     startConditionLabel: any;
-    conditionBuilderRef: any;
     getConditionState: any;
+    getActionsState: any;
     initialState: any;
+    actions: any;
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace ConditionBuilderContent {
     namespace propTypes {
         let actions: PropTypes.Requireable<(PropTypes.InferProps<{
-            id: PropTypes.Requireable<number>;
-            label: PropTypes.Requireable<string>;
+            id: PropTypes.Validator<NonNullable<NonNullable<string | number | null | undefined>>>;
+            label: PropTypes.Validator<string>;
         }> | null | undefined)[]>;
-        let conditionBuilderRef: PropTypes.Requireable<object>;
         let getActionsState: PropTypes.Requireable<(...args: any[]) => any>;
         let getConditionState: PropTypes.Validator<(...args: any[]) => any>;
         let initialState: PropTypes.Requireable<PropTypes.InferProps<{
             groups: PropTypes.Requireable<(PropTypes.InferProps<{
-                groupSeparateOperator: PropTypes.Requireable<string>;
-                groupOperator: PropTypes.Requireable<string>;
-                statement: PropTypes.Requireable<string>;
-                conditions: PropTypes.Requireable<(PropTypes.InferProps<{
-                    property: PropTypes.Requireable<string>;
-                    operator: PropTypes.Requireable<string>;
-                    value: PropTypes.Requireable<string>;
-                }> | null | undefined)[]>;
+                groupOperator: PropTypes.Validator<string>;
+                statement: PropTypes.Validator<string>;
+                conditions: PropTypes.Requireable<(object | null | undefined)[]>;
             }> | null | undefined)[]>;
+            operator: PropTypes.Requireable<string>;
         }>>;
         let startConditionLabel: PropTypes.Validator<string>;
     }

package/es/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.js

@@ -5,33 +5,34 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2, extends as _extends, toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2, toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useContext, useState, useEffect, useCallback } from 'react';
 import PropTypes from '../../../node_modules/prop-types/index.js';
 import { Button, Section, Heading } from '@carbon/react';
 import { Add, TextNewLine } from '@carbon/react/icons';
 import ConditionGroupBuilder from '../ConditionGroupBuilder/ConditionGroupBuilder.js';
 import { ConditionBuilderContext, emptyState } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
-import { blockClass, translateWithId } from '../ConditionBuilderContext/DataConfigs.js';
+import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 import uuidv4 from '../../../global/js/utils/uuidv4.js';
 import ConditionPreview from '../ConditionPreview/ConditionPreview.js';
 import GroupConnector from '../ConditionBuilderConnector/GroupConnector.js';
+import ConditionBuilderActions from '../ConditionBuilderActions/ConditionBuilderActions.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
-var _Heading, _GroupConnector, _ConditionPreview;
+var _GroupConnector;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
-  var _rootState$groups2;
+  var _rootState$groups3;
   var startConditionLabel = _ref.startConditionLabel,
-    conditionBuilderRef = _ref.conditionBuilderRef,
     getConditionState = _ref.getConditionState,
-    initialState = _ref.initialState;
-  // const { rootState, setRootState, variant, actionState } = useContext(
-  //   ConditionBuilderContext
-  // );
+    getActionsState = _ref.getActionsState,
+    initialState = _ref.initialState,
+    actions = _ref.actions;
   var _useContext = useContext(ConditionBuilderContext),
     rootState = _useContext.rootState,
     setRootState = _useContext.setRootState,
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    actionState = _useContext.actionState;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isConditionBuilderActive = _useState2[0],
@@ -40,6 +41,16 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     showConditionGroupPreview = _useState4[0],
     setShowConditionGroupPreview = _useState4[1];
+  var _useTranslations = useTranslations(['addConditionGroupText', 'conditionHeadingText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 2),
+    addConditionGroupText = _useTranslations2[0],
+    conditionHeadingText = _useTranslations2[1];
+  var showConditionGroupPreviewHandler = function showConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(true);
+  };
+  var hideConditionGroupPreviewHandler = function hideConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(false);
+  };
   useEffect(function () {
     var _rootState$groups;
     if (rootState !== null && rootState !== void 0 && (_rootState$groups = rootState.groups) !== null && _rootState$groups !== void 0 && _rootState$groups.length) {
@@ -53,11 +64,10 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [rootState]);
-
-  // useEffect(() => {
-  //   getActionsState?.(actionState);
-  //   // eslint-disable-next-line react-hooks/exhaustive-deps
-  // }, [actionState]);
+  useEffect(function () {
+    getActionsState === null || getActionsState === void 0 || getActionsState(actionState);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [actionState]);
   var onStartConditionBuilder = function onStartConditionBuilder() {
     //when add condition button is clicked.
     setIsConditionBuilderActive(true);
@@ -83,8 +93,6 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   };
   var addConditionGroupHandler = function addConditionGroupHandler() {
     var newGroup = {
-      groupSeparateOperator: 'and',
-      // 'or'|'and'|'null',
       groupOperator: 'and',
       //'and|or',
       statement: 'if',
@@ -102,28 +110,31 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       groups: [].concat(_toConsumableArray(rootState.groups), [newGroup])
     }));
   };
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, !isConditionBuilderActive && /*#__PURE__*/React__default.createElement(Button, {
-    className: "".concat(blockClass, "__add-condition-button"),
-    renderIcon: function renderIcon(props) {
-      return /*#__PURE__*/React__default.createElement(Add, _extends({
-        size: 16
-      }, props));
-    },
-    iconDescription: startConditionLabel,
-    kind: "ghost",
-    size: "sm",
-    onClick: onStartConditionBuilder
-  }, startConditionLabel), isConditionBuilderActive &&
-  /*#__PURE__*/
-  // <h5 >Condition</h5>
-  React__default.createElement(Section, {
+  var getColorIndex = function getColorIndex() {
+    var _rootState$groups$len, _rootState$groups2;
+    var groupLength = (_rootState$groups$len = rootState === null || rootState === void 0 || (_rootState$groups2 = rootState.groups) === null || _rootState$groups2 === void 0 ? void 0 : _rootState$groups2.length) !== null && _rootState$groups$len !== void 0 ? _rootState$groups$len : 0;
+    return groupLength % 5;
+  };
+  if (!isConditionBuilderActive) {
+    return /*#__PURE__*/React__default.createElement(Button, {
+      className: "".concat(blockClass, "__addConditionText-button"),
+      renderIcon: function renderIcon(props) {
+        return /*#__PURE__*/React__default.createElement(Add, props);
+      },
+      iconDescription: startConditionLabel,
+      kind: "ghost",
+      size: "sm",
+      onClick: onStartConditionBuilder
+    }, startConditionLabel);
+  }
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(Section, {
     className: "".concat(blockClass, "__heading"),
     level: 4
-  }, _Heading || (_Heading = /*#__PURE__*/React__default.createElement(Heading, null, "Condition"))), /*#__PURE__*/React__default.createElement("div", {
+  }, /*#__PURE__*/React__default.createElement(Heading, null, conditionHeadingText)), /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__content-container"),
     role: "treegrid",
     "aria-label": "condition builder tree"
-  }, rootState && (rootState === null || rootState === void 0 || (_rootState$groups2 = rootState.groups) === null || _rootState$groups2 === void 0 ? void 0 : _rootState$groups2.map(function (eachGroup, groupIndex) {
+  }, rootState && (rootState === null || rootState === void 0 || (_rootState$groups3 = rootState.groups) === null || _rootState$groups3 === void 0 ? void 0 : _rootState$groups3.map(function (eachGroup, groupIndex) {
     return /*#__PURE__*/React__default.createElement("div", {
       key: eachGroup.id,
       className: "".concat(blockClass, "__group-wrapper")
@@ -140,32 +151,38 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       },
       onChange: function onChange(updatedGroup) {
         onChangeHandler(updatedGroup, groupIndex);
-      },
-      conditionBuilderRef: conditionBuilderRef
+      }
     }), groupIndex < rootState.groups.length - 1 && (_GroupConnector || (_GroupConnector = /*#__PURE__*/React__default.createElement(GroupConnector, null))));
-  })), isConditionBuilderActive && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, variant == 'tree' && /*#__PURE__*/React__default.createElement("div", {
+  })), variant == 'tree' && /*#__PURE__*/React__default.createElement("div", {
     role: "row",
     tabIndex: -1,
-    "aria-level": 1
+    "aria-level": 1,
+    className: "".concat(blockClass, "__add-group")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, {
     renderIcon: TextNewLine,
     onClick: addConditionGroupHandler,
-    onMouseEnter: function onMouseEnter() {
-      setShowConditionGroupPreview(true);
-    },
-    onMouseLeave: function onMouseLeave() {
-      setShowConditionGroupPreview(false);
-    },
+    onMouseEnter: showConditionGroupPreviewHandler,
+    onMouseLeave: hideConditionGroupPreviewHandler,
+    onFocus: showConditionGroupPreviewHandler,
+    onBlur: hideConditionGroupPreviewHandler,
     className: "".concat(blockClass, "__add-condition-group "),
     hideLabel: true,
-    label: translateWithId('add-condition-sub-group'),
+    label: addConditionGroupText,
     wrapperProps: {
       role: 'gridcell',
-      'aria-label': translateWithId('add-condition-sub-group')
+      'aria-label': addConditionGroupText
+    }
+  })), showConditionGroupPreview && /*#__PURE__*/React__default.createElement(ConditionPreview, {
+    previewType: "newGroup",
+    colorIndex: getColorIndex(),
+    group: {
+      groupOperator: rootState.operator
     }
-  })), showConditionGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default.createElement(ConditionPreview, {
-    previewType: "newGroup"
-  }))))));
+  })), actions && /*#__PURE__*/React__default.createElement(ConditionBuilderActions, {
+    actions: actions,
+    className: "".concat(blockClass, "__actions-container"),
+    variant: variant
+  }));
 };
 var ConditionBuilderContent$1 = ConditionBuilderContent;
 ConditionBuilderContent.propTypes = {
@@ -173,13 +190,9 @@ ConditionBuilderContent.propTypes = {
    * optional array of object that give the list of actions.
    */
   actions: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.number,
-    label: PropTypes.string
+    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+    label: PropTypes.string.isRequired
   })),
-  /**
-   * ref of condition builder
-   */
-  conditionBuilderRef: PropTypes.object,
   /**
    * callback functions that will provide the updated action state back.
    */
@@ -193,15 +206,21 @@ ConditionBuilderContent.propTypes = {
    */
   initialState: PropTypes.shape({
     groups: PropTypes.arrayOf(PropTypes.shape({
-      groupSeparateOperator: PropTypes.string,
-      groupOperator: PropTypes.string,
-      statement: PropTypes.string,
-      conditions: PropTypes.arrayOf(PropTypes.shape({
-        property: PropTypes.string,
-        operator: PropTypes.string,
-        value: PropTypes.string
-      }))
-    }))
+      groupOperator: PropTypes.string.isRequired,
+      statement: PropTypes.string.isRequired,
+      conditions: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.shape({
+        property: PropTypes.string.isRequired,
+        operator: PropTypes.string.isRequired,
+        value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.shape({
+          id: PropTypes.string,
+          label: PropTypes.string
+        })), PropTypes.shape({
+          id: PropTypes.string,
+          label: PropTypes.string
+        })])
+      }), PropTypes.object]))
+    })),
+    operator: PropTypes.string
   }),
   /* Provide a label to the button that starts condition builder
    */