@carbon/ibm-products 2.43.2-canary.9 → 2.43.2-canary.92

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

@@ -16,20 +16,19 @@ var index = require('../../../node_modules/prop-types/index.js');
 var cx = require('classnames');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
-var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
 var util = require('../utils/util.js');
 var ConditionConnector = require('../ConditionBuilderConnector/ConditionConnector.js');
 var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
 var uuidv4 = require('../../../global/js/utils/uuidv4.js');
 var ConditionPreview = require('../ConditionPreview/ConditionPreview.js');
+var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
+var useTranslations = require('../utils/useTranslations.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
-var _ConditionPreview, _ConditionPreview2;
-
 /**
  *
  *  state - this is the current group that is being rendered . This can be a inner group or outer group
@@ -38,14 +37,20 @@ var _ConditionPreview, _ConditionPreview2;
  */
 
 var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
+  var _ConditionPreview, _ConditionPreview2;
   var group = _ref.group,
     aria = _ref.aria,
     onRemove = _ref.onRemove,
     onChange = _ref.onChange,
-    conditionBuilderRef = _ref.conditionBuilderRef,
     className = _ref.className;
+  var _useTranslations = useTranslations.useTranslations(['conditionBuilderGroupText', 'conditionText', 'conditionBuilderText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 3),
+    conditionBuilderGroupText = _useTranslations2[0],
+    conditionText = _useTranslations2[1],
+    conditionBuilderText = _useTranslations2[2];
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useState = React.useState(-1),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     showConditionPreview = _useState2[0],
@@ -54,14 +59,46 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
     showConditionSubGroupPreview = _useState4[0],
     setShowConditionSubGroupPreview = _useState4[1];
-  var onRemoveHandler = function onRemoveHandler(conditionId, evt) {
+  var conditionBuilderContentRef = React.useRef();
+  var onRemoveHandler = function onRemoveHandler(conditionId, evt, conditionIndex) {
     if (group.conditions.length > 1) {
-      onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
-        conditions: group.conditions.filter(function (condition) {
-          return conditionId !== condition.id;
-        })
-      }));
-      handleFocusOnClose(evt);
+      variant == 'tree' ? handleFocusOnCloseTree(evt) : handleFocusOnClose(evt, conditionIndex);
+      if (group.conditions[1].conditions && group.conditions[1].id !== conditionId) {
+        //when we remove every plain conditions of a group without deleting  the subgroup, we need to restructure the group
+        //the inner group become outer group and same level subgroups become plain conditions
+
+        //ensure we are deleting last condition , not the subgroup
+
+        //spreading out the condition inside the subgroup
+        var allConditions = group.conditions.reduce(function (acc, item) {
+          if (item.conditions) {
+            return acc.concat(item.conditions);
+          }
+          return acc;
+        }, []);
+
+        //we always have conditions first and then subgroups, so ordering accordingly
+        var groupedItems = {
+          groups: [],
+          conditions: []
+        };
+        allConditions.forEach(function (item) {
+          if (item.conditions) {
+            groupedItems.groups.push(item);
+          } else {
+            groupedItems.conditions.push(item);
+          }
+        });
+        onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+          conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(groupedItems.conditions), _rollupPluginBabelHelpers.toConsumableArray(groupedItems.groups))
+        }));
+      } else {
+        onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+          conditions: group.conditions.filter(function (condition) {
+            return conditionId !== condition.id;
+          })
+        }));
+      }
     } else {
       onRemove(evt);
     }
@@ -84,17 +121,59 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [newCondition], _rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(conditionIndex + 1)))
     }));
   };
