@carbon/ibm-products 2.44.0-rc.2 → 2.45.0-rc.0

package/lib/components/CoachmarkStack/CoachmarkStack.js

@@ -21,6 +21,7 @@ var CoachmarkStackHome = require('./CoachmarkStackHome.js');
 var CoachmarkTagline = require('../Coachmark/CoachmarkTagline.js');
 var context = require('../Coachmark/utils/context.js');
 var enums = require('../Coachmark/utils/enums.js');
+var useIsomorphicEffect = require('../../global/js/hooks/useIsomorphicEffect.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -56,7 +57,6 @@ var defaults = {
  * This variant allows the stacking of multiple coachmark overlays to be displayed by interacting with the tagline.
  */
 exports.CoachmarkStack = /*#__PURE__*/React__default["default"].forwardRef(function (_ref, ref) {
-  var _document$querySelect;
   var children = _ref.children,
     className = _ref.className,
     _ref$onClose = _ref.onClose,
@@ -72,7 +72,11 @@ exports.CoachmarkStack = /*#__PURE__*/React__default["default"].forwardRef(funct
     theme = _ref$theme === void 0 ? defaults.theme : _ref$theme,
     title = _ref.title,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
-  var portalNode = portalTarget ? (_document$querySelect = document.querySelector(portalTarget)) !== null && _document$querySelect !== void 0 ? _document$querySelect : document.querySelector('body') : document.querySelector('body');
+  var portalNode = React.useRef();
+  useIsomorphicEffect.useIsomorphicEffect(function () {
+    var _document$querySelect, _document, _document2, _document3;
+    portalNode.current = portalTarget ? (_document$querySelect = (_document = document) === null || _document === void 0 ? void 0 : _document.querySelector(portalTarget)) !== null && _document$querySelect !== void 0 ? _document$querySelect : (_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.querySelector('body') : (_document3 = document) === null || _document3 === void 0 ? void 0 : _document3.querySelector('body');
+  }, [portalTarget]);
   var stackHomeRef = React.useRef();
   var stackedCoachmarkRefs = React.useRef([]);
   var _useState = React.useState(false),
@@ -215,7 +219,7 @@ exports.CoachmarkStack = /*#__PURE__*/React__default["default"].forwardRef(funct
     portalTarget: portalTarget,
     closeButtonLabel: closeButtonLabel,
     title: title
-  }), /*#__PURE__*/reactDom.createPortal(wrappedChildren, portalNode)));
+  }), portalNode !== null && portalNode !== void 0 && portalNode.current ? /*#__PURE__*/reactDom.createPortal(wrappedChildren, portalNode === null || portalNode === void 0 ? void 0 : portalNode.current) : null));
 });
 
 // Return a placeholder if not released and not enabled by feature flag

package/lib/components/CoachmarkStack/CoachmarkStackHome.js

@@ -20,6 +20,7 @@ var devtools = require('../../global/js/utils/devtools.js');
 var settings = require('../../settings.js');
 var reactDom = require('react-dom');
 var CoachmarkHeader = require('../Coachmark/CoachmarkHeader.js');
+var useIsomorphicEffect = require('../../global/js/hooks/useIsomorphicEffect.js');
 var SteppedAnimatedMedia = require('../SteppedAnimatedMedia/SteppedAnimatedMedia.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -42,7 +43,6 @@ var componentName = 'CoachmarkStackHome';
  * of other Onboarding components.
  */
 exports.CoachmarkStackHome = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var _document$querySelect;
   var className = _ref.className,
     description = _ref.description,
     isOpen = _ref.isOpen,
@@ -66,11 +66,15 @@ exports.CoachmarkStackHome = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       }
     }, 100);
   }, [isOpen]);
+  var portalNode = React.useRef();
+  useIsomorphicEffect.useIsomorphicEffect(function () {
+    var _document$querySelect, _document, _document2, _document3;
+    portalNode.current = portalTarget ? (_document$querySelect = (_document = document) === null || _document === void 0 ? void 0 : _document.querySelector(portalTarget)) !== null && _document$querySelect !== void 0 ? _document$querySelect : (_document2 = document) === null || _document2 === void 0 ? void 0 : _document2.querySelector('body') : (_document3 = document) === null || _document3 === void 0 ? void 0 : _document3.querySelector('body');
+  }, [portalTarget]);
   if (!navLinkLabels) {
     return pconsole["default"].warn("".concat(componentName, " is an Onboarding internal component and is not intended for general use."));
   }
