@carbon/ibm-products 2.43.2-canary.25 → 2.43.2-canary.252

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

@@ -0,0 +1,155 @@
+/// <reference path="../../../src/custom-typings/index.d.ts" />
+/**
+ * Copyright IBM Corp. 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+import { TextAreaProps, TextInputProps } from '@carbon/react';
+import { CarbonIconType } from '@carbon/react/icons';
+import { NumberInputProps } from '@carbon/react/lib/components/NumberInput/NumberInput';
+import { Dispatch, ForwardedRef, PropsWithChildren, ReactNode, SetStateAction } from 'react';
+export type LogicalOperator = 'and' | 'or';
+export type StatementOperator = 'ifAll' | 'ifAny' | 'unlessAll' | 'unlessAny';
+type CoreOperator = 'is';
+type NumberOperator = 'greater' | 'greaterEqual' | 'lower' | 'lowerEqual';
+type StringOperator = 'startsWith' | 'endsWith';
+type ArrayOperator = 'contains';
+type OptionOperator = 'oneOf';
+type DateOperator = 'before' | 'after';
+export type Operator = LogicalOperator | StatementOperator | CoreOperator | NumberOperator | StringOperator | ArrayOperator | OptionOperator | DateOperator;
+export type OperatorGroups = 'logical' | 'statement' | 'core' | 'number' | 'string' | 'array' | 'option' | 'date';
+export type Operators = {
+    logical: LogicalOperator;
+    statement: StatementOperator;
+    core: CoreOperator;
+    number: NumberOperator;
+    string: StringOperator;
+    array: ArrayOperator;
+    option: OptionOperator;
+    date: DateOperator;
+};
+export type PropertyConfigOption = {
+    type: 'option';
+    config?: {
+        options?: {
+            id: string;
+            label: string;
+            icon?: CarbonIconType;
+        }[];
+    };
+};
+export interface PropertyConfigText {
+    type: 'text';
+    config: TextInputProps;
+}
+export interface PropertyConfigTextArea {
+    type: 'textarea';
+    config: TextAreaProps;
+}
+export interface PropertyConfigNumber {
+    type: 'number';
+    config: {
+        min?: number;
+        max?: number;
+        step?: number;
+        unit?: string;
+    } & NumberInputProps;
+}
+export type PropertyConfigDate = {
+    type: 'date';
+    config: object;
+};
+export type PropertyConfigTime = {
+    type: 'time';
+    config: {
+        timeZones: string[];
+    };
+};
+export type PropertyConfigCustom = {
+    type: 'custom';
+    config: {
+        component: React.ComponentType<any>;
+        operators: {
+            label: string;
+            id: string;
+        }[];
+    };
+};
+export type PropertyConfig = {
+    option: PropertyConfigOption;
+    text: PropertyConfigText;
+    textarea: PropertyConfigTextArea;
+    number: PropertyConfigNumber;
+    date: PropertyConfigDate;
+    time: PropertyConfigTime;
+    custom: PropertyConfigCustom;
+};
+export type Property = {
+    id: string;
+    label: string;
+    icon?: CarbonIconType;
+} & (PropertyConfig['option'] | PropertyConfig['text'] | PropertyConfig['number'] | PropertyConfig['date'] | PropertyConfig['textarea'] | PropertyConfig['time'] | PropertyConfig['custom']);
+export type inputConfig = {
+    properties: Property[];
+};
+export type Option = {
+    id: string;
+    label: string;
+    icon?: CarbonIconType;
+};
+export type Condition = {
+    property?: string;
+    operator?: Operator | '' | 'INVALID';
+    value?: string | Option[] | Option;
+    id?: string | number;
+    popoverToOpen?: string;
+};
+export type ConditionGroup = {
+    conditions?: (ConditionGroup | Condition)[];
+    groupOperator?: LogicalOperator;
+    statement?: StatementOperator;
+    id: string;
+};
+export type ConditionBuilderState = {
+    groups?: ConditionGroup[];
+    operator?: LogicalOperator;
+};
+export type Action = {
+    id?: string | number;
+    label?: string;
+};
+export type variantsType = 'Non-Hierarchical' | 'Hierarchical';
+export type ConditionBuilderProps = {
+    inputConfig: inputConfig;
+    initialState?: InitialState;
+    getActionsState?: (state: Action[] | undefined) => void;
+    getConditionState: (state: ConditionBuilderState | undefined) => void;
+    getOptions?: (state: ConditionBuilderState, condition: Condition) => Promise<Option[]>;
+    actions?: Action[];
+    className?: string;
+    popOverSearchThreshold: number;
+    startConditionLabel?: string;
+    variant?: 'Non-Hierarchical' | 'Hierarchical';
+    translateWithId: (id: string) => string;
+};
+export type InitialState = {
+    state: ConditionBuilderState;
+    enabledDefault?: boolean;
+};
+export interface ConditionBuilderContextInputProps extends PropsWithChildren {
+    children?: ReactNode;
+    inputConfig?: inputConfig;
+    popOverSearchThreshold?: number;
+    getOptions?: (state: ConditionBuilderState, condition: Condition) => Promise<Option[]>;
+    variant?: string;
+    translateWithId?: (id: string) => string;
+    conditionBuilderRef?: ForwardedRef<HTMLDivElement>;
+}
+export type ConditionBuilderContextProps = {
+    rootState?: ConditionBuilderState;
+    setRootState?: Dispatch<SetStateAction<ConditionBuilderState>>;
+    actionState?: Action[];
+    setActionState?: Dispatch<SetStateAction<Action[]>>;
+} & ConditionBuilderContextInputProps;
+export {};

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

@@ -1,15 +1,29 @@
-export default ConditionBuilderActions;
-declare function ConditionBuilderActions({ actions, className }: {
-    actions: any;
-    className: any;
-}): import("react/jsx-runtime").JSX.Element;
-declare namespace ConditionBuilderActions {
-    namespace propTypes {
-        let actions: PropTypes.Requireable<(PropTypes.InferProps<{
-            id: PropTypes.Requireable<number>;
-            label: PropTypes.Requireable<string>;
-        }> | null | undefined)[]>;
-        let className: PropTypes.Requireable<string>;
-    }
-}
+/**
+ * Copyright IBM Corp. 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import PropTypes from 'prop-types';
+import { Action, Option } from '../ConditionBuilder.types';
+interface ConditionBuilderActionsProps {
+    actions: Action[] | Option[];
+    className?: string;
+}
+declare const ConditionBuilderActions: {
+    ({ actions, className, }: ConditionBuilderActionsProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * optional array of object that give the list of actions.
+         */
+        actions: PropTypes.Requireable<(PropTypes.InferProps<{
+            id: PropTypes.Validator<NonNullable<NonNullable<string | number | null | undefined>>>;
+            label: PropTypes.Validator<string>;
+        }> | null | undefined)[]>;
+        /**
+         * Provide an optional class to be applied to the containing node.
+         */
+        className: PropTypes.Requireable<string>;
+    };
+};
+export default ConditionBuilderActions;

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

