@carbon/ibm-products 2.43.2-canary.103 → 2.43.2-canary.105

package/es/components/ActionBar/ActionBar.js

@@ -20,7 +20,6 @@ import { ActionBarOverflowItems } from './ActionBarOverflowItems.js';
 var _excluded = ["actions", "className", "maxVisible", "menuOptionsClass", "onWidthChange", "overflowAriaLabel", "rightAlign"],
   _excluded2 = ["key", "id"],
   _excluded3 = ["key"];
-
 // The block part of our conventional BEM class names (blockClass__E--M).
 var blockClass = "".concat(pkg.prefix, "--action-bar");
 var componentName = 'ActionBar';
@@ -29,7 +28,6 @@ var componentName = 'ActionBar';
 var defaults = {
   actions: Object.freeze([])
 };
-
 // NOTE: the component SCSS is not imported here: it is rolled up separately.
 
 /**
@@ -53,7 +51,7 @@ var ActionBar = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     displayedItems = _useState4[0],
     setDisplayedItems = _useState4[1];
-  var _useState5 = useState([]),
+  var _useState5 = useState(null),
     _useState6 = _slicedToArray(_useState5, 2),
     hiddenSizingItems = _useState6[0],
     setHiddenSizingItems = _useState6[1];
@@ -61,7 +59,7 @@ var ActionBar = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
   var refDisplayedItems = useRef(null);
   var sizingRef = useRef(null);
   var sizes = useRef({});
-  var backupRef = useRef();
+  var backupRef = useRef(null);
   var localRef = ref || backupRef;
 
   // create hidden sizing items
@@ -121,24 +119,25 @@ var ActionBar = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
   var checkFullyVisibleItems = function checkFullyVisibleItems() {
     /* istanbul ignore if */
     if (sizingRef.current) {
+      var _refDisplayedItems$cu;
       var sizingItems = Array.from(sizingRef.current.querySelectorAll(".".concat(blockClass, "__hidden-sizing-item")));
 
       // first item is always the overflow even if nothing else is rendered
       var overflowItem = sizingItems.shift();
 
       // determine how many will fit
-      var spaceAvailable = refDisplayedItems.current.offsetWidth;
+      var spaceAvailable = (_refDisplayedItems$cu = refDisplayedItems.current) === null || _refDisplayedItems$cu === void 0 ? void 0 : _refDisplayedItems$cu.offsetWidth;
       var willFit = 0;
       var maxVisibleWidth = 0;
       var fitLimit = maxVisible ? Math.min(maxVisible, sizingItems.length) : sizingItems.length;
 
       // loop checking the space available
       for (var i = 0; i < fitLimit; i++) {
-        var newSpaceAvailable = spaceAvailable - sizingItems[i].offsetWidth;
+        var newSpaceAvailable = spaceAvailable && spaceAvailable - sizingItems[i].offsetWidth;
 
         // update maxVisibleWidth for later use by onWidthChange
         maxVisibleWidth += sizingItems[i].offsetWidth;
-        if (newSpaceAvailable >= 0) {
+        if (newSpaceAvailable && newSpaceAvailable >= 0) {
           spaceAvailable = newSpaceAvailable;
           willFit += 1;
         }
@@ -148,7 +147,7 @@ var ActionBar = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
       var overflowWidth = overflowItem.offsetWidth;
       if (willFit < sizingItems.length) {
         // Check space for overflow
-        while (willFit > 0 && spaceAvailable < overflowWidth) {
+        while (willFit > 0 && spaceAvailable && spaceAvailable < overflowWidth) {
           willFit -= 1;
 
           // Highly unlikely that any action bar item is narrower than the overflow item
@@ -161,7 +160,10 @@ var ActionBar = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
         sizes.current.minWidth = overflowWidth;
         sizes.current.maxWidth = maxVisibleWidth;
         // emit onWidthChange
-        onWidthChange(_objectSpread2({}, sizes.current));
+        onWidthChange({
+          minWidth: overflowWidth,
+          maxWidth: maxVisibleWidth
+        });
       }
       if (willFit < 1) {
         setDisplayCount(0);
@@ -212,14 +214,17 @@ ActionBar.propTypes = {
    *
    * Carbon Button API https://react.carbondesignsystem.com/?path=/docs/components-button--default#component-api
    */
+  /**@ts-ignore */
   actions: PropTypes.arrayOf(PropTypes.shape(_objectSpread2(_objectSpread2({}, prepareProps(Button.propTypes, [
   // props not desired from Button.propTypes
   'kind', 'size', 'tooltipPosition', 'tooltipAlignment'])), {}, {
+    id: PropTypes.string,
     // Additional props
     key: PropTypes.string.isRequired,
     // Redefine as form different  to Button and a key prop used by ActionBarItems
     iconDescription: PropTypes.string.isRequired,
     label: PropTypes.string.isRequired,
+    /**@ts-ignore */
     renderIcon: Button.propTypes.renderIcon.isRequired,
     // We duplicate onClick here to improve DocGen in Storybook
     onClick: PropTypes.func

package/es/components/ActionBar/ActionBarItem.d.ts

@@ -1,5 +1,39 @@
+import React, { PropsWithChildren } from 'react';
+import { CarbonIconType } from '@carbon/icons-react/lib/CarbonIcon';
+interface ActionBarItemProps extends PropsWithChildren {
+    /**
+     * Specify an optional className to be added to your Button
+     *
+     * (inherited from Carbon Button)
+     */
+    className?: string;
+    /**
+     * If specifying the `renderIcon` prop, provide a description for that icon that can
+     * be read by screen readers
+     *
+     * (inherited from Carbon Button)
+     */
+    label?: string;
+    /**
+     * Optional click handler
+     *
+     * (inherited from Carbon Button)
+     */
+    onClick?: () => void;
+    /**
+     * Optional prop to allow overriding the icon rendering.
+     * Can be a React component class
+     *
+     * (inherited from Carbon Button)
+     */
+    renderIcon?: CarbonIconType;
+    /**
+     * Optional tab index
+     */
+    tabIndex?: number;
+}
 /**
  * The ActionBarItem is used in the page header to populate the action bar
  */
-export let ActionBarItem: React.ForwardRefExoticComponent<React.RefAttributes<any>>;
-import React from 'react';
+export declare let ActionBarItem: React.ForwardRefExoticComponent<ActionBarItemProps & React.RefAttributes<HTMLDivElement>>;
+export {};

package/es/components/ActionBar/ActionBarItem.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectWithoutProperties as _objectWithoutProperties, objectSpread2 as _objectSpread2 } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectSpread2 as _objectSpread2, objectWithoutProperties as _objectWithoutProperties } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default from 'react';
 import PropTypes from '../../node_modules/prop-types/index.js';
 import cx from 'classnames';
@@ -13,11 +13,9 @@ import { pkg } from '../../settings.js';
 import { IconButton } from '@carbon/react';
 
 var _excluded = ["label", "className", "renderIcon"];
-
 // The block part of our conventional BEM class names (blockClass__E--M).
 var componentName = 'ActionBarItem';
 var blockClass = "".concat(pkg.prefix, "--action-bar-item");
-
 // NOTE: the component SCSS is not imported here: it is rolled up separately.
 
 /**
@@ -85,7 +83,12 @@ ActionBarItem.propTypes = _objectSpread2(_objectSpread2({}, propTypes), {}, {
    *
    * (inherited from Carbon Button)
    */
-  renderIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
+  /**@ts-ignore */
+  renderIcon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+  /**
+   * Optional tab index
+   */
+  tabIndex: PropTypes.number
 });
 
 export { ActionBarItem };

package/es/components/ActionBar/ActionBarOverflowItems.d.ts

@@ -1,18 +1,57 @@
-export function ActionBarOverflowItems({ className, menuOptionsClass, overflowItems, overflowAriaLabel, }: {
-    className: any;
-    menuOptionsClass: any;
-    overflowItems: any;
-    overflowAriaLabel: any;
-}): import("react/jsx-runtime").JSX.Element;
-export namespace ActionBarOverflowItems {
-    export { componentName as displayName };
-    export namespace propTypes {
-        let className: PropTypes.Requireable<string>;
-        let menuOptionsClass: PropTypes.Requireable<string>;
-        let overflowAriaLabel: PropTypes.Requireable<string>;
-        let overflowItems: PropTypes.Requireable<(PropTypes.ReactElementLike | null | undefined)[]>;
-    }
-}
-declare const componentName: "ActionBar";
+import { PropsWithChildren, ReactElement } from 'react';
 import PropTypes from 'prop-types';
+import { CarbonIconType } from '@carbon/icons-react/lib/CarbonIcon';
+type OverflowItem = {
+    label: string;
+    onClick: () => void;
+    renderIcon: CarbonIconType;
+};
+interface ActionBarOverflowItemProps extends PropsWithChildren {
+    /**
+     * className
+     */
+    className?: string;
+    /**
+     * class name applied to the overflow options
+     */
+    menuOptionsClass?: string;
+    /**
+     * overflowAriaLabel label for open close button overflow used for action bar items that do nto fit.
+     */
+    overflowAriaLabel?: string;
+    /**
+     * overflowItems: items to bre shown in the ActionBar overflow menu
+     */
+    overflowItems?: ReactElement<OverflowItem>[];
+    /**
+     * Optional tab index
+     */
+    tabIndex?: number;
+}
+export declare const ActionBarOverflowItems: {
+    ({ className, menuOptionsClass, overflowItems, overflowAriaLabel, }: ActionBarOverflowItemProps): import("react/jsx-runtime").JSX.Element;
+    displayName: string;
+    propTypes: {
+        /**
+         * className
+         */
+        className: PropTypes.Requireable<string>;
+        /**
+         * class name applied to the overflow options
+         */
+        menuOptionsClass: PropTypes.Requireable<string>;
+        /**
+         * overflowAriaLabel label for open close button overflow used for action bar items that do nto fit.
+         */
+        overflowAriaLabel: PropTypes.Requireable<string>;
+        /**
+         * overflowItems: items to bre shown in the ActionBar overflow menu
+         */
+        overflowItems: PropTypes.Requireable<(PropTypes.ReactElementLike | null | undefined)[]>;
+        /**
+         * Optional tab index
+         */
+        tabIndex: PropTypes.Requireable<number>;
+    };
+};
 export {};

package/es/components/ActionBar/ActionBarOverflowItems.js

@@ -33,17 +33,17 @@ var ActionBarOverflowItems = function ActionBarOverflowItems(_ref) {
     // This uses a copy of a menu item option
     // NOTE: Cannot use a real Tooltip icon below as it uses a <button /> the
     // div equivalent below is based on Carbon 10.25.0
-    var ItemIcon = item.props.renderIcon;
+    var ItemIcon = item === null || item === void 0 ? void 0 : item.props.renderIcon;
     return /*#__PURE__*/React__default.createElement(OverflowMenuItem, {
       className: "".concat(blockClass, "__item"),
-      onClick: item.props.onClick,
+      onClick: item === null || item === void 0 ? void 0 : item.props.onClick,
       itemText: /*#__PURE__*/React__default.createElement("div", {
         className: "".concat(blockClass, "__item-content"),
         "aria-describedby": "".concat(internalId.current, "-").concat(index, "--item-label")
       }, /*#__PURE__*/React__default.createElement("span", {
         className: "".concat(blockClass, "__item-label"),
         id: "".concat(internalId.current, "-").concat(index, "--item-label")
-      }, item.props.label), typeof item.props.renderIcon === 'function' ? /*#__PURE__*/React__default.createElement(ItemIcon, null) : item.props.renderIcon)
+      }, item === null || item === void 0 ? void 0 : item.props.label), typeof (item === null || item === void 0 ? void 0 : item.props.renderIcon) === 'function' ? /*#__PURE__*/React__default.createElement(ItemIcon, null) : item === null || item === void 0 ? void 0 : item.props.renderIcon)
     });
   }));
 };
@@ -65,7 +65,11 @@ ActionBarOverflowItems.propTypes = {
   /**
    * overflowItems: items to bre shown in the ActionBar overflow menu
    */
-  overflowItems: PropTypes.arrayOf(PropTypes.element)
+  overflowItems: PropTypes.arrayOf(PropTypes.element),
+  /**
+   * Optional tab index
+   */
+  tabIndex: PropTypes.number
 };
 
 export { ActionBarOverflowItems };

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

@@ -20,6 +20,7 @@ declare namespace ConditionBlock {
         let onConnectorOperatorChange: PropTypes.Requireable<(...args: any[]) => any>;
         let onRemove: PropTypes.Requireable<(...args: any[]) => any>;
         let onStatementChange: PropTypes.Requireable<(...args: any[]) => any>;
+        let setShowDeletionPreviewForSubgroups: PropTypes.Requireable<(...args: any[]) => any>;
         let showConditionPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
         let showConditionSubGroupPreviewHandler: PropTypes.Requireable<(...args: any[]) => any>;
         let state: PropTypes.Requireable<object>;

package/es/components/ConditionBuilder/ConditionBlock/ConditionBlock.js

@@ -6,7 +6,7 @@
  */
 
 import { slicedToArray as _slicedToArray, extends as _extends, defineProperty as _defineProperty, objectSpread2 as _objectSpread2 } from '../../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useContext, useState } from 'react';
+import React__default, { useContext, useState, useEffect } from 'react';
 import { Close } from '@carbon/react/icons';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
 import PropTypes from '../../../node_modules/prop-types/index.js';
@@ -52,7 +52,8 @@ var ConditionBlock = function ConditionBlock(props) {
     showConditionSubGroupPreviewHandler = props.showConditionSubGroupPreviewHandler,
     hideConditionPreviewHandler = props.hideConditionPreviewHandler,
     showConditionPreviewHandler = props.showConditionPreviewHandler,
-    isLastCondition = props.isLastCondition;
+    isLastCondition = props.isLastCondition,
+    setShowDeletionPreviewForSubgroups = props.setShowDeletionPreviewForSubgroups;
   var _useContext = useContext(ConditionBuilderContext),
     inputConfig = _useContext.inputConfig,
     variant = _useContext.variant,
@@ -93,6 +94,15 @@ var ConditionBlock = function ConditionBlock(props) {
     textarea: ConditionBuilderItemText
   };
   var ItemComponent = property ? itemComponents[type] : null;
+  useEffect(function () {
+    var _group$conditions, _group$conditions2;
+    if (showDeletionPreview && (group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.length) > 1 && group !== null && group !== void 0 && (_group$conditions2 = group.conditions) !== null && _group$conditions2 !== void 0 && _group$conditions2[1].conditions && group.conditions[1].id !== condition.id) {
+      setShowDeletionPreviewForSubgroups === null || setShowDeletionPreviewForSubgroups === void 0 || setShowDeletionPreviewForSubgroups(true);
+    } else {
+      setShowDeletionPreviewForSubgroups === null || setShowDeletionPreviewForSubgroups === void 0 || setShowDeletionPreviewForSubgroups(false);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [showDeletionPreview]);
   var onStatementChangeHandler = function onStatementChangeHandler(v, evt) {
     focusThisField(evt, conditionBuilderRef);
     onStatementChange(v);
@@ -112,10 +122,9 @@ var ConditionBlock = function ConditionBlock(props) {
       popoverToOpen: checkIsValid(newOperator) ? 'valueField' : ''
     }));
   };
-  var onValueChangeHandler = function onValueChangeHandler(newValue, evt) {
+  var onValueChangeHandler = function onValueChangeHandler(newValue) {
     var currentCondition = _objectSpread2({}, condition);
     delete currentCondition.popoverToOpen;
-    focusThisField(evt, conditionBuilderRef);
     onChange(_objectSpread2(_objectSpread2({}, currentCondition), {}, {
       value: newValue
     }));
@@ -308,6 +317,10 @@ ConditionBlock.propTypes = {
    * callback to handle the statement(if/ excl.if) change
    */
   onStatementChange: PropTypes.func,
+  /**
+   * method to set ShowDeletionPreviewForSubgroups
+   */
+  setShowDeletionPreviewForSubgroups: PropTypes.func,
   /**
    * handler for showing add condition preview
    */

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

@@ -87,11 +87,11 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
   })), enableSubGroup && /*#__PURE__*/React__default.createElement(ConditionBuilderButton, _extends({
     renderIcon: TextNewLine,
     onClick: addConditionSubGroupHandler,
-    className: cx("".concat(blockClass, "__add-condition-sub-group ").concat(blockClass, "__gap-left")),
+    className: cx("".concat(blockClass, "__add-condition-sub-group")),
     hideLabel: true,
     label: addSubgroupText,
     wrapperProps: wrapperProps,
-    wrapperClassName: cx("".concat(blockClass, "__add-condition-sub-group-wrapper"), _defineProperty({}, "".concat(blockClass, "__add-condition-sub-group-wrapper--show"), isAddSubgroup))
+    wrapperClassName: cx("".concat(blockClass, "__add-condition-sub-group-wrapper ").concat(blockClass, "__gap-left"), _defineProperty({}, "".concat(blockClass, "__add-condition-sub-group-wrapper--show"), isAddSubgroup))
   }, previewHandlersForSubgroup())));
 };
 var ConditionBuilderAdd$1 = ConditionBuilderAdd;

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

@@ -9,7 +9,7 @@ import { objectWithoutProperties as _objectWithoutProperties, extends as _extend
 import React__default from 'react';
 import cx from 'classnames';
 import PropTypes from '../../../node_modules/prop-types/index.js';
-import { Tooltip } from '@carbon/react';
+import { usePrefix, Tooltip } from '@carbon/react';
 import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
 import { WarningAltFilled } from '@carbon/react/icons';
 
@@ -33,11 +33,11 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
     wrapperClassName = _ref.wrapperClassName,
     tabIndex = _ref.tabIndex,
     rest = _objectWithoutProperties(_ref, _excluded);
+  var carbonPrefix = usePrefix();
   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.createElement("button", _extends({
-      // role={'gridcell'}
       tabIndex: tabIndex != undefined ? tabIndex : -1,
       className: cx([className, "".concat(blockClass, "__button"), _defineProperty({}, "".concat(blockClass, "__text-ellipsis"), showToolTip && !hideLabel && !isInvalid), _defineProperty({}, "".concat(blockClass, "__invalid-input"), isInvalid)]),
       type: "button",
@@ -52,8 +52,10 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
   return hideLabel || showToolTip ? /*#__PURE__*/React__default.createElement(Tooltip, _extends({
     label: label,
     align: tooltipAlign,
-    className: "".concat(wrapperClassName)
-  }, wrapperProps), Button()) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, Button());
+    className: "".concat(wrapperClassName, " ").concat(blockClass, "__tooltip ").concat(carbonPrefix, "--icon-tooltip")
+  }, wrapperProps, {
+    leaveDelayMs: 0
+  }), Button()) : /*#__PURE__*/React__default.createElement(React__default.Fragment, null, Button());
 };
 ConditionBuilderButton.propTypes = {
   /**

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

@@ -14,6 +14,7 @@ import PropTypes from '../../../node_modules/prop-types/index.js';
 import { focusThisField } from '../utils/util.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
 import { useTranslations } from '../utils/useTranslations.js';
+import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 
 var _excluded = ["operator", "className", "onChange"];
 var ConditionConnector = function ConditionConnector(_ref) {
@@ -48,7 +49,9 @@ var ConditionConnector = function ConditionConnector(_ref) {
   };
   return variant == 'tree' ? /*#__PURE__*/React__default.createElement("span", {
     className: "".concat(className, " ").concat(blockClass, "__connector--disabled")
-  }, operator) :
+  }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, {
+    label: operator
+  })) :
   /*#__PURE__*/
   // <div className={className} {...rest}>
   React__default.createElement(ConditionBuilderItem, _extends({

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

@@ -22,7 +22,7 @@ import { useTranslations } from '../utils/useTranslations.js';
 
 var _GroupConnector;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
-  var _rootState$groups2;
+  var _rootState$groups3;
   var startConditionLabel = _ref.startConditionLabel,
     getConditionState = _ref.getConditionState,
     getActionsState = _ref.getActionsState,
@@ -110,6 +110,11 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       groups: [].concat(_toConsumableArray(rootState.groups), [newGroup])
     }));
   };
