@carbon/ibm-products 2.43.2-canary.7 → 2.43.2-canary.70

package/lib/components/ConditionBuilder/ConditionBuilderAdd/ConditionBuilderAdd.js

@@ -11,14 +11,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
+var cx = require('classnames');
 var icons = require('@carbon/react/icons');
 var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilderButton.js');
 var index = require('../../../node_modules/prop-types/index.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var useTranslations = require('../utils/useTranslations.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
   var className = _ref.className,
@@ -29,11 +32,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 = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     isAddSubgroup = _useState2[0],
     setIsAddSubgroup = _useState2[1];
+  var _useTranslations = useTranslations.useTranslations(['addConditionText', 'addConditionRowText', 'addSubgroupText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 3),
+    addConditionText = _useTranslations2[0],
+    addConditionRowText = _useTranslations2[1],
+    addSubgroupText = _useTranslations2[2];
   var showAddSubGroup = function showAddSubGroup() {
     setIsAddSubgroup(true);
   };
@@ -61,13 +70,13 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
     };
   };
   var wrapperProps = enableSubGroup ? {
-    role: 'gridcell',
-    'aria-label': DataConfigs.translateWithId('add-condition')
+    role: 'gridcell'
+    // 'aria-label': addSubgroupText,
   } : {};
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(className, " ").concat(DataConfigs.blockClass, "__add-button-wrapper"),
     role: !enableSubGroup ? 'gridcell' : 'none',
-    "aria-label": !enableSubGroup ? DataConfigs.translateWithId('add_condition_row') : undefined,
+    "aria-label": !enableSubGroup ? addConditionRowText : undefined,
     onMouseEnter: showAddSubGroup,
     onMouseLeave: hideAddSubGroup,
     onFocus: showAddSubGroup,
@@ -76,18 +85,20 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
     renderIcon: icons.AddAlt,
     onClick: onClickHandler
   }, previewHandlers(), {
+    wrapperProps: wrapperProps,
     className: "".concat(DataConfigs.blockClass, "__add-button"),
     hideLabel: true,
     "data-name": "addButton",
-    label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : DataConfigs.translateWithId('add-condition'),
-    wrapperProps: wrapperProps
-  })), isAddSubgroup && enableSubGroup && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
+    label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : addConditionText,
+    tabIndex: tabIndex
+  })), enableSubGroup && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
     renderIcon: icons.TextNewLine,
     onClick: addConditionSubGroupHandler,
-    className: "".concat(DataConfigs.blockClass, "__add-condition-group ").concat(DataConfigs.blockClass, "__gap-left"),
+    className: cx__default["default"]("".concat(DataConfigs.blockClass, "__add-condition-sub-group ").concat(DataConfigs.blockClass, "__gap-left")),
     hideLabel: true,
-    label: DataConfigs.translateWithId('add-condition'),
-    wrapperProps: wrapperProps
+    label: addSubgroupText,
+    wrapperProps: wrapperProps,
+    wrapperClassName: cx__default["default"]("".concat(DataConfigs.blockClass, "__add-condition-sub-group-wrapper"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__add-condition-sub-group-wrapper--show"), isAddSubgroup))
   }, previewHandlersForSubgroup())));
 };
 var ConditionBuilderAdd$1 = ConditionBuilderAdd;
@@ -122,10 +133,14 @@ ConditionBuilderAdd.propTypes = {
       */
   onClick: index["default"].func,
   showConditionPreviewHandler: index["default"].func,
-  showConditionSubGroupPreviewHandler: index["default"].func
+  showConditionSubGroupPreviewHandler: index["default"].func,
   /**
    * handler for hiding sub group preview
    */
+  /**
+   * Tab index
+   */
+  tabIndex: index["default"].number
 };
 
 exports["default"] = ConditionBuilderAdd$1;

package/lib/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/lib/components/ConditionBuilder/ConditionBuilderButton/ConditionBuilderButton.js

@@ -15,12 +15,15 @@ var cx = require('classnames');
 var index = require('../../../node_modules/prop-types/index.js');
 var react = require('@carbon/react');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var icons = require('@carbon/react/icons');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
