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

package/es/components/ConditionBuilder/ConditionPreview/ConditionPreview.js

@@ -18,7 +18,8 @@ import { Bee } from '@carbon/react/icons';
 var ConditionPreview = function ConditionPreview(_ref) {
   var _ConditionBuilderItem, _ConditionBuilderItem2, _ConditionBuilderItem3;
   var previewType = _ref.previewType,
-    group = _ref.group;
+    group = _ref.group,
+    colorIndex = _ref.colorIndex;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     animate = _useState2[0],
@@ -50,6 +51,7 @@ var ConditionPreview = function ConditionPreview(_ref) {
     className: "".concat(blockClass, "__statement-button"),
     label: group.groupOperator
   })), /*#__PURE__*/React__default.createElement("div", {
+    "data-color-index": colorIndex,
     "aria-hidden": true,
     className: cx(["".concat(blockClass, "__group ").concat(blockClass, "__condition-wrapper ").concat(blockClass, "__group-preview ").concat(blockClass, "__group-wrapper "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement("div", {
@@ -58,7 +60,7 @@ var ConditionPreview = function ConditionPreview(_ref) {
     className: "".concat(blockClass, "__statement-button"),
     label: ifText
   })), getConditionSection())), previewType == 'subGroup' && /*#__PURE__*/React__default.createElement("div", {
-    className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
+    className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview ").concat(blockClass, "__gap-bottom"), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__condition-block  ").concat(blockClass, "__gap")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
@@ -71,7 +73,7 @@ var ConditionPreview = function ConditionPreview(_ref) {
     className: "".concat(blockClass, "__gap ").concat(blockClass, "__groupConnector"),
     operator: ifText
   }), getConditionSection()))), previewType == 'condition' && /*#__PURE__*/React__default.createElement("div", {
-    className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
+    className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview ").concat(blockClass, "__gap-bottom"), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__condition-block  ").concat(blockClass, "__gap")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
@@ -82,6 +84,10 @@ var ConditionPreview = function ConditionPreview(_ref) {
 };
 var ConditionPreview$1 = ConditionPreview;
 ConditionPreview.propTypes = {
+  /**
+   * index of the color for next group
+   */
+  colorIndex: PropTypes.number,
   /**
    * current conditional group
    */

package/es/components/ConditionBuilder/utils/handleKeyboardEvents.js

@@ -35,12 +35,18 @@ var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentCont
   var allItems = [];
   switch (key) {
     case 'ArrowUp':
+      evt.preventDefault();
       //traverse through the popover options, search box, selectAll button
       parentContainer.querySelectorAll("[role=\"option\"]").forEach(function (eachElem, index, allElements) {
         traverseReverse(eachElem, index, allElements, null, null, conditionBuilderRef);
       });
+      //scroll to top when we reach a the top of the list to make search box visible
+      if (Array.from(evt.target.closest('ul').querySelectorAll('li')).indexOf(evt.target) === 1) {
+        parentContainer.querySelector(".".concat(blockClass, "__popover-content-wrapper")).scrollTop = 0;
+      }
       break;
     case 'ArrowDown':
+      evt.preventDefault();
       //traverse through the popover options, search box, selectAll button
       parentContainer.querySelectorAll("[role=\"option\"]").forEach(function (eachElem, index, allElements) {
         traverseClockVise(eachElem, index, allElements, null, null, conditionBuilderRef);
@@ -68,12 +74,19 @@ var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentCont
       }
       break;
     case 'Enter':
-      if (isMultiSelect !== 'true') {
+      if (isMultiSelect === 'true') {
         if (document.activeElement.type !== 'button') {
           var _document$activeEleme2;
+          //for button , enter key is click which already handled by framework, for other elements trigger click
+          (_document$activeEleme2 = document.activeElement) === null || _document$activeEleme2 === void 0 || _document$activeEleme2.click();
+        }
+        evt.preventDefault();
+      } else {
+        if (document.activeElement.type !== 'button') {
+          var _document$activeEleme3;
           //for button , enter key is click which already handled by framework, else trigger click
           focusThisField(evt, conditionBuilderRef);
-          (_document$activeEleme2 = document.activeElement) === null || _document$activeEleme2 === void 0 || _document$activeEleme2.click();
+          (_document$activeEleme3 = document.activeElement) === null || _document$activeEleme3 === void 0 || _document$activeEleme3.click();
         }
       }
       break;
@@ -84,7 +97,7 @@ var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentCont
   }
 };
 var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, conditionBuilderRef, variant) {
-  var _document$activeEleme3;
+  var _document$activeEleme4;
   switch (evt.key) {
     case 'ArrowRight':
       evt.preventDefault();
@@ -144,9 +157,9 @@ var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, co
       }
       break;
     case 'Enter':
-      if (((_document$activeEleme3 = document.activeElement) === null || _document$activeEleme3 === void 0 || (_document$activeEleme3 = _document$activeEleme3.querySelectorAll("button")) === null || _document$activeEleme3 === void 0 ? void 0 : _document$activeEleme3.length) === 1) {
-        var _document$activeEleme4;
-        (_document$activeEleme4 = document.activeElement) === null || _document$activeEleme4 === void 0 || (_document$activeEleme4 = _document$activeEleme4.querySelectorAll("button")[0]) === null || _document$activeEleme4 === void 0 || _document$activeEleme4.click();
+      if (((_document$activeEleme4 = document.activeElement) === null || _document$activeEleme4 === void 0 || (_document$activeEleme4 = _document$activeEleme4.querySelectorAll("button")) === null || _document$activeEleme4 === void 0 ? void 0 : _document$activeEleme4.length) === 1) {
+        var _document$activeEleme5;
+        (_document$activeEleme5 = document.activeElement) === null || _document$activeEleme5 === void 0 || (_document$activeEleme5 = _document$activeEleme5.querySelectorAll("button")[0]) === null || _document$activeEleme5 === void 0 || _document$activeEleme5.click();
       }
       break;
   }

package/lib/components/ActionBar/ActionBar.d.ts

@@ -1,5 +1,61 @@
+import React, { PropsWithChildren } from 'react';
+import { ButtonProps } from '@carbon/type';
+import { CarbonIconType } from '@carbon/icons-react/lib/CarbonIcon';
+interface Action extends ButtonProps {
+    id?: string;
+    key: string;
+    iconDescription: string;
+    label: string;
+    onClick?: () => void;
+    renderIcon: CarbonIconType;
+}
+interface ActionBarProps extends PropsWithChildren {
+    /**
+     * Specifies the action bar items. Each item is specified as an object
+     * with required fields: key for array rendering, renderIcon, iconDescription and
+     * label to provide the icon to display,
+     * and optional 'onClick' to receive notifications when the button is clicked.
+     * Additional fields in the object will be passed to the
+     * Button component, and these can include 'disabled', 'ref', 'className',
+     * and any other Button props.
+     *
+     * Note that the Button props 'kind', 'size',
+     * 'tooltipPosition', 'tooltipAlignment' and 'type' are ignored, as these
+     * cannot be used for an action bar item.
+     *
+     * Carbon Button API https://react.carbondesignsystem.com/?path=/docs/components-button--default#component-api
+     */
+    actions?: readonly Action[];
+    /**
+     * className
+     */
+    className?: string;
+    /**
+     * maxVisible : Maximum action bar items visible before going into the overflow menu
+     */
+    maxVisible?: number;
+    /**
+     * class name applied to the overflow options
+     */
+    menuOptionsClass?: string;
+    /**
+     * onItemCountChange - event reporting maxWidth
+     */
+    onWidthChange?: (sizes: {
+        minWidth: number;
+        maxWidth: number;
+    }) => void;
+    /**
+     * overflowAriaLabel label for open close button overflow used for action bar items that do nto fit.
+     */
+    overflowAriaLabel: string;
+    /**
+     * align tags to right of available space
+     */
+    rightAlign?: boolean;
+}
 /**
  * The ActionBar is used internally by the PageHeader to wrap ActionBarItems.
  */
-export let ActionBar: React.ForwardRefExoticComponent<React.RefAttributes<any>>;
-import React from 'react';
+export declare let ActionBar: React.ForwardRefExoticComponent<ActionBarProps & React.RefAttributes<HTMLDivElement>>;
+export {};

package/lib/components/ActionBar/ActionBar.js

@@ -29,7 +29,6 @@ var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 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(settings.pkg.prefix, "--action-bar");
 var componentName = 'ActionBar';
@@ -38,7 +37,6 @@ var componentName = 'ActionBar';
 var defaults = {
   actions: Object.freeze([])
 };
-
 // NOTE: the component SCSS is not imported here: it is rolled up separately.
 
 /**
@@ -62,7 +60,7 @@ exports.ActionBar = /*#__PURE__*/React__default["default"].forwardRef(function (
     _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
     displayedItems = _useState4[0],
     setDisplayedItems = _useState4[1];
-  var _useState5 = React.useState([]),
+  var _useState5 = React.useState(null),
     _useState6 = _rollupPluginBabelHelpers.slicedToArray(_useState5, 2),
     hiddenSizingItems = _useState6[0],
     setHiddenSizingItems = _useState6[1];
@@ -70,7 +68,7 @@ exports.ActionBar = /*#__PURE__*/React__default["default"].forwardRef(function (
   var refDisplayedItems = React.useRef(null);
   var sizingRef = React.useRef(null);
   var sizes = React.useRef({});
-  var backupRef = React.useRef();
+  var backupRef = React.useRef(null);
   var localRef = ref || backupRef;
 
   // create hidden sizing items
@@ -130,24 +128,25 @@ exports.ActionBar = /*#__PURE__*/React__default["default"].forwardRef(function (
   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;
         }
@@ -157,7 +156,7 @@ exports.ActionBar = /*#__PURE__*/React__default["default"].forwardRef(function (
       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
@@ -170,7 +169,10 @@ exports.ActionBar = /*#__PURE__*/React__default["default"].forwardRef(function (
         sizes.current.minWidth = overflowWidth;
         sizes.current.maxWidth = maxVisibleWidth;
         // emit onWidthChange
-        onWidthChange(_rollupPluginBabelHelpers.objectSpread2({}, sizes.current));
+        onWidthChange({
+          minWidth: overflowWidth,
+          maxWidth: maxVisibleWidth
+        });
       }
       if (willFit < 1) {
         setDisplayCount(0);
@@ -221,14 +223,17 @@ exports.ActionBar.propTypes = {
    *
    * Carbon Button API https://react.carbondesignsystem.com/?path=/docs/components-button--default#component-api
    */
+  /**@ts-ignore */
   actions: index["default"].arrayOf(index["default"].shape(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, propsHelper.prepareProps(react.Button.propTypes, [
   // props not desired from Button.propTypes
   'kind', 'size', 'tooltipPosition', 'tooltipAlignment'])), {}, {
+    id: index["default"].string,
     // Additional props
     key: index["default"].string.isRequired,
     // Redefine as form different  to Button and a key prop used by ActionBarItems
     iconDescription: index["default"].string.isRequired,
     label: index["default"].string.isRequired,
+    /**@ts-ignore */
     renderIcon: react.Button.propTypes.renderIcon.isRequired,
     // We duplicate onClick here to improve DocGen in Storybook
     onClick: index["default"].func

package/lib/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/lib/components/ActionBar/ActionBarItem.js

@@ -22,11 +22,9 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var _excluded = ["label", "className", "renderIcon"];
-
 // The block part of our conventional BEM class names (blockClass__E--M).
 var componentName = 'ActionBarItem';
 var blockClass = "".concat(settings.pkg.prefix, "--action-bar-item");
-
 // NOTE: the component SCSS is not imported here: it is rolled up separately.
 
 /**
@@ -94,5 +92,10 @@ exports.ActionBarItem.propTypes = _rollupPluginBabelHelpers.objectSpread2(_rollu
    *
    * (inherited from Carbon Button)
    */
-  renderIcon: index["default"].oneOfType([index["default"].func, index["default"].object])
+  /**@ts-ignore */
+  renderIcon: index["default"].oneOfType([index["default"].func, index["default"].object]),
+  /**
+   * Optional tab index
+   */
+  tabIndex: index["default"].number
 });

package/lib/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/lib/components/ActionBar/ActionBarOverflowItems.js

@@ -42,17 +42,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["default"].createElement(react.OverflowMenuItem, {
       className: "".concat(blockClass, "__item"),
-      onClick: item.props.onClick,
+      onClick: item === null || item === void 0 ? void 0 : item.props.onClick,
       itemText: /*#__PURE__*/React__default["default"].createElement("div", {
         className: "".concat(blockClass, "__item-content"),
         "aria-describedby": "".concat(internalId.current, "-").concat(index, "--item-label")
       }, /*#__PURE__*/React__default["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["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["default"].createElement(ItemIcon, null) : item === null || item === void 0 ? void 0 : item.props.renderIcon)
     });
   }));
 };
@@ -74,7 +74,11 @@ ActionBarOverflowItems.propTypes = {
   /**
    * overflowItems: items to bre shown in the ActionBar overflow menu
    */
-  overflowItems: index["default"].arrayOf(index["default"].element)
+  overflowItems: index["default"].arrayOf(index["default"].element),
+  /**
+   * Optional tab index
+   */
+  tabIndex: index["default"].number
 };
 
 exports.ActionBarOverflowItems = ActionBarOverflowItems;

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

@@ -61,7 +61,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 = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
     inputConfig = _useContext.inputConfig,
     variant = _useContext.variant,
@@ -102,6 +103,15 @@ var ConditionBlock = function ConditionBlock(props) {
     textarea: ConditionBuilderItemText.ConditionBuilderItemText
   };
   var ItemComponent = property ? itemComponents[type] : null;
+  React.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) {
     util.focusThisField(evt, conditionBuilderRef);
     onStatementChange(v);
@@ -121,10 +131,9 @@ var ConditionBlock = function ConditionBlock(props) {
       popoverToOpen: util.checkIsValid(newOperator) ? 'valueField' : ''
     }));
   };
-  var onValueChangeHandler = function onValueChangeHandler(newValue, evt) {
+  var onValueChangeHandler = function onValueChangeHandler(newValue) {
     var currentCondition = _rollupPluginBabelHelpers.objectSpread2({}, condition);
     delete currentCondition.popoverToOpen;
-    util.focusThisField(evt, conditionBuilderRef);
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, currentCondition), {}, {
       value: newValue
     }));
@@ -317,6 +326,10 @@ ConditionBlock.propTypes = {
    * callback to handle the statement(if/ excl.if) change
    */
   onStatementChange: index["default"].func,
+  /**
+   * method to set ShowDeletionPreviewForSubgroups
+   */
+  setShowDeletionPreviewForSubgroups: index["default"].func,
   /**
    * handler for showing add condition preview
    */

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

@@ -96,11 +96,11 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
   })), enableSubGroup && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
     renderIcon: icons.TextNewLine,
     onClick: addConditionSubGroupHandler,
-    className: cx__default["default"]("".concat(DataConfigs.blockClass, "__add-condition-sub-group ").concat(DataConfigs.blockClass, "__gap-left")),
+    className: cx__default["default"]("".concat(DataConfigs.blockClass, "__add-condition-sub-group")),
     hideLabel: true,
     label: addSubgroupText,
     wrapperProps: wrapperProps,
-    wrapperClassName: cx__default["default"]("".concat(DataConfigs.blockClass, "__add-condition-sub-group-wrapper"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__add-condition-sub-group-wrapper--show"), isAddSubgroup))
+    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;

package/lib/components/ConditionBuilder/ConditionBuilderButton/ConditionBuilderButton.js

@@ -42,11 +42,11 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
     wrapperClassName = _ref.wrapperClassName,
     tabIndex = _ref.tabIndex,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
+  var carbonPrefix = react.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["default"].createElement("button", _rollupPluginBabelHelpers["extends"]({
-      // role={'gridcell'}
       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",
@@ -61,8 +61,10 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
   return hideLabel || showToolTip ? /*#__PURE__*/React__default["default"].createElement(react.Tooltip, _rollupPluginBabelHelpers["extends"]({
     label: label,
     align: tooltipAlign,
-    className: "".concat(wrapperClassName)
-  }, 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 = {
   /**

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

@@ -18,6 +18,7 @@ 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 }; }
 
@@ -56,7 +57,9 @@ var ConditionConnector = function ConditionConnector(_ref) {
   };
   return variant == 'tree' ? /*#__PURE__*/React__default["default"].createElement("span", {
     className: "".concat(className, " ").concat(DataConfigs.blockClass, "__connector--disabled")
-  }, operator) :
+  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
+    label: operator
+  })) :
   /*#__PURE__*/
   // <div className={className} {...rest}>
   React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, _rollupPluginBabelHelpers["extends"]({

package/lib/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.js

@@ -30,7 +30,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var _GroupConnector;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
-  var _rootState$groups2;
+  var _rootState$groups3;
   var startConditionLabel = _ref.startConditionLabel,
     getConditionState = _ref.getConditionState,
     getActionsState = _ref.getActionsState,
@@ -118,6 +118,11 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       groups: [].concat(_rollupPluginBabelHelpers.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["default"].createElement(react.Button, {
       className: "".concat(DataConfigs.blockClass, "__addConditionText-button"),
@@ -137,7 +142,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     className: "".concat(DataConfigs.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["default"].createElement("div", {
       key: eachGroup.id,
       className: "".concat(DataConfigs.blockClass, "__group-wrapper")
@@ -177,6 +182,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     }
   })), showConditionGroupPreview && /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
     previewType: "newGroup",
+    colorIndex: getColorIndex(),
     group: {
       groupOperator: rootState.operator
     }

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

@@ -36,7 +36,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',
@@ -49,7 +49,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'
 };
 
 exports.translationsObject = translationsObject;