@carbon/ibm-products 2.43.2-canary.173 → 2.43.2-canary.174

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

@@ -0,0 +1,18 @@
+export function useDataConfigs(): {
+    statementConfig: {
+        label: string;
+        id: string;
+        connector: string;
+        text1: any;
+        text2: string;
+    }[];
+    connectorConfig: {
+        label: any;
+        id: string;
+    }[];
+    operatorConfig: {
+        label: any;
+        id: string;
+        type: string;
+    }[];
+};

package/lib/components/ConditionBuilder/utils/useDataConfigs.js

@@ -0,0 +1,124 @@
+/**
+ * Copyright IBM Corp. 2020, 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
+var useTranslations = require('./useTranslations.js');
+
+var useDataConfigs = function useDataConfigs() {
+  var _useTranslations = useTranslations.useTranslations(['ifAll', 'ifAny', 'unlessAll', 'unlessAny', 'and', 'or', 'is', 'greater', 'greaterEqual', 'lower', 'lowerEqual', 'startsWith', 'endsWith', 'contains', 'oneOf', 'before', 'after', 'between']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 18),
+    ifAll = _useTranslations2[0],
+    ifAny = _useTranslations2[1],
+    unlessAll = _useTranslations2[2],
+    unlessAny = _useTranslations2[3],
+    and = _useTranslations2[4],
+    or = _useTranslations2[5],
+    is = _useTranslations2[6],
+    greater = _useTranslations2[7],
+    greaterEqual = _useTranslations2[8],
+    lower = _useTranslations2[9],
+    lowerEqual = _useTranslations2[10],
+    startsWith = _useTranslations2[11],
+    endsWith = _useTranslations2[12],
+    contains = _useTranslations2[13],
+    oneOf = _useTranslations2[14],
+    before = _useTranslations2[15],
+    after = _useTranslations2[16],
+    between = _useTranslations2[17];
+  var statementConfig = [{
+    label: 'ifText',
+    id: 'ifAll',
+    connector: 'and',
+    text1: ifAll,
+    text2: '(a && b)'
+  }, {
+    label: 'ifText',
+    id: 'ifAny',
+    connector: 'or',
+    text1: ifAny,
+    text2: '(a || b)'
+  }, {
+    label: 'unlessText',
+    id: 'unlessAll',
+    connector: 'and',
+    text1: unlessAll,
+    text2: '! (a && b)'
+  }, {
+    label: 'unlessText',
+    id: 'unlessAny',
+    connector: 'or',
+    text1: unlessAny,
+    text2: '! (a || b)'
+  }];
+  var connectorConfig = [{
+    label: and,
+    id: 'and'
+  }, {
+    label: or,
+    id: 'or'
+  }];
+  var operatorConfig = [{
+    label: is,
+    id: 'is',
+    type: 'all'
+  }, {
+    label: greater,
+    id: 'greater',
+    type: 'number'
+  }, {
+    label: greaterEqual,
+    id: 'greaterEqual',
+    type: 'number'
+  }, {
+    label: lower,
+    id: 'lower',
+    type: 'number'
+  }, {
+    label: lowerEqual,
+    id: 'lowerEqual',
+    type: 'number'
+  }, {
+    label: startsWith,
+    id: 'startsWith',
+    type: 'text,textarea'
+  }, {
+    label: endsWith,
+    id: 'endsWith',
+    type: 'text,textarea'
+  }, {
+    label: contains,
+    id: 'contains',
+    type: 'text,textarea'
+  }, {
+    label: oneOf,
+    id: 'oneOf',
+    type: 'option'
+  }, {
+    label: before,
+    id: 'before',
+    type: 'date,time'
+  }, {
+    label: after,
+    id: 'after',
+    type: 'date,time'
+  }, {
+    label: between,
+    id: 'between',
+    type: 'date'
+  }];
+  return {
+    statementConfig: statementConfig,
+    connectorConfig: connectorConfig,
+    operatorConfig: operatorConfig
+  };
+};
+
+exports.useDataConfigs = useDataConfigs;

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

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

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

@@ -13,10 +13,13 @@ var React = require('react');
 var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
 var translationObject = require('../ConditionBuilderContext/translationObject.js');
 
-var useTranslations = function useTranslations(translationKeys) {
+var useTranslations = function useTranslations(translationKeys, alterTranslationKeyMap) {
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
     translateWithId = _useContext.translateWithId;
   return translationKeys.map(function (translationKey) {
+    if (alterTranslationKeyMap !== null && alterTranslationKeyMap !== void 0 && alterTranslationKeyMap[translationKey]) {
+      translationKey = alterTranslationKeyMap[translationKey];
+    }
     if (translateWithId !== null && translateWithId !== void 0 && translateWithId(translationKey)) {
       return translateWithId(translationKey);
     } else if (translationObject.translationsObject[translationKey]) {

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

@@ -1,3 +1,6 @@
+export const blockClass: string;
+export const NON_HIERARCHICAL_VARIANT: "Non-Hierarchical";
+export const HIERARCHICAL_VARIANT: "Hierarchical";
 export function focusThisField(evt: any, conditionBuilderRef: any): void;
 export function focusThisItem(currentElement: any, conditionBuilderRef: any): void;
 export function traverseClockVise(eachElem: any, index: any, allElements: any, rotate: any, trapFocus: any, conditionBuilderRef: any): void;
@@ -5,3 +8,12 @@ export function traverseReverse(eachElem: any, index: any, allElements: any, rot
 export function checkForHoldingKey(evt: any, key: any): any;
 export function checkIsValid(item: any): any;
 export function manageTabIndexAndFocus(currentElement: any, conditionBuilderRef: any): void;
+export namespace getValue {
+    function text(value: any): any;
+    function textarea(value: any): any;
+    function time(value: any): any;
+    function number(value: any): any;
+    function option(value: any): any;
+    function date(value: any): any;
+    function custom(value: any): any;
+}

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

@@ -9,8 +9,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var settings = require('../../../settings.js');
 
+var blockClass = "".concat(settings.pkg.prefix, "--condition-builder");
+var NON_HIERARCHICAL_VARIANT = 'Non-Hierarchical';
+var HIERARCHICAL_VARIANT = 'Hierarchical';
 var focusThisField = function focusThisField(evt, conditionBuilderRef) {
   if (evt) {
     setTimeout(function () {
@@ -62,19 +65,66 @@ var checkIsValid = function checkIsValid(item) {
 };
 var manageTabIndexAndFocus = function manageTabIndexAndFocus(currentElement, conditionBuilderRef) {
   var _currentElement$close, _conditionBuilderRef$;
-  var contentContainer = (_currentElement$close = currentElement === null || currentElement === void 0 ? void 0 : currentElement.closest(".".concat(DataConfigs.blockClass, "__content-container"))) !== null && _currentElement$close !== void 0 ? _currentElement$close : currentElement === null || currentElement === void 0 ? void 0 : currentElement.closest(".".concat(DataConfigs.blockClass, "__actions-container"));
+  var contentContainer = (_currentElement$close = currentElement === null || currentElement === void 0 ? void 0 : currentElement.closest(".".concat(blockClass, "__content-container"))) !== null && _currentElement$close !== void 0 ? _currentElement$close : currentElement === null || currentElement === void 0 ? void 0 : currentElement.closest(".".concat(blockClass, "__actions-container"));
   contentContainer && Array.from(contentContainer.querySelectorAll('[tabindex="0"]')).map(function (element) {
     return element === null || element === void 0 ? void 0 : element.setAttribute('tabindex', '-1');
   });
   currentElement === null || currentElement === void 0 || currentElement.setAttribute('tabindex', '0');
-  (_conditionBuilderRef$ = conditionBuilderRef.current) === null || _conditionBuilderRef$ === void 0 || (_conditionBuilderRef$ = _conditionBuilderRef$.querySelector(".".concat(DataConfigs.blockClass, "__statement-button"))) === null || _conditionBuilderRef$ === void 0 || _conditionBuilderRef$.setAttribute('tabindex', '1');
+  (_conditionBuilderRef$ = conditionBuilderRef.current) === null || _conditionBuilderRef$ === void 0 || (_conditionBuilderRef$ = _conditionBuilderRef$.querySelector(".".concat(blockClass, "__statement-button"))) === null || _conditionBuilderRef$ === void 0 || _conditionBuilderRef$.setAttribute('tabindex', '1');
   currentElement === null || currentElement === void 0 || currentElement.focus();
 };
+var formatDate = function formatDate(date) {
+  var day = String(date.getDate()).padStart(2, '0');
+  var month = String(date.getMonth() + 1).padStart(2, '0');
+  var year = date.getFullYear();
+  return "".concat(day, "/").concat(month, "/").concat(year);
+};
+var getValue = {
+  text: function text(value) {
+    return value;
+  },
+  textarea: function textarea(value) {
+    return value;
+  },
+  time: function time(value) {
+    return value;
+  },
+  number: function number(value) {
+    return value;
+  },
+  option: function option(value) {
+    if (value && typeof value !== 'string') {
+      var selectedValues = Array.isArray(value) ? value : [value];
+      return selectedValues.map(function (option) {
+        return option.label;
+      }).join(', ');
+    }
+    return value;
+  },
+  date: function date(value) {
+    if (Array.isArray(value) && value.length > 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;
+    }
+  },
+  custom: function custom(value) {
+    return value;
+  }
+};
 
+exports.HIERARCHICAL_VARIANT = HIERARCHICAL_VARIANT;
+exports.NON_HIERARCHICAL_VARIANT = NON_HIERARCHICAL_VARIANT;
+exports.blockClass = blockClass;
 exports.checkForHoldingKey = checkForHoldingKey;
 exports.checkIsValid = checkIsValid;
 exports.focusThisField = focusThisField;
 exports.focusThisItem = focusThisItem;
+exports.getValue = getValue;
 exports.manageTabIndexAndFocus = manageTabIndexAndFocus;
 exports.traverseClockVise = traverseClockVise;
 exports.traverseReverse = traverseReverse;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.43.2-canary.173+485e8bcac",
+  "version": "2.43.2-canary.174+91733fb43",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -96,7 +96,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.9",
     "@carbon/feature-flags": "^0.20.0",
-    "@carbon/ibm-products-styles": "^2.39.1-canary.183+485e8bcac",
+    "@carbon/ibm-products-styles": "^2.39.1-canary.184+91733fb43",
     "@carbon/telemetry": "^0.1.0",
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/modifiers": "^7.0.0",
@@ -120,5 +120,5 @@
     "react": "^16.8.6 || ^17.0.1 || ^18.2.0",
     "react-dom": "^16.8.6 || ^17.0.1 || ^18.2.0"
   },
-  "gitHead": "485e8bcac3193e56d65721076160944b4e126256"
+  "gitHead": "91733fb43157eab26c885f0652adaf9276f372d4"
 }

package/scss/components/ConditionBuilder/styles/_conditionBuilderItem.scss

@@ -54,7 +54,8 @@ $block-class: #{c4p-settings.$pkg-prefix}--condition-builder;
 }
 
 .#{$block-class}__item-option__option {
-  height: 2rem;
+  display: grid;
+  min-height: 2rem;
   cursor: pointer;
   padding-inline: $spacing-05;
 }
@@ -297,3 +298,11 @@ $colors: (
     fill: $icon-primary;
   }
 }
+
+.#{$block-class}__statement_wrapper {
+  padding: $spacing-03 0;
+
+  :nth-child(2) {
+    color: $text-secondary;
+  }
+}

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

@@ -1,30 +0,0 @@
-export const statementConfig: {
-    label: string;
-    id: string;
-    connector: string;
-}[];
-export const connectorConfig: {
-    label: string;
-    id: string;
-}[];
-export const actionConfig: {
-    label: string;
-    id: string;
-}[];
-export const operatorConfig: {
-    label: string;
-    id: string;
-    type: string;
-}[];
-export const NON_HIERARCHICAL_VARIANT: "Non-Hierarchical";
-export const HIERARCHICAL_VARIANT: "Hierarchical";
-export const blockClass: string;
-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;
-    function date(value: any): any;
-    function custom(value: any): any;
-}

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

@@ -1,125 +0,0 @@
-/**
- * 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 { pkg } from '../../../settings.js';
-
-var statementConfig = [{
-  label: 'if',
-  id: 'if',
-  connector: 'and'
-}, {
-  label: 'excl.if',
-  id: 'excl_if',
-  connector: 'or'
-}];
-var connectorConfig = [{
-  label: 'and',
-  id: 'and'
-}, {
-  label: 'or',
-  id: 'or'
-}];
-var operatorConfig = [{
-  label: 'is',
-  id: 'is',
-  type: 'all'
-}, {
-  label: 'is greater than',
-  id: 'greater',
-  type: 'number'
-}, {
-  label: 'is greater than or equal to',
-  id: 'greaterEqual',
-  type: 'number'
-}, {
-  label: 'is lower than',
-  id: 'lower',
-  type: 'number'
-}, {
-  label: 'is lower than or equal to',
-  id: 'lowerEqual',
-  type: 'number'
-}, {
-  label: 'starts with',
-  id: 'startsWith',
-  type: 'text,textarea'
-}, {
-  label: 'ends with',
-  id: 'endsWith',
-  type: 'text,textarea'
-}, {
-  label: 'contains',
-  id: 'contains',
-  type: 'text,textarea'
-}, {
-  label: 'is one of',
-  id: 'oneOf',
-  type: 'option'
-}, {
-  label: 'is before',
-  id: 'before',
-  type: 'date,time'
-}, {
-  label: 'is after',
-  id: 'after',
-  type: 'date,time'
-}, {
-  label: 'is between',
-  id: 'between',
-  type: 'date'
-}];
-var NON_HIERARCHICAL_VARIANT = 'Non-Hierarchical';
-var HIERARCHICAL_VARIANT = 'Hierarchical';
-// The block part of our conventional BEM class names (blockClass__E--M).
-var blockClass = "".concat(pkg.prefix, "--condition-builder");
-var formatDate = function formatDate(date) {
-  var day = String(date.getDate()).padStart(2, '0');
-  var month = String(date.getMonth() + 1).padStart(2, '0');
-  var year = date.getFullYear();
-  return "".concat(day, "/").concat(month, "/").concat(year);
-};
-//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;
-  },
-  number: function number(val) {
-    return val;
-  },
-  option: function option(value) {
-    if (value && typeof value !== 'string') {
-      var selectedValues = Array.isArray(value) ? value : [value];
-      return selectedValues.map(function (option) {
-        return option.label;
-      }).join(', ');
-    }
-    return value;
-  },
-  date: function date(value) {
-    if (Array.isArray(value) && value.length > 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;
-    }
-  },
-  custom: function custom(value) {
-    return value;
-  }
-};
-
-export { HIERARCHICAL_VARIANT, NON_HIERARCHICAL_VARIANT, blockClass, connectorConfig, operatorConfig, statementConfig, valueRenderers };

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

@@ -1,30 +0,0 @@
-export const statementConfig: {
-    label: string;
-    id: string;
-    connector: string;
-}[];
-export const connectorConfig: {
-    label: string;
-    id: string;
-}[];
-export const actionConfig: {
-    label: string;
-    id: string;
-}[];
-export const operatorConfig: {
-    label: string;
-    id: string;
-    type: string;
-}[];
-export const NON_HIERARCHICAL_VARIANT: "Non-Hierarchical";
-export const HIERARCHICAL_VARIANT: "Hierarchical";
-export const blockClass: string;
-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;
-    function date(value: any): any;
-    function custom(value: any): any;
-}

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

@@ -1,135 +0,0 @@
-/**
- * Copyright IBM Corp. 2020, 2024
- *
- * This source code is licensed under the Apache-2.0 license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var settings = require('../../../settings.js');
-
-var statementConfig = [{
-  label: 'if',
-  id: 'if',
-  connector: 'and'
-}, {
-  label: 'excl.if',
-  id: 'excl_if',
-  connector: 'or'
-}];
-var connectorConfig = [{
-  label: 'and',
-  id: 'and'
-}, {
-  label: 'or',
-  id: 'or'
-}];
-var operatorConfig = [{
-  label: 'is',
-  id: 'is',
-  type: 'all'
-}, {
-  label: 'is greater than',
-  id: 'greater',
-  type: 'number'
-}, {
-  label: 'is greater than or equal to',
-  id: 'greaterEqual',
-  type: 'number'
-}, {
-  label: 'is lower than',
-  id: 'lower',
-  type: 'number'
-}, {
-  label: 'is lower than or equal to',
-  id: 'lowerEqual',
-  type: 'number'
-}, {
-  label: 'starts with',
-  id: 'startsWith',
-  type: 'text,textarea'
-}, {
-  label: 'ends with',
-  id: 'endsWith',
-  type: 'text,textarea'
-}, {
-  label: 'contains',
-  id: 'contains',
-  type: 'text,textarea'
-}, {
-  label: 'is one of',
-  id: 'oneOf',
-  type: 'option'
-}, {
-  label: 'is before',
-  id: 'before',
-  type: 'date,time'
-}, {
-  label: 'is after',
-  id: 'after',
-  type: 'date,time'
-}, {
-  label: 'is between',
-  id: 'between',
-  type: 'date'
-}];
-var NON_HIERARCHICAL_VARIANT = 'Non-Hierarchical';
-var HIERARCHICAL_VARIANT = 'Hierarchical';
-// The block part of our conventional BEM class names (blockClass__E--M).
-var blockClass = "".concat(settings.pkg.prefix, "--condition-builder");
-var formatDate = function formatDate(date) {
-  var day = String(date.getDate()).padStart(2, '0');
-  var month = String(date.getMonth() + 1).padStart(2, '0');
-  var year = date.getFullYear();
-  return "".concat(day, "/").concat(month, "/").concat(year);
-};
-//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;
-  },
-  number: function number(val) {
-    return val;
-  },
-  option: function option(value) {
-    if (value && typeof value !== 'string') {
-      var selectedValues = Array.isArray(value) ? value : [value];
-      return selectedValues.map(function (option) {
-        return option.label;
-      }).join(', ');
-    }
-    return value;
-  },
-  date: function date(value) {
-    if (Array.isArray(value) && value.length > 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;
-    }
-  },
-  custom: function custom(value) {
-    return value;
-  }
-};
-
-exports.HIERARCHICAL_VARIANT = HIERARCHICAL_VARIANT;
-exports.NON_HIERARCHICAL_VARIANT = NON_HIERARCHICAL_VARIANT;
-exports.blockClass = blockClass;
-exports.connectorConfig = connectorConfig;
-exports.operatorConfig = operatorConfig;
-exports.statementConfig = statementConfig;
-exports.valueRenderers = valueRenderers;