@carbon/ibm-products 2.43.2-canary.78 → 2.43.2-canary.81

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

@@ -18,7 +18,7 @@ import { ConditionBuilderItemText } from '../ConditionBuilderItem/ConditionBuild
 import { ConditionBuilderItemDate } from '../ConditionBuilderItem/ConditionBuilderItemDate/ConditionBuilderItemDate.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
 import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
-import { focusThisField } from '../utils/util.js';
+import { checkIsValid, focusThisField } from '../utils/util.js';
 import { ConditionBuilderItemTime } from '../ConditionBuilderItem/ConditionBuilderItemTime/ConditionBuilderItemTime.js';
 import ConditionBuilderAdd from '../ConditionBuilderAdd/ConditionBuilderAdd.js';
 import { ItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js';
@@ -55,7 +55,8 @@ var ConditionBlock = function ConditionBlock(props) {
     isLastCondition = props.isLastCondition;
   var _useContext = useContext(ConditionBuilderContext),
     inputConfig = _useContext.inputConfig,
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showDeletionPreview = _useState2[0],
@@ -71,9 +72,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,
@@ -93,7 +94,7 @@ var ConditionBlock = function ConditionBlock(props) {
   };
   var ItemComponent = property ? itemComponents[type] : null;
   var onStatementChangeHandler = function onStatementChangeHandler(v, evt) {
-    focusThisField(evt);
+    focusThisField(evt, conditionBuilderRef);
     onStatementChange(v);
   };
   var onPropertyChangeHandler = function onPropertyChangeHandler(newProperty) {
@@ -101,19 +102,20 @@ var ConditionBlock = function ConditionBlock(props) {
       property: newProperty,
       operator: undefined,
       value: '',
-      popoverToOpen: 'operatorField'
+      popoverToOpen: checkIsValid(newProperty) ? 'operatorField' : ''
     }));
   };
   var onOperatorChangeHandler = function onOperatorChangeHandler(newOperator) {
     onChange(_objectSpread2(_objectSpread2({}, condition), {}, {
       operator: newOperator,
       value: undefined,
-      popoverToOpen: 'valueField'
+      popoverToOpen: checkIsValid(newOperator) ? 'valueField' : ''
     }));
   };
-  var onValueChangeHandler = function onValueChangeHandler(newValue) {
+  var onValueChangeHandler = function onValueChangeHandler(newValue, evt) {
     var currentCondition = _objectSpread2({}, condition);
     delete currentCondition.popoverToOpen;
+    focusThisField(evt, conditionBuilderRef);
     onChange(_objectSpread2(_objectSpread2({}, currentCondition), {}, {
       value: newValue
     }));
@@ -149,7 +151,8 @@ var ConditionBlock = function ConditionBlock(props) {
       onChange: onValueChangeHandler,
       config: config,
       "data-name": "valueField",
-      parentRef: popoverRef
+      parentRef: popoverRef,
+      type: type
     });
   };
   return /*#__PURE__*/React__default.createElement("div", _extends({
@@ -180,13 +183,14 @@ var ConditionBlock = function ConditionBlock(props) {
       options: statementConfig
     }
   })), /*#__PURE__*/React__default.createElement(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(blockClass, "__property-field"),
     "data-name": "propertyField",
     condition: condition,
-    type: type
+    type: type,
+    onChange: onPropertyChangeHandler
   }, /*#__PURE__*/React__default.createElement(ItemOption, {
     conditionState: {
       value: property,
@@ -196,12 +200,13 @@ var ConditionBlock = function ConditionBlock(props) {
     config: {
       options: inputConfig.properties
     }
-  })), property && /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
+  })), checkIsValid(property) && /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
     label: operator,
     title: operatorText,
     "data-name": "operatorField",
     condition: condition,
