@carbon/ibm-products 2.43.2-canary.54 → 2.43.2-canary.55

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

@@ -11,7 +11,8 @@ import { Search } from '@carbon/react';
 import { Checkmark } from '@carbon/react/icons';
 import PropTypes from '../../../../node_modules/prop-types/index.js';
 import { ConditionBuilderContext } from '../../ConditionBuilderContext/ConditionBuilderProvider.js';
-import { blockClass, translateWithId } from '../../ConditionBuilderContext/DataConfigs.js';
+import { blockClass } from '../../ConditionBuilderContext/DataConfigs.js';
+import { useTranslations } from '../../utils/useTranslations.js';
 
 var ItemOption = function ItemOption(_ref) {
   var _ref$conditionState = _ref.conditionState,
@@ -22,6 +23,10 @@ var ItemOption = function ItemOption(_ref) {
   var _useContext = useContext(ConditionBuilderContext),
     popOverSearchThreshold = _useContext.popOverSearchThreshold;
   var contentRef = useRef();
+  var _useTranslations = useTranslations(['propertyText', 'clearSearchText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 2),
+    propertyText = _useTranslations2[0],
+    clearSearchText = _useTranslations2[1];
   var allOptions = config.options;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -49,7 +54,7 @@ var ItemOption = function ItemOption(_ref) {
     setSearchValue(value);
   };
   var getAriaLabel = function getAriaLabel() {
-    return conditionState.label ? conditionState.label : conditionState.property ? conditionState.property : translateWithId('property');
+    return conditionState.label ? conditionState.label : conditionState.property ? conditionState.property : propertyText;
   };
   if (!allOptions) {
     return;
@@ -61,8 +66,8 @@ var ItemOption = function ItemOption(_ref) {
     className: "".concat(blockClass, "__item-option__search")
   }, /*#__PURE__*/React__default.createElement(Search, {
     size: "sm",
-    labelText: translateWithId('clear_search'),
-    closeButtonLabelText: translateWithId('clear_search'),
+    labelText: clearSearchText,
+    closeButtonLabelText: clearSearchText,
     onChange: onSearchChangeHandler
   })), /*#__PURE__*/React__default.createElement("ul", {
     "aria-label": getAriaLabel(),

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

@@ -11,7 +11,8 @@ import { SelectSkeleton, Search, Button } from '@carbon/react';
 import { CheckboxCheckedFilled, Checkbox, Checkmark } from '@carbon/react/icons';
 import PropTypes from '../../../../node_modules/prop-types/index.js';
 import { ConditionBuilderContext } from '../../ConditionBuilderContext/ConditionBuilderProvider.js';
-import { blockClass, translateWithId } from '../../ConditionBuilderContext/DataConfigs.js';
+import { blockClass } from '../../ConditionBuilderContext/DataConfigs.js';
+import { useTranslations } from '../../utils/useTranslations.js';
 
 var _SelectSkeleton, _CheckboxCheckedFille, _Checkbox;
 var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
@@ -20,11 +21,15 @@ var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
     _ref$config = _ref.config,
     config = _ref$config === void 0 ? {} : _ref$config,
     onChange = _ref.onChange;
-  var multiSelectable = conditionState.operator === 'one_of';
+  var multiSelectable = conditionState.operator === 'oneOf';
   var _useContext = useContext(ConditionBuilderContext),
     popOverSearchThreshold = _useContext.popOverSearchThreshold,
     getOptions = _useContext.getOptions,
     rootState = _useContext.rootState;
+  var _useTranslations = useTranslations(['propertyText', 'clearSearchText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 2),
+    propertyText = _useTranslations2[0],
+    clearSearchText = _useTranslations2[1];
   var contentRef = useRef();
   var _useState = useState(config.options),
     _useState2 = _slicedToArray(_useState, 2),
@@ -122,7 +127,7 @@ var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
     }
   };
   var getAriaLabel = function getAriaLabel() {
-    return conditionState.label ? conditionState.label : conditionState.property ? conditionState.property : translateWithId('property');
+    return conditionState.label ? conditionState.label : conditionState.property ? conditionState.property : propertyText;
   };
   if (!allOptions) {
     return _SelectSkeleton || (_SelectSkeleton = /*#__PURE__*/React__default.createElement(SelectSkeleton, null));
@@ -134,8 +139,8 @@ var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
     className: "".concat(blockClass, "__item-option__search")
   }, /*#__PURE__*/React__default.createElement(Search, {
     size: "sm",
-    labelText: translateWithId('clear_search'),
-    closeButtonLabelText: translateWithId('clear_search'),
+    labelText: clearSearchText,
+    closeButtonLabelText: clearSearchText,
     onChange: onSearchChangeHandler
   })), multiSelectable && /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__multiselectSelectionStatusContainer")

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

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

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

@@ -5,18 +5,19 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { objectSpread2 as _objectSpread2 } from '../../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default from 'react';
-import { TextInput } from '@carbon/react';
+import { TextArea, TextInput } from '@carbon/react';
 import PropTypes from '../../../../node_modules/prop-types/index.js';
 import { blockClass } from '../../ConditionBuilderContext/DataConfigs.js';
 
 var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
   var _conditionState$value, _conditionState$prope;
   var conditionState = _ref.conditionState,
-    _onChange = _ref.onChange;
-  return /*#__PURE__*/React__default.createElement("div", {
-    className: "".concat(blockClass, "__item-text")
-  }, /*#__PURE__*/React__default.createElement(TextInput, {
+    _onChange = _ref.onChange,
+    config = _ref.config,
+    type = _ref.type;
+  var inputProps = _objectSpread2({
     labelText: conditionState.property,
     hideLabel: true,
     value: (_conditionState$value = conditionState.value) !== null && _conditionState$value !== void 0 ? _conditionState$value : '',
@@ -24,17 +25,28 @@ var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
     onChange: function onChange(evt) {
       _onChange(evt.target.value);
     }
-  }));
+  }, config);
+  return /*#__PURE__*/React__default.createElement("div", {
+    className: "".concat(blockClass, "__item-text")
+  }, type == 'textarea' ? /*#__PURE__*/React__default.createElement(TextArea, inputProps) : /*#__PURE__*/React__default.createElement(TextInput, inputProps));
 };
 ConditionBuilderItemText.propTypes = {
   /**
    * current condition object
    */
   conditionState: PropTypes.object,
+  /**
+   * config of the current property
+   */
+  config: PropTypes.object,
   /**
    * callback to update state oin date change
    */
-  onChange: PropTypes.func
+  onChange: PropTypes.func,
+  /**
+   * current input type
+   */
+  type: PropTypes.object
 };
 
 export { ConditionBuilderItemText };

package/es/components/ConditionBuilder/ConditionGroupBuilder/ConditionGroupBuilder.js

@@ -6,11 +6,11 @@
  */
 
 import { slicedToArray as _slicedToArray, defineProperty as _defineProperty, objectSpread2 as _objectSpread2, toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useContext, useState, Fragment } from 'react';
+import React__default, { useContext, useState, useRef, Fragment } from 'react';
 import ConditionBlock from '../ConditionBlock/ConditionBlock.js';
 import PropTypes from '../../../node_modules/prop-types/index.js';
 import cx from 'classnames';
-import { blockClass, translateWithId, statementConfig } from '../ConditionBuilderContext/DataConfigs.js';
+import { blockClass, statementConfig } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
 import { focusThisField } from '../utils/util.js';
 import ConditionConnector from '../ConditionBuilderConnector/ConditionConnector.js';
@@ -18,8 +18,8 @@ import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBui
 import uuidv4 from '../../../global/js/utils/uuidv4.js';
 import ConditionPreview from '../ConditionPreview/ConditionPreview.js';
 import { ItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
-var _ConditionPreview, _ConditionPreview2;
 /**
  *
  *  state - this is the current group that is being rendered . This can be a inner group or outer group
@@ -28,12 +28,17 @@ var _ConditionPreview, _ConditionPreview2;
  */
 
 var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
+  var _ConditionPreview, _ConditionPreview2;
   var group = _ref.group,
     aria = _ref.aria,
     onRemove = _ref.onRemove,
     onChange = _ref.onChange,
     conditionBuilderRef = _ref.conditionBuilderRef,
     className = _ref.className;
+  var _useTranslations = useTranslations(['condition_builder_group', 'conditionText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 2),
+    conditionBuilderGroupText = _useTranslations2[0],
+    conditionText = _useTranslations2[1];
   var _useContext = useContext(ConditionBuilderContext),
     variant = _useContext.variant;
   var _useState = useState(-1),
@@ -44,6 +49,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     showConditionSubGroupPreview = _useState4[0],
     setShowConditionSubGroupPreview = _useState4[1];
+  var conditionBuilderContentRef = useRef();
   var onRemoveHandler = function onRemoveHandler(conditionId, evt) {
     if (group.conditions.length > 1) {
       onChange(_objectSpread2(_objectSpread2({}, group), {}, {
@@ -51,7 +57,6 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
           return conditionId !== condition.id;
         })
       }));
-      handleFocusOnClose(evt);
     } else {
       onRemove(evt);
     }
@@ -74,13 +79,6 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       conditions: [].concat(_toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [newCondition], _toConsumableArray(group.conditions.slice(conditionIndex + 1)))
     }));
   };
-  var handleFocusOnClose = function handleFocusOnClose(e) {
-    var _e$currentTarget;
-    var previousClose = (_e$currentTarget = e.currentTarget) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.closest('[role="row"]')) === null || _e$currentTarget === void 0 || (_e$currentTarget = _e$currentTarget.previousSibling) === null || _e$currentTarget === void 0 ? void 0 : _e$currentTarget.querySelector('[data-name="closeCondition"]');
-    if (previousClose) {
-      previousClose.focus();
-    }
-  };
   var addConditionSubGroupHandler = function addConditionSubGroupHandler(conditionIndex) {
     onChange(_objectSpread2(_objectSpread2({}, group), {}, {
       conditions: [].concat(_toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [{
@@ -113,7 +111,12 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     setShowConditionPreview(-1);
   };
   var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
+    var _statementConfig$find;
+    var groupOperator = (_statementConfig$find = statementConfig.find(function (statement) {
+      return statement.id == updatedStatement;
+    })) === null || _statementConfig$find === void 0 ? void 0 : _statementConfig$find.connector;
     onChange(_objectSpread2(_objectSpread2({}, group), {}, {
+      groupOperator: groupOperator,
       statement: updatedStatement
     }));
   };
@@ -129,7 +132,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     }, /*#__PURE__*/React__default.createElement("div", {
       className: "".concat(blockClass, "__condition-wrapper"),
       role: "grid",
-      "aria-label": translateWithId('condition_builder_group')
+      "aria-label": conditionBuilderGroupText
     }, group === null || group === void 0 || (_group$conditions = group.conditions) === null || _group$conditions === void 0 ? void 0 : _group$conditions.map(function (eachCondition, conditionIndex) {
       return /*#__PURE__*/React__default.createElement("div", {
         key: eachCondition.id,
@@ -163,7 +166,8 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     return /*#__PURE__*/React__default.createElement("div", {
       className: "".concat(className, " ").concat(blockClass, "__condition-wrapper"),
       role: aria.level === 1 ? 'rowgroup' : undefined,
-      "aria-label": aria.level == 1 ? translateWithId('condition_builder_group') : undefined
+      "aria-label": aria.level == 1 ? conditionBuilderGroupText : undefined,
+      ref: conditionBuilderContentRef
     }, /*#__PURE__*/React__default.createElement("div", {
       tabIndex: 0,
       role: "row",
@@ -172,14 +176,14 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       "aria-setsize": aria.setsize
     }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
       label: group.statement,
-      title: translateWithId('condition'),
+      title: conditionText,
       "data-name": "connectorField",
       popOverClassName: "".concat(blockClass, "__gap"),
       className: "".concat(blockClass, "__statement-button")
     }, /*#__PURE__*/React__default.createElement(ItemOption, {
       conditionState: {
         value: group.statement,
-        label: translateWithId('condition')
+        label: conditionText
       },
       onChange: function onChange(v, evt) {
         focusThisField(evt);
@@ -243,9 +247,11 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         hideConditionPreviewHandler: hideConditionPreviewHandler,
         isLastCondition: isLastCondition
       })), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default.createElement(ConditionPreview, {
-        previewType: "subGroup"
+        previewType: "subGroup",
+        group: group
       }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React__default.createElement(ConditionPreview, {
-        previewType: "condition"
+        previewType: "condition",
+        group: group
       }))));
     }));
   };

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

@@ -1,9 +1,11 @@
 export default ConditionPreview;
-declare function ConditionPreview({ previewType }: {
+declare function ConditionPreview({ previewType, group }: {
     previewType: any;
+    group: any;
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace ConditionPreview {
     namespace propTypes {
+        let group: PropTypes.Requireable<object>;
         let previewType: PropTypes.Requireable<string>;
     }
 }

package/es/components/ConditionBuilder/ConditionPreview/ConditionPreview.js

@@ -9,33 +9,46 @@ import { slicedToArray as _slicedToArray, defineProperty as _defineProperty } fr
 import React__default, { useState, useEffect } from 'react';
 import cx from 'classnames';
 import PropTypes from '../../../node_modules/prop-types/index.js';
-import { blockClass, translateWithId } from '../ConditionBuilderContext/DataConfigs.js';
+import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
 import ConditionConnector from '../ConditionBuilderConnector/ConditionConnector.js';
+import { useTranslations } from '../utils/useTranslations.js';
+import { Bee } from '@carbon/react/icons';
 
 var ConditionPreview = function ConditionPreview(_ref) {
-  var previewType = _ref.previewType;
+  var _ConditionBuilderItem, _ConditionBuilderItem2, _ConditionBuilderItem3;
+  var previewType = _ref.previewType,
+    group = _ref.group;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     animate = _useState2[0],
     setAnimate = _useState2[1];
+  var _useTranslations = useTranslations(['valueText', 'operatorText', 'propertyText', 'ifText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 4),
+    propertyText = _useTranslations2[0],
+    operatorText = _useTranslations2[1],
+    valueText = _useTranslations2[2],
+    ifText = _useTranslations2[3];
   useEffect(function () {
     setAnimate(true);
   }, []);
   var getConditionSection = function getConditionSection() {
-    return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-      label: translateWithId('property')
-    }), /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-      label: translateWithId('operator')
-    }), /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-      label: translateWithId('value')
-    }));
+    return /*#__PURE__*/React__default.createElement("div", {
+      className: "".concat(blockClass, "__preview-condition")
+    }, _ConditionBuilderItem || (_ConditionBuilderItem = /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
+      label: propertyText,
+      renderIcon: Bee
+    })), _ConditionBuilderItem2 || (_ConditionBuilderItem2 = /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
+      label: operatorText
+    })), _ConditionBuilderItem3 || (_ConditionBuilderItem3 = /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
+      label: valueText
+    })));
   };
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, previewType == 'newGroup' && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", {
     className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
     className: "".concat(blockClass, "__statement-button"),