@@ -12,121 +12,147 @@ 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 ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.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');
 var util = require('../utils/util.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,
+    _useContext$actionSta = _useContext.actionState,
+    actionState = _useContext$actionSta === void 0 ? [] : _useContext$actionSta,
     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: 'actionField'
+      popoverToOpen: 'valueField'
     };
-    setActionState([].concat(_rollupPluginBabelHelpers.toConsumableArray(actionState), [action]));
+    setActionState === null || setActionState === void 0 || setActionState([].concat(_rollupPluginBabelHelpers.toConsumableArray(actionState), [action]));
   };
-  var onchangeHandler = function onchangeHandler(evt, selectedId, actionIndex, currentAction) {
+  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
 
-    //if the action is duplicate, that action is added with a new id, else the same action is used.
     // same actions can be added multiple times
-    var newAction = util.checkDuplicateAction(actionState, selectedId, currentAction.id) ? _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, action), {}, {
-      id: uuidv4["default"]()
-    }) : action;
-    setActionState([].concat(_rollupPluginBabelHelpers.toConsumableArray(actionState.slice(0, actionIndex)), [newAction], _rollupPluginBabelHelpers.toConsumableArray(actionState.slice(actionIndex + 1))));
-    util.focusThisField(evt);
+    var newAction = _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, action), {}, {
+      id: actionState[actionIndex].id
+    });
+    setActionState === null || setActionState === void 0 || 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) {
+    setActionState === null || setActionState === void 0 || 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: "".concat(className)
+    className: className
   }, /*#__PURE__*/React__default["default"].createElement(react.Section, {
-    className: "".concat(DataConfigs.blockClass, "__heading"),
+    className: "".concat(util.blockClass, "__heading"),
     level: 4
-  }, /*#__PURE__*/React__default["default"].createElement(react.Heading, null, DataConfigs.translateWithId('actions'))), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(DataConfigs.blockClass, "__condition-wrapper")
+  }, /*#__PURE__*/React__default["default"].createElement(react.Heading, null, actionsText)), /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(util.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,
-      "aria-hidden": true,
-      className: "".concat(DataConfigs.blockClass, "__condition-block conditionBlockWrapper ").concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom ")
+      role: "row",
+      className: cx__default["default"]("".concat(util.blockClass, "__condition-block ").concat(util.blockClass, "__gap ").concat(util.blockClass, "__gap-bottom"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(util.blockClass, "__condition__deletion-preview"), showDeletionPreview == index))
     }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