-  var portalNode = portalTarget ? (_document$querySelect = document.querySelector(portalTarget)) !== null && _document$querySelect !== void 0 ? _document$querySelect : document.querySelector('body') : document.querySelector('body');
-  return /*#__PURE__*/reactDom.createPortal( /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
+  return portalNode !== null && portalNode !== void 0 && portalNode.current ? /*#__PURE__*/reactDom.createPortal( /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     className: cx__default["default"](blockClass, className),
     ref: ref,
     role: "main"
@@ -112,7 +116,7 @@ exports.CoachmarkStackHome = /*#__PURE__*/React.forwardRef(function (_ref, ref)
       setLinkFocusIndex(0);
       _onClose();
     }
-  }, closeButtonLabel))))), portalNode);
+  }, closeButtonLabel))))), portalNode === null || portalNode === void 0 ? void 0 : portalNode.current) : null;
   function renderNavLink(index, label) {
     var ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
     return /*#__PURE__*/React__default["default"].createElement("li", {

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

@@ -27,6 +27,7 @@ var ConditionBuilderItemTime = require('../ConditionBuilderItem/ConditionBuilder
 var ConditionBuilderAdd = require('../ConditionBuilderAdd/ConditionBuilderAdd.js');
 var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
 var ItemOptionForValueField = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOptionForValueField.js');
+var useTranslations = require('../utils/useTranslations.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -68,6 +69,13 @@ var ConditionBlock = function ConditionBlock(props) {
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     showDeletionPreview = _useState2[0],
     setShowDeletionPreview = _useState2[1];
+  var _useTranslations = useTranslations.useTranslations(['conditionRowText', 'conditionText', 'propertyText', 'operatorText', 'removeConditionText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 5),
+    conditionRowText = _useTranslations2[0],
+    conditionText = _useTranslations2[1],
+    propertyText = _useTranslations2[2],
+    operatorText = _useTranslations2[3],
+    removeConditionText = _useTranslations2[4];
 
   //filtering the current property to access its properties and config options
   var getCurrentConfig = function getCurrentConfig(property) {
@@ -89,7 +97,8 @@ var ConditionBlock = function ConditionBlock(props) {
     date: ConditionBuilderItemDate.ConditionBuilderItemDate,
     time: ConditionBuilderItemTime.ConditionBuilderItemTime,
     option: ItemOptionForValueField.ItemOptionForValueField,
-    custom: config === null || config === void 0 ? void 0 : config.component
+    custom: config === null || config === void 0 ? void 0 : config.component,
+    textarea: ConditionBuilderItemText.ConditionBuilderItemText
   };
   var ItemComponent = property ? itemComponents[type] : null;
   var onStatementChangeHandler = function onStatementChangeHandler(v, evt) {
@@ -139,11 +148,23 @@ var ConditionBlock = function ConditionBlock(props) {
       'aria-setsize': aria.setsize
     } : {};
   };
+  var renderChildren = function renderChildren(popoverRef) {
+    return /*#__PURE__*/React__default["default"].createElement(ItemComponent, {
+      conditionState: {
+        property: property,
+        operator: operator,
+        value: value
+      },
+      onChange: onValueChangeHandler,
+      config: config,
+      "data-name": "valueField",
+      parentRef: popoverRef
+    });
+  };
   return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
     className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__condition__deletion-preview"), showDeletionPreview), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap-bottom"), variant == 'tree' && !(conditionIndex + 1 >= group.conditions.length)), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom"), variant == 'sentence')),
     role: "row",
-    "aria-label": DataConfigs.translateWithId('condition_row'),
-    tabIndex: -1
+    "aria-label": conditionRowText
   }, getAriaAttributes()), conjunction ? /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
     className: "".concat(DataConfigs.blockClass, "__gap"),
     operator: conjunction,
@@ -154,14 +175,14 @@ var ConditionBlock = function ConditionBlock(props) {
     role: "gridcell"
   })), isStatement && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: group.statement,
-    title: DataConfigs.translateWithId('condition'),
+    title: conditionText,
     "data-name": "connectorField",
     popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
     className: "".concat(DataConfigs.blockClass, "__statement-button")
   }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     conditionState: {
       value: group.statement,
-      label: DataConfigs.translateWithId('condition')
+      label: conditionText
     },
     onChange: onStatementChangeHandler,
     config: {
@@ -169,7 +190,7 @@ var ConditionBlock = function ConditionBlock(props) {
     }
   })), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: label,
