@carbon/ibm-products 2.43.2-canary.65 → 2.43.2-canary.67

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

@@ -13,14 +13,22 @@ var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHel
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var util = require('./util.js');
 
-var handleKeyDown = function handleKeyDown(evt, conditionBuilderRef) {
+var handleKeyDown = function handleKeyDown(evt, conditionBuilderRef, variant) {
   var activeElement = document.activeElement;
+  if (excludeKeyPress(evt)) {
+    return;
+  }
   if (activeElement.closest("[role=\"dialog\"]")) {
     handleKeyPressForPopover(evt, activeElement.closest("[role=\"dialog\"]"));
   } else {
-    handleKeyPressForMainContent(evt, conditionBuilderRef);
+    handleKeyPressForMainContent(evt, conditionBuilderRef, variant);
   }
 };
+//skipping keyboard handling for date and time fields to get take carbon's
+var excludeKeyPress = function excludeKeyPress(evt) {
+  var _evt$target$closest, _evt$target$closest2;
+  return !['Escape'].includes(evt.key) && (((_evt$target$closest = evt.target.closest(".".concat(DataConfigs.blockClass, "__item-date"))) === null || _evt$target$closest === void 0 ? void 0 : _evt$target$closest.length) || ((_evt$target$closest2 = evt.target.closest(".".concat(DataConfigs.blockClass, "__item-time"))) === null || _evt$target$closest2 === void 0 ? void 0 : _evt$target$closest2.length));
+};
 var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentContainer) {
   var _parentContainer$quer;
   var key = evt.key;
@@ -66,8 +74,8 @@ 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
-          (_document$activeEleme2 = document.activeElement) === null || _document$activeEleme2 === void 0 || _document$activeEleme2.click();
           util.focusThisField(evt);
+          (_document$activeEleme2 = document.activeElement) === null || _document$activeEleme2 === void 0 || _document$activeEleme2.click();
         }
       }
       break;
@@ -77,8 +85,70 @@ var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentCont
       break;
   }
 };
+var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, conditionBuilderRef, variant) {
+  switch (evt.key) {
+    case 'ArrowRight':
+      evt.preventDefault();
+      if (variant == 'tree') {
+        var _evt$target$closest3;
+        var allCellsInRow = Array.from((_evt$target$closest3 = evt.target.closest('[role="row"]')) === null || _evt$target$closest3 === void 0 ? void 0 : _evt$target$closest3.querySelectorAll('[role="gridcell"] button'));
+        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
+          if (allCellsInRow.length === 1) {
+            handleRowNavigationTree(evt, conditionBuilderRef, variant);
+            //focus next row
+          } else {
+            var _allCellsInRow$;
+            (_allCellsInRow$ = allCellsInRow[0]) === null || _allCellsInRow$ === void 0 || _allCellsInRow$.focus();
+          }
+        } 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) {
+            util.focusThisItem(allCellsInRow[currentItemIndex + 1]);
+          }
+        }
+      } else {
+        handleCellNavigation(evt, conditionBuilderRef);
+      }
+      break;
+    case 'ArrowLeft':
+      evt.preventDefault();
+      if (variant == 'tree') {
+        if (evt.target.getAttribute('role') !== 'row') {
+          var _evt$target$closest4;
+          //when any cell is focussed, arrow left will select the previous cell or current row
+
+          var allItems = Array.from((_evt$target$closest4 = evt.target.closest('[role="row"]')) === null || _evt$target$closest4 === void 0 ? void 0 : _evt$target$closest4.querySelectorAll('[role="gridcell"] button'));
+          var _currentItemIndex = allItems.indexOf(evt.target);
+          if (_currentItemIndex > 0) {
+            util.focusThisItem(allItems[_currentItemIndex - 1]);
+          } else {
+            //focus the row
+            var wrapper = evt.target.closest("[role=\"row\"]");
+            wrapper.focus();
+          }
+        }
+      } else {
+        handleCellNavigation(evt, conditionBuilderRef);
+      }
+      break;
+    case 'ArrowUp':
+    case 'ArrowDown':
+      evt.preventDefault();
+      if (variant == 'tree') {
+        handleRowNavigationTree(evt, conditionBuilderRef, variant);
+      } else {
+        handleRowNavigation(evt, conditionBuilderRef, variant);
+      }
+      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);
@@ -86,14 +156,39 @@ 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);
 };
-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
+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) {
+      rows[currentRowIndex].setAttribute('tabindex', '-1');
+      rows[nextRowIndex].setAttribute('tabindex', '0');
+      rows[nextRowIndex].focus();
+    }
+  } else {
+    navigateToNextRowCell(evt, currentRowIndex, rows, variant);
+  }
+}
+var navigateToNextRowCell = function navigateToNextRowCell(evt, currentRowIndex, rows, variant) {
+  //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') {
@@ -104,25 +199,22 @@ 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') {
-          util.traverseClockVise(eachElem, index, allElements);
-        } else {
-          util.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, "\"]"))) {
+    var _nextRow$querySelecto;
+    nextRow === null || nextRow === void 0 || (_nextRow$querySelecto = nextRow.querySelector("[data-name=\"".concat(itemName, "\"]"))) === null || _nextRow$querySelecto === void 0 || _nextRow$querySelecto.focus();
+  } 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)
+    nextRow === null || nextRow === void 0 || nextRow.focus();
   }
 };