+  var getColorIndex = function getColorIndex() {
+    var _rootState$groups$len, _rootState$groups2;
+    var groupLength = (_rootState$groups$len = rootState === null || rootState === void 0 || (_rootState$groups2 = rootState.groups) === null || _rootState$groups2 === void 0 ? void 0 : _rootState$groups2.length) !== null && _rootState$groups$len !== void 0 ? _rootState$groups$len : 0;
+    return groupLength % 5;
+  };
   if (!isConditionBuilderActive) {
     return /*#__PURE__*/React__default.createElement(Button, {
       className: "".concat(blockClass, "__addConditionText-button"),
@@ -129,7 +134,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     className: "".concat(blockClass, "__content-container"),
     role: "treegrid",
     "aria-label": "condition builder tree"
-  }, rootState && (rootState === null || rootState === void 0 || (_rootState$groups2 = rootState.groups) === null || _rootState$groups2 === void 0 ? void 0 : _rootState$groups2.map(function (eachGroup, groupIndex) {
+  }, rootState && (rootState === null || rootState === void 0 || (_rootState$groups3 = rootState.groups) === null || _rootState$groups3 === void 0 ? void 0 : _rootState$groups3.map(function (eachGroup, groupIndex) {
     return /*#__PURE__*/React__default.createElement("div", {
       key: eachGroup.id,
       className: "".concat(blockClass, "__group-wrapper")
@@ -169,6 +174,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     }
   })), showConditionGroupPreview && /*#__PURE__*/React__default.createElement(ConditionPreview, {
     previewType: "newGroup",
+    colorIndex: getColorIndex(),
     group: {
       groupOperator: rootState.operator
     }

package/es/components/ConditionBuilder/ConditionBuilderContext/translationObject.d.ts

@@ -39,4 +39,7 @@ export namespace translationsObject {
     let conditionBuilderText: string;
     let actionSectionText: string;
     let conditionHeadingText: string;
+    let addPropertyText: string;
+    let addOperatorText: string;
+    let addValueText: string;
 }

package/es/components/ConditionBuilder/ConditionBuilderContext/translationObject.js

@@ -32,7 +32,7 @@ var translationsObject = {
   connectorText: 'Connector',
   conditionRowText: 'Condition row',
   conditionRowGroupText: 'Condition row group',
-  removeConditionText: 'Remove condition',
+  removeConditionText: 'Delete condition',
   addConditionRowText: 'Add condition row',
   startText: 'Start',
   endText: 'End',
@@ -45,7 +45,10 @@ var translationsObject = {
   invalidNumberWarnText: 'Invalid number, must be 0 or greater',
   conditionBuilderText: 'Condition Builder',
   actionSectionText: 'Action Section',
-  conditionHeadingText: 'Condition'
+  conditionHeadingText: 'Condition',
+  addPropertyText: 'Add property',
+  addOperatorText: 'Add operator',
+  addValueText: 'Add value'
 };
 
 export { translationsObject };

package/es/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItem.js

@@ -36,11 +36,14 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  var _useTranslations = useTranslations(['invalidText', 'addConditionText', label]),
-    _useTranslations2 = _slicedToArray(_useTranslations, 3),
+  var _useTranslations = useTranslations(['invalidText', 'addConditionText', 'addPropertyText', 'addOperatorText', 'addValueText', label]),
+    _useTranslations2 = _slicedToArray(_useTranslations, 6),
     invalidText = _useTranslations2[0],
     addConditionText = _useTranslations2[1],
-    labelText = _useTranslations2[2];
+    addPropertyText = _useTranslations2[2],
+    addOperatorText = _useTranslations2[3],
+    addValueText = _useTranslations2[4],
+    labelText = _useTranslations2[5];
   var _useContext = useContext(ConditionBuilderContext),
     conditionBuilderRef = _useContext.conditionBuilderRef;
   var getPropertyDetails = function getPropertyDetails() {
@@ -125,6 +128,19 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
       manageInvalidSelection();
     }
   };
+  var getLabel = function getLabel() {
+    if (propertyLabel) {
+      return propertyLabel;
+    } else if (rest['data-name'] === 'propertyField') {
+      return addPropertyText;
+    } else if (rest['data-name'] === 'operatorField') {
+      return addOperatorText;
+    } else if (rest['data-name'] === 'valueField') {
+      return addValueText;
+    } else {
+      return addConditionText;
+    }
+  };
   return /*#__PURE__*/React__default.createElement(Popover, {
     open: open,
     isTabTip: true,
@@ -133,7 +149,7 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     ref: popoverRef,
     onRequestClose: closePopover
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, _extends({
-    label: propertyLabel !== null && propertyLabel !== void 0 ? propertyLabel : addConditionText,
+    label: getLabel(),
     hideLabel: !label ? true : false,
     onClick: togglePopover,
     className: className,

package/es/components/ConditionBuilder/ConditionGroupBuilder/ConditionGroupBuilder.js

@@ -50,6 +50,10 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     showConditionSubGroupPreview = _useState4[0],
     setShowConditionSubGroupPreview = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    showDeletionPreviewForSubgroups = _useState6[0],
+    setShowDeletionPreviewForSubgroups = _useState6[1];
   var conditionBuilderContentRef = useRef();
   var onRemoveHandler = function onRemoveHandler(conditionId, evt, conditionIndex) {
     if (group.conditions.length > 1) {
@@ -80,9 +84,11 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
             groupedItems.conditions.push(item);
           }
         });
-        onChange(_objectSpread2(_objectSpread2({}, group), {}, {
-          conditions: [].concat(_toConsumableArray(groupedItems.conditions), _toConsumableArray(groupedItems.groups))
-        }));
+        onRemove(evt);
+        // onChange({
+        //   ...group,
+        //   conditions: [...groupedItems.conditions, ...groupedItems.groups],
+        // });
       } else {
         onChange(_objectSpread2(_objectSpread2({}, group), {}, {
           conditions: group.conditions.filter(function (condition) {
@@ -155,10 +161,11 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         };
         setTimeout(function () {
           var currentRowToFocus = conditionBuilderContentRef.current.querySelector("[role=\"row\"][aria-level=\"".concat(rowIdentity.ariaLevel, "\"][aria-posinset=\"").concat(rowIdentity.ariaPosInSet, "\"]"));
-          manageTabIndexAndFocus(currentRowToFocus, conditionBuilderRef);
+          manageTabIndexAndFocus(currentRowToFocus === null || currentRowToFocus === void 0 ? void 0 : currentRowToFocus.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
         }, 0);
       } else if ((prevRows === null || prevRows === void 0 ? void 0 : prevRows.length) > 1) {
-        manageTabIndexAndFocus(prevRows[prevRows.length - 2], conditionBuilderRef);
+        var _prevRows;
+        manageTabIndexAndFocus((_prevRows = prevRows[prevRows.length - 2]) === null || _prevRows === void 0 ? void 0 : _prevRows.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
       }
     }
   };
@@ -279,7 +286,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       return /*#__PURE__*/React__default.createElement(Fragment, {
         key: eachCondition.id
       }, eachCondition.conditions ? /*#__PURE__*/React__default.createElement("div", {
-        className: cx("".concat(blockClass, "__condition-block subgroup  ").concat(blockClass, "__gap"), _defineProperty({}, "".concat(blockClass, "__gap-bottom"), group.conditions.length < conditionIndex + 1))
+        className: cx("".concat(blockClass, "__condition-block subgroup  ").concat(blockClass, "__gap"), _defineProperty(_defineProperty({}, "".concat(blockClass, "__gap-bottom"), group.conditions.length < conditionIndex + 1), "".concat(blockClass, "__subgroup_deletionPreview"), showDeletionPreviewForSubgroups), {})
       }, /*#__PURE__*/React__default.createElement(ConditionConnector, {
         className: "".concat(blockClass, "__gap ").concat(blockClass, "__gap-bottom ").concat(blockClass, "__groupConnector"),
         operator: group.groupOperator,
@@ -327,7 +334,8 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           _showConditionPreviewHandler(conditionIndex);
         },
         hideConditionPreviewHandler: hideConditionPreviewHandler,
-        isLastCondition: isLastCondition
+        isLastCondition: isLastCondition,
+        setShowDeletionPreviewForSubgroups: setShowDeletionPreviewForSubgroups
       })), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default.createElement(ConditionPreview, {
         previewType: "subGroup",
         group: group

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

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