@carbon/ibm-products 2.43.2-canary.9 → 2.43.2-canary.92

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

@@ -6,20 +6,19 @@
  */
 
 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 { ConditionBuilderItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js';
-import { focusThisField } from '../utils/util.js';
+import { focusThisField, manageTabIndexAndFocus } from '../utils/util.js';
 import ConditionConnector from '../ConditionBuilderConnector/ConditionConnector.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
 import uuidv4 from '../../../global/js/utils/uuidv4.js';
 import ConditionPreview from '../ConditionPreview/ConditionPreview.js';
-
-var _ConditionPreview, _ConditionPreview2;
+import { ItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
 /**
  *
@@ -29,14 +28,20 @@ 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(['conditionBuilderGroupText', 'conditionText', 'conditionBuilderText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 3),
+    conditionBuilderGroupText = _useTranslations2[0],
+    conditionText = _useTranslations2[1],
+    conditionBuilderText = _useTranslations2[2];
   var _useContext = useContext(ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useState = useState(-1),
     _useState2 = _slicedToArray(_useState, 2),
     showConditionPreview = _useState2[0],
@@ -45,14 +50,46 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     showConditionSubGroupPreview = _useState4[0],
     setShowConditionSubGroupPreview = _useState4[1];
-  var onRemoveHandler = function onRemoveHandler(conditionId, evt) {
+  var conditionBuilderContentRef = useRef();
+  var onRemoveHandler = function onRemoveHandler(conditionId, evt, conditionIndex) {
     if (group.conditions.length > 1) {
-      onChange(_objectSpread2(_objectSpread2({}, group), {}, {
-        conditions: group.conditions.filter(function (condition) {
-          return conditionId !== condition.id;
-        })
-      }));
-      handleFocusOnClose(evt);
+      variant == 'tree' ? handleFocusOnCloseTree(evt) : handleFocusOnClose(evt, conditionIndex);
+      if (group.conditions[1].conditions && group.conditions[1].id !== conditionId) {
+        //when we remove every plain conditions of a group without deleting  the subgroup, we need to restructure the group
+        //the inner group become outer group and same level subgroups become plain conditions
+
+        //ensure we are deleting last condition , not the subgroup
+
+        //spreading out the condition inside the subgroup
+        var allConditions = group.conditions.reduce(function (acc, item) {
+          if (item.conditions) {
+            return acc.concat(item.conditions);
+          }
+          return acc;
+        }, []);
+
+        //we always have conditions first and then subgroups, so ordering accordingly
+        var groupedItems = {
+          groups: [],
+          conditions: []
+        };
+        allConditions.forEach(function (item) {
+          if (item.conditions) {
+            groupedItems.groups.push(item);
+          } else {
+            groupedItems.conditions.push(item);
+          }
+        });
+        onChange(_objectSpread2(_objectSpread2({}, group), {}, {
+          conditions: [].concat(_toConsumableArray(groupedItems.conditions), _toConsumableArray(groupedItems.groups))
+        }));
+      } else {
+        onChange(_objectSpread2(_objectSpread2({}, group), {}, {
+          conditions: group.conditions.filter(function (condition) {
+            return conditionId !== condition.id;
+          })
+        }));
+      }
     } else {
       onRemove(evt);
     }
@@ -75,17 +112,59 @@ 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 handleFocusOnClose = function handleFocusOnClose(e, conditionIndex) {
+    var _e$currentTarget$clos;
+    //get all close buttons.
+    //if the last condition is closing, focus the second last one.
+    //or focus the next one.
+    var currentGroupCloseButtons = (_e$currentTarget$clos = e.currentTarget.closest(".".concat(blockClass, "__group"))) === null || _e$currentTarget$clos === void 0 ? void 0 : _e$currentTarget$clos.querySelectorAll('[data-name="closeCondition"]');
+    if (conditionIndex == currentGroupCloseButtons.length - 1) {
+      manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex - 1], conditionBuilderRef);
+    } else {
+      manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex + 1], conditionBuilderRef);
+    }
+  };
+  var handleFocusOnCloseTree = function handleFocusOnCloseTree(evt) {
+    var _evt$currentTarget, _evt$currentTarget2, _conditionBuilderCont, _conditionBuilderCont2;
+    //getting the current aria-level and aria-posinset.
+    var currentLevel = (_evt$currentTarget = evt.currentTarget) === null || _evt$currentTarget === void 0 || (_evt$currentTarget = _evt$currentTarget.closest('[role="row"]')) === null || _evt$currentTarget === void 0 ? void 0 : _evt$currentTarget.getAttribute('aria-level');
+    var currentPos = (_evt$currentTarget2 = evt.currentTarget) === null || _evt$currentTarget2 === void 0 || (_evt$currentTarget2 = _evt$currentTarget2.closest('[role="row"]')) === null || _evt$currentTarget2 === void 0 ? void 0 : _evt$currentTarget2.getAttribute('aria-posinset');
+
+    //finding the next and previous items in same level
+    var nextElement = (_conditionBuilderCont = conditionBuilderContentRef.current) === null || _conditionBuilderCont === void 0 ? void 0 : _conditionBuilderCont.querySelector("[aria-level=\"".concat(currentLevel, "\"][aria-posinset=\"").concat(Number(currentPos) + 1, "\"]"));
+    var prevElement = (_conditionBuilderCont2 = conditionBuilderContentRef.current) === null || _conditionBuilderCont2 === void 0 ? void 0 : _conditionBuilderCont2.querySelector("[aria-level=\"".concat(currentLevel, "\"][aria-posinset=\"").concat(Number(currentPos) - 1, "\"]"));
+    //checking if next level is a valid condition. If then, focus the close button inside that condition
+    //Otherwise , check the previous item is a valid condition
+
+    if (nextElement !== null && nextElement !== void 0 && nextElement.classList.contains("".concat(blockClass, "__condition-block"))) {
+      manageTabIndexAndFocus(nextElement === null || nextElement === void 0 ? void 0 : nextElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+    } else if (prevElement !== null && prevElement !== void 0 && prevElement.classList.contains("".concat(blockClass, "__condition-block"))) {
+      manageTabIndexAndFocus(prevElement === null || prevElement === void 0 ? void 0 : prevElement.querySelector('[data-name="closeCondition"]'), conditionBuilderRef);
+    }
+    //If there are no valid condition in this group, focus next or previous row
+    else {
+      var _conditionBuilderCont3, _conditionBuilderCont4;
+      var prevRows = (_conditionBuilderCont3 = conditionBuilderContentRef.current) === null || _conditionBuilderCont3 === void 0 ? void 0 : _conditionBuilderCont3.querySelectorAll("[aria-level=\"".concat(Number(currentLevel) - 1, "\"][role=\"row\"]"));
+      var nextRow = (_conditionBuilderCont4 = conditionBuilderContentRef.current) === null || _conditionBuilderCont4 === void 0 ? void 0 : _conditionBuilderCont4.querySelector("[aria-level=\"".concat(Number(currentLevel) + 1, "\"][role=\"row\"]"));
+      if (nextRow) {
+        //since there are no condition in current group, this group will move one level up
+
+        var rowIdentity = {
+          ariaLevel: Number(nextRow.ariaLevel) - 1,
+          ariaPosInSet: nextRow.ariaPosInSet
+        };
+        setTimeout(function () {
+          var currentRowToFocus = conditionBuilderContentRef.current.querySelector("[role=\"row\"][aria-level=\"".concat(rowIdentity.ariaLevel, "\"][aria-posinset=\"").concat(rowIdentity.ariaPosInSet, "\"]"));
+          manageTabIndexAndFocus(currentRowToFocus, conditionBuilderRef);
+        }, 0);
+      } else if ((prevRows === null || prevRows === void 0 ? void 0 : prevRows.length) > 1) {
+        manageTabIndexAndFocus(prevRows[prevRows.length - 2], conditionBuilderRef);
+      }
     }
   };
   var addConditionSubGroupHandler = function addConditionSubGroupHandler(conditionIndex) {
     onChange(_objectSpread2(_objectSpread2({}, group), {}, {
       conditions: [].concat(_toConsumableArray(group.conditions.slice(0, conditionIndex + 1)), [{
-        groupSeparateOperator: null,
         groupOperator: 'and',
         statement: 'if',
         conditions: [{
@@ -115,7 +194,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
     }));
   };
@@ -131,7 +215,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": conditionBuilderText
     }, 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,
@@ -152,7 +236,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         addConditionHandler: addConditionHandler,
         onRemove: function onRemove(e) {
-          onRemoveHandler(eachCondition.id, e);
+          onRemoveHandler(eachCondition.id, e, conditionIndex);
         },
         onConnectorOperatorChange: onConnectorOperatorChange,
         onStatementChange: onStatementChangeHandler,
@@ -165,7 +249,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",
@@ -174,17 +259,17 @@ 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(ConditionBuilderItemOption, {
+    }, /*#__PURE__*/React__default.createElement(ItemOption, {
       conditionState: {
         value: group.statement,
-        label: translateWithId('condition')
+        label: conditionText
       },
       onChange: function onChange(v, evt) {
-        focusThisField(evt);
+        focusThisField(evt, conditionBuilderRef);
         onStatementChangeHandler(v);
       },
       config: {
@@ -196,7 +281,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       }, eachCondition.conditions ? /*#__PURE__*/React__default.createElement("div", {
         className: cx("".concat(blockClass, "__condition-block subgroup  ").concat(blockClass, "__gap"), _defineProperty({}, "".concat(blockClass, "__gap-bottom"), group.conditions.length < conditionIndex + 1))
       }, /*#__PURE__*/React__default.createElement(ConditionConnector, {
-        className: "".concat(blockClass, "__gap ").concat(blockClass, "__groupConnector"),
+        className: "".concat(blockClass, "__gap ").concat(blockClass, "__gap-bottom ").concat(blockClass, "__groupConnector"),
         operator: group.groupOperator,
         "aria-hidden": true
       }), /*#__PURE__*/React__default.createElement(ConditionGroupBuilder, {
@@ -212,9 +297,8 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         onRemove: function onRemove(e) {
           onRemoveHandler(eachCondition.id, e);
-        },
-        conditionBuilderRef: conditionBuilderRef
-      })) : /*#__PURE__*/React__default.createElement(ConditionBlock, {
+        }
+      })) : /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(ConditionBlock, {
         conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
         aria: {
           level: aria.level + 1,
@@ -244,10 +328,12 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         hideConditionPreviewHandler: hideConditionPreviewHandler,
         isLastCondition: isLastCondition
-      }), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default.createElement(ConditionPreview, {
-        previewType: "subGroup"
+      })), conditionIndex == showConditionSubGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default.createElement(ConditionPreview, {
+        previewType: "subGroup",
+        group: group
       }))), conditionIndex == showConditionPreview && (_ConditionPreview2 || (_ConditionPreview2 = /*#__PURE__*/React__default.createElement(ConditionPreview, {
-        previewType: "condition"
+        previewType: "condition",
+        group: group
       }))));
     }));
   };
