@carbon/ibm-products 2.43.2-canary.16 → 2.43.2-canary.162

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,9 @@ 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');
+var useTranslations = require('../utils/useTranslations.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -33,18 +35,16 @@ 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.
  */
 
 var ConditionBlock = function ConditionBlock(props) {
-  var _props$condition = props.condition,
-    property = _props$condition.property,
-    value = _props$condition.value,
-    operator = _props$condition.operator;
   var onRemove = props.onRemove,
     onChange = props.onChange,
-    condition = props.condition,
+    _props$condition = props.condition,
+    condition = _props$condition === void 0 ? {} : _props$condition,
     conjunction = props.conjunction,
     onConnectorOperatorChange = props.onConnectorOperatorChange,
     isStatement = props.isStatement,
@@ -59,64 +59,83 @@ var ConditionBlock = function ConditionBlock(props) {
     hideConditionPreviewHandler = props.hideConditionPreviewHandler,
     showConditionPreviewHandler = props.showConditionPreviewHandler,
     isLastCondition = props.isLastCondition;
+  var property = condition.property,
+    value = condition.value,
+    operator = condition.operator;
   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
-  };
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     showDeletionPreview = _useState2[0],
     setShowDeletionPreview = _useState2[1];
+  var _useState3 = React.useState(false),
+    _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
+    showAllActions = _useState4[0],
+    setShowAllActions = _useState4[1];
+  var _useTranslations = useTranslations.useTranslations(['conditionRowText', 'conditionText', 'propertyText', 'operatorText', 'removeConditionText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 5),
+    conditionRowText = _useTranslations2[0],
+    conditionText = _useTranslations2[1],
+    propertyText = _useTranslations2[2],
+    operatorText = _useTranslations2[3],
+    removeConditionText = _useTranslations2[4];
 
   //filtering the current property to access its properties and config options
   var getCurrentConfig = function getCurrentConfig(property) {
     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 === null || inputConfig === void 0 || (_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,
-    type = _getCurrentConfig.type,
-    config = _getCurrentConfig.config,
-    label = _getCurrentConfig.label;
-  var ItemComponent;
-  //   if (type == 'custom') {
-  //     ItemComponent = config.component;
-  //   } else {
-  ItemComponent = property ? itemComponents[type] : null;
-  //}
+  var _ref = getCurrentConfig(property),
+    icon = _ref.icon,
+    type = _ref.type,
+    config = _ref.config,
+    label = _ref.label;
 
+  //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,
+    textarea: ConditionBuilderItemText.ConditionBuilderItemText
+  };
+  var ItemComponent = itemComponents[type];
+  var showAllActionsHandler = function showAllActionsHandler() {
+    setShowAllActions(true);
+  };
+  var hideAllActionsHandler = function hideAllActionsHandler() {
+    setShowAllActions(false);
+  };
   var onStatementChangeHandler = function onStatementChangeHandler(v, evt) {
-    util.focusThisField(evt);
-    onStatementChange(v);
+    util.focusThisField(evt, conditionBuilderRef);
+    onStatementChange === null || onStatementChange === void 0 || onStatementChange(v);
   };
   var onPropertyChangeHandler = function onPropertyChangeHandler(newProperty) {
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, condition), {}, {
       property: newProperty,
       operator: undefined,
       value: '',
-      popoverToOpen: 'operatorField'
+      popoverToOpen: util.checkIsValid(newProperty) ? 'operatorField' : ''
     }));
   };
   var onOperatorChangeHandler = function onOperatorChangeHandler(newOperator) {
     onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, condition), {}, {
       operator: newOperator,
       value: undefined,
-      popoverToOpen: 'valueField'
+      popoverToOpen: util.checkIsValid(newOperator) ? 'valueField' : ''
     }));
   };
   var onValueChangeHandler = function onValueChangeHandler(newValue) {
-    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() {
@@ -125,101 +144,124 @@ var ConditionBlock = function ConditionBlock(props) {
   var handleHideDeletionPreview = function handleHideDeletionPreview() {
     setShowDeletionPreview(false);
   };
+  var manageActionButtons = function manageActionButtons(conditionIndex, conditions) {
+    if (variant === DataConfigs.HIERARCHICAL_VARIANT) {
+      return true;
+    }
+    return isLastCondition(conditionIndex, conditions);
+  };
   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';
     });
   };
   var getAriaAttributes = function getAriaAttributes() {
-    return variant == 'tree' ? {
+    return variant == DataConfigs.HIERARCHICAL_VARIANT ? {
       'aria-level': aria.level,
       'aria-posinset': aria.posinset,
       'aria-setsize': aria.setsize
     } : {};
   };
+  var renderChildren = function renderChildren(popoverRef) {
+    return /*#__PURE__*/React__default["default"].createElement(ItemComponent, {
+      conditionState: {
+        property: property,
+        operator: operator,
+        value: value
+      },
+      onChange: onValueChangeHandler,
+      config: config,
+      "data-name": "valueField",
+      parentRef: popoverRef,
+      type: type
+    });
+  };
   return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({
-    className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__condition__deletion-preview"), showDeletionPreview), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap-bottom"), variant == 'tree' && !(conditionIndex + 1 >= group.conditions.length)), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom"), variant == 'sentence')),
+    className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__condition__deletion-preview"), showDeletionPreview), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap-bottom"), variant == DataConfigs.HIERARCHICAL_VARIANT), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom"), variant == DataConfigs.NON_HIERARCHICAL_VARIANT), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__condition--interacting"), showAllActions)),
     role: "row",