+var _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,
@@ -34,24 +37,31 @@ 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 = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var Button = function Button() {
+    var _rest$dataName;
+    var dataName = (_rest$dataName = rest['data-name']) !== null && _rest$dataName !== void 0 ? _rest$dataName : '';
     return /*#__PURE__*/React__default["default"].createElement("button", {
       // role={'gridcell'}
-      tabIndex: -1,
-      className: cx__default["default"]([className, "".concat(DataConfigs.blockClass, "__button"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__text-ellipsis"), showToolTip && !hideLabel)]),
+      tabIndex: tabIndex != undefined ? tabIndex : -1,
+      className: cx__default["default"]([className, "".concat(DataConfigs.blockClass, "__button"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__text-ellipsis"), showToolTip && !hideLabel && !isInvalid), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__invalid-input"), isInvalid)]),
       type: "button",
       onClick: onClick,
       onBlur: onBlur,
       onFocus: onFocus,
       onMouseEnter: onMouseEnter,
-      onMouseLeave: onMouseLeave
-    }, Icon && (_Icon || (_Icon = /*#__PURE__*/React__default["default"].createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default["default"].createElement("span", null, label))));
+      onMouseLeave: onMouseLeave,
+      "data-name": dataName
+    }, Icon && (_Icon || (_Icon = /*#__PURE__*/React__default["default"].createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default["default"].createElement("span", null, label))), isInvalid && (_WarningAltFilled || (_WarningAltFilled = /*#__PURE__*/React__default["default"].createElement(icons.WarningAltFilled, null))));
   };
   return hideLabel || showToolTip ? /*#__PURE__*/React__default["default"].createElement(react.Tooltip, _rollupPluginBabelHelpers["extends"]({
     label: label,
     align: tooltipAlign,
-    className: "".concat(DataConfigs.blockClass, "__con-tooltip")
+    className: "".concat(wrapperClassName)
   }, wrapperProps), Button()) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, Button());
 };
 ConditionBuilderButton.propTypes = {
@@ -63,6 +73,10 @@ ConditionBuilderButton.propTypes = {
    * decides if label and tooltip to be hidden
    */
   hideLabel: index["default"].bool,
+  /**
+   * boolean to know the updated value in not valid
+   */
+  isInvalid: index["default"].bool,
   /**
    * label of the button
    */
@@ -88,10 +102,18 @@ ConditionBuilderButton.propTypes = {
    *decides if  tooltip to be shown
    */
   showToolTip: index["default"].bool,
+  /**
+   * Tab index
+   */
+  tabIndex: index["default"].number,
   /**
    * tooltip position
    */
   tooltipAlign: index["default"].string,
+  /**
+   * classname applies to the wrapper of popover
+   */
+  wrapperClassName: index["default"].string,
   /**
    * optional props for tree grid to add role and aria-label to wrapper span
    */

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

@@ -12,11 +12,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
-var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
+var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var index = require('../../../node_modules/prop-types/index.js');
 var util = require('../utils/util.js');
 var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
+var useTranslations = require('../utils/useTranslations.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -30,6 +31,9 @@ var ConditionConnector = function ConditionConnector(_ref) {
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
     variant = _useContext.variant;
+  var _useTranslations = useTranslations.useTranslations(['connectorText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 1),
+    connectorText = _useTranslations2[0];
   var handleConnectorHover = React.useCallback(function (parentGroup, isHover) {
     if (isHover) {
       parentGroup.classList.add('hoveredConnector');
@@ -56,7 +60,7 @@ var ConditionConnector = function ConditionConnector(_ref) {
   // <div className={className} {...rest}>
   React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, _rollupPluginBabelHelpers["extends"]({
     label: operator,
-    title: DataConfigs.translateWithId('connector'),
+    title: connectorText,
     "data-name": "connectorField",
     onMouseEnter: activeConnectorHandler,
     onMouseLeave: inActiveConnectorHandler,
@@ -65,13 +69,13 @@ var ConditionConnector = function ConditionConnector(_ref) {
   }, rest, {
     popOverClassName: className,
     className: "".concat(DataConfigs.blockClass, "__connector-button ")
-  }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+  }), /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     config: {
       options: DataConfigs.connectorConfig
     },
     conditionState: {
       value: operator,
-      label: DataConfigs.translateWithId('connector')
+      label: connectorText
     },
     onChange: onChangeHandler
   }))

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

@@ -9,12 +9,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
-var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
-var util = require('../utils/util.js');
+var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
 var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
+var useTranslations = require('../utils/useTranslations.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -22,26 +23,33 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var GroupConnector = function GroupConnector() {
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    rootState = _useContext.rootState;
+    rootState = _useContext.rootState,
+    setRootState = _useContext.setRootState;
+  var _useTranslations = useTranslations.useTranslations(['conditionText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 1),
+    conditionText = _useTranslations2[0];
+  var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
+    setRootState(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, rootState), {}, {
+      operator: updatedStatement
+    }));
+  };
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__group-separator"),
+    className: "".concat(DataConfigs.blockClass, "__group-separator ").concat(DataConfigs.blockClass, "__group-separator-row"),
     role: "row",
     tabIndex: -1,
     "aria-level": 1
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: rootState.operator,
-    title: DataConfigs.translateWithId('condition'),
+    title: conditionText,
     "data-name": "connectorField",
     popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
     className: "".concat(DataConfigs.blockClass, "__statement-button")
-  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+  }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     conditionState: {
       value: rootState.operator,
-      label: DataConfigs.translateWithId('condition')
-    },
-    onChange: function onChange(v, e) {
-      util.focusThisField(e);
+      label: conditionText
     },
+    onChange: onStatementChangeHandler,
     config: {
       options: DataConfigs.connectorConfig
     }

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

@@ -1,30 +1,28 @@
 export default ConditionBuilderContent;
-declare function ConditionBuilderContent({ startConditionLabel, conditionBuilderRef, getConditionState, initialState, }: {
+declare function ConditionBuilderContent({ startConditionLabel, conditionBuilderRef, 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/lib/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.js

@@ -21,25 +21,27 @@ var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilder
 var uuidv4 = require('../../../global/js/utils/uuidv4.js');
 var ConditionPreview = require('../ConditionPreview/ConditionPreview.js');
 var GroupConnector = require('../ConditionBuilderConnector/GroupConnector.js');
+var ConditionBuilderActions = require('../ConditionBuilderActions/ConditionBuilderActions.js');
+var useTranslations = require('../utils/useTranslations.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var _Heading, _GroupConnector, _ConditionPreview;
+var _Heading, _GroupConnector;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   var _rootState$groups2;
   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 = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
     rootState = _useContext.rootState,
     setRootState = _useContext.setRootState,
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    actionState = _useContext.actionState;
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     isConditionBuilderActive = _useState2[0],
@@ -48,6 +50,15 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
     showConditionGroupPreview = _useState4[0],
     setShowConditionGroupPreview = _useState4[1];
+  var _useTranslations = useTranslations.useTranslations(['addConditionGroupText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 1),
+    addConditionGroupText = _useTranslations2[0];
+  var showConditionGroupPreviewHandler = function showConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(true);
+  };
+  var hideConditionGroupPreviewHandler = function hideConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(false);
+  };
   React.useEffect(function () {
     var _rootState$groups;
     if (rootState !== null && rootState !== void 0 && (_rootState$groups = rootState.groups) !== null && _rootState$groups !== void 0 && _rootState$groups.length) {
@@ -61,11 +72,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]);
+  React.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);
@@ -91,8 +101,6 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   };
   var addConditionGroupHandler = function addConditionGroupHandler() {
     var newGroup = {
-      groupSeparateOperator: 'and',
-      // 'or'|'and'|'null',
       groupOperator: 'and',
       //'and|or',
       statement: 'if',
@@ -111,7 +119,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     }));
   };
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, !isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(react.Button, {
-    className: "".concat(DataConfigs.blockClass, "__add-condition-button"),
+    className: "".concat(DataConfigs.blockClass, "__addConditionText-button"),
     renderIcon: function renderIcon(props) {
       return /*#__PURE__*/React__default["default"].createElement(icons.Add, _rollupPluginBabelHelpers["extends"]({
         size: 16
@@ -121,10 +129,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     kind: "ghost",
     size: "sm",
     onClick: onStartConditionBuilder
-  }, startConditionLabel), isConditionBuilderActive &&
-  /*#__PURE__*/
-  // <h5 >Condition</h5>
-  React__default["default"].createElement(react.Section, {
+  }, startConditionLabel), isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(react.Section, {
     className: "".concat(DataConfigs.blockClass, "__heading"),
     level: 4
   }, _Heading || (_Heading = /*#__PURE__*/React__default["default"].createElement(react.Heading, null, "Condition"))), /*#__PURE__*/React__default["default"].createElement("div", {
@@ -158,22 +163,28 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
     renderIcon: icons.TextNewLine,
     onClick: addConditionGroupHandler,
-    onMouseEnter: function onMouseEnter() {
-      setShowConditionGroupPreview(true);
-    },
-    onMouseLeave: function onMouseLeave() {
-      setShowConditionGroupPreview(false);
-    },
+    onMouseEnter: showConditionGroupPreviewHandler,
+    onMouseLeave: hideConditionGroupPreviewHandler,
+    onFocus: showConditionGroupPreviewHandler,
+    onBlur: hideConditionGroupPreviewHandler,
     className: "".concat(DataConfigs.blockClass, "__add-condition-group "),
     hideLabel: true,
-    label: DataConfigs.translateWithId('add-condition-sub-group'),
+    label: addConditionGroupText,
     wrapperProps: {
       role: 'gridcell',
-      'aria-label': DataConfigs.translateWithId('add-condition-sub-group')
+      'aria-label': addConditionGroupText
+    }
+  })), showConditionGroupPreview && /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
+    previewType: "newGroup",
+    group: {
+      groupOperator: rootState.operator
     }
-  })), showConditionGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
-    previewType: "newGroup"
-  }))))));
+  }))), isConditionBuilderActive && actions && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderActions["default"], {
+    actions: actions,
+    className: "".concat(DataConfigs.blockClass, "__actions-container"),
+    variant: variant,
+    conditionBuilderRef: conditionBuilderRef
+  }));
 };
 var ConditionBuilderContent$1 = ConditionBuilderContent;
 ConditionBuilderContent.propTypes = {
@@ -181,8 +192,8 @@ ConditionBuilderContent.propTypes = {
    * optional array of object that give the list of actions.
    */
   actions: index["default"].arrayOf(index["default"].shape({
-    id: index["default"].number,
-    label: index["default"].string
+    id: index["default"].oneOfType([index["default"].string, index["default"].number]).isRequired,
+    label: index["default"].string.isRequired
   })),
   /**
    * ref of condition builder
@@ -201,15 +212,21 @@ ConditionBuilderContent.propTypes = {
    */
   initialState: index["default"].shape({
     groups: index["default"].arrayOf(index["default"].shape({
-      groupSeparateOperator: index["default"].string,
-      groupOperator: index["default"].string,
-      statement: index["default"].string,
-      conditions: index["default"].arrayOf(index["default"].shape({
-        property: index["default"].string,
-        operator: index["default"].string,
-        value: index["default"].string
-      }))
-    }))
+      groupOperator: index["default"].string.isRequired,
+      statement: index["default"].string.isRequired,
+      conditions: index["default"].arrayOf(index["default"].oneOfType([index["default"].shape({
+        property: index["default"].string.isRequired,
+        operator: index["default"].string.isRequired,
+        value: index["default"].oneOfType([index["default"].string, index["default"].arrayOf(index["default"].shape({
+          id: index["default"].string,
+          label: index["default"].string
+        })), index["default"].shape({
+          id: index["default"].string,
+          label: index["default"].string
+        })])
+      }), index["default"].object]))
+    })),
+    operator: index["default"].string
   }),
   /* Provide a label to the button that starts condition builder
    */