-    label: translateWithId('and')
+    label: group.groupOperator
   })), /*#__PURE__*/React__default.createElement("div", {
     "aria-hidden": true,
     className: cx(["".concat(blockClass, "__group ").concat(blockClass, "__condition-wrapper ").concat(blockClass, "__group-preview ").concat(blockClass, "__group-wrapper "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
@@ -43,32 +56,36 @@ var ConditionPreview = function ConditionPreview(_ref) {
     className: "".concat(blockClass, "__gap")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
     className: "".concat(blockClass, "__statement-button"),
-    label: translateWithId('if')
+    label: ifText
   })), getConditionSection())), previewType == 'subGroup' && /*#__PURE__*/React__default.createElement("div", {
     className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__condition-block  ").concat(blockClass, "__gap")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-    label: translateWithId('and'),
+    label: group.groupOperator,
     className: "".concat(blockClass, "__statement-button"),
     popOverClassName: "".concat(blockClass, "__gap")
   }), /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__group ").concat(blockClass, "__condition-wrapper")
   }, /*#__PURE__*/React__default.createElement(ConditionConnector, {
     className: "".concat(blockClass, "__gap ").concat(blockClass, "__groupConnector"),
-    operator: translateWithId('if')
+    operator: ifText
   }), getConditionSection()))), previewType == 'condition' && /*#__PURE__*/React__default.createElement("div", {
     className: cx(["".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__condition-block  ").concat(blockClass, "__gap")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
-    label: translateWithId('and'),
+    label: group.groupOperator,
     className: "".concat(blockClass, "__statement-button"),
     popOverClassName: "".concat(blockClass, "__gap")
   }), getConditionSection())));
 };
 var ConditionPreview$1 = ConditionPreview;
 ConditionPreview.propTypes = {
+  /**
+   * current conditional group
+   */
+  group: PropTypes.object,
   /**
    * type of review to be displayed
    */

package/es/components/ConditionBuilder/utils/useTranslations.d.ts

@@ -0,0 +1 @@
+export function useTranslations(translationKeys: any): any;

package/es/components/ConditionBuilder/utils/useTranslations.js

@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+import { useContext } from 'react';
+import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
+import { translationsObject } from '../ConditionBuilderContext/translationObject.js';
+
+var useTranslations = function useTranslations(translationKeys) {
+  var _useContext = useContext(ConditionBuilderContext),
+    translateWithId = _useContext.translateWithId;
+  return translationKeys.map(function (translationKey) {
+    if (translateWithId !== null && translateWithId !== void 0 && translateWithId(translationKey)) {
+      return translateWithId(translationKey);
+    } else if (translationsObject[translationKey]) {
+      return translationsObject[translationKey];
+    } else {
+      return translationKey;
+    }
+  });
+};
+
+export { useTranslations };

package/es/components/ConditionBuilder/utils/util.js

@@ -48,13 +48,5 @@ var checkForHoldingKey = function checkForHoldingKey(evt, key) {
   }
   return evt[key];
 };
