@carbon/ibm-products 2.43.2-canary.2 → 2.43.2-canary.22

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

@@ -1,38 +1,41 @@
 export namespace translationsObject {
-    let en: {
-        if: string;
-        'excl-if': string;
-        and: string;
-        or: string;
-        is: string;
-        greater: string;
-        'greater-equal': string;
-        lower: string;
-        'lower-equal': string;
-        'starts-with': string;
-        'ends-with': string;
-        contains: string;
-        'one-of': string;
-        before: string;
-        after: string;
-        between: string;
-        'add-condition': string;
-        'add-condition-group': string;
-        'add-condition-sub-group': string;
-        condition: string;
-        property: string;
-        operator: string;
-        value: string;
-        connector: string;
-        condition_row: string;
-        remove_condition: string;
-        add_condition_row: string;
-        start: string;
-        end: string;
-        clear_search: string;
-        actions: string;
-        then: string;
-        remove_action: string;
-        add_action: string;
-    };
+    namespace en {
+        let _if: string;
+        export { _if as if };
+        export let excl_if: string;
+        export let and: string;
+        export let or: string;
+        export let is: string;
+        export let greater: string;
+        export let greater_equal: string;
+        export let lower: string;
+        export let lower_equal: string;
+        export let starts_with: string;
+        export let ends_with: string;
+        export let contains: string;
+        export let one_of: string;
+        export let before: string;
+        export let after: string;
+        export let between: string;
+        export let add_condition: string;
+        export let add_condition_group: string;
+        export let add_subgroup: string;
+        export let condition: string;
+        export let property: string;
+        export let operator: string;
+        export let value: string;
+        export let connector: string;
+        export let condition_row: string;
+        export let remove_condition: string;
+        export let add_condition_row: string;
+        export let start: string;
+        export let end: string;
+        export let clear_search: string;
+        export let actions: string;
+        export let then: string;
+        export let remove_action: string;
+        export let add_action: string;
+        export let invalid_text: string;
+        export let text_invalid_number: string;
+    }
 }

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

