@carbon/ibm-products 2.45.0 → 2.46.0

package/lib/components/ActionBar/ActionBarItem.js

@@ -43,7 +43,7 @@ exports.ActionBarItem = /*#__PURE__*/React__default["default"].forwardRef(functi
     className: cx__default["default"](blockClass, className),
     kind: 'ghost',
     size: 'md',
-    align: 'bottom-right',
+    align: 'bottom-end',
     type: 'button',
     label: label
   }), Icon ? /*#__PURE__*/React__default["default"].createElement(Icon, null) : null);

package/lib/components/Coachmark/Coachmark.d.ts

@@ -12,6 +12,11 @@ interface CoachmarkProps {
      * @see COACHMARK_ALIGNMENT
      */
     align?: 'bottom' | 'bottom-left' | 'bottom-right' | 'left' | 'left-top' | 'left-bottom' | 'right' | 'right-top' | 'right-bottom' | 'top' | 'top-left' | 'top-right';
+    /**
+     * Auto aligns the coachmark based on screen boundaries
+     * Applies only to Tooltip Coachmarks.
+     */
+    autoAlign?: boolean;
     /**
      * Coachmark should use a single CoachmarkOverlayElements component as a child.
      * @see CoachmarkOverlayElements
@@ -51,7 +56,7 @@ interface CoachmarkProps {
     positionTune?: {
         x: number;
         y: number;
-    } | object;
+    };
     /**
      * The optional button or beacon that the user will click to show the Coachmark.
      */

package/lib/components/Coachmark/Coachmark.js

@@ -21,6 +21,7 @@ var hooks = require('./utils/hooks.js');
 var devtools = require('../../global/js/utils/devtools.js');
 var settings = require('../../settings.js');
 var lodash = require('lodash');
+var react = require('@carbon/react');
 var useIsomorphicEffect = require('../../global/js/hooks/useIsomorphicEffect.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -28,7 +29,8 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
-var _excluded = ["align", "children", "className", "onClose", "overlayClassName", "overlayKind", "overlayRef", "portalTarget", "positionTune", "target", "theme"];
+var _excluded = ["align", "autoAlign", "children", "className", "onClose", "overlayClassName", "overlayKind", "overlayRef", "positionTune", "portalTarget", "target", "theme"];
+
 // The block part of our conventional BEM class names (blockClass__E--M).
 var blockClass = "".concat(settings.pkg.prefix, "--coachmark");
 var overlayBlockClass = "".concat(blockClass, "-overlay");
@@ -46,8 +48,10 @@ var defaults = {
  */
 
 exports.Coachmark = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
+  var _positionTune$y, _positionTune$x;
   var _ref$align = _ref.align,
     align = _ref$align === void 0 ? defaults.align : _ref$align,
+    autoAlign = _ref.autoAlign,
     children = _ref.children,
     className = _ref.className,
     _ref$onClose = _ref.onClose,
@@ -56,8 +60,8 @@ exports.Coachmark = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     _ref$overlayKind = _ref.overlayKind,
     overlayKind = _ref$overlayKind === void 0 ? defaults.overlayKind : _ref$overlayKind,
     overlayRef = _ref.overlayRef,
-    portalTarget = _ref.portalTarget,
     positionTune = _ref.positionTune,
+    portalTarget = _ref.portalTarget,
     target = _ref.target,
     _ref$theme = _ref.theme,
     theme = _ref$theme === void 0 ? defaults.theme : _ref$theme,
@@ -133,6 +137,10 @@ exports.Coachmark = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       setShouldResetPosition(true);
     }
   };
+  var overlayPositionStyle = {
+    top: ((_positionTune$y = positionTune === null || positionTune === void 0 ? void 0 : positionTune.y) !== null && _positionTune$y !== void 0 ? _positionTune$y : 0) - 16,
+    left: ((_positionTune$x = positionTune === null || positionTune === void 0 ? void 0 : positionTune.x) !== null && _positionTune$x !== void 0 ? _positionTune$x : 0) - 16
+  };
   var contextValue = {
     buttonProps: {
       'aria-expanded': isOpen,
@@ -148,7 +156,8 @@ exports.Coachmark = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     targetRect: targetRect,
     targetOffset: targetOffset,
     align: align,
-    positionTune: positionTune
+    positionTune: positionTune,
+    isOpen: isOpen
   };
   var handleResize = lodash.throttle(function () {
     closeOverlay();
@@ -182,7 +191,7 @@ exports.Coachmark = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }, /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
     className: cx__default["default"](blockClass, "".concat(blockClass, "__").concat(theme), className),
     ref: _coachmarkRef
-  }, rest, devtools.getDevtoolsProps(componentName)), target, isOpen && (portalNode === null || portalNode === void 0 ? void 0 : portalNode.current) && /*#__PURE__*/reactDom.createPortal( /*#__PURE__*/React__default["default"].createElement(CoachmarkOverlay.CoachmarkOverlay, {
+  }, rest, devtools.getDevtoolsProps(componentName)), overlayKind !== 'tooltip' ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, target, isOpen && (portalNode === null || portalNode === void 0 ? void 0 : portalNode.current) && /*#__PURE__*/reactDom.createPortal( /*#__PURE__*/React__default["default"].createElement(CoachmarkOverlay.CoachmarkOverlay, {
     ref: _overlayRef,
     fixedIsVisible: false,
     kind: overlayKind,
@@ -190,7 +199,23 @@ exports.Coachmark = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     theme: theme,
     className: cx__default["default"](overlayClassName, "".concat(overlayBlockClass, "--is-visible"))
   }, children), // Default to `document.body` when `portalNode` is `null`
-  portalNode === null || portalNode === void 0 ? void 0 : portalNode.current)));
+  portalNode === null || portalNode === void 0 ? void 0 : portalNode.current)) : /*#__PURE__*/React__default["default"].createElement(react.Popover, {
+    highContrast: true,
+    caret: true,
+    style: _rollupPluginBabelHelpers.objectSpread2({
+      position: 'absolute'
+    }, overlayPositionStyle),
+    align: align,
+    autoAlign: autoAlign,
+    open: isOpen
+  }, target, /*#__PURE__*/React__default["default"].createElement(react.PopoverContent, null, isOpen && /*#__PURE__*/React__default["default"].createElement(CoachmarkOverlay.CoachmarkOverlay, {
+    ref: _overlayRef,
+    fixedIsVisible: false,
+    kind: overlayKind,
+    onClose: handleClose,
+    theme: theme,
+    className: cx__default["default"](overlayClassName, _rollupPluginBabelHelpers.defineProperty({}, "".concat(overlayBlockClass, "--is-visible"), isOpen))
+  }, children)))));
 });
 var overlayRefType = typeof HTMLElement === 'undefined' ? index["default"].object :
 // eslint-disable-next-line ssr-friendly/no-dom-globals-in-module-scope