-var checkDuplicateAction = function checkDuplicateAction(actionState, selectedId, currentActionId) {
-  if (selectedId !== currentActionId && actionState.find(function (eachAction) {
-    return eachAction.id === selectedId;
-  })) {
-    return true;
-  }
-  return false;
-};
 
-export { checkDuplicateAction, checkForHoldingKey, focusThisField, focusThisItem, traverseClockVise, traverseReverse };
+export { checkForHoldingKey, focusThisField, focusThisItem, traverseClockVise, traverseReverse };

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

@@ -27,6 +27,7 @@ var ConditionBuilderItemTime = require('../ConditionBuilderItem/ConditionBuilder
 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 }; }
 
@@ -68,6 +69,13 @@ var ConditionBlock = function ConditionBlock(props) {
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     showDeletionPreview = _useState2[0],
     setShowDeletionPreview = _useState2[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) {
@@ -89,7 +97,8 @@ var ConditionBlock = function ConditionBlock(props) {
     date: ConditionBuilderItemDate.ConditionBuilderItemDate,
     time: ConditionBuilderItemTime.ConditionBuilderItemTime,
     option: ItemOptionForValueField.ItemOptionForValueField,
-    custom: config === null || config === void 0 ? void 0 : config.component
+    custom: config === null || config === void 0 ? void 0 : config.component,
+    textarea: ConditionBuilderItemText.ConditionBuilderItemText
   };
   var ItemComponent = property ? itemComponents[type] : null;
   var onStatementChangeHandler = function onStatementChangeHandler(v, evt) {
@@ -142,7 +151,7 @@ var ConditionBlock = function ConditionBlock(props) {
   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')),
     role: "row",
-    "aria-label": DataConfigs.translateWithId('condition_row'),
+    "aria-label": conditionRowText,
     tabIndex: -1
   }, getAriaAttributes()), conjunction ? /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
     className: "".concat(DataConfigs.blockClass, "__gap"),
@@ -154,14 +163,14 @@ var ConditionBlock = function ConditionBlock(props) {
     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(ItemOption.ItemOption, {
     conditionState: {
       value: group.statement,
-      label: DataConfigs.translateWithId('condition')
+      label: conditionText
     },
     onChange: onStatementChangeHandler,
     config: {
@@ -169,7 +178,7 @@ var ConditionBlock = function ConditionBlock(props) {
     }
   })), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: label,
-    title: DataConfigs.translateWithId('property'),
+    title: propertyText,
     renderIcon: icon !== null && icon !== void 0 ? icon : null,
     className: "".concat(DataConfigs.blockClass, "__property-field"),
     "data-name": "propertyField",
@@ -178,7 +187,7 @@ var ConditionBlock = function ConditionBlock(props) {
   }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     conditionState: {
       value: property,
-      label: DataConfigs.translateWithId('property')
+      label: propertyText
     },
     onChange: onPropertyChangeHandler,
     config: {
@@ -186,7 +195,7 @@ var ConditionBlock = function ConditionBlock(props) {
     }
   })), property && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
     label: operator,
-    title: DataConfigs.translateWithId('operator'),
+    title: operatorText,
     "data-name": "operatorField",
     condition: condition,
     type: type
@@ -196,7 +205,7 @@ var ConditionBlock = function ConditionBlock(props) {
     },
     conditionState: {
       value: operator,
-      label: DataConfigs.translateWithId('operator')
+      label: operatorText
     },
     onChange: onOperatorChangeHandler
   })), property && operator && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