@@ -12,24 +12,24 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var translationsObject = {
   en: {
     if: 'if',
-    'excl-if': 'excl.if',
+    excl_if: 'excl.if',
     and: 'and',
     or: 'or',
     is: 'is',
     greater: 'is greater than',
-    'greater-equal': 'is greater than or equal to',
+    greater_equal: 'is greater than or equal to',
     lower: 'is lower than',
-    'lower-equal': 'is lower than or equal to',
-    'starts-with': 'starts with',
-    'ends-with': 'ends with',
+    lower_equal: 'is lower than or equal to',
+    starts_with: 'starts with',
+    ends_with: 'ends with',
     contains: 'contains',
-    'one-of': 'is one of',
+    one_of: 'is one of',
     before: 'is before',
     after: 'is after',
     between: 'is between',
-    'add-condition': 'Add Condition',
-    'add-condition-group': 'Add Condition Group',
-    'add-condition-sub-group': 'Add Condition sub group',
+    add_condition: 'Add condition',
+    add_condition_group: 'Add condition group',
+    add_subgroup: 'Add subgroup',
     condition: 'Condition',
     property: 'Property',
     operator: 'Operator',
@@ -44,7 +44,9 @@ var translationsObject = {
     actions: 'Actions',
     then: 'then',
     remove_action: 'Remove Action',
-    add_action: 'Add action'
+    add_action: 'Add action',
+    invalid_text: 'Incomplete',
+    text_invalid_number: 'Invalid number, must be 0 or greater'
   }
 };
 

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

@@ -17,7 +17,7 @@ export namespace ConditionBuilderItem {
         let className: PropTypes.Requireable<string>;
         let condition: PropTypes.Requireable<object>;
         let config: PropTypes.Requireable<object>;
-        let label: PropTypes.Requireable<NonNullable<string | any[] | null | undefined>>;
+        let label: PropTypes.Requireable<NonNullable<string | object | null | undefined>>;
         let popOverClassName: PropTypes.Requireable<string>;
         let renderIcon: PropTypes.Requireable<object>;
         let showToolTip: PropTypes.Requireable<boolean>;

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItem.js

@@ -35,19 +35,26 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     config = _ref.config,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var contentRef = React.useRef(null);
-  var _useState = React.useState(label),
+  var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
-    propertyLabel = _useState2[0],
-    setPropertyLabel = _useState2[1];
-  var _useState3 = React.useState(false),
-    _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
-  React.useEffect(function () {
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var getPropertyDetails = function getPropertyDetails() {
+    if (label === 'INVALID') {
+      return {
+        propertyLabel: DataConfigs.translateWithId('invalid_text'),
+        isInvalid: true
+      };
+    }
     var propertyId = rest['data-name'] == 'valueField' && type ? DataConfigs.valueRenderers[type](label, config) : label;
-    setPropertyLabel(DataConfigs.translateWithId(propertyId));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [label]);
+    return {
+      isInvalid: false,
+      propertyLabel: DataConfigs.translateWithId(propertyId)
+    };
+  };
+  var _getPropertyDetails = getPropertyDetails(),
+    propertyLabel = _getPropertyDetails.propertyLabel,
+    isInvalid = _getPropertyDetails.isInvalid;
   React.useEffect(function () {
     /**
      * rest['data-name'] holds the current field name
@@ -59,7 +66,7 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
       if (condition.popoverToOpen && currentField !== condition.popoverToOpen) {
         // close the previous popover
         setOpen(false);
-      } else if (currentField == 'valueField' && type == 'option' && condition.operator !== 'one-of') {
+      } else if (currentField == 'valueField' && type == 'option' && condition.operator !== 'one_of') {
         //close the current popover if the field is valueField and  is a single select dropdown. For all other inputs ,popover need to be open on value changes.
         setOpen(false);
       }
@@ -92,7 +99,7 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
       setOpen(false);
     }
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
-    label: propertyLabel !== null && propertyLabel !== void 0 ? propertyLabel : DataConfigs.translateWithId('add-condition'),
+    label: propertyLabel !== null && propertyLabel !== void 0 ? propertyLabel : DataConfigs.translateWithId('add_condition'),
     hideLabel: !label ? true : false,
     onClick: function onClick() {
       children ? setOpen(!open) : null;
@@ -101,7 +108,8 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     "aria-haspopup": true,
     "aria-expanded": open,
     renderIcon: renderIcon ? renderIcon : label == undefined ? icons.Add : null,
-    showToolTip: showToolTip
+    showToolTip: showToolTip,
+    isInvalid: isInvalid
   }, rest)), /*#__PURE__*/React__default["default"].createElement(react.PopoverContent, {
     className: "".concat(DataConfigs.blockClass, "__item__content"),
     role: "dialog",
@@ -133,7 +141,7 @@ ConditionBuilderItem.propTypes = {
   /**
    * text to be displayed in the field
    */
-  label: index["default"].oneOfType([index["default"].string, index["default"].array]),
+  label: index["default"].oneOfType([index["default"].string, index["default"].array, index["default"].object]),
   /**
    * class name for popover
    */

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

@@ -11,14 +11,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
 var react = require('@carbon/react');
-var settings = require('../../../../settings.js');
 var index = require('../../../../node_modules/prop-types/index.js');
+var DataConfigs = require('../../ConditionBuilderContext/DataConfigs.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var blockClass = "".concat(settings.pkg.prefix, "--condition-builder");
 var ConditionBuilderItemNumber = function ConditionBuilderItemNumber(_ref) {
   var _conditionState$prope;
   var conditionState = _ref.conditionState,
@@ -26,18 +25,34 @@ var ConditionBuilderItemNumber = function ConditionBuilderItemNumber(_ref) {
     onChange = _ref.onChange;
   var onChangeHandler = function onChangeHandler(e, _ref2) {
     var value = _ref2.value;
-    onChange(value + '');
+    if (checkIfValid(value)) {
+      var _config$unit;
+      onChange("".concat(value, " ").concat((_config$unit = config.unit) !== null && _config$unit !== void 0 ? _config$unit : ''));
+    } else {
+      onChange('INVALID');
+    }
+  };
+  var checkIfValid = function checkIfValid(value) {
+    if (value > config.max || value < config.min) {
+      return false;
+    }
+    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];
   };
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "".concat(blockClass, "__item-number")
+    className: "".concat(DataConfigs.blockClass, "__item-number")
   }, /*#__PURE__*/React__default["default"].createElement(react.NumberInput, {
     label: conditionState.property,
     hideLabel: true,
+    defaultValue: getDefaultValue(),
     id: (_conditionState$prope = conditionState.property) === null || _conditionState$prope === void 0 ? void 0 : _conditionState$prope.replace(/\s/g, ''),
-    value: conditionState.value ? conditionState.value.split(' ')[0] : conditionState.value,
     min: config.min,
     max: config.max,
     step: config.step,
+    invalidText: DataConfigs.translateWithId('text_invalid_number'),
     allowEmpty: true,
     onChange: onChangeHandler
   }));

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.d.ts

@@ -0,0 +1,13 @@
+export function ItemOption({ conditionState, config, onChange }: {
+    conditionState?: {} | undefined;
+    config?: {} | undefined;
+    onChange: any;
+}): import("react/jsx-runtime").JSX.Element | undefined;
+export namespace ItemOption {
+    namespace propTypes {
+        let conditionState: PropTypes.Requireable<object>;
+        let config: PropTypes.Requireable<object>;
+        let onChange: PropTypes.Requireable<(...args: any[]) => any>;
+    }
+}
+import PropTypes from 'prop-types';

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js

@@ -0,0 +1,117 @@
+/**
+ * Copyright IBM Corp. 2020, 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _rollupPluginBabelHelpers = require('../../../../_virtual/_rollupPluginBabelHelpers.js');
+var React = require('react');
+var react = require('@carbon/react');
+var icons = require('@carbon/react/icons');
+var index = require('../../../../node_modules/prop-types/index.js');
+var ConditionBuilderProvider = require('../../ConditionBuilderContext/ConditionBuilderProvider.js');
+var DataConfigs = require('../../ConditionBuilderContext/DataConfigs.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+var ItemOption = function ItemOption(_ref) {
+  var _ref$conditionState = _ref.conditionState,
+    conditionState = _ref$conditionState === void 0 ? {} : _ref$conditionState,
+    _ref$config = _ref.config,
+    config = _ref$config === void 0 ? {} : _ref$config,
+    onChange = _ref.onChange;
+  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
+    popOverSearchThreshold = _useContext.popOverSearchThreshold;
+  var contentRef = React.useRef();
+  var allOptions = config.options;
+  var _useState = React.useState(''),
+    _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
+    searchValue = _useState2[0],
+    setSearchValue = _useState2[1];
+  var selection = conditionState.value;
+  var filteredItems = allOptions === null || allOptions === void 0 ? void 0 : allOptions.filter(function (opt) {
+    return opt.label.toLowerCase().includes(searchValue.toLowerCase());
+  });
+  React.useEffect(function () {
+    //this will focus the first input field in the popover
+
+    if (contentRef.current) {
+      var firstFocusableElement = contentRef.current.querySelector('input, button,li');
+      if (firstFocusableElement) {
+        firstFocusableElement.focus();
+      }
+    }
+  }, [allOptions]);
+  var onClickHandler = function onClickHandler(evt, option) {
+    onChange(option.id, evt);
+  };
+  var onSearchChangeHandler = function onSearchChangeHandler(evt) {
+    var value = evt.target.value;
+    setSearchValue(value);
+  };
+  var getAriaLabel = function getAriaLabel() {
+    return conditionState.label ? conditionState.label : conditionState.property ? conditionState.property : DataConfigs.translateWithId('property');
+  };
+  if (!allOptions) {
+    return;
+  }
+  return /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__item-option"),
+    ref: contentRef
+  }, allOptions.length > popOverSearchThreshold && /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__item-option__search")
+  }, /*#__PURE__*/React__default["default"].createElement(react.Search, {
+    size: "sm",
+    labelText: DataConfigs.translateWithId('clear_search'),
+    closeButtonLabelText: DataConfigs.translateWithId('clear_search'),
+    onChange: onSearchChangeHandler
+  })), /*#__PURE__*/React__default["default"].createElement("ul", {
+    "aria-label": getAriaLabel(),
+    role: "listbox"
+  }, filteredItems === null || filteredItems === void 0 ? void 0 : filteredItems.map(function (option) {
+    var isSelected = selection === option.id;
+    var Icon = option.icon;
+    return /*#__PURE__*/React__default["default"].createElement("li", {
+      tabIndex: 0,
+      key: option.id,
+      role: "option",
+      "aria-selected": isSelected,
+      className: "".concat(DataConfigs.blockClass, "__item-option__option"),
+      onKeyUp: function onKeyUp() {
+        return false;
+      },
+      onClick: function onClick(evt) {
+        return onClickHandler(evt, option);
+      }
+    }, /*#__PURE__*/React__default["default"].createElement("div", {
+      className: "".concat(DataConfigs.blockClass, "__item-option__option-content")
+    }, /*#__PURE__*/React__default["default"].createElement("span", {
+      className: "".concat(DataConfigs.blockClass, "__item-option__option-label")
+    }, Icon && /*#__PURE__*/React__default["default"].createElement(Icon, null), option.label), isSelected && /*#__PURE__*/React__default["default"].createElement(icons.Checkmark, {
+      className: "".concat(DataConfigs.blockClass, "__checkmark")
+    })));
+  })));
+};
+ItemOption.propTypes = {
+  /**
+   * current condition object
+   */
+  conditionState: index["default"].object,
+  /**
+   * current config object that this property is part of
+   */
+  config: index["default"].object,
+  /**
+   * callback to update state oin date change
+   */
+  onChange: index["default"].func
+};
+
+exports.ItemOption = ItemOption;

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/{ConditionBuilderItemOption.d.ts → ItemOptionForValueField.d.ts}

@@ -1,9 +1,9 @@
-export function ConditionBuilderItemOption({ conditionState, config, onChange, }: {
+export function ItemOptionForValueField({ conditionState, config, onChange, }: {
     conditionState?: {} | undefined;
     config?: {} | undefined;
     onChange: any;
 }): import("react/jsx-runtime").JSX.Element;
-export namespace ConditionBuilderItemOption {
+export namespace ItemOptionForValueField {
     namespace propTypes {
         let conditionState: PropTypes.Requireable<object>;
         let config: PropTypes.Requireable<object>;

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/{ConditionBuilderItemOption.js → ItemOptionForValueField.js}

@@ -21,28 +21,51 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var _CheckboxCheckedFille, _Checkbox, _SelectSkeleton;
-var ConditionBuilderItemOption = function ConditionBuilderItemOption(_ref) {
+var _SelectSkeleton, _CheckboxCheckedFille, _Checkbox;
+var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
   var _ref$conditionState = _ref.conditionState,
     conditionState = _ref$conditionState === void 0 ? {} : _ref$conditionState,
     _ref$config = _ref.config,
     config = _ref$config === void 0 ? {} : _ref$config,
     onChange = _ref.onChange;
-  var multiSelectable = conditionState.operator === 'one-of';
+  var multiSelectable = conditionState.operator === 'one_of';
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
     popOverSearchThreshold = _useContext.popOverSearchThreshold,
-    getOptions = _useContext.getOptions;
+    getOptions = _useContext.getOptions,
+    rootState = _useContext.rootState;
+  var contentRef = React.useRef();
   var _useState = React.useState(config.options),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     allOptions = _useState2[0],
     setAllOptions = _useState2[1];
-  var _useState3 = React.useState(config.options),
+  var _useState3 = React.useState(''),
     _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
-    filteredItems = _useState4[0],
-    setFilteredItems = _useState4[1];
+    searchValue = _useState4[0],
+    setSearchValue = _useState4[1];
+  var filteredItems = allOptions === null || allOptions === void 0 ? void 0 : allOptions.filter(function (opt) {
+    return opt.label.toLowerCase().includes(searchValue.toLowerCase());
+  });
   var selection = Array.isArray(conditionState.value) ? conditionState.value : conditionState.value !== undefined ? [conditionState.value] : [];
-  var contentRef = React.useRef();
   React.useEffect(function () {
+    // if(rest['data-name'] == 'valueField'){
+    //   const fetchData = async () => {
+    //     const response = await config.options(conditionState);
+    //     if (
+    //       response?.length > 0 &&
+    //       Object.keys(response[0]).includes('label') &&
+    //       Object.keys(response[0]).includes('id')
+    //     ) {
+    //       setAllOptions(response);
+    //       setFilteredItems(response);
+    //     }
+    //   };
+
+    //   fetchData(); // Call the async method
+    // }else{
+    //   setAllOptions(config.options);
+    //       setFilteredItems(config.options);
+    // }
+
     if (!allOptions && getOptions) {
       var fetchData = /*#__PURE__*/function () {
         var _ref2 = _rollupPluginBabelHelpers.asyncToGenerator( /*#__PURE__*/_rollupPluginBabelHelpers.regeneratorRuntime().mark(function _callee() {
@@ -51,12 +74,11 @@ var ConditionBuilderItemOption = function ConditionBuilderItemOption(_ref) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return getOptions(conditionState);
+                return getOptions(rootState, conditionState);
               case 2:
                 response = _context.sent;
                 if ((response === null || response === void 0 ? void 0 : response.length) > 0 && Object.keys(response[0]).includes('label') && Object.keys(response[0]).includes('id')) {
                   setAllOptions(response);
-                  setFilteredItems(response);
                 }
               case 4:
               case "end":
@@ -76,46 +98,47 @@ var ConditionBuilderItemOption = function ConditionBuilderItemOption(_ref) {
     //this will focus the first input field in the popover
 
     if (contentRef.current) {
-      var _contentRef$current;
-      var firstFocusableElement = (_contentRef$current = contentRef.current) === null || _contentRef$current === void 0 ? void 0 : _contentRef$current.querySelector('input, button,li');
-      firstFocusableElement === null || firstFocusableElement === void 0 || firstFocusableElement.focus();
+      var firstFocusableElement = contentRef.current.querySelector('input, button,li');
+      if (firstFocusableElement) {
+        firstFocusableElement.focus();
+      }
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [allOptions]);
   var handleSelectAll = function handleSelectAll(evt) {
     if (evt.currentTarget.dataset.selectedAll == 'false') {
       onChange(undefined);
     } else {
-      onChange(allOptions.map(function (op) {
-        return op.id;
-      }));
+      onChange(allOptions);
     }
   };
   var onSearchChangeHandler = function onSearchChangeHandler(evt) {
     var value = evt.target.value;
-    var _filteredItems = allOptions.filter(function (opt) {
-      return opt.label.toLowerCase().includes(value.toLowerCase());
-    });
-    setFilteredItems(_filteredItems);
+    setSearchValue(value);
   };
   var onClickHandler = function onClickHandler(evt, option, isSelected) {
     if (multiSelectable) {
       if (isSelected) {
         var items = selection.filter(function (v) {
-          return v !== option.id;
+          return v.id !== option.id;
         });
         onChange(items.length > 0 ? items : undefined, evt);
       } else {
-        onChange([].concat(_rollupPluginBabelHelpers.toConsumableArray(selection), [option.id]), evt);
+        onChange([].concat(_rollupPluginBabelHelpers.toConsumableArray(selection), [option]), evt);
       }
     } else {
-      onChange(option.id, evt);
+      onChange(option, evt);
     }
   };
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, allOptions && /*#__PURE__*/React__default["default"].createElement("div", {
+  var getAriaLabel = function getAriaLabel() {
+    return conditionState.label ? conditionState.label : conditionState.property ? conditionState.property : DataConfigs.translateWithId('property');
+  };
+  if (!allOptions) {
+    return _SelectSkeleton || (_SelectSkeleton = /*#__PURE__*/React__default["default"].createElement(react.SelectSkeleton, null));
+  }
+  return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__item-option"),
     ref: contentRef
-  }, (config.includeSearch || allOptions.length > popOverSearchThreshold) && /*#__PURE__*/React__default["default"].createElement("div", {
+  }, allOptions.length > popOverSearchThreshold && /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__item-option__search")
   }, /*#__PURE__*/React__default["default"].createElement(react.Search, {
     size: "sm",
@@ -131,11 +154,13 @@ var ConditionBuilderItemOption = function ConditionBuilderItemOption(_ref) {
     onClick: handleSelectAll,
     className: "".concat(DataConfigs.blockClass, "__selectAll-button")
   }, selection.length == 0 ? 'Select all' : 'Deselect all')), /*#__PURE__*/React__default["default"].createElement("ul", {
-    "aria-label": conditionState.label ? conditionState.label : conditionState.property ? conditionState.property : DataConfigs.translateWithId('property'),
+    "aria-label": getAriaLabel(),
     role: "listbox",
     "data-multi-select": multiSelectable
   }, filteredItems === null || filteredItems === void 0 ? void 0 : filteredItems.map(function (option) {
-    var isSelected = selection.includes(option.id);
+    var isSelected = selection.map(function (option) {
+      return option.id;
+    }).includes(option.id);
     var Icon = option.icon;
     return /*#__PURE__*/React__default["default"].createElement("li", {
       tabIndex: 0,
@@ -162,9 +187,9 @@ var ConditionBuilderItemOption = function ConditionBuilderItemOption(_ref) {
     }, Icon && /*#__PURE__*/React__default["default"].createElement(Icon, null), option.label), isSelected && /*#__PURE__*/React__default["default"].createElement(icons.Checkmark, {
       className: "".concat(DataConfigs.blockClass, "__checkmark")
     }))));
-  }))), !allOptions && (_SelectSkeleton || (_SelectSkeleton = /*#__PURE__*/React__default["default"].createElement(react.SelectSkeleton, null))));
+  })));
 };
-ConditionBuilderItemOption.propTypes = {
+ItemOptionForValueField.propTypes = {
   /**
    * current condition object
    */
@@ -179,4 +204,4 @@ ConditionBuilderItemOption.propTypes = {
   onChange: index["default"].func
 };
 
-exports.ConditionBuilderItemOption = ConditionBuilderItemOption;
+exports.ItemOptionForValueField = ItemOptionForValueField;

package/lib/components/ConditionBuilder/ConditionGroupBuilder/ConditionGroupBuilder.js

@@ -16,12 +16,12 @@ var index = require('../../../node_modules/prop-types/index.js');
 var cx = require('classnames');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
-var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
 var util = require('../utils/util.js');
 var ConditionConnector = require('../ConditionBuilderConnector/ConditionConnector.js');
 var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
 var uuidv4 = require('../../../global/js/utils/uuidv4.js');
 var ConditionPreview = require('../ConditionPreview/ConditionPreview.js');
+var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -29,7 +29,6 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var _ConditionPreview, _ConditionPreview2;
-
 /**
  *
  *  state - this is the current group that is being rendered . This can be a inner group or outer group
@@ -94,7 +93,6 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
   var addConditionSubGroupHandler = function addConditionSubGroupHandler(conditionIndex) {
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
       conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [{
-        groupSeparateOperator: null,
         groupOperator: 'and',
         statement: 'if',
         conditions: [{
@@ -187,7 +185,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       "data-name": "connectorField",
       popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
       className: "".concat(DataConfigs.blockClass, "__statement-button")
-    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+    }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
       conditionState: {
         value: group.statement,
         label: DataConfigs.translateWithId('condition')
@@ -223,7 +221,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           onRemoveHandler(eachCondition.id, e);
         },
         conditionBuilderRef: conditionBuilderRef
-      })) : /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
+      })) : /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
         conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
         aria: {
           level: aria.level + 1,
@@ -253,7 +251,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         hideConditionPreviewHandler: hideConditionPreviewHandler,
         isLastCondition: isLastCondition
-      }), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
+      })), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
         previewType: "subGroup"
       }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
         previewType: "condition"