-      className: "".concat(DataConfigs.blockClass, "__statement-button"),
-      popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
-      label: index === 0 ? DataConfigs.translateWithId('then') : DataConfigs.translateWithId('and')
+      className: "".concat(util.blockClass, "__statement-button"),
+      tabIndex: 0,
+      popOverClassName: "".concat(util.blockClass, "__gap"),
+      label: index === 0 ? thenText : andText
     }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
       label: action.label,
-      title: DataConfigs.translateWithId('actions'),
-      popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
+      title: actionsText,
       condition: action,
-      "data-name": "actionField"
-    }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
+      "data-name": "valueField",
+      type: "option"
+    }, /*#__PURE__*/React__default["default"].createElement(ItemOptionForValueField.ItemOptionForValueField, {
       conditionState: {
         value: action.label
       },
-      onChange: function onChange(selectedId, evt) {
-        return onchangeHandler(evt, selectedId, index, action);
+      onChange: function onChange(selection) {
+        return onchangeHandler(selection.id, index);
       },
       config: {
         options: actions
       }
     })), /*#__PURE__*/React__default["default"].createElement("span", {
       role: "gridcell",
-      "aria-label": DataConfigs.translateWithId('remove_action')
+      "aria-label": removeActionText
     }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
       hideLabel: true,
-      label: DataConfigs.translateWithId('remove_action'),
+      label: removeActionText,
       onClick: function onClick() {
         return onRemove(action.id);
-      }
-      //   onMouseEnter={handleShowDeletionPreview}
-      //   onMouseLeave={handleHideDeletionPreview}
-      //   onFocus={handleShowDeletionPreview}
-      //   onBlur={handleHideDeletionPreview}
-      ,
+      },
+      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"),
+      className: "".concat(util.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: DataConfigs.translateWithId('add_action')
+      className: "".concat(util.blockClass, "__gap ").concat(util.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: DataConfigs.translateWithId('add_action')
+    className: "".concat(util.blockClass, "__gap ").concat(util.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"].number,
-    label: index["default"].string
+    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.
@@ -134,4 +160,4 @@ ConditionBuilderActions.propTypes = {
   className: index["default"].string
 };
 
-exports["default"] = ConditionBuilderActions$1;
+exports["default"] = ConditionBuilderActions;

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

@@ -1,26 +1,63 @@
-export default ConditionBuilderAdd;
-declare function ConditionBuilderAdd({ className, onClick, addConditionSubGroupHandler, showConditionSubGroupPreviewHandler, hideConditionSubGroupPreviewHandler, showConditionPreviewHandler, hideConditionPreviewHandler, enableSubGroup, buttonLabel, }: {
-    className: any;
-    onClick: any;
-    addConditionSubGroupHandler: any;
-    showConditionSubGroupPreviewHandler: any;
-    hideConditionSubGroupPreviewHandler: any;
-    showConditionPreviewHandler: any;
-    hideConditionPreviewHandler: any;
-    enableSubGroup: any;
-    buttonLabel: any;
-}): import("react/jsx-runtime").JSX.Element;
-declare namespace ConditionBuilderAdd {
-    namespace propTypes {
-        let addConditionSubGroupHandler: PropTypes.Requireable<(...args: any[]) => any>;
-        let buttonLabel: PropTypes.Requireable<string>;
-        let className: PropTypes.Requireable<string>;
-        let enableSubGroup: PropTypes.Requireable<boolean>;
-        let hideConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
-        let hideConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
-        let onClick: PropTypes.Requireable<(...args: any[]) => any>;
-        let showConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
-        let showConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
-    }
-}
+/**
+ * Copyright IBM Corp. 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
 import PropTypes from 'prop-types';
+interface ConditionBuilderAddProps {
+    className?: string;
+    onClick: () => void;
+    addConditionSubGroupHandler?: () => void;
+    showConditionSubGroupPreviewHandler?: () => void;
+    hideConditionSubGroupPreviewHandler?: () => void;
+    showConditionPreviewHandler?: () => void;
+    hideConditionPreviewHandler?: () => void;
+    enableSubGroup?: boolean;
+    buttonLabel?: string;
+    tabIndex?: number;
+}
+declare const ConditionBuilderAdd: {
+    ({ className, onClick, addConditionSubGroupHandler, showConditionSubGroupPreviewHandler, hideConditionSubGroupPreviewHandler, showConditionPreviewHandler, hideConditionPreviewHandler, enableSubGroup, buttonLabel, tabIndex, }: ConditionBuilderAddProps): import("react/jsx-runtime").JSX.Element;
+    propTypes: {
+        /**
+         * handler for hiding sub group preview
+         */
+        addConditionSubGroupHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * handler for hiding sub group preview
+         */ /**
+        * tooltip label for plus button
+        */
+        buttonLabel: PropTypes.Requireable<string>;
+        /**
+         * Provide an optional class to be applied to the containing node.
+         */
+        className: PropTypes.Requireable<string>;
+        /**
+         * boolean to enable sub groups for the tree variant
+         */
+        enableSubGroup: PropTypes.Requireable<boolean>;
+        /**
+         * handler for hiding sub group preview
+         */
+        hideConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        hideConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * handler for hiding sub group preview
+         */ /**
+        * callback triggered on click of add button
+        */
+        onClick: PropTypes.Requireable<(...args: any[]) => any>;
+        showConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        showConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
+        /**
+         * handler for hiding sub group preview
+         */
+        /**
+         * Tab index
+         */
+        tabIndex: PropTypes.Requireable<number>;
+    };
+};
+export default ConditionBuilderAdd;

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

@@ -15,7 +15,8 @@ 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');
+var util = require('../utils/util.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -31,17 +32,13 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
     showConditionPreviewHandler = _ref.showConditionPreviewHandler,
     hideConditionPreviewHandler = _ref.hideConditionPreviewHandler,
     enableSubGroup = _ref.enableSubGroup,
-    buttonLabel = _ref.buttonLabel;
-  var _useState = React.useState(false),
-    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
-    isAddSubgroup = _useState2[0],
-    setIsAddSubgroup = _useState2[1];
-  var showAddSubGroup = function showAddSubGroup() {
-    setIsAddSubgroup(true);
-  };
-  var hideAddSubGroup = function hideAddSubGroup() {
-    setIsAddSubgroup(false);
-  };
+    buttonLabel = _ref.buttonLabel,
+    tabIndex = _ref.tabIndex;
+  var _useTranslations = useTranslations.useTranslations(['addConditionText', 'addConditionRowText', 'addSubgroupText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 3),
+    addConditionText = _useTranslations2[0],
+    addConditionRowText = _useTranslations2[1],
+    addSubgroupText = _useTranslations2[2];
   var onClickHandler = function onClickHandler() {
     hideConditionPreviewHandler === null || hideConditionPreviewHandler === void 0 || hideConditionPreviewHandler();
     onClick();
@@ -62,38 +59,37 @@ 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"),
+    className: "".concat(className, " ").concat(util.blockClass, "__add-button-wrapper"),
     role: !enableSubGroup ? 'gridcell' : 'none',
-    "aria-label": !enableSubGroup ? DataConfigs.translateWithId('add_condition_row') : undefined,
-    onMouseEnter: showAddSubGroup,
-    onMouseLeave: hideAddSubGroup,
-    onFocus: showAddSubGroup,
-    onBlur: hideAddSubGroup
+    "aria-label": getAriaLabel()
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
     renderIcon: icons.AddAlt,
     onClick: onClickHandler
   }, previewHandlers(), {
-    className: "".concat(DataConfigs.blockClass, "__add-button"),
+    wrapperProps: wrapperProps,
+    className: "".concat(util.blockClass, "__add-button"),
     hideLabel: true,
     "data-name": "addButton",
-    label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : DataConfigs.translateWithId('add-condition'),
-    wrapperProps: wrapperProps
+    label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : addConditionText,
+    tabIndex: tabIndex,
+    wrapperClassName: "".concat(util.blockClass, "__add-condition-wrapper")
   })), enableSubGroup && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
     renderIcon: icons.TextNewLine,
     onClick: addConditionSubGroupHandler,
-    className: cx__default["default"]("".concat(DataConfigs.blockClass, "__add_condition_group ").concat(DataConfigs.blockClass, "__gap-left")),
+    className: cx__default["default"]("".concat(util.blockClass, "__add-condition-sub-group")),
     hideLabel: true,
-    label: DataConfigs.translateWithId('add-condition'),
+    label: addSubgroupText,
     wrapperProps: wrapperProps,
-    wrapperClassName: cx__default["default"]("".concat(DataConfigs.blockClass, "__add_condition_group-wrapper"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__add_condition_group-wrapper--show"), isAddSubgroup))
+    wrapperClassName: "".concat(util.blockClass, "__add-condition-sub-group-wrapper ").concat(util.blockClass, "__gap-left")
   }, previewHandlersForSubgroup())));
 };
-var ConditionBuilderAdd$1 = ConditionBuilderAdd;
 ConditionBuilderAdd.propTypes = {
   /**
    * handler for hiding sub group preview
@@ -125,10 +121,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;
+exports["default"] = ConditionBuilderAdd;