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

package/es/components/Datagrid/useInlineEdit.js

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { typeof as _typeof } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default from 'react';
 import { pkg } from '../../settings.js';
 import cx from 'classnames';
@@ -13,19 +14,20 @@ import { InlineEditCell } from './Datagrid/addons/InlineEdit/InlineEditCell/Inli
 var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useInlineEdit = function useInlineEdit(hooks) {
   var addInlineEdit = function addInlineEdit(props, _ref) {
-    var _cell$column, _cell$column2;
+    var _cell$column, _cell$column2, _cell$value, _cell$value2, _cell$value3;
     var cell = _ref.cell,
       instance = _ref.instance;
     var columnInlineEditConfig = cell.column.inlineEdit;
     var inlineEditType = (_cell$column = cell.column) === null || _cell$column === void 0 || (_cell$column = _cell$column.inlineEdit) === null || _cell$column === void 0 ? void 0 : _cell$column.type;
     var isDisabled = (_cell$column2 = cell.column) === null || _cell$column2 === void 0 ? void 0 : _cell$column2.isDisabled;
+    var staticCell = _typeof(cell.value) === 'object' && cell.column.id === ((_cell$value = cell.value) === null || _cell$value === void 0 ? void 0 : _cell$value.columnId) && ((_cell$value2 = cell.value) === null || _cell$value2 === void 0 ? void 0 : _cell$value2.isStaticCell);
     var renderInlineEditComponent = function renderInlineEditComponent(type) {
       return /*#__PURE__*/React__default.createElement(InlineEditCell, {
         config: columnInlineEditConfig,
         tabIndex: -1,
         value: cell.value,
         cell: cell,
-        isDisabled: isDisabled,
+        disabledCell: isDisabled,
         instance: instance,
         type: type
       });
@@ -38,7 +40,15 @@ var useInlineEdit = function useInlineEdit(hooks) {
     return [props, {
       className: cx("".concat(blockClass, "__cell"), "".concat(blockClass, "__cell-inline-edit")),
       role: 'gridcell',
-      children: /*#__PURE__*/React__default.createElement(React__default.Fragment, null, inlineEditType === 'text' && renderInlineEditComponent(inlineEditType), inlineEditType === 'number' && renderInlineEditComponent(inlineEditType), inlineEditType === 'selection' && renderInlineEditComponent(inlineEditType), inlineEditType === 'date' && renderInlineEditComponent(inlineEditType), !inlineEditType && /*#__PURE__*/React__default.createElement(InlineEditCell, {
+      children: /*#__PURE__*/React__default.createElement(React__default.Fragment, null, !staticCell && inlineEditType === 'text' && renderInlineEditComponent(inlineEditType), !staticCell && inlineEditType === 'number' && renderInlineEditComponent(inlineEditType), !staticCell && inlineEditType === 'selection' && renderInlineEditComponent(inlineEditType), !staticCell && inlineEditType === 'date' && renderInlineEditComponent(inlineEditType), staticCell && /*#__PURE__*/React__default.createElement(InlineEditCell, {
+        config: columnInlineEditConfig,
+        tabIndex: -1,
+        value: (_cell$value3 = cell.value) === null || _cell$value3 === void 0 ? void 0 : _cell$value3.value,
+        cell: cell,
+        instance: instance,
+        nonEditCell: true,
+        type: "text"
+      }), !inlineEditType && /*#__PURE__*/React__default.createElement(InlineEditCell, {
         config: columnInlineEditConfig,
         tabIndex: -1,
         value: cell.value,

package/es/components/Datagrid/useNestedRows.js

@@ -15,12 +15,30 @@ var blockClass = "".concat(pkg.prefix, "--datagrid");
 var useNestedRows = function useNestedRows(hooks) {
   useNestedRowExpander(hooks);
   var useInstance = function useInstance(instance) {
+    useEffect(function () {
+      var _ref = instance,
+        rows = _ref.rows;
+      var defaultExpandedRows = rows.filter(function (row) {
+        var _row$original;
+        return row === null || row === void 0 || (_row$original = row.original) === null || _row$original === void 0 ? void 0 : _row$original.defaultExpanded;
+      });
+      if (defaultExpandedRows !== null && defaultExpandedRows !== void 0 && defaultExpandedRows.length) {
+        defaultExpandedRows.map(function (defaultExpandedRow) {
+          if (!(defaultExpandedRow !== null && defaultExpandedRow !== void 0 && defaultExpandedRow.isExpanded) && !(defaultExpandedRow !== null && defaultExpandedRow !== void 0 && defaultExpandedRow.hasExpanded)) {
+            var _defaultExpandedRow$t;
+            defaultExpandedRow === null || defaultExpandedRow === void 0 || (_defaultExpandedRow$t = defaultExpandedRow.toggleRowExpanded) === null || _defaultExpandedRow$t === void 0 || _defaultExpandedRow$t.call(defaultExpandedRow);
+            defaultExpandedRow.hasExpanded = true;
+            return;
+          }
+        });
+      }
+    }, [instance, instance.rows]);
     // This useEffect will expand rows if they exist in the initialState obj
     useEffect(function () {
       var rows = instance.rows,
         initialState = instance.initialState;
-      var _ref = initialState,
-        expandedRowIds = _ref.expandedRowIds;
+      var _ref2 = initialState,
+        expandedRowIds = _ref2.expandedRowIds;
       if (expandedRowIds) {
         Object.keys(expandedRowIds).forEach(function (key) {
           var row = rows.filter(function (r) {
@@ -34,14 +52,14 @@ var useNestedRows = function useNestedRows(hooks) {
       }
     }, [instance]);
     var marginLeft = 24;
-    var getRowProps = function getRowProps(props, _ref2) {
-      var row = _ref2.row;
+    var getRowProps = function getRowProps(props, _ref3) {
+      var row = _ref3.row;
       return [props, {
         className: cx(_defineProperty(_defineProperty({}, "".concat(blockClass, "__carbon-nested-row"), row.depth > 0), "".concat(blockClass, "__carbon-row-expanded"), row.isExpanded))
       }];
     };
-    var getRowStyles = function getRowStyles(props, _ref3) {
-      var row = _ref3.row;
+    var getRowStyles = function getRowStyles(props, _ref4) {
+      var row = _ref4.row;
       return [props, {
         style: {
           paddingLeft: "".concat(row.depth > 1 ? marginLeft * 2 + (row.depth - 1) * (marginLeft + marginLeft / 3) : row.depth === 1 ? marginLeft * 2 : 0, "px")
@@ -51,9 +69,9 @@ var useNestedRows = function useNestedRows(hooks) {
     var getIndentation = function getIndentation(depth) {
       return 32 * depth + 16;
     }; // row indentation padding
-    var getCellProps = function getCellProps(props, _ref4) {
-      var cell = _ref4.cell,
-        instance = _ref4.instance;
+    var getCellProps = function getCellProps(props, _ref5) {
+      var cell = _ref5.cell,
+        instance = _ref5.instance;
       // we add a dynamic -ve margin right only if the cell is resized below minimum width i.e 50px, else we set the width based on indentation at different levels
       var isFirstCell = instance.columns.findIndex(function (c) {
         return c.id === cell.column.id;

package/es/components/Decorator/Decorator.js

@@ -87,7 +87,8 @@ Decorator.propTypes = {
    */
   small: PropTypes.bool,
   /**
-   * Determines the theme of the component.
+   * Override the default theme of the component.
+   * Useful if you want "invert" the component's theme.
    */
   theme: PropTypes.oneOf(['light', 'dark']),
   /**

package/es/components/DecoratorBase/DecoratorBase.js

@@ -23,8 +23,7 @@ var defaults = {
   onContextMenu: function onContextMenu() {},
   onContextMenuLabel: function onContextMenuLabel() {},
   onContextMenuValue: function onContextMenuValue() {},
-  scoreThresholds: [0, 4, 7, 10],
-  theme: 'light'
+  scoreThresholds: [0, 4, 7, 10]
 };
 
 /**
@@ -56,8 +55,7 @@ var DecoratorBase = /*#__PURE__*/React__default.forwardRef(function (_ref, ref)
     _ref$scoreThresholds = _ref.scoreThresholds,
     scoreThresholds = _ref$scoreThresholds === void 0 ? defaults.scoreThresholds : _ref$scoreThresholds,
     small = _ref.small,
-    _ref$theme = _ref.theme,
-    theme = _ref$theme === void 0 ? defaults.theme : _ref$theme,
+    theme = _ref.theme,
     truncateValue = _ref.truncateValue,
     value = _ref.value,
     valueTitle = _ref.valueTitle,
@@ -67,7 +65,7 @@ var DecoratorBase = /*#__PURE__*/React__default.forwardRef(function (_ref, ref)
   var _value = truncate(value, truncateValue);
 
   // These class names apply to all types of DecoratorBase.
-  var classNames = cx(blockClass, className, "".concat(blockClass, "--").concat(theme), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(blockClass, "--sm"), small), "".concat(blockClass, "--truncate-end"), truncateValue === 'end'), "".concat(blockClass, "--truncate-start"), truncateValue === 'start'), "".concat(blockClass, "--truncate-midline"), truncateValue === null || truncateValue === void 0 ? void 0 : truncateValue.maxLength));
+  var classNames = cx(blockClass, className, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(blockClass, "--").concat(theme), theme), "".concat(blockClass, "--sm"), small), "".concat(blockClass, "--truncate-end"), truncateValue === 'end'), "".concat(blockClass, "--truncate-start"), truncateValue === 'start'), "".concat(blockClass, "--truncate-midline"), truncateValue === null || truncateValue === void 0 ? void 0 : truncateValue.maxLength));
 
   // These properties apply to all <DecoratorIcons>.
   var decoratorIconsProps = {

package/es/components/DecoratorDualButton/DecoratorDualButton.js

@@ -111,7 +111,8 @@ DecoratorDualButton.propTypes = {
    */
   small: PropTypes.bool,
   /**
-   * Determines the theme of the component.
+   * Override the default theme of the component.
+   * Useful if you want "invert" the component's theme.
    */
   theme: PropTypes.oneOf(['light', 'dark']),
   /**

package/es/components/DecoratorLink/DecoratorLink.js

@@ -101,7 +101,8 @@ DecoratorLink.propTypes = {
    */
   small: PropTypes.bool,
   /**
-   * Determines the theme of the component.
+   * Override the default theme of the component.
+   * Useful if you want "invert" the component's theme.
    */
   theme: PropTypes.oneOf(['light', 'dark']),
   /**

package/es/components/DecoratorSingleButton/DecoratorSingleButton.js

@@ -101,7 +101,8 @@ DecoratorSingleButton.propTypes = {
    */
   small: PropTypes.bool,
   /**
-   * Determines the theme of the component.
+   * Override the default theme of the component.
+   * Useful if you want "invert" the component's theme.
    */
   theme: PropTypes.oneOf(['light', 'dark']),
   /**

package/es/components/Tearsheet/Tearsheet.d.ts

@@ -99,9 +99,16 @@ interface TearsheetProps extends PropsWithChildren {
      */
     portalTarget: ReactNode;
     /**
-     * Specify a CSS selector that matches the DOM element that should be focused when the Modal opens
+     * Specify a CSS selector that matches the DOM element that should be
+     * focused when the Modal opens.
      */
     selectorPrimaryFocus?: string;
+    /**
+     * Specify the CSS selectors that match the floating menus.
+     *
+     * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+     */
+    selectorsFloatingMenus?: string[];
     /**
      * The main title of the tearsheet, displayed in the header area.
      */

package/es/components/Tearsheet/Tearsheet.js

@@ -190,9 +190,17 @@ Tearsheet.propTypes = _objectSpread2({
   /**@ts-ignore */
   portalTarget: portalType,
   /**
-   * Specify a CSS selector that matches the DOM element that should be focused when the Modal opens
+   * Specify a CSS selector that matches the DOM element that should be
+   * focused when the Modal opens.
    */
   selectorPrimaryFocus: PropTypes.string,
+  /**
+   * Specify the CSS selectors that match the floating menus.
+   *
+   * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+   */
+  /**@ts-ignore*/
+  selectorsFloatingMenus: PropTypes.arrayOf(PropTypes.string),
   /**
    * The main title of the tearsheet, displayed in the header area.
    */

package/es/components/Tearsheet/TearsheetNarrow.d.ts

@@ -64,6 +64,17 @@ interface TearsheetNarrowBaseProps extends PropsWithChildren {
      * The DOM element that the tearsheet should be rendered within. Defaults to document.body.
      */
     portalTarget?: ReactNode;
+    /**
+     * Specify a CSS selector that matches the DOM element that should be
+     * focused when the Modal opens.
+     */
+    selectorPrimaryFocus?: string;
+    /**
+     * Specify the CSS selectors that match the floating menus.
+     *
+     * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+     */
+    selectorsFloatingMenus?: string[];
     /**
      * The main title of the tearsheet, displayed in the header area.
      */

package/es/components/Tearsheet/TearsheetNarrow.js

@@ -148,6 +148,18 @@ TearsheetNarrow.propTypes = _objectSpread2({
    */
   /**@ts-ignore */
   portalTarget: portalType,
+  /**
+   * Specify a CSS selector that matches the DOM element that should be
+   * focused when the Modal opens.
+   */
+  selectorPrimaryFocus: PropTypes.string,
+  /**
+   * Specify the CSS selectors that match the floating menus.
+   *
+   * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+   */
+  /**@ts-ignore*/
+  selectorsFloatingMenus: PropTypes.arrayOf(PropTypes.string),
   /**
    * The main title of the tearsheet, displayed in the header area.
    */

package/es/components/Tearsheet/TearsheetShell.d.ts

@@ -81,7 +81,17 @@ interface TearsheetShellProps extends PropsWithChildren {
      * The DOM element that the tearsheet should be rendered within. Defaults to document.body.
      */
     portalTarget?: ReactNode;
+    /**
+     * Specify a CSS selector that matches the DOM element that should be
+     * focused when the Modal opens.
+     */
     selectorPrimaryFocus?: string;
+    /**
+     * Specify the CSS selectors that match the floating menus.
+     *
+     * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+     */
+    selectorsFloatingMenus?: string[];
     /**
      * Specifies the width of the tearsheet, 'narrow' or 'wide'.
      */

package/es/components/Tearsheet/TearsheetShell.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectSpread2 as _objectSpread2, objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, extends as _extends, defineProperty as _defineProperty } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectSpread2 as _objectSpread2, objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, extends as _extends, defineProperty as _defineProperty, toConsumableArray as _toConsumableArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useRef, useState, useEffect } from 'react';
 import { useResizeObserver } from '../../global/js/hooks/useResizeObserver.js';
 import PropTypes from '../../node_modules/prop-types/index.js';
@@ -20,7 +20,7 @@ import { useFocus } from '../../global/js/hooks/useFocus.js';
 import { usePreviousValue } from '../../global/js/hooks/usePreviousValue.js';
 import { ActionSet } from '../ActionSet/ActionSet.js';
 
-var _excluded = ["actions", "ariaLabel", "children", "className", "closeIconDescription", "description", "hasCloseIcon", "headerActions", "influencer", "influencerPosition", "influencerWidth", "label", "navigation", "onClose", "open", "portalTarget", "selectorPrimaryFocus", "size", "slug", "title", "verticalPosition", "launcherButtonRef"];
+var _excluded = ["actions", "ariaLabel", "children", "className", "closeIconDescription", "description", "hasCloseIcon", "headerActions", "influencer", "influencerPosition", "influencerWidth", "label", "navigation", "onClose", "open", "portalTarget", "selectorPrimaryFocus", "selectorsFloatingMenus", "size", "slug", "title", "verticalPosition", "launcherButtonRef"];
 
 // The block part of our conventional BEM class names (bc__E--M).
 var bc = "".concat(pkg.prefix, "--tearsheet");
@@ -79,6 +79,8 @@ var TearsheetShell = /*#__PURE__*/React__default.forwardRef(function (_ref, ref)
     open = _ref.open,
     portalTargetIn = _ref.portalTarget,
     selectorPrimaryFocus = _ref.selectorPrimaryFocus,
+    _ref$selectorsFloatin = _ref.selectorsFloatingMenus,
+    selectorsFloatingMenus = _ref$selectorsFloatin === void 0 ? [] : _ref$selectorsFloatin,
     size = _ref.size,
     slug = _ref.slug,
     title = _ref.title,
@@ -249,7 +251,7 @@ var TearsheetShell = /*#__PURE__*/React__default.forwardRef(function (_ref, ref)
       onKeyDown: keyDownListener,
       preventCloseOnClickOutside: !isPassive,
       ref: modalRef,
-      selectorsFloatingMenus: [".".concat(carbonPrefix, "--overflow-menu-options"), ".".concat(carbonPrefix, "--tooltip"), '.flatpickr-calendar', ".".concat(bc, "__container")],
+      selectorsFloatingMenus: [".".concat(carbonPrefix, "--overflow-menu-options"), ".".concat(carbonPrefix, "--tooltip"), '.flatpickr-calendar', ".".concat(bc, "__container")].concat(_toConsumableArray(selectorsFloatingMenus)),
       size: "sm"
     }), includeHeader && /*#__PURE__*/React__default.createElement(ModalHeader, {
       className: cx("".concat(bc, "__header"), _defineProperty(_defineProperty({}, "".concat(bc, "__header--with-close-icon"), effectiveHasCloseIcon), "".concat(bc, "__header--with-nav"), navigation)),
@@ -445,6 +447,18 @@ TearsheetShell.propTypes = _objectSpread2({
    */
   /**@ts-ignore*/
   portalTarget: portalType,
+  /**
+   * Specify a CSS selector that matches the DOM element that should be
+   * focused when the Modal opens.
+   */
+  selectorPrimaryFocus: PropTypes.string,
+  /**
+   * Specify the CSS selectors that match the floating menus.
+   *
+   * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+   */
+  /**@ts-ignore*/
+  selectorsFloatingMenus: PropTypes.arrayOf(PropTypes.string),
   /**
    * Specifies the width of the tearsheet, 'narrow' or 'wide'.
    */

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

@@ -15,7 +15,6 @@ var icons = require('@carbon/react/icons');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
 var index = require('../../../node_modules/prop-types/index.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
-var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
 var cx = require('classnames');
 var ConditionConnector = require('../ConditionBuilderConnector/ConditionConnector.js');
 var ConditionBuilderItemNumber = require('../ConditionBuilderItem/ConditionBuilderItemNumber/ConditionBuilderItemNumber.js');
@@ -26,6 +25,8 @@ var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilder
 var util = require('../utils/util.js');
 var ConditionBuilderItemTime = require('../ConditionBuilderItem/ConditionBuilderItemTime/ConditionBuilderItemTime.js');
 var ConditionBuilderAdd = require('../ConditionBuilderAdd/ConditionBuilderAdd.js');
+var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
+var ItemOptionForValueField = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOptionForValueField.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -33,6 +34,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var _div;
+
 /**
  * This component build each block of condition consisting of property, operator value and close button.
  */
@@ -62,14 +64,6 @@ var ConditionBlock = function ConditionBlock(props) {
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
     inputConfig = _useContext.inputConfig,
     variant = _useContext.variant;
-  //Below possible input types expected for value field.
-  var itemComponents = {
-    option: ConditionBuilderItemOption.ConditionBuilderItemOption,
-    text: ConditionBuilderItemText.ConditionBuilderItemText,
-    number: ConditionBuilderItemNumber.ConditionBuilderItemNumber,
-    date: ConditionBuilderItemDate.ConditionBuilderItemDate,
-    time: ConditionBuilderItemTime.ConditionBuilderItemTime
-  };
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     showDeletionPreview = _useState2[0],
@@ -87,13 +81,17 @@ var ConditionBlock = function ConditionBlock(props) {
     type = _getCurrentConfig.type,
     config = _getCurrentConfig.config,
     label = _getCurrentConfig.label;
-  var ItemComponent;
-  //   if (type == 'custom') {
-  //     ItemComponent = config.component;
-  //   } else {
-  ItemComponent = property ? itemComponents[type] : null;
-  //}
 
+  //Below possible input types expected for value field.
+  var itemComponents = {
+    text: ConditionBuilderItemText.ConditionBuilderItemText,
+    number: ConditionBuilderItemNumber.ConditionBuilderItemNumber,
+    date: ConditionBuilderItemDate.ConditionBuilderItemDate,
+    time: ConditionBuilderItemTime.ConditionBuilderItemTime,
+    option: ItemOptionForValueField.ItemOptionForValueField,
+    custom: config === null || config === void 0 ? void 0 : config.component
+  };
+  var ItemComponent = property ? itemComponents[type] : null;
   var onStatementChangeHandler = function onStatementChangeHandler(v, evt) {
     util.focusThisField(evt);
     onStatementChange(v);
@@ -114,9 +112,10 @@ var ConditionBlock = function ConditionBlock(props) {
     }));
   };
   var onValueChangeHandler = function onValueChangeHandler(newValue) {
-    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, condition), {}, {
-      value: newValue,
-      popoverToOpen: ''
+    var currentCondition = _rollupPluginBabelHelpers.objectSpread2({}, condition);
+    delete currentCondition.popoverToOpen;
+    onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, currentCondition), {}, {
+      value: newValue
     }));
   };
   var handleShowDeletionPreview = function handleShowDeletionPreview() {
@@ -126,6 +125,9 @@ var ConditionBlock = function ConditionBlock(props) {
     setShowDeletionPreview(false);
   };
   var getOperators = function getOperators() {
+    if (config !== null && config !== void 0 && config.operators) {
+      return config.operators;
+    }
     return DataConfigs.operatorConfig.filter(function (operator) {
       return operator.type.indexOf(type) != -1 || operator.type == 'all';
     });
@@ -156,7 +158,7 @@ var ConditionBlock = function ConditionBlock(props) {
     "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')
@@ -173,7 +175,7 @@ var ConditionBlock = function ConditionBlock(props) {
     "data-name": "propertyField",
     condition: condition,
     type: type
-  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+  }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     conditionState: {
       value: property,
       label: DataConfigs.translateWithId('property')
@@ -188,7 +190,7 @@ var ConditionBlock = function ConditionBlock(props) {
     "data-name": "operatorField",
     condition: condition,
     type: type
-  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+  }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     config: {
       options: getOperators()
     },

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", "variant"];
+var _excluded = ["className", "inputConfig", "startConditionLabel", "popOverSearchThreshold", "getOptions", "initialState", "getConditionState", "getActionsState", "variant", "actions"];
 
 // Carbon and package components we use.
 /* TODO: @import(s) of carbon components and other package components. */
@@ -61,7 +61,9 @@ exports.ConditionBuilder = /*#__PURE__*/React__default["default"].forwardRef(fun
     getOptions = _ref.getOptions,
     initialState = _ref.initialState,
     getConditionState = _ref.getConditionState,
+    getActionsState = _ref.getActionsState,
     variant = _ref.variant,
+    actions = _ref.actions,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var localRef = React.useRef();
   var conditionBuilderRef = ref || localRef;
@@ -92,7 +94,9 @@ exports.ConditionBuilder = /*#__PURE__*/React__default["default"].forwardRef(fun
     startConditionLabel: startConditionLabel,
     conditionBuilderRef: conditionBuilderRef,
     getConditionState: getConditionState,
-    initialState: initialState
+    getActionsState: getActionsState,
+    initialState: initialState,
+    actions: actions
   }))));
 });
 
@@ -108,27 +112,66 @@ exports.ConditionBuilder.displayName = componentName;
 // See https://www.npmjs.com/package/prop-types#usage.
 exports.ConditionBuilder.propTypes = {
   /**
-   * Provide the contents of the ConditionBuilder.
+   * optional array of actions
    */
-  //children: PropTypes.node.isRequired,
-
+  actions: index["default"].arrayOf(index["default"].shape({
+    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.
    */
   className: index["default"].string,
+  /**
+   * This is a callback that gives back the updated action state
+   */
+  getActionsState: index["default"].func,
+  /**
+   * This is a callback that gives back updated condition state
+   */
   getConditionState: index["default"].func.isRequired,
+  /**
+   * This is a callback that get triggered when  you want to dynamically fetch options.
+   *  Component call this when the option array is not passed against a property with type as option in the input config.
+   * This is an asynchronous callback that can return a promise , and you need to resolve the promise with options array in the valid format.
+   * You will receive the root condition state and current condition as the 2 arguments.
+   * eg: const getOptions = async (conditionState,condition) => {
+  switch (condition.property) {
+    case 'continent':
+      return new Promise((resolve) => {
+        const continents=[{
+      label: 'Africa',
+      id: 'Africa',
+    },...]
+          resolve(continents);
+      });
+      default:
+      return [];
+  }
+  };
+   */
   getOptions: index["default"].func,
+  /**
+   * Optional prop if you want to pass a saved condition state.
+   *  This object should respect the structure of condition state that is available in getConditionState callback
+   */
   initialState: index["default"].shape({
     groups: index["default"].arrayOf(index["default"].shape({
-      groupSeparateOperator: index["default"].string,
-      groupOperator: index["default"].string,
-      statement: index["default"].string,
-      conditions: index["default"].arrayOf(index["default"].shape({
-        property: index["default"].string,
-        operator: index["default"].string,
-        value: index["default"].string
-      }))
-    }))
+      groupOperator: index["default"].string.isRequired,
+      statement: index["default"].string.isRequired,
+      conditions: index["default"].arrayOf(index["default"].oneOfType([index["default"].shape({
+        property: index["default"].string.isRequired,
+        operator: index["default"].string.isRequired,
+        value: index["default"].oneOfType([index["default"].string, index["default"].arrayOf(index["default"].shape({
+          id: index["default"].string,
+          label: index["default"].string
+        })), index["default"].shape({
+          id: index["default"].string,
+          label: index["default"].string
+        })])
+      }), index["default"].object]))
+    })),
+    operator: index["default"].string
   }),
   /**
    * This is a mandatory prop that defines the input to the condition builder.
@@ -136,17 +179,21 @@ exports.ConditionBuilder.propTypes = {
    */
   inputConfig: index["default"].shape({
     properties: index["default"].arrayOf(index["default"].shape({
-      id: index["default"].string,
-      label: index["default"].string,
+      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']),
+      type: index["default"].oneOf(['text', 'number', 'date', 'option', 'time', 'custom']).isRequired,
       config: index["default"].shape({
         options: index["default"].arrayOf(index["default"].shape({
-          id: index["default"].string,
-          label: index["default"].string,
+          id: index["default"].string.isRequired,
+          label: index["default"].string.isRequired,
           icon: index["default"].oneOfType([index["default"].func, index["default"].object])
         })),
-        includeSearch: index["default"].bool
+        component: index["default"].func,
+        operators: index["default"].arrayOf(index["default"].shape({
+          id: index["default"].string.isRequired,
+          label: index["default"].string.isRequired
+        }))
       })
     }))
   }).isRequired,

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

@@ -0,0 +1,15 @@
+export default ConditionBuilderActions;
+declare function ConditionBuilderActions({ actions, className }: {
+    actions: any;
+    className: any;
+}): import("react/jsx-runtime").JSX.Element;
+declare namespace ConditionBuilderActions {
+    namespace propTypes {
+        let actions: PropTypes.Requireable<(PropTypes.InferProps<{
+            id: PropTypes.Requireable<number>;
+            label: PropTypes.Requireable<string>;
+        }> | null | undefined)[]>;
+        let className: PropTypes.Requireable<string>;
+    }
+}
+import PropTypes from 'prop-types';