-    title: DataConfigs.translateWithId('property'),
+    title: propertyText,
     renderIcon: icon !== null && icon !== void 0 ? icon : null,
     className: "".concat(DataConfigs.blockClass, "__property-field"),
     "data-name": "propertyField",
@@ -178,7 +199,7 @@ var ConditionBlock = function ConditionBlock(props) {
   }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     conditionState: {
       value: property,
-      label: DataConfigs.translateWithId('property')
+      label: propertyText
     },
     onChange: onPropertyChangeHandler,
     config: {
@@ -186,7 +207,7 @@ var ConditionBlock = function ConditionBlock(props) {
     }
   })), property && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: operator,
-    title: DataConfigs.translateWithId('operator'),
+    title: operatorText,
     "data-name": "operatorField",
     condition: condition,
     type: type
@@ -196,7 +217,7 @@ var ConditionBlock = function ConditionBlock(props) {
     },
     conditionState: {
       value: operator,
-      label: DataConfigs.translateWithId('operator')
+      label: operatorText
     },
     onChange: onOperatorChangeHandler
   })), property && operator && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
@@ -206,22 +227,14 @@ var ConditionBlock = function ConditionBlock(props) {
     showToolTip: true,
     "data-name": "valueField",
     condition: condition,
-    config: config
-  }, /*#__PURE__*/React__default["default"].createElement(ItemComponent, {
-    conditionState: {
-      property: property,
-      operator: operator,
-      value: value
-    },
-    onChange: onValueChangeHandler,
     config: config,
-    "data-name": "valueField"
-  })), /*#__PURE__*/React__default["default"].createElement("span", {
+    renderChildren: renderChildren
+  }), /*#__PURE__*/React__default["default"].createElement("span", {
     role: "gridcell",
-    "aria-label": DataConfigs.translateWithId('remove_condition')
+    "aria-label": removeConditionText
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
     hideLabel: true,
-    label: DataConfigs.translateWithId('remove_condition'),
+    label: removeConditionText,
     onClick: onRemove,
     onMouseEnter: handleShowDeletionPreview,
     onMouseLeave: handleHideDeletionPreview,

package/lib/components/ConditionBuilder/ConditionBuilder.js

@@ -26,7 +26,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
-var _excluded = ["className", "inputConfig", "startConditionLabel", "popOverSearchThreshold", "getOptions", "initialState", "getConditionState", "getActionsState", "variant", "actions"];
+var _excluded = ["className", "inputConfig", "startConditionLabel", "popOverSearchThreshold", "getOptions", "initialState", "getConditionState", "getActionsState", "variant", "actions", "translateWithId"];
 
 // Carbon and package components we use.
 /* TODO: @import(s) of carbon components and other package components. */
@@ -62,19 +62,22 @@ exports.ConditionBuilder = /*#__PURE__*/React__default["default"].forwardRef(fun
     initialState = _ref.initialState,
     getConditionState = _ref.getConditionState,
     getActionsState = _ref.getActionsState,
-    variant = _ref.variant,
+    _ref$variant = _ref.variant,
+    variant = _ref$variant === void 0 ? 'sentence' : _ref$variant,
     actions = _ref.actions,
+    translateWithId = _ref.translateWithId,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var localRef = React.useRef();
   var conditionBuilderRef = ref || localRef;
   var handleKeyDownHandler = function handleKeyDownHandler(evt) {
-    handleKeyboardEvents.handleKeyDown(evt, conditionBuilderRef);
+    handleKeyboardEvents.handleKeyDown(evt, conditionBuilderRef, variant);
   };
   return /*#__PURE__*/React__default["default"].createElement(ConditionBuilderProvider.ConditionBuilderProvider, {
     inputConfig: inputConfig,
     popOverSearchThreshold: popOverSearchThreshold,
     getOptions: getOptions,
-    variant: variant
+    variant: variant,
+    translateWithId: translateWithId
   }, /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     className: cx__default["default"](DataConfigs.blockClass,
     // Apply the block class to the main HTML element
@@ -115,7 +118,7 @@ exports.ConditionBuilder.propTypes = {
    * optional array of actions
    */
   actions: index["default"].arrayOf(index["default"].shape({
-    id: index["default"].oneOfType([index["default"].string | index["default"].number]).isRequired,
+    id: index["default"].oneOfType([index["default"].string, index["default"].number]).isRequired,
     label: index["default"].string.isRequired
   })),
   /**
@@ -182,7 +185,7 @@ exports.ConditionBuilder.propTypes = {
       id: index["default"].string.isRequired,
       label: index["default"].string.isRequired,
       icon: index["default"].oneOfType([index["default"].func, index["default"].object]),
-      type: index["default"].oneOf(['text', 'number', 'date', 'option', 'time', 'custom']).isRequired,
+      type: index["default"].oneOf(['text', 'textarea', 'number', 'date', 'option', 'time', 'custom']).isRequired,
       config: index["default"].shape({
         options: index["default"].arrayOf(index["default"].shape({
           id: index["default"].string.isRequired,
@@ -205,9 +208,16 @@ exports.ConditionBuilder.propTypes = {
    * Provide a label to the button that starts condition builder
    */
   startConditionLabel: index["default"].string.isRequired,
+  /**
+   * 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"]
+  ]
+   */
+  translateWithId: index["default"].func,
   /* TODO: add types and DocGen for all props. */
   /**
    * Provide the condition builder variant: sentence/ tree
    */
-  variant: index["default"].string.isRequired
+  variant: index["default"].oneOf(['tree', 'sentence'])
 };

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

@@ -6,8 +6,8 @@ declare function ConditionBuilderActions({ actions, className }: {
 declare namespace ConditionBuilderActions {
     namespace propTypes {
         let actions: PropTypes.Requireable<(PropTypes.InferProps<{
-            id: PropTypes.Requireable<number>;
-            label: PropTypes.Requireable<string>;
+            id: PropTypes.Validator<NonNullable<NonNullable<string | number | null | undefined>>>;
+            label: PropTypes.Validator<string>;
         }> | null | undefined)[]>;
         let className: PropTypes.Requireable<string>;
     }

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

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

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

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

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

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

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

@@ -1,4 +1,5 @@
-export function ConditionBuilderButton({ className, label, hideLabel, tooltipAlign, renderIcon: Icon, onClick, showToolTip, wrapperProps, onBlur, onFocus, onMouseEnter, onMouseLeave, isInvalid, wrapperClassName, }: {
+export function ConditionBuilderButton({ className, label, hideLabel, tooltipAlign, renderIcon: Icon, onClick, showToolTip, wrapperProps, onBlur, onFocus, onMouseEnter, onMouseLeave, isInvalid, wrapperClassName, tabIndex, ...rest }: {
+    [x: string]: any;
     className: any;
     label: any;
     hideLabel: any;
@@ -13,6 +14,7 @@ export function ConditionBuilderButton({ className, label, hideLabel, tooltipAli
     onMouseLeave: any;
     isInvalid: any;
     wrapperClassName: any;
+    tabIndex: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace ConditionBuilderButton {
     namespace propTypes {
@@ -27,6 +29,7 @@ export namespace ConditionBuilderButton {
         let onMouseLeave: PropTypes.Requireable<(...args: any[]) => any>;
         let renderIcon: PropTypes.Requireable<object>;
         let showToolTip: PropTypes.Requireable<boolean>;
+        let tabIndex: PropTypes.Requireable<number>;
         let tooltipAlign: PropTypes.Requireable<string>;
         let wrapperClassName: PropTypes.Requireable<string>;
         let wrapperProps: PropTypes.Requireable<object>;