-  var handleFocusOnClose = function handleFocusOnClose(e) {
-    var _e$currentTarget;
-    var previousClose = (_e$currentTarget = e.currentTarget) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.closest('[role="row"]')) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.previousSibling) === null || _e$currentTarget === void 0 ? void 0 : _e$currentTarget.querySelector('[data-name="closeCondition"]');
-    if (previousClose) {
-      previousClose.focus();
+  var handleFocusOnClose = function handleFocusOnClose(e, conditionIndex) {
+    var _e$currentTarget$clos;
+    //get all close buttons.
+    //if the last condition is closing, focus the second last one.
+    //or focus the next one.
+    var currentGroupCloseButtons = (_e$currentTarget$clos = e.currentTarget.closest(".".concat(DataConfigs.blockClass, "__group"))) === null || _e$currentTarget$clos === void 0 ? void 0 : _e$currentTarget$clos.querySelectorAll('[data-name="closeCondition"]');
+    if (conditionIndex == currentGroupCloseButtons.length - 1) {
+      util.manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex - 1], conditionBuilderRef);
+    } else {
+      util.manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex + 1], conditionBuilderRef);
+    }
+  };
+  var handleFocusOnCloseTree = function handleFocusOnCloseTree(evt) {
+    var _evt$currentTarget, _evt$currentTarget2, _conditionBuilderCont, _conditionBuilderCont2;
+    //getting the current aria-level and aria-posinset.
+    var currentLevel = (_evt$currentTarget = evt.currentTarget) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.closest('[role="row"]')) === null || _evt$currentTarget === void 0 ? void 0 : _evt$currentTarget.getAttribute('aria-level');
+    var currentPos = (_evt$currentTarget2 = evt.currentTarget) === null || _evt$currentTarget2 === void 0 || (_evt$currentTarget2 = _evt$currentTarget2.closest('[role="row"]')) === null || _evt$currentTarget2 === void 0 ? void 0 : _evt$currentTarget2.getAttribute('aria-posinset');
+
+    //finding the next and previous items in same level
+    var nextElement = (_conditionBuilderCont = conditionBuilderContentRef.current) === null || _conditionBuilderCont === void 0 ? void 0 : _conditionBuilderCont.querySelector("[aria-level=\"".concat(currentLevel, "\"][aria-posinset=\"").concat(Number(currentPos) + 1, "\"]"));
+    var prevElement = (_conditionBuilderCont2 = conditionBuilderContentRef.current) === null || _conditionBuilderCont2 === void 0 ? void 0 : _conditionBuilderCont2.querySelector("[aria-level=\"".concat(currentLevel, "\"][aria-posinset=\"").concat(Number(currentPos) - 1, "\"]"));
+    //checking if next level is a valid condition. If then, focus the close button inside that condition
+    //Otherwise , check the previous item is a valid condition
+
+    if (nextElement !== null && nextElement !== void 0 && nextElement.classList.contains("".concat(DataConfigs.blockClass, "__condition-block"))) {
+      util.manageTabIndexAndFocus(nextElement === null || nextElement === void 0 ? void 0 : nextElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+    } else if (prevElement !== null && prevElement !== void 0 && prevElement.classList.contains("".concat(DataConfigs.blockClass, "__condition-block"))) {
+      util.manageTabIndexAndFocus(prevElement === null || prevElement === void 0 ? void 0 : prevElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+    }
+    //If there are no valid condition in this group, focus next or previous row
+    else {
+      var _conditionBuilderCont3, _conditionBuilderCont4;
+      var prevRows = (_conditionBuilderCont3 = conditionBuilderContentRef.current) === null || _conditionBuilderCont3 === void 0 ? void 0 : _conditionBuilderCont3.querySelectorAll("[aria-level=\"".concat(Number(currentLevel) - 1, "\"][role=\"row\"]"));
+      var nextRow = (_conditionBuilderCont4 = conditionBuilderContentRef.current) === null || _conditionBuilderCont4 === void 0 ? void 0 : _conditionBuilderCont4.querySelector("[aria-level=\"".concat(Number(currentLevel) + 1, "\"][role=\"row\"]"));
+      if (nextRow) {
+        //since there are no condition in current group, this group will move one level up
+
+        var rowIdentity = {
+          ariaLevel: Number(nextRow.ariaLevel) - 1,
+          ariaPosInSet: nextRow.ariaPosInSet
+        };
+        setTimeout(function () {
+          var currentRowToFocus = conditionBuilderContentRef.current.querySelector("[role=\"row\"][aria-level=\"".concat(rowIdentity.ariaLevel, "\"][aria-posinset=\"").concat(rowIdentity.ariaPosInSet, "\"]"));
+          util.manageTabIndexAndFocus(currentRowToFocus, conditionBuilderRef);
+        }, 0);
+      } else if ((prevRows === null || prevRows === void 0 ? void 0 : prevRows.length) > 1) {
+        util.manageTabIndexAndFocus(prevRows[prevRows.length - 2], conditionBuilderRef);
+      }
     }
   };
   var addConditionSubGroupHandler = function addConditionSubGroupHandler(conditionIndex) {
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
       conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [{
-        groupSeparateOperator: null,
         groupOperator: 'and',
         statement: 'if',
         conditions: [{
@@ -124,7 +203,12 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     setShowConditionPreview(-1);
   };
   var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
+    var _statementConfig$find;
+    var groupOperator = (_statementConfig$find = DataConfigs.statementConfig.find(function (statement) {
+      return statement.id == updatedStatement;
+    })) === null || _statementConfig$find === void 0 ? void 0 : _statementConfig$find.connector;
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+      groupOperator: groupOperator,
       statement: updatedStatement
     }));
   };
@@ -140,7 +224,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     }, /*#__PURE__*/React__default["default"].createElement("div", {
       className: "".concat(DataConfigs.blockClass, "__condition-wrapper"),
       role: "grid",
-      "aria-label": DataConfigs.translateWithId('condition_builder_group')
+      "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) {
       return /*#__PURE__*/React__default["default"].createElement("div", {
         key: eachCondition.id,
@@ -161,7 +245,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         addConditionHandler: addConditionHandler,
         onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e);
+          onRemoveHandler(eachCondition.id, e, conditionIndex);
         },
         onConnectorOperatorChange: onConnectorOperatorChange,
         onStatementChange: onStatementChangeHandler,
@@ -174,7 +258,8 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     return /*#__PURE__*/React__default["default"].createElement("div", {
       className: "".concat(className, " ").concat(DataConfigs.blockClass, "__condition-wrapper"),
       role: aria.level === 1 ? 'rowgroup' : undefined,
-      "aria-label": aria.level == 1 ? DataConfigs.translateWithId('condition_builder_group') : undefined
+      "aria-label": aria.level == 1 ? conditionBuilderGroupText : undefined,
+      ref: conditionBuilderContentRef
     }, /*#__PURE__*/React__default["default"].createElement("div", {
       tabIndex: 0,
       role: "row",
@@ -183,17 +268,17 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       "aria-setsize": aria.setsize
     }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
       label: group.statement,
-      title: DataConfigs.translateWithId('condition'),
+      title: conditionText,
       "data-name": "connectorField",
       popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
       className: "".concat(DataConfigs.blockClass, "__statement-button")
-    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+    }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
       conditionState: {
         value: group.statement,
-        label: DataConfigs.translateWithId('condition')
+        label: conditionText
       },
       onChange: function onChange(v, evt) {
-        util.focusThisField(evt);
+        util.focusThisField(evt, conditionBuilderRef);
         onStatementChangeHandler(v);
       },
       config: {
@@ -205,7 +290,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       }, eachCondition.conditions ? /*#__PURE__*/React__default["default"].createElement("div", {
         className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block subgroup  ").concat(DataConfigs.blockClass, "__gap"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap-bottom"), group.conditions.length < conditionIndex + 1))
       }, /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
-        className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__groupConnector"),
+        className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom ").concat(DataConfigs.blockClass, "__groupConnector"),
         operator: group.groupOperator,
         "aria-hidden": true
       }), /*#__PURE__*/React__default["default"].createElement(ConditionGroupBuilder, {
@@ -221,9 +306,8 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         onRemove: function onRemove(e) {
           onRemoveHandler(eachCondition.id, e);
-        },
-        conditionBuilderRef: conditionBuilderRef
-      })) : /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
+        }
+      })) : /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
         conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
         aria: {
           level: aria.level + 1,
@@ -253,10 +337,12 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         hideConditionPreviewHandler: hideConditionPreviewHandler,
         isLastCondition: isLastCondition
-      }), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
-        previewType: "subGroup"
+      })), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
+        previewType: "subGroup",
+        group: group
       }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
