@carbon/ibm-products 2.44.0 → 2.45.0-rc.1

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

@@ -11,7 +11,8 @@ import cx from 'classnames';
 import { AddAlt, TextNewLine } from '@carbon/react/icons';
 import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 import PropTypes from '../../../node_modules/prop-types/index.js';
-import { translateWithId, blockClass } from '../ConditionBuilderContext/DataConfigs.js';
+import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
 var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
   var className = _ref.className,
@@ -22,11 +23,17 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
     showConditionPreviewHandler = _ref.showConditionPreviewHandler,
     hideConditionPreviewHandler = _ref.hideConditionPreviewHandler,
     enableSubGroup = _ref.enableSubGroup,
-    buttonLabel = _ref.buttonLabel;
+    buttonLabel = _ref.buttonLabel,
+    tabIndex = _ref.tabIndex;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isAddSubgroup = _useState2[0],
     setIsAddSubgroup = _useState2[1];
+  var _useTranslations = useTranslations(['addConditionText', 'addConditionRowText', 'addSubgroupText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 3),
+    addConditionText = _useTranslations2[0],
+    addConditionRowText = _useTranslations2[1],
+    addSubgroupText = _useTranslations2[2];
   var showAddSubGroup = function showAddSubGroup() {
     setIsAddSubgroup(true);
   };
@@ -54,13 +61,13 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
     };
   };
   var wrapperProps = enableSubGroup ? {
-    role: 'gridcell',
-    'aria-label': translateWithId('add-condition')
+    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 ? translateWithId('add_condition_row') : undefined,
+    "aria-label": !enableSubGroup ? addConditionRowText : undefined,
     onMouseEnter: showAddSubGroup,
     onMouseLeave: hideAddSubGroup,
     onFocus: showAddSubGroup,
@@ -69,19 +76,20 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
     renderIcon: AddAlt,
     onClick: onClickHandler
   }, previewHandlers(), {
+    wrapperProps: wrapperProps,
     className: "".concat(blockClass, "__add-button"),
     hideLabel: true,
     "data-name": "addButton",
-    label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : translateWithId('add-condition'),
-    wrapperProps: wrapperProps
+    label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : addConditionText,
+    tabIndex: tabIndex
   })), enableSubGroup && /*#__PURE__*/React__default.createElement(ConditionBuilderButton, _extends({
     renderIcon: TextNewLine,
     onClick: addConditionSubGroupHandler,
-    className: cx("".concat(blockClass, "__add_condition_group ").concat(blockClass, "__gap-left")),
+    className: cx("".concat(blockClass, "__add-condition-sub-group ").concat(blockClass, "__gap-left")),
     hideLabel: true,
-    label: translateWithId('add-condition'),
+    label: addSubgroupText,
     wrapperProps: wrapperProps,
-    wrapperClassName: cx("".concat(blockClass, "__add_condition_group-wrapper"), _defineProperty({}, "".concat(blockClass, "__add_condition_group-wrapper--show"), isAddSubgroup))
+    wrapperClassName: cx("".concat(blockClass, "__add-condition-sub-group-wrapper"), _defineProperty({}, "".concat(blockClass, "__add-condition-sub-group-wrapper--show"), isAddSubgroup))
   }, previewHandlersForSubgroup())));
 };
 var ConditionBuilderAdd$1 = ConditionBuilderAdd;
@@ -116,10 +124,14 @@ ConditionBuilderAdd.propTypes = {
       */
   onClick: PropTypes.func,
   showConditionPreviewHandler: PropTypes.func,
-  showConditionSubGroupPreviewHandler: PropTypes.func
+  showConditionSubGroupPreviewHandler: PropTypes.func,
   /**
    * handler for hiding sub group preview
    */
+  /**
+   * Tab index
+   */
+  tabIndex: PropTypes.number
 };
 
 export { ConditionBuilderAdd$1 as default };

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

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

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { extends as _extends, defineProperty as _defineProperty } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectWithoutProperties as _objectWithoutProperties, extends as _extends, defineProperty as _defineProperty } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default from 'react';
 import cx from 'classnames';
 import PropTypes from '../../../node_modules/prop-types/index.js';
@@ -14,6 +14,7 @@ import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
 import { WarningAltFilled } from '@carbon/react/icons';
 
 var _WarningAltFilled;
+var _excluded = ["className", "label", "hideLabel", "tooltipAlign", "renderIcon", "onClick", "showToolTip", "wrapperProps", "onBlur", "onFocus", "onMouseEnter", "onMouseLeave", "isInvalid", "wrapperClassName", "tabIndex"];
 var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
   var _Icon, _span;
   var className = _ref.className,