-    "aria-label": DataConfigs.translateWithId('condition_row'),
-    tabIndex: -1
-  }, getAriaAttributes()), conjunction ? /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
+    "aria-label": conditionRowText
+  }, getAriaAttributes(), {
+    tabIndex: -1,
+    onMouseEnter: showAllActionsHandler,
+    onMouseLeave: hideAllActionsHandler,
+    onBlur: hideAllActionsHandler
+  }), conjunction ? /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
     className: "".concat(DataConfigs.blockClass, "__gap"),
     operator: conjunction,
     onChange: function onChange(op) {
-      return onConnectorOperatorChange(op);
+      return onConnectorOperatorChange === null || onConnectorOperatorChange === void 0 ? void 0 : onConnectorOperatorChange(op);
     }
   }) : _div || (_div = /*#__PURE__*/React__default["default"].createElement("div", {
     role: "gridcell"
   })), isStatement && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: group.statement,
-    title: DataConfigs.translateWithId('condition'),
+    title: conditionText,
     "data-name": "connectorField",
     popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
-    className: "".concat(DataConfigs.blockClass, "__statement-button")
-  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+    className: "".concat(DataConfigs.blockClass, "__statement-button"),
+    tabIndex: 0
+  }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     conditionState: {
       value: group.statement,
-      label: DataConfigs.translateWithId('condition')
+      label: conditionText
     },
     onChange: onStatementChangeHandler,
     config: {
       options: DataConfigs.statementConfig
     }
   })), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
-    label: label,
-    title: DataConfigs.translateWithId('property'),
-    renderIcon: icon !== null && icon !== void 0 ? icon : null,
+    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 : undefined,
     className: "".concat(DataConfigs.blockClass, "__property-field"),
     "data-name": "propertyField",
     condition: condition,
-    type: type
-  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+    type: type,
+    onChange: onPropertyChangeHandler
+  }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     conditionState: {
       value: property,
-      label: DataConfigs.translateWithId('property')
+      label: propertyText
     },
     onChange: onPropertyChangeHandler,
     config: {
-      options: inputConfig.properties
+      options: inputConfig === null || inputConfig === void 0 ? void 0 : inputConfig.properties
     }