-        previewType: "condition"
+        previewType: "condition",
+        group: group
       }))));
     }));
   };
@@ -275,11 +361,6 @@ ConditionGroupBuilder.propTypes = {
    * Provide an optional class to be applied to the containing node.
    */
   className: index["default"].string,
-  /**
-  className: PropTypes.string,
-   * ref of condition builder
-   */
-  conditionBuilderRef: index["default"].object,
   group: index["default"].object,
   /**
    * callback to update the current condition of the state tree

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

@@ -1,9 +1,11 @@
 export default ConditionPreview;
-declare function ConditionPreview({ previewType }: {
+declare function ConditionPreview({ previewType, group }: {
     previewType: any;
+    group: any;
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace ConditionPreview {
     namespace propTypes {
+        let group: PropTypes.Requireable<object>;
         let previewType: PropTypes.Requireable<string>;
     }
 }

package/lib/components/ConditionBuilder/ConditionPreview/ConditionPreview.js

@@ -9,65 +9,92 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
+var cx = require('classnames');
 var index = require('../../../node_modules/prop-types/index.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
 var ConditionConnector = require('../ConditionBuilderConnector/ConditionConnector.js');
+var useTranslations = require('../utils/useTranslations.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 ConditionPreview = function ConditionPreview(_ref) {
-  var previewType = _ref.previewType;
+  var _ConditionBuilderItem, _ConditionBuilderItem2, _ConditionBuilderItem3;
+  var previewType = _ref.previewType,
+    group = _ref.group;
+  var _useState = React.useState(false),
+    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
+    animate = _useState2[0],
+    setAnimate = _useState2[1];
+  var _useTranslations = useTranslations.useTranslations(['valueText', 'operatorText', 'propertyText', 'ifText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 4),
+    propertyText = _useTranslations2[0],
+    operatorText = _useTranslations2[1],
+    valueText = _useTranslations2[2],
+    ifText = _useTranslations2[3];
+  React.useEffect(function () {
+    setAnimate(true);
+  }, []);
   var getConditionSection = function getConditionSection() {
-    return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
-      label: DataConfigs.translateWithId('property')
-    }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
-      label: DataConfigs.translateWithId('operator')
-    }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
-      label: DataConfigs.translateWithId('value')
-    }));
+    return /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "".concat(DataConfigs.blockClass, "__preview-condition")
+    }, _ConditionBuilderItem || (_ConditionBuilderItem = /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      label: propertyText,
+      renderIcon: icons.Bee
+    })), _ConditionBuilderItem2 || (_ConditionBuilderItem2 = /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      label: operatorText
+    })), _ConditionBuilderItem3 || (_ConditionBuilderItem3 = /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      label: valueText
+    })));
   };
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, previewType == 'newGroup' && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__group__row ").concat(DataConfigs.blockClass, "__group-preview  ")
+    className: cx__default["default"](["".concat(DataConfigs.blockClass, "__group__row ").concat(DataConfigs.blockClass, "__group-preview "), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     className: "".concat(DataConfigs.blockClass, "__statement-button"),
-    label: DataConfigs.translateWithId('and')
+    label: group.groupOperator
   })), /*#__PURE__*/React__default["default"].createElement("div", {
     "aria-hidden": true,
-    className: "".concat(DataConfigs.blockClass, "__group ").concat(DataConfigs.blockClass, "__condition-wrapper ").concat(DataConfigs.blockClass, "__group-preview ").concat(DataConfigs.blockClass, "__group-wrapper")
+    className: cx__default["default"](["".concat(DataConfigs.blockClass, "__group ").concat(DataConfigs.blockClass, "__condition-wrapper ").concat(DataConfigs.blockClass, "__group-preview ").concat(DataConfigs.blockClass, "__group-wrapper "), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__gap")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     className: "".concat(DataConfigs.blockClass, "__statement-button"),
-    label: DataConfigs.translateWithId('if')
+    label: ifText
   })), getConditionSection())), previewType == 'subGroup' && /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__group-preview")