@@ -213,6 +238,11 @@ exports.Coachmark.propTypes = {
    * @see COACHMARK_ALIGNMENT
    */
   align: index["default"].oneOf(['bottom', 'bottom-left', 'bottom-right', 'left', 'left-top', 'left-bottom', 'right', 'right-top', 'right-bottom', 'top', 'top-left', 'top-right']),
+  /**
+   * Auto aligns the coachmark based on screen boundaries
+   * Applies only to Tooltip Coachmarks.
+   */
+  autoAlign: index["default"].bool,
   /**
    * Coachmark should use a single CoachmarkOverlayElements component as a child.
    * @see CoachmarkOverlayElements
@@ -251,6 +281,7 @@ exports.Coachmark.propTypes = {
   /**
    * Fine tune the position of the target in pixels. Applies only to Beacons.
    */
+  // @ts-ignore
   positionTune: index["default"].shape({
     x: index["default"].number,
     y: index["default"].number

package/lib/components/Coachmark/CoachmarkOverlay.js

@@ -64,7 +64,7 @@ exports.CoachmarkOverlay = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var coachmark = context.useCoachmark();
   var isBeacon = kind === enums.COACHMARK_OVERLAY_KIND.TOOLTIP;
   var isDraggable = kind === enums.COACHMARK_OVERLAY_KIND.FLOATING;
-  var isVisible = className && className.includes('is-visible');
+  var isVisible = className === null || className === void 0 ? void 0 : className.includes('is-visible');
   var handleKeyPress = function handleKeyPress(event) {
     var shiftKey = event.shiftKey,
       key = event.key;
@@ -172,9 +172,7 @@ exports.CoachmarkOverlay = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     return /*#__PURE__*/React__default["default"].cloneElement(child, {
       isVisible: isVisible
     });
-  })), isBeacon && /*#__PURE__*/React__default["default"].createElement("span", {
-    className: "".concat(blockClass, "__caret")
-  }));
+  })));
 });
 function getWindowDimensions() {
   var _window = window,

package/lib/components/CoachmarkBeacon/CoachmarkBeacon.js

@@ -35,7 +35,6 @@ var defaults = {
  * Use beacon for the target prop of a Coachmark component.
  */
 exports.CoachmarkBeacon = /*#__PURE__*/React__default["default"].forwardRef(function (_ref, ref) {
-  var _coachmark$positionTu, _coachmark$positionTu2, _coachmark$positionTu3, _coachmark$positionTu4;
   var label = _ref.label,
     className = _ref.className,
     _ref$kind = _ref.kind,
@@ -45,14 +44,9 @@ exports.CoachmarkBeacon = /*#__PURE__*/React__default["default"].forwardRef(func
   if (!coachmark) {
     return _div || (_div = /*#__PURE__*/React__default["default"].createElement("div", null, "CoachmarkBeacon is to be use exclusively within the target prop of Coachmark"));
   }
-  var overlayPositionStyle = {
-    top: (_coachmark$positionTu = (_coachmark$positionTu2 = coachmark.positionTune) === null || _coachmark$positionTu2 === void 0 ? void 0 : _coachmark$positionTu2.y) !== null && _coachmark$positionTu !== void 0 ? _coachmark$positionTu : 0,
-    left: (_coachmark$positionTu3 = (_coachmark$positionTu4 = coachmark.positionTune) === null || _coachmark$positionTu4 === void 0 ? void 0 : _coachmark$positionTu4.x) !== null && _coachmark$positionTu3 !== void 0 ? _coachmark$positionTu3 : 0
-  };
   return /*#__PURE__*/React__default["default"].createElement("span", _rollupPluginBabelHelpers["extends"]({}, rest, {
     className: cx__default["default"](blockClass, "".concat(blockClass, "-").concat(kind), className),
-    ref: ref,
-    style: overlayPositionStyle
+    ref: ref
   }, devtools.getDevtoolsProps(componentName), {
     role: "tooltip"
   }), /*#__PURE__*/React__default["default"].createElement("button", _rollupPluginBabelHelpers["extends"]({

package/lib/components/ConditionBuilder/ConditionBlock/ConditionBlock.js

@@ -64,7 +64,8 @@ var ConditionBlock = function ConditionBlock(props) {
     isLastCondition = props.isLastCondition;
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
     inputConfig = _useContext.inputConfig,
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     showDeletionPreview = _useState2[0],
@@ -80,9 +81,9 @@ var ConditionBlock = function ConditionBlock(props) {
   //filtering the current property to access its properties and config options
   var getCurrentConfig = function getCurrentConfig(property) {
     var _inputConfig$properti, _inputConfig$properti2;
-    return (_inputConfig$properti = (_inputConfig$properti2 = inputConfig.properties) === null || _inputConfig$properti2 === void 0 ? void 0 : _inputConfig$properti2.filter(function (eachProperty) {
+    return (_inputConfig$properti = (_inputConfig$properti2 = inputConfig.properties) === null || _inputConfig$properti2 === void 0 ? void 0 : _inputConfig$properti2.find(function (eachProperty) {
       return eachProperty.id == property;
-    })[0]) !== null && _inputConfig$properti !== void 0 ? _inputConfig$properti : {};
+    })) !== null && _inputConfig$properti !== void 0 ? _inputConfig$properti : {};
   };
   var _getCurrentConfig = getCurrentConfig(property),
     icon = _getCurrentConfig.icon,
@@ -102,7 +103,7 @@ var ConditionBlock = function ConditionBlock(props) {
   };
   var ItemComponent = property ? itemComponents[type] : null;
   var onStatementChangeHandler = function onStatementChangeHandler(v, evt) {
-    util.focusThisField(evt);
+    util.focusThisField(evt, conditionBuilderRef);
     onStatementChange(v);
   };
   var onPropertyChangeHandler = function onPropertyChangeHandler(newProperty) {
@@ -110,19 +111,20 @@ var ConditionBlock = function ConditionBlock(props) {
       property: newProperty,
       operator: undefined,
       value: '',
-      popoverToOpen: 'operatorField'
+      popoverToOpen: util.checkIsValid(newProperty) ? 'operatorField' : ''
     }));
   };
   var onOperatorChangeHandler = function onOperatorChangeHandler(newOperator) {
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, condition), {}, {
       operator: newOperator,
       value: undefined,
-      popoverToOpen: 'valueField'
+      popoverToOpen: util.checkIsValid(newOperator) ? 'valueField' : ''
     }));
   };
-  var onValueChangeHandler = function onValueChangeHandler(newValue) {
+  var onValueChangeHandler = function onValueChangeHandler(newValue, evt) {
     var currentCondition = _rollupPluginBabelHelpers.objectSpread2({}, condition);
     delete currentCondition.popoverToOpen;
+    util.focusThisField(evt, conditionBuilderRef);
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, currentCondition), {}, {
       value: newValue
     }));
@@ -158,7 +160,8 @@ var ConditionBlock = function ConditionBlock(props) {
       onChange: onValueChangeHandler,
       config: config,
       "data-name": "valueField",
-      parentRef: popoverRef
+      parentRef: popoverRef,
+      type: type
     });
   };
   return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
@@ -189,13 +192,14 @@ var ConditionBlock = function ConditionBlock(props) {
       options: DataConfigs.statementConfig
     }
   })), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