-  })), property && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+  })), util.checkIsValid(property) && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: operator,
-    title: DataConfigs.translateWithId('operator'),
+    title: operatorText,
     "data-name": "operatorField",
     condition: condition,
-    type: type
-  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+    type: type,
+    onChange: onOperatorChangeHandler
+  }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     config: {
       options: getOperators()
     },
     conditionState: {
       value: operator,
-      label: DataConfigs.translateWithId('operator')
+      label: operatorText
     },
     onChange: onOperatorChangeHandler
-  })), property && operator && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+  })), util.checkIsValid(property) && util.checkIsValid(operator) && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: value,
     type: type,
     title: label,
     showToolTip: true,
     "data-name": "valueField",
     condition: condition,
-    config: config
-  }, /*#__PURE__*/React__default["default"].createElement(ItemComponent, {
-    conditionState: {
-      property: property,
-      operator: operator,
-      value: value
-    },
-    onChange: onValueChangeHandler,
     config: config,
-    "data-name": "valueField"
-  })), /*#__PURE__*/React__default["default"].createElement("span", {
+    onChange: onValueChangeHandler,
+    renderChildren: renderChildren
+  }), /*#__PURE__*/React__default["default"].createElement("span", {
     role: "gridcell",
-    "aria-label": DataConfigs.translateWithId('remove_condition')
+    "aria-label": removeConditionText
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
     hideLabel: true,
-    label: DataConfigs.translateWithId('remove_condition'),
+    label: removeConditionText,
     onClick: onRemove,
     onMouseEnter: handleShowDeletionPreview,
     onMouseLeave: handleHideDeletionPreview,
@@ -228,22 +270,21 @@ var ConditionBlock = function ConditionBlock(props) {
     renderIcon: icons.Close,
     className: "".concat(DataConfigs.blockClass, "__close-condition"),
     "data-name": "closeCondition"
-  })), isLastCondition(conditionIndex, group.conditions) && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
+  })), manageActionButtons(conditionIndex, group.conditions) && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
     onClick: function onClick() {
-      addConditionHandler(conditionIndex);
+      addConditionHandler === null || addConditionHandler === void 0 || addConditionHandler(conditionIndex);
     },
     addConditionSubGroupHandler: function addConditionSubGroupHandler() {
-      _addConditionSubGroupHandler(conditionIndex);
+      _addConditionSubGroupHandler === null || _addConditionSubGroupHandler === void 0 || _addConditionSubGroupHandler(conditionIndex);
     },
     showConditionSubGroupPreviewHandler: showConditionSubGroupPreviewHandler,
     hideConditionSubGroupPreviewHandler: hideConditionSubGroupPreviewHandler,
-    enableSubGroup: variant == 'tree',
+    enableSubGroup: variant == DataConfigs.HIERARCHICAL_VARIANT,
     showConditionPreviewHandler: showConditionPreviewHandler,
     hideConditionPreviewHandler: hideConditionPreviewHandler,
     className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-left")
   }));
 };
