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

package/lib/components/ConditionBuilder/ConditionBuilderActions/ConditionBuilderActions.js

@@ -0,0 +1,163 @@
+/**
+ * Copyright IBM Corp. 2020, 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.
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
+var React = require('react');
+var index = require('../../../node_modules/prop-types/index.js');
+var cx = require('classnames');
+var icons = require('@carbon/react/icons');
+var react = require('@carbon/react');
+var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
+var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
+var ConditionBuilderAdd = require('../ConditionBuilderAdd/ConditionBuilderAdd.js');
+var uuidv4 = require('../../../global/js/utils/uuidv4.js');
+var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilderButton.js');
+var useTranslations = require('../utils/useTranslations.js');
+var ItemOptionForValueField = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOptionForValueField.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 ConditionBuilderActions = function ConditionBuilderActions(_ref) {
+  var actions = _ref.actions,
+    className = _ref.className;
+  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
+    actionState = _useContext.actionState,
+    setActionState = _useContext.setActionState;
+  var _useState = React.useState(-1),
+    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
+    showDeletionPreview = _useState2[0],
+    setShowDeletionPreview = _useState2[1];
+  var _useTranslations = useTranslations.useTranslations(['actionsText', 'then', 'and', 'removeActionText', 'addActionText', 'actionSectionText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 6),
+    actionsText = _useTranslations2[0],
+    thenText = _useTranslations2[1],
+    andText = _useTranslations2[2],
+    removeActionText = _useTranslations2[3],
+    addActionText = _useTranslations2[4],
+    actionSectionText = _useTranslations2[5];
+  var addActionHandler = function addActionHandler() {
+    var action = {
+      id: uuidv4["default"](),
+      label: undefined,
+      popoverToOpen: 'valueField'
+    };
+    setActionState([].concat(_rollupPluginBabelHelpers.toConsumableArray(actionState), [action]));
+  };
+  var onchangeHandler = function onchangeHandler(selectedId, actionIndex) {
+    var action = actions.find(function (action) {
+      return action.id === selectedId;
+    }); //fetch the selected action from the input action array
+
+    // same actions can be added multiple times
+    var newAction = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, action), {}, {
+      id: actionState[actionIndex].id
+    });
+    setActionState([].concat(_rollupPluginBabelHelpers.toConsumableArray(actionState.slice(0, actionIndex)), [newAction], _rollupPluginBabelHelpers.toConsumableArray(actionState.slice(actionIndex + 1))));
+  };
+  var onRemove = function onRemove(selectedId) {
+    setActionState(actionState.filter(function (action) {
+      return action.id !== selectedId;
+    }));
+  };
+  var handleShowDeletionPreview = function handleShowDeletionPreview(index) {
+    setShowDeletionPreview(index);
+  };
+  var handleHideDeletionPreview = function handleHideDeletionPreview() {
+    setShowDeletionPreview(-1);
+  };
+  return /*#__PURE__*/React__default["default"].createElement("div", {
+    className: className
+  }, /*#__PURE__*/React__default["default"].createElement(react.Section, {
+    className: "".concat(DataConfigs.blockClass, "__heading"),
+    level: 4
+  }, /*#__PURE__*/React__default["default"].createElement(react.Heading, null, actionsText)), /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__condition-wrapper"),
+    role: "grid",
+    "aria-label": actionSectionText
+  }, actionState === null || actionState === void 0 ? void 0 : actionState.map(function (action, index) {
+    return /*#__PURE__*/React__default["default"].createElement("div", {
+      key: action.id,
+      role: "row",
+      className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block ").concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__condition__deletion-preview"), showDeletionPreview == index))
+    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      className: "".concat(DataConfigs.blockClass, "__statement-button"),
+      tabIndex: 0,
+      popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
+      label: index === 0 ? thenText : andText
+    }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      label: action.label,
+      title: actionsText,
+      condition: action,
+      "data-name": "valueField",
+      type: "option"
+    }, /*#__PURE__*/React__default["default"].createElement(ItemOptionForValueField.ItemOptionForValueField, {
+      conditionState: {
+        value: action.label
+      },
+      onChange: function onChange(selection) {
+        return onchangeHandler(selection.id, index);
+      },
+      config: {
+        options: actions
+      }
+    })), /*#__PURE__*/React__default["default"].createElement("span", {
+      role: "gridcell",
+      "aria-label": removeActionText
+    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
+      hideLabel: true,
+      label: removeActionText,
+      onClick: function onClick() {
+        return onRemove(action.id);
+      },
+      onMouseEnter: function onMouseEnter() {
+        return handleShowDeletionPreview(index);
+      },
+      onMouseLeave: handleHideDeletionPreview,
+      onFocus: function onFocus() {
+        return handleShowDeletionPreview(index);
+      },
+      onBlur: handleHideDeletionPreview,
+      renderIcon: icons.Close,
+      className: "".concat(DataConfigs.blockClass, "__close-condition"),
+      "data-name": "closeCondition"
+    })), actionState.length === index + 1 && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
+      onClick: addActionHandler,
+      className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-left"),
+      buttonLabel: addActionText,
+      tabIndex: 0
+    }));
+  }), actionState.length === 0 && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
+    onClick: addActionHandler,
+    className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-left"),
+    buttonLabel: addActionText,
+    tabIndex: 0
+  })));
+};
+var ConditionBuilderActions$1 = ConditionBuilderActions;
+ConditionBuilderActions.propTypes = {
+  /**
+   * optional array of object that give the list of actions.
+   */
+  actions: index["default"].arrayOf(index["default"].shape({
+    id: index["default"].oneOfType([index["default"].string, index["default"].number]).isRequired,
+    label: index["default"].string.isRequired
+  })),
+  /**
+   * Provide an optional class to be applied to the containing node.
+   */
+  className: index["default"].string
+};
+
+exports["default"] = ConditionBuilderActions$1;

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