-    label: label,
+    label: label !== null && label !== void 0 ? label : condition === null || condition === void 0 ? void 0 : condition.property,
     title: propertyText,
     renderIcon: icon !== null && icon !== void 0 ? icon : null,
     className: "".concat(DataConfigs.blockClass, "__property-field"),
     "data-name": "propertyField",
     condition: condition,
-    type: type
+    type: type,
+    onChange: onPropertyChangeHandler
   }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     conditionState: {
       value: property,
@@ -205,12 +209,13 @@ var ConditionBlock = function ConditionBlock(props) {
     config: {
       options: inputConfig.properties
     }
-  })), property && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+  })), util.checkIsValid(property) && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: operator,
     title: operatorText,
     "data-name": "operatorField",
     condition: condition,
-    type: type
+    type: type,
+    onChange: onOperatorChangeHandler
   }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     config: {
       options: getOperators()
@@ -220,7 +225,7 @@ var ConditionBlock = function ConditionBlock(props) {
       label: operatorText
     },
     onChange: onOperatorChangeHandler
-  })), property && operator && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+  })), util.checkIsValid(property) && util.checkIsValid(operator) && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: value,
     type: type,
     title: label,
@@ -228,6 +233,7 @@ var ConditionBlock = function ConditionBlock(props) {
     "data-name": "valueField",
     condition: condition,
     config: config,
+    onChange: onValueChangeHandler,
     renderChildren: renderChildren
   }), /*#__PURE__*/React__default["default"].createElement("span", {
     role: "gridcell",

package/lib/components/ConditionBuilder/ConditionBuilder.js

@@ -77,7 +77,8 @@ exports.ConditionBuilder = /*#__PURE__*/React__default["default"].forwardRef(fun
     popOverSearchThreshold: popOverSearchThreshold,
     getOptions: getOptions,
     variant: variant,
-    translateWithId: translateWithId
+    translateWithId: translateWithId,
+    conditionBuilderRef: conditionBuilderRef
   }, /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     className: cx__default["default"](DataConfigs.blockClass,
     // Apply the block class to the main HTML element
@@ -95,7 +96,6 @@ exports.ConditionBuilder = /*#__PURE__*/React__default["default"].forwardRef(fun
     onKeyDown: handleKeyDownHandler
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderContent["default"], {
     startConditionLabel: startConditionLabel,
-    conditionBuilderRef: conditionBuilderRef,
     getConditionState: getConditionState,
     getActionsState: getActionsState,
     initialState: initialState,
@@ -211,7 +211,7 @@ exports.ConditionBuilder.propTypes = {
   /**
    * Optional prop, if you need to pass translations to the texts on the component instead of the defined defaults.
    * This callback function will receive the message id and you need to return the corresponding text for that id.
-   * The message id will be one of [   "ifText","addConditionText",   "addConditionGroupText",   "addSubgroupText",   "conditionText",   "propertyText",   "operatorText",   "valueText",   "connectorText",   "conditionRowText",   "removeConditionText",   "addConditionRowText",   "startText",   "endText",   "clearSearchText",   "actionsText",   "then",   "removeActionText",   "addActionText",   "invalidText", "invalidDateText",  "invalidNumberWarnText"]
+   * The message id will be one of [   "ifText","addConditionText",   "addConditionGroupText",   "addSubgroupText",   "conditionText",   "propertyText",   "operatorText",   "valueText",   "connectorText",   "conditionRowText","conditionRowGroupText","conditionBuilderText","actionSectionText",   "removeConditionText",   "addConditionRowText",   "startText",   "endText",   "clearSearchText",   "actionsText",   "then",   "removeActionText",   "addActionText",   "invalidText",  "invalidNumberWarnText"]
   ]
    */
   translateWithId: index["default"].func,

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

@@ -39,13 +39,14 @@ var ConditionBuilderActions = function ConditionBuilderActions(_ref) {
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     showDeletionPreview = _useState2[0],
     setShowDeletionPreview = _useState2[1];
-  var _useTranslations = useTranslations.useTranslations(['actionsText', 'then', 'and', 'removeActionText', 'addActionText']),
-    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 5),
+  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];
+    addActionText = _useTranslations2[4],
+    actionSectionText = _useTranslations2[5];
   var addActionHandler = function addActionHandler() {
     var action = {
       id: uuidv4["default"](),
@@ -83,7 +84,8 @@ var ConditionBuilderActions = function ConditionBuilderActions(_ref) {
     level: 4
   }, /*#__PURE__*/React__default["default"].createElement(react.Heading, null, actionsText)), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__condition-wrapper"),
-    role: "grid"
+    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,
@@ -133,7 +135,8 @@ var ConditionBuilderActions = function ConditionBuilderActions(_ref) {
     })), actionState.length === index + 1 && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
       onClick: addActionHandler,
       className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-left"),
-      buttonLabel: addActionText
+      buttonLabel: addActionText,
+      tabIndex: 0
     }));
   }), actionState.length === 0 && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
     onClick: addActionHandler,

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