@@ -266,11 +352,6 @@ ConditionGroupBuilder.propTypes = {
    * Provide an optional class to be applied to the containing node.
    */
   className: PropTypes.string,
-  /**
-  className: PropTypes.string,
-   * ref of condition builder
-   */
-  conditionBuilderRef: PropTypes.object,
   group: PropTypes.object,
   /**
    * callback to update the current condition of the state tree

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

@@ -5,61 +5,87 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import React__default from 'react';
+import { slicedToArray as _slicedToArray, defineProperty as _defineProperty } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+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: "".concat(blockClass, "__group__row ").concat(blockClass, "__group-preview  ")
+    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: "".concat(blockClass, "__group ").concat(blockClass, "__condition-wrapper ").concat(blockClass, "__group-preview ").concat(blockClass, "__group-wrapper")
+    className: cx(["".concat(blockClass, "__group ").concat(blockClass, "__condition-wrapper ").concat(blockClass, "__group-preview ").concat(blockClass, "__group-wrapper "), _defineProperty({}, "".concat(blockClass, "__group-preview-animate"), animate)])
   }, /*#__PURE__*/React__default.createElement("div", {
     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: "".concat(blockClass, "__group-preview")
+    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: "".concat(blockClass, "__group-preview")
+    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/handleKeyboardEvents.d.ts

@@ -1 +1,2 @@
-export function handleKeyDown(evt: any, conditionBuilderRef: any): void;
+export function handleKeyDown(evt: any, conditionBuilderRef: any, variant: any): void;
+export function handleKeyDownForPopover(evt: any, conditionBuilderRef: any, popoverRef: any): void;

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

@@ -7,18 +7,27 @@
 
 import { toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
-import { checkForHoldingKey } from './checkForHoldingKey.js';
-import { focusThisField, traverseReverse, traverseClockVise } from './util.js';
+import { focusThisItem, manageTabIndexAndFocus, traverseClockVise, traverseReverse, checkForHoldingKey, focusThisField } from './util.js';
 
-var handleKeyDown = function handleKeyDown(evt, conditionBuilderRef) {
+var handleKeyDown = function handleKeyDown(evt, conditionBuilderRef, variant) {
+  var _activeElement$closes;
   var activeElement = document.activeElement;
-  if (activeElement.closest("[role=\"dialog\"]")) {
-    handleKeyPressForPopover(evt, activeElement.closest("[role=\"dialog\"]"));
-  } else {
-    handleKeyPressForMainContent(evt, conditionBuilderRef);
+  if (!((_activeElement$closes = activeElement.closest(".".concat(blockClass, "__popover"))) !== null && _activeElement$closes !== void 0 && _activeElement$closes.querySelector('[role="dialog"]'))) {
+    handleKeyPressForMainContent(evt, conditionBuilderRef, variant);
+  }
+};
+var handleKeyDownForPopover = function handleKeyDownForPopover(evt, conditionBuilderRef, popoverRef) {
+  if (excludeKeyPress(evt)) {
+    return;
   }
+  handleKeyPressForPopover(evt, popoverRef === null || popoverRef === void 0 ? void 0 : popoverRef.current, conditionBuilderRef);
 };
-var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentContainer) {
+
+//skipping keyboard handling for date and time fields to get take carbon's
+var excludeKeyPress = function excludeKeyPress(evt) {
+  return !['Escape'].includes(evt.key) && (evt.target.closest(".".concat(blockClass, "__item-date")) || evt.target.closest(".".concat(blockClass, "__item-time")));
+};
+var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentContainer, conditionBuilderRef) {
   var _parentContainer$quer;
   var key = evt.key;
   var isHoldingShiftKey = checkForHoldingKey(evt, 'shiftKey');
@@ -28,22 +37,22 @@ var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentCont
     case 'ArrowUp':
       //traverse through the popover options, search box, selectAll button
       parentContainer.querySelectorAll("[role=\"option\"]").forEach(function (eachElem, index, allElements) {
-        traverseReverse(eachElem, index, allElements);
+        traverseReverse(eachElem, index, allElements, null, null, conditionBuilderRef);
       });
       break;
     case 'ArrowDown':
       //traverse through the popover options, search box, selectAll button
       parentContainer.querySelectorAll("[role=\"option\"]").forEach(function (eachElem, index, allElements) {
-        traverseClockVise(eachElem, index, allElements);
+        traverseClockVise(eachElem, index, allElements, null, null, conditionBuilderRef);
       });
       break;
     case 'Tab':
       allItems = [].concat(_toConsumableArray(Array.from(parentContainer.querySelectorAll(".".concat(blockClass, "__selectAll-button,[role=\"searchbox\"]")))), [parentContainer.querySelector("[role=\"option\"]")]);
       allItems.forEach(function (eachElem, index, allElements) {
         if (isHoldingShiftKey) {
-          traverseReverse(eachElem, index, allElements, true, true);
+          traverseReverse(eachElem, index, allElements, true, true, conditionBuilderRef);
         } else {
-          traverseClockVise(eachElem, index, allElements, true, true);
+          traverseClockVise(eachElem, index, allElements, true, true, conditionBuilderRef);
         }
       });
       evt.preventDefault();
@@ -63,19 +72,88 @@ var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentCont
         if (document.activeElement.type !== 'button') {
           var _document$activeEleme2;
           //for button , enter key is click which already handled by framework, else trigger click
+          focusThisField(evt, conditionBuilderRef);
           (_document$activeEleme2 = document.activeElement) === null || _document$activeEleme2 === void 0 || _document$activeEleme2.click();
-          focusThisField(evt);
         }
       }
       break;
     case 'Escape':
-      //focus the corresponding field in which the popover is triggered
-      focusThisField(evt);
+      //focus the corresponding field in which the popover is triggered\
+      focusThisField(evt, conditionBuilderRef);
+      break;
+  }
+};
+var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, conditionBuilderRef, variant) {
+  var _document$activeEleme3;
+  switch (evt.key) {
+    case 'ArrowRight':
+      evt.preventDefault();
+      if (variant == 'tree') {
+        var _evt$target$closest;
+        var allCellsInRow = Array.from((_evt$target$closest = evt.target.closest('[role="row"]')) === null || _evt$target$closest === void 0 ? void 0 : _evt$target$closest.querySelectorAll('[role="gridcell"] button'));
+        if (allCellsInRow.length === 1) {
+          evt.target = evt.target.closest('[role="row"]');
+          handleRowNavigationTree(evt, conditionBuilderRef, variant);
+          //focus next row
+        } else if (evt.target.getAttribute('role') == 'row') {
+          //when current focus is on a row, then we need to enter inside and focus the first cell of that row
+
+          //focus first cell
+          manageTabIndexAndFocus(allCellsInRow[0], conditionBuilderRef);
+        } else {
+          //finding the next cell to be focussed
+          //next cell = current cell index + 1
+
+          var currentItemIndex = allCellsInRow.indexOf(evt.target);
+          if (currentItemIndex < allCellsInRow.length - 1) {
+            focusThisItem(allCellsInRow[currentItemIndex + 1], conditionBuilderRef);
+          }
+        }
+      } else {
+        handleCellNavigation(evt, conditionBuilderRef);
+      }
+      break;
+    case 'ArrowLeft':
+      evt.preventDefault();
+      if (variant == 'tree') {
+        if (evt.target.getAttribute('role') !== 'row') {
+          var _evt$target$closest2;
+          //when any cell is focussed, arrow left will select the previous cell or current row
+
+          var _allCellsInRow = Array.from((_evt$target$closest2 = evt.target.closest('[role="row"]')) === null || _evt$target$closest2 === void 0 ? void 0 : _evt$target$closest2.querySelectorAll('[role="gridcell"] button'));
+          var _currentItemIndex = _allCellsInRow.indexOf(evt.target);
+          if (_currentItemIndex > 0) {
+            focusThisItem(_allCellsInRow[_currentItemIndex - 1], conditionBuilderRef);
+          } else {
+            //focus the row
+            var wrapper = evt.target.closest("[role=\"row\"]");
+            manageTabIndexAndFocus(wrapper, conditionBuilderRef);
+          }
+        }
+      } else {
+        handleCellNavigation(evt, conditionBuilderRef);
+      }
+      break;
+    case 'ArrowUp':
+    case 'ArrowDown':
+      evt.preventDefault();
+      if (variant == 'tree') {
+        handleRowNavigationTree(evt, conditionBuilderRef, variant);
+      } else {
+        handleRowNavigation(evt, conditionBuilderRef, variant);
+      }
+      break;
+    case 'Enter':
+      if (((_document$activeEleme3 = document.activeElement) === null || _document$activeEleme3 === void 0 || (_document$activeEleme3 = _document$activeEleme3.querySelectorAll("button")) === null || _document$activeEleme3 === void 0 ? void 0 : _document$activeEleme3.length) === 1) {
+        var _document$activeEleme4;
+        (_document$activeEleme4 = document.activeElement) === null || _document$activeEleme4 === void 0 || (_document$activeEleme4 = _document$activeEleme4.querySelectorAll("button")[0]) === null || _document$activeEleme4 === void 0 || _document$activeEleme4.click();
+      }
       break;
   }
 };
 var getRows = function getRows(conditionBuilderRef) {
-  return Array.from(conditionBuilderRef.current.querySelectorAll('[role="row"]'));
+  var _conditionBuilderRef$;
+  return Array.from((_conditionBuilderRef$ = conditionBuilderRef.current) === null || _conditionBuilderRef$ === void 0 ? void 0 : _conditionBuilderRef$.querySelectorAll('[role="row"]'));
 };
 var getRowIndex = function getRowIndex(element, conditionBuilderRef) {
   var rows = getRows(conditionBuilderRef);
@@ -83,14 +161,37 @@ var getRowIndex = function getRowIndex(element, conditionBuilderRef) {
     return row.contains(element);
   });
 };
-var handleRowNavigation = function handleRowNavigation(evt, conditionBuilderRef) {
+var handleRowNavigation = function handleRowNavigation(evt, conditionBuilderRef, variant) {
   var rows = getRows(conditionBuilderRef);
   var currentRowIndex = getRowIndex(evt.target, conditionBuilderRef);
-  navigateToNextRowCell(evt, currentRowIndex, rows);
+  navigateToNextRowCell(evt, currentRowIndex, rows, variant, conditionBuilderRef);
 };
-var navigateToNextRowCell = function navigateToNextRowCell(evt, currentRowIndex, rows) {
-  var _nextRow$querySelecto;
-  //when the focussed element is a cell of the row which has only 1 cell (connector or statement) , focus the next row
+var handleRowNavigationTree = function handleRowNavigationTree(evt, conditionBuilderRef, variant) {
+  var rows = getRows(conditionBuilderRef);
+  var currentRowIndex = getRowIndex(evt.target, conditionBuilderRef);
+  var nextRowIndex = currentRowIndex;
+  if (evt.target.getAttribute('role') == 'row') {
+    if (['ArrowDown', 'ArrowRight'].includes(evt.key)) {
+      nextRowIndex += 1;
+    } else if (evt.key === 'ArrowUp') {
+      nextRowIndex -= 1;
+    }
+
+    //maintaining selection for first and last rows
+    if (nextRowIndex < 0) {
+      nextRowIndex = 0;
+    } else if (nextRowIndex >= rows.length) {
+      nextRowIndex = rows.length - 1;
+    }
+    if (nextRowIndex !== currentRowIndex) {
+      manageTabIndexAndFocus(rows[nextRowIndex], conditionBuilderRef);
+    }
+  } else {
+    navigateToNextRowCell(evt, currentRowIndex, rows, variant, conditionBuilderRef);
+  }
+};
+var navigateToNextRowCell = function navigateToNextRowCell(evt, currentRowIndex, rows, variant, conditionBuilderRef) {
+  //when the current focussed element is a cell of any row, arrow up/down will focus the next row same cell.
 
   var nextRowIndex = currentRowIndex;
   if (evt.key === 'ArrowUp') {
@@ -101,25 +202,21 @@ var navigateToNextRowCell = function navigateToNextRowCell(evt, currentRowIndex,
   }
   var nextRow = rows[nextRowIndex];
   var itemName = evt.target.dataset.name;
-  nextRow === null || nextRow === void 0 || (_nextRow$querySelecto = nextRow.querySelector("[data-name=\"".concat(itemName, "\"]"))) === null || _nextRow$querySelecto === void 0 || _nextRow$querySelecto.focus();
-};
-var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, conditionBuilderRef) {
-  switch (evt.key) {
-    case 'ArrowRight':
-    case 'ArrowLeft':
-      conditionBuilderRef.current.querySelectorAll("[role=\"gridcell\"] button").forEach(function (eachElem, index, allElements) {
-        if (evt.key === 'ArrowRight') {
-          traverseClockVise(eachElem, index, allElements);
-        } else {
-          traverseReverse(eachElem, index, allElements);
-        }
-      });
-      break;
-    case 'ArrowUp':
-    case 'ArrowDown':
-      handleRowNavigation(evt, conditionBuilderRef);
-      break;
+  if (nextRow !== null && nextRow !== void 0 && nextRow.querySelector("[data-name=\"".concat(itemName, "\"]"))) {
+    manageTabIndexAndFocus(nextRow === null || nextRow === void 0 ? void 0 : nextRow.querySelector("[data-name=\"".concat(itemName, "\"]")), conditionBuilderRef);
+  } else if (variant === 'tree') {
+    //when the next row is a if statement , then that row is focused. From any cell of last row of an group , arrow down select the next row (if)
+    manageTabIndexAndFocus(nextRow, conditionBuilderRef);
   }
 };
+var handleCellNavigation = function handleCellNavigation(evt, conditionBuilderRef) {
+  conditionBuilderRef.current.querySelectorAll("[role=\"gridcell\"] button").forEach(function (eachElem, index, allElements) {
+    if (evt.key === 'ArrowRight') {
+      traverseClockVise(eachElem, index, allElements, null, null, conditionBuilderRef);
+    } else {
+      traverseReverse(eachElem, index, allElements, null, null, conditionBuilderRef);
+    }
+  });
+};
 
-export { handleKeyDown };
+export { handleKeyDown, handleKeyDownForPopover };

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

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