@@ -1,5 +1,5 @@
 export default ConditionBuilderAdd;
-declare function ConditionBuilderAdd({ className, onClick, addConditionSubGroupHandler, showConditionSubGroupPreviewHandler, hideConditionSubGroupPreviewHandler, showConditionPreviewHandler, hideConditionPreviewHandler, enableSubGroup, buttonLabel, }: {
+declare function ConditionBuilderAdd({ className, onClick, addConditionSubGroupHandler, showConditionSubGroupPreviewHandler, hideConditionSubGroupPreviewHandler, showConditionPreviewHandler, hideConditionPreviewHandler, enableSubGroup, buttonLabel, tabIndex, }: {
     className: any;
     onClick: any;
     addConditionSubGroupHandler: any;
@@ -9,6 +9,7 @@ declare function ConditionBuilderAdd({ className, onClick, addConditionSubGroupH
     hideConditionPreviewHandler: any;
     enableSubGroup: any;
     buttonLabel: any;
+    tabIndex: any;
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace ConditionBuilderAdd {
     namespace propTypes {
@@ -21,6 +22,7 @@ declare namespace ConditionBuilderAdd {
         let onClick: PropTypes.Requireable<(...args: any[]) => any>;
         let showConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
         let showConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        let tabIndex: PropTypes.Requireable<number>;
     }
 }
 import PropTypes from 'prop-types';

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);
   };
@@ -60,14 +69,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': DataConfigs.translateWithId('add-condition')
+    role: 'gridcell'
   } : {};
   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": getAriaLabel(),
     onMouseEnter: showAddSubGroup,
     onMouseLeave: hideAddSubGroup,
     onFocus: showAddSubGroup,
@@ -76,18 +87,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")),
     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 ").concat(DataConfigs.blockClass, "__gap-left"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__add-condition-sub-group-wrapper--show"), isAddSubgroup))
   }, previewHandlersForSubgroup())));
 };
 var ConditionBuilderAdd$1 = ConditionBuilderAdd;
@@ -122,10 +135,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,25 +37,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 = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
+  var carbonPrefix = react.usePrefix();
   var Button = function Button() {
-    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)]),
+    var _rest$dataName;
+    var dataName = (_rest$dataName = rest['data-name']) !== null && _rest$dataName !== void 0 ? _rest$dataName : '';
+    return /*#__PURE__*/React__default["default"].createElement("button", _rollupPluginBabelHelpers["extends"]({
+      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
+    }, rest), 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")
-  }, wrapperProps), Button()) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, Button());
+    className: "".concat(wrapperClassName, " ").concat(DataConfigs.blockClass, "__tooltip ").concat(carbonPrefix, "--icon-tooltip")
+  }, wrapperProps, {
+    leaveDelayMs: 0
+  }), Button()) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, Button());
 };
 ConditionBuilderButton.propTypes = {
   /**
@@ -63,6 +75,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 +104,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,13 @@ 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');
+var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilderButton.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -29,7 +31,11 @@ var ConditionConnector = function ConditionConnector(_ref) {
     onChange = _ref.onChange,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
+  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');
@@ -47,16 +53,18 @@ var ConditionConnector = function ConditionConnector(_ref) {
   };
   var onChangeHandler = function onChangeHandler(op, evt) {
     onChange(op);
-    util.focusThisField(evt);
+    util.focusThisField(evt, conditionBuilderRef);
   };
   return variant == 'tree' ? /*#__PURE__*/React__default["default"].createElement("span", {
-    className: "".concat(className, " ").concat(DataConfigs.blockClass, "__connector-disabled")
-  }, operator) :
+    className: "".concat(className, " ").concat(DataConfigs.blockClass, "__connector--disabled")
+  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
+    label: operator
+  })) :
   /*#__PURE__*/
   // <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 +73,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,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>;
     }