@@ -69,14 +69,16 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
       onBlur: hideConditionSubGroupPreviewHandler
     };
   };
+  var getAriaLabel = function getAriaLabel() {
+    return buttonLabel ? buttonLabel : !enableSubGroup ? addConditionRowText : undefined;
+  };
   var wrapperProps = enableSubGroup ? {
     role: 'gridcell'
-    // 'aria-label': addSubgroupText,
   } : {};
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(className, " ").concat(DataConfigs.blockClass, "__add-button-wrapper"),
     role: !enableSubGroup ? 'gridcell' : 'none',
-    "aria-label": !enableSubGroup ? addConditionRowText : undefined,
+    "aria-label": getAriaLabel(),
     onMouseEnter: showAddSubGroup,
     onMouseLeave: hideAddSubGroup,
     onFocus: showAddSubGroup,

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

@@ -45,7 +45,7 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
   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", {
+    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)]),
@@ -56,7 +56,7 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
       onMouseEnter: onMouseEnter,
       onMouseLeave: onMouseLeave,
       "data-name": dataName
-    }, Icon && (_Icon || (_Icon = /*#__PURE__*/React__default["default"].createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default["default"].createElement("span", null, label))), isInvalid && (_WarningAltFilled || (_WarningAltFilled = /*#__PURE__*/React__default["default"].createElement(icons.WarningAltFilled, null))));
+    }, rest), Icon && (_Icon || (_Icon = /*#__PURE__*/React__default["default"].createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default["default"].createElement("span", null, label))), isInvalid && (_WarningAltFilled || (_WarningAltFilled = /*#__PURE__*/React__default["default"].createElement(icons.WarningAltFilled, null))));
   };
   return hideLabel || showToolTip ? /*#__PURE__*/React__default["default"].createElement(react.Tooltip, _rollupPluginBabelHelpers["extends"]({
     label: label,

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

@@ -30,7 +30,8 @@ var ConditionConnector = function ConditionConnector(_ref) {
     onChange = _ref.onChange,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useTranslations = useTranslations.useTranslations(['connectorText']),
     _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 1),
     connectorText = _useTranslations2[0];
@@ -51,10 +52,10 @@ var ConditionConnector = function ConditionConnector(_ref) {
   };
   var onChangeHandler = function onChangeHandler(op, evt) {
     onChange(op);
-    util.focusThisField(evt);
+    util.focusThisField(evt, conditionBuilderRef);
   };
   return variant == 'tree' ? /*#__PURE__*/React__default["default"].createElement("span", {
-    className: "".concat(className, " ").concat(DataConfigs.blockClass, "__connector-disabled")
+    className: "".concat(className, " ").concat(DataConfigs.blockClass, "__connector--disabled")
   }, operator) :
   /*#__PURE__*/
   // <div className={className} {...rest}>

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

@@ -1,7 +1,6 @@
 export default ConditionBuilderContent;
-declare function ConditionBuilderContent({ startConditionLabel, conditionBuilderRef, getConditionState, getActionsState, initialState, actions, }: {
+declare function ConditionBuilderContent({ startConditionLabel, getConditionState, getActionsState, initialState, actions, }: {
     startConditionLabel: any;
-    conditionBuilderRef: any;
     getConditionState: any;
     getActionsState: any;
     initialState: any;
@@ -13,7 +12,6 @@ declare namespace ConditionBuilderContent {
             id: PropTypes.Validator<NonNullable<NonNullable<string | number | null | undefined>>>;
             label: PropTypes.Validator<string>;
         }> | null | undefined)[]>;
-        let conditionBuilderRef: PropTypes.Requireable<object>;
         let getActionsState: PropTypes.Requireable<(...args: any[]) => any>;
         let getConditionState: PropTypes.Validator<(...args: any[]) => any>;
         let initialState: PropTypes.Requireable<PropTypes.InferProps<{

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

@@ -28,11 +28,10 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var _Heading, _GroupConnector;
+var _GroupConnector;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   var _rootState$groups2;
   var startConditionLabel = _ref.startConditionLabel,
-    conditionBuilderRef = _ref.conditionBuilderRef,
     getConditionState = _ref.getConditionState,
     getActionsState = _ref.getActionsState,
     initialState = _ref.initialState,
@@ -50,9 +49,10 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
     showConditionGroupPreview = _useState4[0],
     setShowConditionGroupPreview = _useState4[1];
-  var _useTranslations = useTranslations.useTranslations(['addConditionGroupText']),
-    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 1),
-    addConditionGroupText = _useTranslations2[0];
+  var _useTranslations = useTranslations.useTranslations(['addConditionGroupText', 'conditionHeadingText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 2),
+    addConditionGroupText = _useTranslations2[0],
+    conditionHeadingText = _useTranslations2[1];
   var showConditionGroupPreviewHandler = function showConditionGroupPreviewHandler() {
     setShowConditionGroupPreview(true);
   };
@@ -118,21 +118,22 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       groups: [].concat(_rollupPluginBabelHelpers.toConsumableArray(rootState.groups), [newGroup])
     }));
   };
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, !isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(react.Button, {
-    className: "".concat(DataConfigs.blockClass, "__addConditionText-button"),
-    renderIcon: function renderIcon(props) {
-      return /*#__PURE__*/React__default["default"].createElement(icons.Add, _rollupPluginBabelHelpers["extends"]({
-        size: 16
-      }, props));
-    },
-    iconDescription: startConditionLabel,
-    kind: "ghost",
-    size: "sm",
-    onClick: onStartConditionBuilder
-  }, startConditionLabel), isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(react.Section, {
+  if (!isConditionBuilderActive) {
+    return /*#__PURE__*/React__default["default"].createElement(react.Button, {
+      className: "".concat(DataConfigs.blockClass, "__addConditionText-button"),
+      renderIcon: function renderIcon(props) {
+        return /*#__PURE__*/React__default["default"].createElement(icons.Add, props);
+      },
+      iconDescription: startConditionLabel,
+      kind: "ghost",
+      size: "sm",
+      onClick: onStartConditionBuilder
+    }, startConditionLabel);
+  }
+  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(react.Section, {
     className: "".concat(DataConfigs.blockClass, "__heading"),
     level: 4
-  }, _Heading || (_Heading = /*#__PURE__*/React__default["default"].createElement(react.Heading, null, "Condition"))), /*#__PURE__*/React__default["default"].createElement("div", {
+  }, /*#__PURE__*/React__default["default"].createElement(react.Heading, null, conditionHeadingText)), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__content-container"),
     role: "treegrid",
     "aria-label": "condition builder tree"
@@ -153,13 +154,13 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       },
       onChange: function onChange(updatedGroup) {
         onChangeHandler(updatedGroup, groupIndex);
-      },
-      conditionBuilderRef: conditionBuilderRef
+      }
     }), groupIndex < rootState.groups.length - 1 && (_GroupConnector || (_GroupConnector = /*#__PURE__*/React__default["default"].createElement(GroupConnector["default"], null))));
-  })), isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, variant == 'tree' && /*#__PURE__*/React__default["default"].createElement("div", {
+  })), variant == 'tree' && /*#__PURE__*/React__default["default"].createElement("div", {
     role: "row",
     tabIndex: -1,
-    "aria-level": 1
+    "aria-level": 1,
+    className: "".concat(DataConfigs.blockClass, "__add-group")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
     renderIcon: icons.TextNewLine,
     onClick: addConditionGroupHandler,
@@ -179,11 +180,10 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     group: {
       groupOperator: rootState.operator
     }
-  }))), isConditionBuilderActive && actions && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderActions["default"], {
+  })), actions && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderActions["default"], {
     actions: actions,
     className: "".concat(DataConfigs.blockClass, "__actions-container"),
-    variant: variant,
-    conditionBuilderRef: conditionBuilderRef
+    variant: variant
   }));
 };
 var ConditionBuilderContent$1 = ConditionBuilderContent;