-var ConditionBlock$1 = ConditionBlock;
 ConditionBlock.propTypes = {
   /**
    * callback to add a new condition
@@ -310,4 +351,4 @@ ConditionBlock.propTypes = {
   state: index["default"].object
 };
 
-exports["default"] = ConditionBlock$1;
+exports["default"] = ConditionBlock;

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

@@ -1,5 +1,12 @@
 /**
- * TODO: A description of the component.
+ * Copyright IBM Corp. 2024, 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.
  */
-export let ConditionBuilder: React.ForwardRefExoticComponent<React.RefAttributes<any>>;
 import React from 'react';
+import { ConditionBuilderProps } from './ConditionBuilder.types';
+/**
+ * TODO: A description of the component.
+ */
+export declare let ConditionBuilder: React.ForwardRefExoticComponent<ConditionBuilderProps & React.RefAttributes<HTMLDivElement>>;

package/lib/components/ConditionBuilder/ConditionBuilder.js

@@ -26,8 +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", "translateWithId"];
 // Carbon and package components we use.
 /* TODO: @import(s) of carbon components and other package components. */
 
@@ -61,18 +60,24 @@ exports.ConditionBuilder = /*#__PURE__*/React__default["default"].forwardRef(fun
     getOptions = _ref.getOptions,
     initialState = _ref.initialState,
     getConditionState = _ref.getConditionState,
-    variant = _ref.variant,
+    getActionsState = _ref.getActionsState,
+    _ref$variant = _ref.variant,
+    variant = _ref$variant === void 0 ? DataConfigs.NON_HIERARCHICAL_VARIANT : _ref$variant,
+    actions = _ref.actions,
+    translateWithId = _ref.translateWithId,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
-  var localRef = React.useRef();
+  var localRef = React.useRef(null);
   var conditionBuilderRef = ref || localRef;
   var handleKeyDownHandler = function handleKeyDownHandler(evt) {
-    handleKeyboardEvents.handleKeyDown(evt, conditionBuilderRef);
+    handleKeyboardEvents.handleKeyDown(evt, conditionBuilderRef, variant);
   };
   return /*#__PURE__*/React__default["default"].createElement(ConditionBuilderProvider.ConditionBuilderProvider, {
     inputConfig: inputConfig,
     popOverSearchThreshold: popOverSearchThreshold,
     getOptions: getOptions,
-    variant: variant
+    variant: variant,
+    translateWithId: translateWithId,
+    conditionBuilderRef: conditionBuilderRef
   }, /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     className: cx__default["default"](DataConfigs.blockClass,
     // Apply the block class to the main HTML element
@@ -90,9 +95,10 @@ exports.ConditionBuilder = /*#__PURE__*/React__default["default"].forwardRef(fun
     onKeyDown: handleKeyDownHandler
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderContent["default"], {
     startConditionLabel: startConditionLabel,
-    conditionBuilderRef: conditionBuilderRef,
     getConditionState: getConditionState,
-    initialState: initialState
+    getActionsState: getActionsState,
+    initialState: initialState,
+    actions: actions
   }))));
 });
 
@@ -108,45 +114,91 @@ 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,
-
+  /**@ts-ignore */
+  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
+   */
+  /**@ts-ignore */
   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({
+      conditions: index["default"].arrayOf(index["default"].oneOfType([index["default"].shape({
         property: index["default"].string,
         operator: index["default"].string,
-        value: index["default"].string
-      }))
-    }))
+        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.
    
    */
+  /**@ts-ignore */
   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', 'textarea', '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,
@@ -158,9 +210,17 @@ exports.ConditionBuilder.propTypes = {
    * Provide a label to the button that starts condition builder
    */
   startConditionLabel: index["default"].string.isRequired,
+  /**
+   * Optional prop, if you need to pass translations to the texts on the component instead of the defined defaults.
+   * This callback function will receive the message id and you need to return the corresponding text for that id.
+   * The message id will be one of [   "ifText","addConditionText",   "addConditionGroupText",   "addSubgroupText",   "conditionText",   "propertyText",   "operatorText",   "valueText",   "connectorText",   "conditionRowText","conditionRowGroupText","conditionBuilderText","actionSectionText",   "removeConditionText",   "addConditionRowText",   "startText",   "endText",   "clearSearchText",   "actionsText",   "then",   "removeActionText",   "addActionText",   "invalidText",  "invalidNumberWarnText"]
+  ]
+   */
+  /**@ts-ignore */
+  translateWithId: index["default"].func,
   /* TODO: add types and DocGen for all props. */
   /**
-   * Provide the condition builder variant: sentence/ tree
+   * Provide the condition builder variant: Non-Hierarchical/ Hierarchical
    */
-  variant: index["default"].string.isRequired
+  variant: index["default"].oneOf(['Non-Hierarchical', 'Hierarchical'])
 };