+var handleCellNavigation = function handleCellNavigation(evt, conditionBuilderRef) {
+  conditionBuilderRef.current.querySelectorAll("[role=\"gridcell\"] button").forEach(function (eachElem, index, allElements) {
+    if (evt.key === 'ArrowRight') {
+      util.traverseClockVise(eachElem, index, allElements);
+    } else {
+      util.traverseReverse(eachElem, index, allElements);
+    }
+  });
+};
 
 exports.handleKeyDown = handleKeyDown;

package/lib/global/js/package-settings.d.ts

@@ -39,6 +39,7 @@ declare namespace defaults {
         let ErrorEmptyState: boolean;
         let ExportModal: boolean;
         let ExpressiveCard: boolean;
+        let FullPageError: boolean;
         let HTTPError403: boolean;
         let HTTPError404: boolean;
         let HTTPErrorOther: boolean;
@@ -80,7 +81,6 @@ declare namespace defaults {
         let BigNumbers: boolean;
         let TruncatedList: boolean;
         let DelimitedList: boolean;
-        let FullPageError: boolean;
         let ScrollGradient: boolean;
         let StringFormatter: boolean;
         let StatusIndicator: boolean;

package/lib/global/js/package-settings.js

@@ -41,6 +41,7 @@ var defaults = {
     ErrorEmptyState: true,
     ExportModal: true,
     ExpressiveCard: true,
+    FullPageError: true,
     HTTPError403: true,
     HTTPError404: true,
     HTTPErrorOther: true,
@@ -83,7 +84,6 @@ var defaults = {
     BigNumbers: false,
     TruncatedList: false,
     DelimitedList: false,
-    FullPageError: false,
     ScrollGradient: false,
     StringFormatter: false,
     StatusIndicator: false,

package/lib/settings.d.ts

@@ -25,6 +25,7 @@ export const pkg: {
         ErrorEmptyState: boolean;
         ExportModal: boolean;
         ExpressiveCard: boolean;
+        FullPageError: boolean;
         HTTPError403: boolean;
         HTTPError404: boolean;
         HTTPErrorOther: boolean;
@@ -66,7 +67,6 @@ export const pkg: {
         BigNumbers: boolean;
         TruncatedList: boolean;
         DelimitedList: boolean;
-        FullPageError: boolean;
         ScrollGradient: boolean;
         StringFormatter: boolean;
         StatusIndicator: boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@carbon/ibm-products",
   "description": "Carbon for IBM Products",
-  "version": "2.43.2-canary.65+6850586b7",
+  "version": "2.43.2-canary.67+ebeb82381",
   "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.40.0-rc.2",
+    "@carbon/ibm-products-styles": "^2.39.1-canary.77+ebeb82381",
     "@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": "6850586b76bb36f66bdc2fd82b2256f9d089a337"
+  "gitHead": "ebeb8238145ca36520ee38985e70a060db997ab7"
 }

package/scss/components/ConditionBuilder/_condition-builder.scss

@@ -49,7 +49,7 @@ $block-class: #{c4p-settings.$pkg-prefix}--condition-builder;
 }
 .#{$block-class}__condition-block {
   display: flex;
-  width: max-content;
+  width: fit-content;
   flex-direction: row;
 }
 .#{$block-class}__content-container {

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

@@ -216,7 +216,7 @@ $colors: (
     > :nth-child(2)
     .#{$block-class}__button:not(
       .#{$block-class}__add-button,
-      .#{$block-class}__add_condition_group
+      .#{$block-class}__add-condition-sub-group
     ) {
     /* stylelint-disable-next-line carbon/theme-token-use */
     box-shadow: inset 0 #{$spacing-01} 0 0 var(--#{$block-class}__condition-wrapper-color);
@@ -234,7 +234,7 @@ $colors: (
   align-self: center;
   margin-left: auto;
 }
-.#{$block-class}__add_condition_group-wrapper {
+.#{$block-class}__add-condition-sub-group-wrapper {
   z-index: -1;
   width: 0;
   margin-left: -50%;
@@ -243,7 +243,7 @@ $colors: (
   // stylelint-disable-next-line carbon/motion-duration-use, carbon/motion-easing-use
   transition: all linear $duration-fast-02;
 }
-.#{$block-class}__add_condition_group-wrapper--show {
+.#{$block-class}__add-condition-sub-group-wrapper--show {
   z-index: 0;
   width: auto;
   margin-left: 0;
@@ -254,5 +254,7 @@ $colors: (
 }
 .#{$block-class}__invalid-input {
   display: flex;
+}
+.#{$block-class}__invalid-input > svg {
   color: $support-warning;
 }

package/scss/components/_index-released-only.scss

@@ -23,6 +23,7 @@
 @use './EmptyStates';
 @use './ExportModal';
 @use './ExpressiveCard';
+@use './FullPageError';
 @use './HTTPErrors';
 @use './ImportModal';
 @use './MultiAddSelect';