@@ -195,10 +195,6 @@ ConditionBuilderContent.propTypes = {
     id: index["default"].oneOfType([index["default"].string, index["default"].number]).isRequired,
     label: index["default"].string.isRequired
   })),
-  /**
-   * ref of condition builder
-   */
-  conditionBuilderRef: index["default"].object,
   /**
    * callback functions that will provide the updated action state back.
    */

package/lib/components/ConditionBuilder/ConditionBuilderContext/ConditionBuilderProvider.d.ts

@@ -18,6 +18,7 @@ export function ConditionBuilderProvider(props: any): import("react/jsx-runtime"
 export namespace ConditionBuilderProvider {
     namespace propTypes {
         let children: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
+        let conditionBuilderRef: PropTypes.Requireable<object>;
         let getOptions: PropTypes.Requireable<(...args: any[]) => any>;
         let inputConfig: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
             properties: PropTypes.Requireable<(PropTypes.InferProps<{

package/lib/components/ConditionBuilder/ConditionBuilderContext/ConditionBuilderProvider.js

@@ -71,7 +71,8 @@ var ConditionBuilderProvider = function ConditionBuilderProvider(props) {
       popOverSearchThreshold: props.popOverSearchThreshold,
       getOptions: props.getOptions,
       variant: props.variant,
-      translateWithId: props.translateWithId
+      translateWithId: props.translateWithId,
+      conditionBuilderRef: props.conditionBuilderRef
     }
   },
   // eslint-disable-next-line react/prop-types
@@ -82,6 +83,10 @@ ConditionBuilderProvider.propTypes = {
    * Provide the contents of the ConditionBuilder.
    */
   children: index["default"].node.isRequired,
+  /**
+   * ref of condition builder
+   */
+  conditionBuilderRef: index["default"].object,
   /**
    * This is an optional callback function that will be triggered when options array is not passed in the inputConfig against a property. 
    * This can be a asynchronous function that need  to  return a promise, so it will allow to fetch options from API call.

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

@@ -24,6 +24,7 @@ export namespace translationsObject {
     let valueText: string;
     let connectorText: string;
     let conditionRowText: string;
+    let conditionRowGroupText: string;
     let removeConditionText: string;
     let addConditionRowText: string;
     let startText: string;
@@ -34,6 +35,8 @@ export namespace translationsObject {
     let removeActionText: string;
     let addActionText: string;
     let invalidText: string;
-    let invalidDateText: string;
     let invalidNumberWarnText: string;
+    let conditionBuilderText: string;
+    let actionSectionText: string;
+    let conditionHeadingText: string;
 }

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

@@ -35,6 +35,7 @@ var translationsObject = {
   valueText: 'Value',
   connectorText: 'Connector',
   conditionRowText: 'Condition row',
+  conditionRowGroupText: 'Condition row group',
   removeConditionText: 'Remove condition',
   addConditionRowText: 'Add condition row',
   startText: 'Start',
@@ -45,8 +46,10 @@ var translationsObject = {
   removeActionText: 'Remove Action',
   addActionText: 'Add action',
   invalidText: 'Incomplete',
-  invalidDateText: 'Invalid Date',
-  invalidNumberWarnText: 'Invalid number, must be 0 or greater'
+  invalidNumberWarnText: 'Invalid number, must be 0 or greater',
+  conditionBuilderText: 'Condition Builder',
+  actionSectionText: 'Action Section',
+  conditionHeadingText: 'Condition'
 };
 
 exports.translationsObject = translationsObject;