@@ -29,18 +30,23 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
     onMouseEnter = _ref.onMouseEnter,
     onMouseLeave = _ref.onMouseLeave,
     isInvalid = _ref.isInvalid,
-    wrapperClassName = _ref.wrapperClassName;
+    wrapperClassName = _ref.wrapperClassName,
+    tabIndex = _ref.tabIndex,
+    rest = _objectWithoutProperties(_ref, _excluded);
   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", {
       // role={'gridcell'}
-      tabIndex: -1,
+      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)]),
       type: "button",
       onClick: onClick,
       onBlur: onBlur,
       onFocus: onFocus,
       onMouseEnter: onMouseEnter,
-      onMouseLeave: onMouseLeave
+      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))));
   };
   return hideLabel || showToolTip ? /*#__PURE__*/React__default.createElement(Tooltip, _extends({
@@ -87,6 +93,10 @@ ConditionBuilderButton.propTypes = {
    *decides if  tooltip to be shown
    */
   showToolTip: PropTypes.bool,
+  /**
+   * Tab index
+   */
+  tabIndex: PropTypes.number,
   /**
    * tooltip position
    */

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

@@ -5,14 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectWithoutProperties as _objectWithoutProperties, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useContext, useCallback } from 'react';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
 import { ItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js';
-import { blockClass, translateWithId, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
+import { blockClass, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
 import PropTypes from '../../../node_modules/prop-types/index.js';
 import { focusThisField } from '../utils/util.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
 var _excluded = ["operator", "className", "onChange"];
 var ConditionConnector = function ConditionConnector(_ref) {
@@ -22,6 +23,9 @@ var ConditionConnector = function ConditionConnector(_ref) {
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useContext = useContext(ConditionBuilderContext),
     variant = _useContext.variant;
+  var _useTranslations = useTranslations(['connectorText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 1),
+    connectorText = _useTranslations2[0];
   var handleConnectorHover = useCallback(function (parentGroup, isHover) {
     if (isHover) {
       parentGroup.classList.add('hoveredConnector');
@@ -48,7 +52,7 @@ var ConditionConnector = function ConditionConnector(_ref) {
   // <div className={className} {...rest}>
   React__default.createElement(ConditionBuilderItem, _extends({
     label: operator,
-    title: translateWithId('connector'),
+    title: connectorText,
     "data-name": "connectorField",
     onMouseEnter: activeConnectorHandler,
     onMouseLeave: inActiveConnectorHandler,
@@ -63,7 +67,7 @@ var ConditionConnector = function ConditionConnector(_ref) {
     },
     conditionState: {
       value: operator,
-      label: translateWithId('connector')
+      label: connectorText
     },
     onChange: onChangeHandler
   }))

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

@@ -5,35 +5,43 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2 } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useContext } from 'react';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
-import { blockClass, translateWithId, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
+import { blockClass, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
 import { ItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js';
-import { focusThisField } from '../utils/util.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
 var GroupConnector = function GroupConnector() {
   var _useContext = useContext(ConditionBuilderContext),
-    rootState = _useContext.rootState;
+    rootState = _useContext.rootState,
+    setRootState = _useContext.setRootState;
+  var _useTranslations = useTranslations(['conditionText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 1),
+    conditionText = _useTranslations2[0];
+  var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
+    setRootState(_objectSpread2(_objectSpread2({}, rootState), {}, {
+      operator: updatedStatement
+    }));
+  };
   return /*#__PURE__*/React__default.createElement("div", {
-    className: "".concat(blockClass, "__group-separator"),
+    className: "".concat(blockClass, "__group-separator ").concat(blockClass, "__group-separator-row"),
     role: "row",
     tabIndex: -1,
     "aria-level": 1
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
     label: rootState.operator,
-    title: translateWithId('condition'),
+    title: conditionText,
     "data-name": "connectorField",
     popOverClassName: "".concat(blockClass, "__gap"),
     className: "".concat(blockClass, "__statement-button")
   }, /*#__PURE__*/React__default.createElement(ItemOption, {
     conditionState: {
       value: rootState.operator,
-      label: translateWithId('condition')
-    },
-    onChange: function onChange(v, e) {
-      focusThisField(e);
+      label: conditionText
     },
+    onChange: onStatementChangeHandler,
     config: {
       options: connectorConfig
     }

package/es/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.js

@@ -12,14 +12,15 @@ import { Button, Section, Heading } from '@carbon/react';
 import { Add, TextNewLine } from '@carbon/react/icons';
 import ConditionGroupBuilder from '../ConditionGroupBuilder/ConditionGroupBuilder.js';
 import { ConditionBuilderContext, emptyState } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
-import { blockClass, translateWithId } from '../ConditionBuilderContext/DataConfigs.js';
+import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 import uuidv4 from '../../../global/js/utils/uuidv4.js';
 import ConditionPreview from '../ConditionPreview/ConditionPreview.js';
 import GroupConnector from '../ConditionBuilderConnector/GroupConnector.js';
 import ConditionBuilderActions from '../ConditionBuilderActions/ConditionBuilderActions.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
-var _Heading, _GroupConnector, _ConditionPreview;
+var _Heading, _GroupConnector;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   var _rootState$groups2;
   var startConditionLabel = _ref.startConditionLabel,
@@ -41,6 +42,15 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     showConditionGroupPreview = _useState4[0],
     setShowConditionGroupPreview = _useState4[1];
+  var _useTranslations = useTranslations(['addConditionGroupText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 1),
+    addConditionGroupText = _useTranslations2[0];
+  var showConditionGroupPreviewHandler = function showConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(true);
+  };
+  var hideConditionGroupPreviewHandler = function hideConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(false);
+  };
   useEffect(function () {
     var _rootState$groups;
     if (rootState !== null && rootState !== void 0 && (_rootState$groups = rootState.groups) !== null && _rootState$groups !== void 0 && _rootState$groups.length) {
@@ -101,7 +111,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     }));
   };
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, !isConditionBuilderActive && /*#__PURE__*/React__default.createElement(Button, {
-    className: "".concat(blockClass, "__add_condition-button"),
+    className: "".concat(blockClass, "__addConditionText-button"),
     renderIcon: function renderIcon(props) {
       return /*#__PURE__*/React__default.createElement(Add, _extends({
         size: 16
@@ -145,24 +155,27 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, {
     renderIcon: TextNewLine,
     onClick: addConditionGroupHandler,
-    onMouseEnter: function onMouseEnter() {
-      setShowConditionGroupPreview(true);
-    },
-    onMouseLeave: function onMouseLeave() {
-      setShowConditionGroupPreview(false);
-    },
-    className: "".concat(blockClass, "__add_condition_group "),
+    onMouseEnter: showConditionGroupPreviewHandler,
+    onMouseLeave: hideConditionGroupPreviewHandler,
+    onFocus: showConditionGroupPreviewHandler,
+    onBlur: hideConditionGroupPreviewHandler,
+    className: "".concat(blockClass, "__add-condition-group "),
     hideLabel: true,
-    label: translateWithId('add_condition_group'),
+    label: addConditionGroupText,
     wrapperProps: {
       role: 'gridcell',
-      'aria-label': translateWithId('add_condition_group')
+      'aria-label': addConditionGroupText
+    }
+  })), showConditionGroupPreview && /*#__PURE__*/React__default.createElement(ConditionPreview, {
+    previewType: "newGroup",
+    group: {
+      groupOperator: rootState.operator
     }
-  })), showConditionGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default.createElement(ConditionPreview, {
-    previewType: "newGroup"
-  }))))), isConditionBuilderActive && actions && /*#__PURE__*/React__default.createElement(ConditionBuilderActions, {
+  }))), isConditionBuilderActive && actions && /*#__PURE__*/React__default.createElement(ConditionBuilderActions, {
     actions: actions,
-    className: "".concat(blockClass, "__actions-container")
+    className: "".concat(blockClass, "__actions-container"),
+    variant: variant,
+    conditionBuilderRef: conditionBuilderRef
   }));
 };
 var ConditionBuilderContent$1 = ConditionBuilderContent;

package/es/components/ConditionBuilder/ConditionBuilderContext/ConditionBuilderProvider.d.ts

@@ -21,21 +21,27 @@ export namespace ConditionBuilderProvider {
         let getOptions: PropTypes.Requireable<(...args: any[]) => any>;
         let inputConfig: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
             properties: PropTypes.Requireable<(PropTypes.InferProps<{
-                id: PropTypes.Requireable<string>;
-                label: PropTypes.Requireable<string>;
+                id: PropTypes.Validator<string>;
+                label: PropTypes.Validator<string>;
                 icon: PropTypes.Requireable<object>;
-                type: PropTypes.Requireable<string>;
+                type: PropTypes.Validator<string>;
                 config: PropTypes.Requireable<PropTypes.InferProps<{
                     options: PropTypes.Requireable<(PropTypes.InferProps<{
-                        id: PropTypes.Requireable<string>;
-                        label: PropTypes.Requireable<string>;
+                        id: PropTypes.Validator<string>;
+                        label: PropTypes.Validator<string>;
                         icon: PropTypes.Requireable<object>;
                     }> | null | undefined)[]>;
-                    includeSearch: PropTypes.Requireable<boolean>;
+                    component: PropTypes.Requireable<(...args: any[]) => any>;
+                    operators: PropTypes.Requireable<(PropTypes.InferProps<{
+                        id: PropTypes.Validator<string>;
+                        label: PropTypes.Validator<string>;
+                    }> | null | undefined)[]>;
+                    long: PropTypes.Requireable<boolean>;
                 }>>;
             }> | null | undefined)[]>;
         }>>>;
         let popOverSearchThreshold: PropTypes.Validator<number>;
+        let translateWithId: PropTypes.Requireable<(...args: any[]) => any>;
         let variant: PropTypes.Validator<string>;
     }
 }

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

@@ -62,7 +62,8 @@ var ConditionBuilderProvider = function ConditionBuilderProvider(props) {
       inputConfig: props.inputConfig,
       popOverSearchThreshold: props.popOverSearchThreshold,
       getOptions: props.getOptions,
-      variant: props.variant
+      variant: props.variant,
+      translateWithId: props.translateWithId
     }
   },
   // eslint-disable-next-line react/prop-types
@@ -89,17 +90,22 @@ ConditionBuilderProvider.propTypes = {
    */
   inputConfig: PropTypes.shape({
     properties: PropTypes.arrayOf(PropTypes.shape({
-      id: PropTypes.string,
-      label: PropTypes.string,
+      id: PropTypes.string.isRequired,
+      label: PropTypes.string.isRequired,
       icon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-      type: PropTypes.oneOf(['text', 'number', 'date', 'option', 'time', 'custom']),
+      type: PropTypes.oneOf(['text', 'textarea', 'number', 'date', 'option', 'time', 'custom']).isRequired,
       config: PropTypes.shape({
         options: PropTypes.arrayOf(PropTypes.shape({
-          id: PropTypes.string,
-          label: PropTypes.string,
+          id: PropTypes.string.isRequired,
+          label: PropTypes.string.isRequired,
           icon: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
         })),
-        includeSearch: PropTypes.bool
+        component: PropTypes.func,
+        operators: PropTypes.arrayOf(PropTypes.shape({
+          id: PropTypes.string.isRequired,
+          label: PropTypes.string.isRequired
+        })),
+        long: PropTypes.bool
       })
     }))
   }).isRequired,
@@ -107,6 +113,13 @@ ConditionBuilderProvider.propTypes = {
    * Provide an mandatory numeric value that will be used to enable search option in the popovers with list.
    */
   popOverSearchThreshold: PropTypes.number.isRequired,
+  /**
+   * Optional prop if you want to pass translation to the texts used . Otherwise this will the defined defaults.
+   * This callback function will receive the message id and you need to return the corresponding text for that id.
+   * The message key will be one of [   "ifText",   "addConditionText",   "addConditionGroupText",   "addSubgroupText",   "conditionText",   "propertyText",   "operatorText",   "valueText",   "connectorText",   "conditionRowText",   "removeConditionText",   "addConditionRowText",   "startText",   "endText",   "clearSearchText",   "actionsText",   "then",   "removeActionText",   "addActionText",   "invalidText",   "invalidNumberWarnText"
+  ]
+   */
+  translateWithId: PropTypes.func,
   /**
    * Provide the condition builder variant: sentence/ tree
    */

package/es/components/ConditionBuilder/ConditionBuilderContext/DataConfigs.d.ts

@@ -1,6 +1,7 @@
 export const statementConfig: {
     label: string;
     id: string;
+    connector: string;
 }[];
 export const connectorConfig: {
     label: string;
@@ -16,9 +17,9 @@ export const operatorConfig: {
     type: string;
 }[];
 export const blockClass: string;
-export function translateWithId(key: any): any;
 export namespace valueRenderers {
     function text(val: any): any;
+    function textarea(val: any): any;
     function time(val: any): any;
     function number(val: any): any;
     function option(value: any): any;

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

@@ -6,14 +6,15 @@
  */
 
 import { pkg } from '../../../settings.js';
-import { translationsObject } from './translationObject.js';
 
 var statementConfig = [{
   label: 'if',
-  id: 'if'
+  id: 'if',
+  connector: 'and'
 }, {
   label: 'excl.if',
-  id: 'excl_if'
+  id: 'excl_if',
+  connector: 'or'
 }];
 var connectorConfig = [{
   label: 'and',
@@ -32,7 +33,7 @@ var operatorConfig = [{
   type: 'number'
 }, {
   label: 'is greater than or equal to',
-  id: 'greater_equal',
+  id: 'greaterEqual',
   type: 'number'
 }, {
   label: 'is lower than',
@@ -40,23 +41,23 @@ var operatorConfig = [{
   type: 'number'
 }, {
   label: 'is lower than or equal to',
-  id: 'lower_equal',
+  id: 'lowerEqual',
   type: 'number'
 }, {
   label: 'starts with',
-  id: 'starts_with',
-  type: 'text'
+  id: 'startsWith',
+  type: 'text,textarea'
 }, {
   label: 'ends with',
-  id: 'ends_with',
-  type: 'text'
+  id: 'endsWith',
+  type: 'text,textarea'
 }, {
   label: 'contains',
   id: 'contains',
-  type: 'text'
+  type: 'text,textarea'
 }, {
   label: 'is one of',
-  id: 'one_of',
+  id: 'oneOf',
   type: 'option'
 }, {
   label: 'is before',
@@ -79,15 +80,15 @@ var formatDate = function formatDate(date) {
   var year = date.getFullYear();
   return "".concat(day, "/").concat(month, "/").concat(year);
 };
-var translationsObjectCurrent = translationsObject['en']; // TO DO: need to discuss if language is to be passed as prop
-var translateWithId = function translateWithId(key) {
-  var _translationsObjectCu;
-  return (_translationsObjectCu = translationsObjectCurrent[key]) !== null && _translationsObjectCu !== void 0 ? _translationsObjectCu : key;
-};
+//const translationsObjectCurrent = translationsObject['en']; // TO DO: need to discuss if language is to be passed as prop
+
 var valueRenderers = {
   text: function text(val) {
     return val;
   },
+  textarea: function textarea(val) {
+    return val;
+  },
   time: function time(val) {
     return val;
   },
@@ -105,11 +106,13 @@ var valueRenderers = {
   },
   date: function date(value) {
     if (Array.isArray(value) && value.length > 1) {
-      var start = value !== null && value !== void 0 && value[0] ? formatDate(new Date(value[0])) : '';
-      var end = value !== null && value !== void 0 && value[1] ? formatDate(new Date(value[1])) : '';
+      var start = value !== null && value !== void 0 && value[0] && !isNaN(new Date(value[0])) ? formatDate(new Date(value[0])) : '';
+      var end = value !== null && value !== void 0 && value[1] && !isNaN(new Date(value[1])) ? formatDate(new Date(value[1])) : '';
       return "".concat(start, " To ").concat(end);
+    } else if (Array.isArray(value) && !isNaN(new Date(value[0]))) {
+      return formatDate(new Date(value[0]));
     } else {
-      return value && new Date(value) ? formatDate(new Date(value)) : value;
+      return value;
     }
   },
   custom: function custom(value) {
@@ -117,4 +120,4 @@ var valueRenderers = {
   }
 };
 
-export { blockClass, connectorConfig, operatorConfig, statementConfig, translateWithId, valueRenderers };
+export { blockClass, connectorConfig, operatorConfig, statementConfig, valueRenderers };

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

@@ -1,41 +1,39 @@
 export namespace translationsObject {
-    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;
-    }
+    let ifText: string;
+    let excl_if: string;
+    let and: string;
+    let or: string;
+    let is: string;
+    let greater: string;
+    let greaterEqual: string;
+    let lower: string;
+    let lowerEqual: string;
+    let startsWith: string;
+    let endsWith: string;
+    let contains: string;
+    let oneOf: string;
+    let before: string;
+    let after: string;
+    let between: string;
+    let addConditionText: string;
+    let addConditionGroupText: string;
+    let addSubgroupText: string;
+    let conditionText: string;
+    let propertyText: string;
+    let operatorText: string;
+    let valueText: string;
+    let connectorText: string;
+    let conditionRowText: string;
+    let removeConditionText: string;
+    let addConditionRowText: string;
+    let startText: string;
+    let endText: string;
+    let clearSearchText: string;
+    let actionsText: string;
+    let then: string;
+    let removeActionText: string;
+    let addActionText: string;
+    let invalidText: string;
+    let invalidDateText: string;
+    let invalidNumberWarnText: string;
 }