@@ -215,13 +224,14 @@ var ConditionBlock = function ConditionBlock(props) {
     },
     onChange: onValueChangeHandler,
     config: config,
+    type: type,
     "data-name": "valueField"
   })), /*#__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,

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", "getActionsState", "variant", "actions"];
+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. */
@@ -62,8 +62,10 @@ exports.ConditionBuilder = /*#__PURE__*/React__default["default"].forwardRef(fun
     initialState = _ref.initialState,
     getConditionState = _ref.getConditionState,
     getActionsState = _ref.getActionsState,
-    variant = _ref.variant,
+    _ref$variant = _ref.variant,
+    variant = _ref$variant === void 0 ? 'sentence' : _ref$variant,
     actions = _ref.actions,
+    translateWithId = _ref.translateWithId,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var localRef = React.useRef();
   var conditionBuilderRef = ref || localRef;
@@ -74,7 +76,8 @@ exports.ConditionBuilder = /*#__PURE__*/React__default["default"].forwardRef(fun
     inputConfig: inputConfig,
     popOverSearchThreshold: popOverSearchThreshold,
     getOptions: getOptions,
-    variant: variant
+    variant: variant,
+    translateWithId: translateWithId
   }, /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, rest, {
     className: cx__default["default"](DataConfigs.blockClass,
     // Apply the block class to the main HTML element
@@ -182,7 +185,7 @@ exports.ConditionBuilder.propTypes = {
       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', 'custom']).isRequired,
+      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.isRequired,
@@ -205,9 +208,16 @@ 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",   "removeConditionText",   "addConditionRowText",   "startText",   "endText",   "clearSearchText",   "actionsText",   "then",   "removeActionText",   "addActionText",   "invalidText",   "invalidNumberWarnText"]
+  ]
+   */
+  translateWithId: index["default"].func,
   /* TODO: add types and DocGen for all props. */
   /**
    * Provide the condition builder variant: sentence/ tree
    */
-  variant: index["default"].string.isRequired
+  variant: index["default"].oneOf(['tree', 'sentence'])
 };

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

@@ -6,8 +6,8 @@ declare function ConditionBuilderActions({ actions, className }: {
 declare namespace ConditionBuilderActions {
     namespace propTypes {
         let actions: PropTypes.Requireable<(PropTypes.InferProps<{
-            id: PropTypes.Requireable<number>;
-            label: PropTypes.Requireable<string>;
+            id: PropTypes.Validator<NonNullable<NonNullable<string | number | null | undefined>>>;
+            label: PropTypes.Validator<string>;
         }> | null | undefined)[]>;
         let className: PropTypes.Requireable<string>;
     }