-    type: type
+    type: type,
+    onChange: onOperatorChangeHandler
   }, /*#__PURE__*/React__default.createElement(ItemOption, {
     config: {
       options: getOperators()
@@ -211,7 +216,7 @@ var ConditionBlock = function ConditionBlock(props) {
       label: operatorText
     },
     onChange: onOperatorChangeHandler
-  })), property && operator && /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
+  })), checkIsValid(property) && checkIsValid(operator) && /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
     label: value,
     type: type,
     title: label,
@@ -219,6 +224,7 @@ var ConditionBlock = function ConditionBlock(props) {
     "data-name": "valueField",
     condition: condition,
     config: config,
+    onChange: onValueChangeHandler,
     renderChildren: renderChildren
   }), /*#__PURE__*/React__default.createElement("span", {
     role: "gridcell",

package/es/components/ConditionBuilder/ConditionBuilder.js

@@ -68,7 +68,8 @@ var ConditionBuilder = /*#__PURE__*/React__default.forwardRef(function (_ref, re
     popOverSearchThreshold: popOverSearchThreshold,
     getOptions: getOptions,
     variant: variant,
-    translateWithId: translateWithId
+    translateWithId: translateWithId,
+    conditionBuilderRef: conditionBuilderRef
   }, /*#__PURE__*/React__default.createElement("div", _extends({}, rest, {
     className: cx(blockClass,
     // Apply the block class to the main HTML element
@@ -86,7 +87,6 @@ var ConditionBuilder = /*#__PURE__*/React__default.forwardRef(function (_ref, re
     onKeyDown: handleKeyDownHandler
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderContent, {
     startConditionLabel: startConditionLabel,
-    conditionBuilderRef: conditionBuilderRef,
     getConditionState: getConditionState,
     getActionsState: getActionsState,
     initialState: initialState,
@@ -202,7 +202,7 @@ 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: PropTypes.func,

package/es/components/ConditionBuilder/ConditionBuilderActions/ConditionBuilderActions.js

@@ -30,13 +30,14 @@ var ConditionBuilderActions = function ConditionBuilderActions(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     showDeletionPreview = _useState2[0],
     setShowDeletionPreview = _useState2[1];
-  var _useTranslations = useTranslations(['actionsText', 'then', 'and', 'removeActionText', 'addActionText']),
-    _useTranslations2 = _slicedToArray(_useTranslations, 5),
+  var _useTranslations = useTranslations(['actionsText', 'then', 'and', 'removeActionText', 'addActionText', 'actionSectionText']),
+    _useTranslations2 = _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(),
@@ -74,7 +75,8 @@ var ConditionBuilderActions = function ConditionBuilderActions(_ref) {
     level: 4
   }, /*#__PURE__*/React__default.createElement(Heading, null, actionsText)), /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(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.createElement("div", {
       key: action.id,
@@ -124,7 +126,8 @@ var ConditionBuilderActions = function ConditionBuilderActions(_ref) {
     })), actionState.length === index + 1 && /*#__PURE__*/React__default.createElement(ConditionBuilderAdd, {
       onClick: addActionHandler,
       className: "".concat(blockClass, "__gap ").concat(blockClass, "__gap-left"),
-      buttonLabel: addActionText
+      buttonLabel: addActionText,
+      tabIndex: 0
     }));
   }), actionState.length === 0 && /*#__PURE__*/React__default.createElement(ConditionBuilderAdd, {
     onClick: addActionHandler,

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

@@ -60,14 +60,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.createElement("div", {
     className: "".concat(className, " ").concat(blockClass, "__add-button-wrapper"),
     role: !enableSubGroup ? 'gridcell' : 'none',
-    "aria-label": !enableSubGroup ? addConditionRowText : undefined,
+    "aria-label": getAriaLabel(),
     onMouseEnter: showAddSubGroup,
     onMouseLeave: hideAddSubGroup,
     onFocus: showAddSubGroup,

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

@@ -36,7 +36,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.createElement("button", {
+    return /*#__PURE__*/React__default.createElement("button", _extends({
       // role={'gridcell'}
       tabIndex: tabIndex != undefined ? tabIndex : -1,
       className: cx([className, "".concat(blockClass, "__button"), _defineProperty({}, "".concat(blockClass, "__text-ellipsis"), showToolTip && !hideLabel && !isInvalid), _defineProperty({}, "".concat(blockClass, "__invalid-input"), isInvalid)]),
@@ -47,7 +47,7 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
       onMouseEnter: onMouseEnter,
       onMouseLeave: onMouseLeave,
       "data-name": dataName
-    }, Icon && (_Icon || (_Icon = /*#__PURE__*/React__default.createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default.createElement("span", null, label))), isInvalid && (_WarningAltFilled || (_WarningAltFilled = /*#__PURE__*/React__default.createElement(WarningAltFilled, null))));
+    }, rest), Icon && (_Icon || (_Icon = /*#__PURE__*/React__default.createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default.createElement("span", null, label))), isInvalid && (_WarningAltFilled || (_WarningAltFilled = /*#__PURE__*/React__default.createElement(WarningAltFilled, null))));
   };
   return hideLabel || showToolTip ? /*#__PURE__*/React__default.createElement(Tooltip, _extends({
     label: label,

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

@@ -22,7 +22,8 @@ var ConditionConnector = function ConditionConnector(_ref) {
     onChange = _ref.onChange,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useContext = useContext(ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useTranslations = useTranslations(['connectorText']),
     _useTranslations2 = _slicedToArray(_useTranslations, 1),
     connectorText = _useTranslations2[0];
@@ -43,10 +44,10 @@ var ConditionConnector = function ConditionConnector(_ref) {
   };
   var onChangeHandler = function onChangeHandler(op, evt) {
     onChange(op);
-    focusThisField(evt);
+    focusThisField(evt, conditionBuilderRef);
   };
   return variant == 'tree' ? /*#__PURE__*/React__default.createElement("span", {
-    className: "".concat(className, " ").concat(blockClass, "__connector-disabled")
+    className: "".concat(className, " ").concat(blockClass, "__connector--disabled")
   }, operator) :
   /*#__PURE__*/
   // <div className={className} {...rest}>

package/es/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/es/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.js

@@ -24,7 +24,6 @@ var _Heading, _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,
@@ -145,13 +144,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.createElement(GroupConnector, null))));
   })), isConditionBuilderActive && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, variant == 'tree' && /*#__PURE__*/React__default.createElement("div", {
     role: "row",
     tabIndex: -1,
-    "aria-level": 1
+    "aria-level": 1,
+    className: "".concat(blockClass, "__add-group")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, {
     renderIcon: TextNewLine,
     onClick: addConditionGroupHandler,
@@ -174,8 +173,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   }))), isConditionBuilderActive && actions && /*#__PURE__*/React__default.createElement(ConditionBuilderActions, {
     actions: actions,
     className: "".concat(blockClass, "__actions-container"),
-    variant: variant,
-    conditionBuilderRef: conditionBuilderRef
+    variant: variant
   }));
 };
 var ConditionBuilderContent$1 = ConditionBuilderContent;
@@ -187,10 +185,6 @@ ConditionBuilderContent.propTypes = {
     id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
     label: PropTypes.string.isRequired
   })),
-  /**
-   * ref of condition builder
-   */
-  conditionBuilderRef: PropTypes.object,
   /**
    * callback functions that will provide the updated action state back.
    */

package/es/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/es/components/ConditionBuilder/ConditionBuilderContext/ConditionBuilderProvider.js

@@ -63,7 +63,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
@@ -74,6 +75,10 @@ ConditionBuilderProvider.propTypes = {
    * Provide the contents of the ConditionBuilder.
    */
   children: PropTypes.node.isRequired,
+  /**
+   * ref of condition builder
+   */
+  conditionBuilderRef: PropTypes.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/es/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,7 @@ export namespace translationsObject {
     let removeActionText: string;
     let addActionText: string;
     let invalidText: string;
-    let invalidDateText: string;
     let invalidNumberWarnText: string;
+    let conditionBuilderText: string;
+    let actionSectionText: string;
 }

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

@@ -31,6 +31,7 @@ var translationsObject = {
   valueText: 'Value',
   connectorText: 'Connector',
   conditionRowText: 'Condition row',
+  conditionRowGroupText: 'Condition row group',
   removeConditionText: 'Remove condition',
   addConditionRowText: 'Add condition row',
   startText: 'Start',
@@ -41,8 +42,9 @@ 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'
 };
 
 export { translationsObject };

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

@@ -1,4 +1,4 @@
-export function ConditionBuilderItem({ children, className, label, renderIcon, title, type, showToolTip, condition, popOverClassName, config, renderChildren, ...rest }: {
+export function ConditionBuilderItem({ children, className, label, renderIcon, title, type, showToolTip, condition, popOverClassName, config, renderChildren, onChange, ...rest }: {
     [x: string]: any;
     children: any;
     className: any;
@@ -11,6 +11,7 @@ export function ConditionBuilderItem({ children, className, label, renderIcon, t
     popOverClassName: any;
     config: any;
     renderChildren: any;
+    onChange: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace ConditionBuilderItem {
     namespace propTypes {
@@ -19,6 +20,7 @@ export namespace ConditionBuilderItem {
         let condition: PropTypes.Requireable<object>;
         let config: PropTypes.Requireable<object>;
         let label: PropTypes.Requireable<NonNullable<string | object | null | undefined>>;
+        let onChange: PropTypes.Requireable<(...args: any[]) => any>;
         let popOverClassName: PropTypes.Requireable<string>;
         let renderChildren: PropTypes.Requireable<(...args: any[]) => any>;
         let renderIcon: PropTypes.Requireable<object>;

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

@@ -6,15 +6,17 @@
  */
 
 import { objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useRef, useState, useEffect } from 'react';
+import React__default, { useRef, useState, useContext, useEffect } from 'react';
 import { Popover, PopoverContent, Layer } from '@carbon/react';
 import PropTypes from '../../../node_modules/prop-types/index.js';
 import { Add } from '@carbon/react/icons';
 import { blockClass, valueRenderers } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 import { useTranslations } from '../utils/useTranslations.js';
+import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
+import { handleKeyDownForPopover } from '../utils/handleKeyboardEvents.js';
 
-var _excluded = ["children", "className", "label", "renderIcon", "title", "type", "showToolTip", "condition", "popOverClassName", "config", "renderChildren"];
+var _excluded = ["children", "className", "label", "renderIcon", "title", "type", "showToolTip", "condition", "popOverClassName", "config", "renderChildren", "onChange"];
 var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
   var children = _ref.children,
     className = _ref.className,
@@ -27,30 +29,29 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     popOverClassName = _ref.popOverClassName,
     config = _ref.config,
     renderChildren = _ref.renderChildren,
+    onChange = _ref.onChange,
     rest = _objectWithoutProperties(_ref, _excluded);
-  var contentRef = useRef(null);
   var popoverRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  var _useTranslations = useTranslations(['invalidText', 'addConditionText', label, 'invalidDateText']),
-    _useTranslations2 = _slicedToArray(_useTranslations, 4),
+  var _useTranslations = useTranslations(['invalidText', 'addConditionText', label]),
+    _useTranslations2 = _slicedToArray(_useTranslations, 3),
     invalidText = _useTranslations2[0],
     addConditionText = _useTranslations2[1],
-    labelText = _useTranslations2[2],
-    invalidDateText = _useTranslations2[3];
+    labelText = _useTranslations2[2];
+  var _useContext = useContext(ConditionBuilderContext),
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var getPropertyDetails = function getPropertyDetails() {
-    if (label === 'INVALID') {
+    var _ref2 = condition || {},
+      property = _ref2.property,
+      operator = _ref2.operator;
+    if (label === 'INVALID' || rest['data-name'] === 'propertyField' && property === 'INVALID' || rest['data-name'] === 'operatorField' && operator === 'INVALID') {
       return {
         propertyLabel: invalidText,
         isInvalid: true
       };
-    } else if (label === 'INVALID_DATE') {
-      return {
-        propertyLabel: invalidDateText,
-        isInvalid: true
-      };
     }
     var propertyId = rest['data-name'] == 'valueField' && type ? valueRenderers[type](label, config) : labelText;
     return {
@@ -89,27 +90,46 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
   }, [condition, label]);
   useEffect(function () {
     //this will focus the first input field in the popover
-    if (open && contentRef.current) {
-      var firstFocusableElement = contentRef.current.querySelector('input,textarea');
+    if (open && popoverRef.current) {
+      var firstFocusableElement = popoverRef.current.querySelector('input,textarea');
       if (firstFocusableElement) {
-        firstFocusableElement.focus();
+        setTimeout(function () {
+          return firstFocusableElement.focus();
+        }, 0);
       }
     }
-  }, [contentRef, open]);
+  }, [popoverRef, open]);
+  var manageInvalidSelection = function manageInvalidSelection() {
+    //when the user didn't select any value , we need to show as incomplete
+    if (rest['data-name'] === 'propertyField' && !(condition !== null && condition !== void 0 && condition.property) || rest['data-name'] === 'operatorField' && !(condition !== null && condition !== void 0 && condition.operator) || rest['data-name'] === 'valueField' && !(condition !== null && condition !== void 0 && condition.value)) {
+      onChange === null || onChange === void 0 || onChange('INVALID');
+    }
+  };
   var closePopover = function closePopover() {
-    return setOpen(false);
+    if (open) {
+      manageInvalidSelection();
+    }
+    setOpen(false);
   };
   var openPopOver = function openPopOver() {
     return setOpen(true);
   };
   var togglePopover = function togglePopover() {
-    return setOpen(!open);
+    if (children || renderChildren) {
+      setOpen(!open);
+    }
+  };
+  var handleKeyDownHandler = function handleKeyDownHandler(evt) {
+    handleKeyDownForPopover(evt, conditionBuilderRef, popoverRef);
+    if (evt.key === 'Escape') {
+      manageInvalidSelection();
+    }
   };
   return /*#__PURE__*/React__default.createElement(Popover, {
     open: open,
     isTabTip: true,
     role: "gridcell",
-    className: popOverClassName,
+    className: "".concat(popOverClassName, " ").concat(blockClass, "__popover"),
     ref: popoverRef,
     onRequestClose: closePopover
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, _extends({
@@ -124,13 +144,13 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     isInvalid: isInvalid,
     condition: condition
   }, rest)), open && /*#__PURE__*/React__default.createElement(PopoverContent, {
-    className: "".concat(blockClass, "__item__content"),
+    className: "".concat(blockClass, "__popover-content-wrapper"),
     role: "dialog",
-    "aria-label": title
+    "aria-label": title,
+    onKeyDown: handleKeyDownHandler
   }, /*#__PURE__*/React__default.createElement(Layer, null, /*#__PURE__*/React__default.createElement("h1", {
     className: "".concat(blockClass, "__item__title")
   }, title), /*#__PURE__*/React__default.createElement("div", {
-    ref: contentRef,
     className: "".concat(blockClass, "__popover-content")
   }, renderChildren ? renderChildren(popoverRef) : children))));
 };
@@ -156,6 +176,10 @@ ConditionBuilderItem.propTypes = {
    * text to be displayed in the field
    */
   label: PropTypes.oneOfType([PropTypes.string, PropTypes.array, PropTypes.object]),
+  /**
+   * callback to update the current condition of the state tree
+   */
+  onChange: PropTypes.func,
   /**
    * class name for popover
    */

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

@@ -24,7 +24,7 @@ var ConditionBuilderItemDate = function ConditionBuilderItemDate(_ref) {
     endText = _useTranslations2[1];
   var datePickerType = conditionState.operator == 'between' ? 'range' : 'single';
   var onCloseHandler = function onCloseHandler(selectedDate) {
-    onChange(selectedDate && selectedDate.length > 0 ? selectedDate : 'INVALID_DATE');
+    onChange(selectedDate && selectedDate.length > 0 ? selectedDate : 'INVALID');
   };
   return /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__item-date ")

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

@@ -22,7 +22,7 @@ var ConditionBuilderItemNumber = function ConditionBuilderItemNumber(_ref) {
     invalidNumberWarnText = _useTranslations2[0];
   var onChangeHandler = function onChangeHandler(e, _ref2) {
     var value = _ref2.value;
-    if (!isNaN(value) && checkIfValid(value)) {
+    if (value !== '' && !isNaN(value) && checkIfValid(value)) {
       var _config$unit;
       onChange("".concat(value, " ").concat((_config$unit = config.unit) !== null && _config$unit !== void 0 ? _config$unit : ''));
     } else {
@@ -36,8 +36,8 @@ var ConditionBuilderItemNumber = function ConditionBuilderItemNumber(_ref) {
     return true;
   };
   var getDefaultValue = function getDefaultValue() {
-    var _conditionState$value;
-    return (_conditionState$value = conditionState.value) === null || _conditionState$value === void 0 || (_conditionState$value = _conditionState$value.split(' ')) === null || _conditionState$value === void 0 ? void 0 : _conditionState$value[0];
+    var _conditionState$value, _conditionState$value2;
+    return (_conditionState$value = (_conditionState$value2 = conditionState.value) === null || _conditionState$value2 === void 0 || (_conditionState$value2 = _conditionState$value2.split(' ')) === null || _conditionState$value2 === void 0 ? void 0 : _conditionState$value2[0]) !== null && _conditionState$value !== void 0 ? _conditionState$value : '';
   };
   return /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__item-number")

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

@@ -113,14 +113,17 @@ var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
     setSearchValue(value);
   };
   var onClickHandler = function onClickHandler(evt, option, isSelected) {
+    var updatedSelections = selection.filter(function (item) {
+      return item !== 'INVALID';
+    });
     if (multiSelectable) {
       if (isSelected) {
-        var items = selection.filter(function (v) {
+        var items = updatedSelections.filter(function (v) {
           return v.id !== option.id;
         });
-        onChange(items.length > 0 ? items : undefined, evt);
+        onChange(items.length > 0 ? items : undefined);
       } else {
-        onChange([].concat(_toConsumableArray(selection), [option]), evt);
+        onChange([].concat(_toConsumableArray(updatedSelections), [option]));
       }
     } else {
       onChange(option, evt);

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

@@ -10,9 +10,10 @@ import React__default from 'react';
 import { TextArea, TextInput } from '@carbon/react';
 import PropTypes from '../../../../node_modules/prop-types/index.js';
 import { blockClass } from '../../ConditionBuilderContext/DataConfigs.js';
+import { checkIsValid } from '../../utils/util.js';
 
 var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
-  var _conditionState$value, _conditionState$prope;
+  var _conditionState$prope;
   var conditionState = _ref.conditionState,
     _onChange = _ref.onChange,
     config = _ref.config,
@@ -20,7 +21,7 @@ var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
   var inputProps = _objectSpread2({
     labelText: conditionState.property,
     hideLabel: true,
-    value: (_conditionState$value = conditionState.value) !== null && _conditionState$value !== void 0 ? _conditionState$value : '',
+    value: checkIsValid(conditionState.value) ? conditionState.value : '',
     id: (_conditionState$prope = conditionState.property) === null || _conditionState$prope === void 0 ? void 0 : _conditionState$prope.replace(/\s/g, ''),
     onChange: function onChange(evt) {
       _onChange(evt.target.value);