package/lib/components/ConditionBuilder/ConditionBuilderContext/ConditionBuilderProvider.d.ts

@@ -1,7 +1,6 @@
 export namespace emptyState {
     let operator: string;
     let groups: {
-        groupSeparateOperator: null;
         groupOperator: string;
         statement: string;
         id: any;
@@ -22,21 +21,27 @@ export namespace ConditionBuilderProvider {
         let getOptions: PropTypes.Requireable<(...args: any[]) => any>;
         let inputConfig: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
             properties: PropTypes.Requireable<(PropTypes.InferProps<{
-                id: PropTypes.Requireable<string>;
-                label: PropTypes.Requireable<string>;
+                id: PropTypes.Validator<string>;
+                label: PropTypes.Validator<string>;
                 icon: PropTypes.Requireable<object>;
-                type: PropTypes.Requireable<string>;
+                type: PropTypes.Validator<string>;
                 config: PropTypes.Requireable<PropTypes.InferProps<{
                     options: PropTypes.Requireable<(PropTypes.InferProps<{
-                        id: PropTypes.Requireable<string>;
-                        label: PropTypes.Requireable<string>;
+                        id: PropTypes.Validator<string>;
+                        label: PropTypes.Validator<string>;
                         icon: PropTypes.Requireable<object>;
                     }> | null | undefined)[]>;
-                    includeSearch: PropTypes.Requireable<boolean>;
+                    component: PropTypes.Requireable<(...args: any[]) => any>;
+                    operators: PropTypes.Requireable<(PropTypes.InferProps<{
+                        id: PropTypes.Validator<string>;
+                        label: PropTypes.Validator<string>;
+                    }> | null | undefined)[]>;
+                    long: PropTypes.Requireable<boolean>;
                 }>>;
             }> | null | undefined)[]>;
         }>>>;
         let popOverSearchThreshold: PropTypes.Validator<number>;
+        let translateWithId: PropTypes.Requireable<(...args: any[]) => any>;
         let variant: PropTypes.Validator<string>;
     }
 }