+    className: cx__default["default"](["".concat(DataConfigs.blockClass, "__group__row ").concat(DataConfigs.blockClass, "__group-preview "), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__condition-block  ").concat(DataConfigs.blockClass, "__gap")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
-    label: DataConfigs.translateWithId('and'),
+    label: group.groupOperator,
     className: "".concat(DataConfigs.blockClass, "__statement-button"),
     popOverClassName: "".concat(DataConfigs.blockClass, "__gap")
   }), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__group ").concat(DataConfigs.blockClass, "__condition-wrapper")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
     className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__groupConnector"),
-    operator: DataConfigs.translateWithId('if')
+    operator: ifText
   }), getConditionSection()))), previewType == 'condition' && /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__group-preview")
+    className: cx__default["default"](["".concat(DataConfigs.blockClass, "__group__row ").concat(DataConfigs.blockClass, "__group-preview "), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__condition-block  ").concat(DataConfigs.blockClass, "__gap")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
-    label: DataConfigs.translateWithId('and'),
+    label: group.groupOperator,
     className: "".concat(DataConfigs.blockClass, "__statement-button"),
     popOverClassName: "".concat(DataConfigs.blockClass, "__gap")
   }), getConditionSection())));
 };
 var ConditionPreview$1 = ConditionPreview;
 ConditionPreview.propTypes = {
+  /**
+   * current conditional group
+   */
+  group: index["default"].object,
   /**
    * type of review to be displayed
    */

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

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