@carbon/ibm-products 2.45.0 → 2.46.0

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

@@ -6,15 +6,17 @@
  */
 
 import { objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, extends as _extends } from '../../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useRef, useState, useEffect } from 'react';
+import React__default, { useRef, useState, useContext, useEffect } from 'react';
 import { Popover, PopoverContent, Layer } from '@carbon/react';
 import PropTypes from '../../../node_modules/prop-types/index.js';
 import { Add } from '@carbon/react/icons';
 import { blockClass, valueRenderers } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 import { useTranslations } from '../utils/useTranslations.js';
+import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
+import { handleKeyDownForPopover } from '../utils/handleKeyboardEvents.js';
 
-var _excluded = ["children", "className", "label", "renderIcon", "title", "type", "showToolTip", "condition", "popOverClassName", "config", "renderChildren"];
+var _excluded = ["children", "className", "label", "renderIcon", "title", "type", "showToolTip", "condition", "popOverClassName", "config", "renderChildren", "onChange"];
 var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
   var children = _ref.children,
     className = _ref.className,
@@ -27,30 +29,29 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     popOverClassName = _ref.popOverClassName,
     config = _ref.config,
     renderChildren = _ref.renderChildren,
+    onChange = _ref.onChange,
     rest = _objectWithoutProperties(_ref, _excluded);
-  var contentRef = useRef(null);
   var popoverRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  var _useTranslations = useTranslations(['invalidText', 'addConditionText', label, 'invalidDateText']),
-    _useTranslations2 = _slicedToArray(_useTranslations, 4),
+  var _useTranslations = useTranslations(['invalidText', 'addConditionText', label]),
+    _useTranslations2 = _slicedToArray(_useTranslations, 3),
     invalidText = _useTranslations2[0],
     addConditionText = _useTranslations2[1],
-    labelText = _useTranslations2[2],
-    invalidDateText = _useTranslations2[3];
+    labelText = _useTranslations2[2];
+  var _useContext = useContext(ConditionBuilderContext),
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var getPropertyDetails = function getPropertyDetails() {
-    if (label === 'INVALID') {
+    var _ref2 = condition || {},
+      property = _ref2.property,
+      operator = _ref2.operator;
+    if (label === 'INVALID' || rest['data-name'] === 'propertyField' && property === 'INVALID' || rest['data-name'] === 'operatorField' && operator === 'INVALID') {
       return {
         propertyLabel: invalidText,
         isInvalid: true
       };
-    } else if (label === 'INVALID_DATE') {
-      return {
-        propertyLabel: invalidDateText,
-        isInvalid: true
-      };
     }
     var propertyId = rest['data-name'] == 'valueField' && type ? valueRenderers[type](label, config) : labelText;
     return {
@@ -89,27 +90,46 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
   }, [condition, label]);
   useEffect(function () {
     //this will focus the first input field in the popover
-    if (open && contentRef.current) {
-      var firstFocusableElement = contentRef.current.querySelector('input,textarea');
+    if (open && popoverRef.current) {
+      var firstFocusableElement = popoverRef.current.querySelector('input,textarea');
       if (firstFocusableElement) {
-        firstFocusableElement.focus();
+        setTimeout(function () {
+          return firstFocusableElement.focus();
+        }, 0);
       }
     }
-  }, [contentRef, open]);
+  }, [popoverRef, open]);
+  var manageInvalidSelection = function manageInvalidSelection() {
+    //when the user didn't select any value , we need to show as incomplete
+    if (rest['data-name'] === 'propertyField' && !(condition !== null && condition !== void 0 && condition.property) || rest['data-name'] === 'operatorField' && !(condition !== null && condition !== void 0 && condition.operator) || rest['data-name'] === 'valueField' && !(condition !== null && condition !== void 0 && condition.value)) {
+      onChange === null || onChange === void 0 || onChange('INVALID');
+    }
+  };
   var closePopover = function closePopover() {
-    return setOpen(false);
+    if (open) {
+      manageInvalidSelection();
+    }
+    setOpen(false);
   };
   var openPopOver = function openPopOver() {
     return setOpen(true);
   };
   var togglePopover = function togglePopover() {
-    return setOpen(!open);
+    if (children || renderChildren) {
+      setOpen(!open);
+    }
+  };
+  var handleKeyDownHandler = function handleKeyDownHandler(evt) {
+    handleKeyDownForPopover(evt, conditionBuilderRef, popoverRef);
+    if (evt.key === 'Escape') {
+      manageInvalidSelection();
+    }
   };
   return /*#__PURE__*/React__default.createElement(Popover, {
     open: open,
     isTabTip: true,
     role: "gridcell",
-    className: popOverClassName,
+    className: "".concat(popOverClassName, " ").concat(blockClass, "__popover"),
     ref: popoverRef,
     onRequestClose: closePopover
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, _extends({
@@ -124,13 +144,13 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     isInvalid: isInvalid,
     condition: condition
   }, rest)), open && /*#__PURE__*/React__default.createElement(PopoverContent, {
-    className: "".concat(blockClass, "__item__content"),
+    className: "".concat(blockClass, "__popover-content-wrapper"),
     role: "dialog",
-    "aria-label": title
+    "aria-label": title,
+    onKeyDown: handleKeyDownHandler
   }, /*#__PURE__*/React__default.createElement(Layer, null, /*#__PURE__*/React__default.createElement("h1", {
     className: "".concat(blockClass, "__item__title")
   }, title), /*#__PURE__*/React__default.createElement("div", {
-    ref: contentRef,
     className: "".concat(blockClass, "__popover-content")
   }, renderChildren ? renderChildren(popoverRef) : children))));
 };
@@ -156,6 +176,10 @@ ConditionBuilderItem.propTypes = {
    * text to be displayed in the field
    */
   label: PropTypes.oneOfType([PropTypes.string, PropTypes.array, PropTypes.object]),
+  /**
+   * callback to update the current condition of the state tree
+   */
+  onChange: PropTypes.func,
   /**
    * class name for popover
    */

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

@@ -24,7 +24,7 @@ var ConditionBuilderItemDate = function ConditionBuilderItemDate(_ref) {
     endText = _useTranslations2[1];
   var datePickerType = conditionState.operator == 'between' ? 'range' : 'single';
   var onCloseHandler = function onCloseHandler(selectedDate) {
-    onChange(selectedDate && selectedDate.length > 0 ? selectedDate : 'INVALID_DATE');
+    onChange(selectedDate && selectedDate.length > 0 ? selectedDate : 'INVALID');
   };
   return /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__item-date ")

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

@@ -22,7 +22,7 @@ var ConditionBuilderItemNumber = function ConditionBuilderItemNumber(_ref) {
     invalidNumberWarnText = _useTranslations2[0];
   var onChangeHandler = function onChangeHandler(e, _ref2) {
     var value = _ref2.value;
-    if (!isNaN(value) && checkIfValid(value)) {
+    if (value !== '' && !isNaN(value) && checkIfValid(value)) {
       var _config$unit;
       onChange("".concat(value, " ").concat((_config$unit = config.unit) !== null && _config$unit !== void 0 ? _config$unit : ''));
     } else {
@@ -36,8 +36,8 @@ var ConditionBuilderItemNumber = function ConditionBuilderItemNumber(_ref) {
     return true;
   };
   var getDefaultValue = function getDefaultValue() {
-    var _conditionState$value;
-    return (_conditionState$value = conditionState.value) === null || _conditionState$value === void 0 || (_conditionState$value = _conditionState$value.split(' ')) === null || _conditionState$value === void 0 ? void 0 : _conditionState$value[0];
+    var _conditionState$value, _conditionState$value2;
+    return (_conditionState$value = (_conditionState$value2 = conditionState.value) === null || _conditionState$value2 === void 0 || (_conditionState$value2 = _conditionState$value2.split(' ')) === null || _conditionState$value2 === void 0 ? void 0 : _conditionState$value2[0]) !== null && _conditionState$value !== void 0 ? _conditionState$value : '';
   };
   return /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__item-number")

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

@@ -113,14 +113,17 @@ var ItemOptionForValueField = function ItemOptionForValueField(_ref) {
     setSearchValue(value);
   };
   var onClickHandler = function onClickHandler(evt, option, isSelected) {
+    var updatedSelections = selection.filter(function (item) {
+      return item !== 'INVALID';
+    });
     if (multiSelectable) {
       if (isSelected) {
-        var items = selection.filter(function (v) {
+        var items = updatedSelections.filter(function (v) {
           return v.id !== option.id;
         });
-        onChange(items.length > 0 ? items : undefined, evt);
+        onChange(items.length > 0 ? items : undefined);
       } else {
-        onChange([].concat(_toConsumableArray(selection), [option]), evt);
+        onChange([].concat(_toConsumableArray(updatedSelections), [option]));
       }
     } else {
       onChange(option, evt);

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

@@ -10,9 +10,10 @@ import React__default from 'react';
 import { TextArea, TextInput } from '@carbon/react';
 import PropTypes from '../../../../node_modules/prop-types/index.js';
 import { blockClass } from '../../ConditionBuilderContext/DataConfigs.js';
+import { checkIsValid } from '../../utils/util.js';
 
 var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
-  var _conditionState$value, _conditionState$prope;
+  var _conditionState$prope;
   var conditionState = _ref.conditionState,
     _onChange = _ref.onChange,
     config = _ref.config,
@@ -20,7 +21,7 @@ var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
   var inputProps = _objectSpread2({
     labelText: conditionState.property,
     hideLabel: true,
-    value: (_conditionState$value = conditionState.value) !== null && _conditionState$value !== void 0 ? _conditionState$value : '',
+    value: checkIsValid(conditionState.value) ? conditionState.value : '',
     id: (_conditionState$prope = conditionState.property) === null || _conditionState$prope === void 0 ? void 0 : _conditionState$prope.replace(/\s/g, ''),
     onChange: function onChange(evt) {
       _onChange(evt.target.value);

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

@@ -5,19 +5,17 @@ export default ConditionGroupBuilder;
  * All the inner components of group are called from here.
  * @returns
  */
-declare function ConditionGroupBuilder({ group, aria, onRemove, onChange, conditionBuilderRef, className, }: {
+declare function ConditionGroupBuilder({ group, aria, onRemove, onChange, className, }: {
     group: any;
     aria: any;
     onRemove: any;
     onChange: any;
-    conditionBuilderRef: any;
     className: any;
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace ConditionGroupBuilder {
     namespace propTypes {
         let aria: PropTypes.Requireable<object>;
         let className: PropTypes.Requireable<string>;
-        let conditionBuilderRef: PropTypes.Requireable<object>;
         let group: PropTypes.Requireable<object>;
         let onChange: PropTypes.Requireable<(...args: any[]) => any>;
         let onRemove: PropTypes.Requireable<(...args: any[]) => any>;

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

@@ -12,7 +12,7 @@ import PropTypes from '../../../node_modules/prop-types/index.js';
 import cx from 'classnames';
 import { blockClass, statementConfig } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.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';
@@ -33,14 +33,15 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     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),
+  var _useTranslations = useTranslations(['conditionBuilderGroupText', 'conditionText', 'conditionBuilderText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 3),
     conditionBuilderGroupText = _useTranslations2[0],
-    conditionText = _useTranslations2[1];
+    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],
@@ -53,11 +54,42 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
   var onRemoveHandler = function onRemoveHandler(conditionId, evt, conditionIndex) {
     if (group.conditions.length > 1) {
       variant == 'tree' ? handleFocusOnCloseTree(evt) : handleFocusOnClose(evt, conditionIndex);
-      onChange(_objectSpread2(_objectSpread2({}, group), {}, {
-        conditions: group.conditions.filter(function (condition) {
-          return conditionId !== condition.id;
-        })
-      }));
+      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);
     }
@@ -87,11 +119,9 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     //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) {
-      var _currentGroupCloseBut;
-      (_currentGroupCloseBut = currentGroupCloseButtons[conditionIndex - 1]) === null || _currentGroupCloseBut === void 0 || _currentGroupCloseBut.focus();
+      manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex - 1], conditionBuilderRef);
     } else {
-      var _currentGroupCloseBut2;
-      (_currentGroupCloseBut2 = currentGroupCloseButtons[conditionIndex + 1]) === null || _currentGroupCloseBut2 === void 0 || _currentGroupCloseBut2.focus();
+      manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex + 1], conditionBuilderRef);
     }
   };
   var handleFocusOnCloseTree = function handleFocusOnCloseTree(evt) {
@@ -107,11 +137,9 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     //Otherwise , check the previous item is a valid condition
 
     if (nextElement !== null && nextElement !== void 0 && nextElement.classList.contains("".concat(blockClass, "__condition-block"))) {
-      var _nextElement$querySel;
-      nextElement === null || nextElement === void 0 || (_nextElement$querySel = nextElement.querySelector('[data-name="closeCondition"]')) === null || _nextElement$querySel === void 0 || _nextElement$querySel.focus();
+      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"))) {
-      var _prevElement$querySel;
-      prevElement === null || prevElement === void 0 || (_prevElement$querySel = prevElement.querySelector('[data-name="closeCondition"]')) === null || _prevElement$querySel === void 0 || _prevElement$querySel.focus();
+      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 {
@@ -119,10 +147,18 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       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) {
-        nextRow === null || nextRow === void 0 || nextRow.focus();
+        //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) {
-        var _prevRows;
-        (_prevRows = prevRows[prevRows.length - 2]) === null || _prevRows === void 0 || _prevRows.focus();
+        manageTabIndexAndFocus(prevRows[prevRows.length - 2], conditionBuilderRef);
       }
     }
   };
@@ -179,7 +215,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     }, /*#__PURE__*/React__default.createElement("div", {
       className: "".concat(blockClass, "__condition-wrapper"),
       role: "grid",
-      "aria-label": conditionBuilderGroupText
+      "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,
@@ -233,7 +269,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         label: conditionText
       },
       onChange: function onChange(v, evt) {
-        focusThisField(evt);
+        focusThisField(evt, conditionBuilderRef);
         onStatementChangeHandler(v);
       },
       config: {
@@ -245,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, {
@@ -261,8 +297,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         onRemove: function onRemove(e) {
           onRemoveHandler(eachCondition.id, e);
-        },
-        conditionBuilderRef: conditionBuilderRef
+        }
       })) : /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement(ConditionBlock, {
         conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
         aria: {
@@ -317,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/utils/handleKeyboardEvents.d.ts

@@ -1 +1,2 @@
 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,25 +7,27 @@
 
 import { toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
-import { checkForHoldingKey, focusThisField, traverseReverse, traverseClockVise, focusThisItem } from './util.js';
+import { focusThisItem, manageTabIndexAndFocus, traverseClockVise, traverseReverse, checkForHoldingKey, focusThisField } from './util.js';
 
 var handleKeyDown = function handleKeyDown(evt, conditionBuilderRef, variant) {
+  var _activeElement$closes;
   var activeElement = document.activeElement;
+  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;
   }
-  if (activeElement.closest("[role=\"dialog\"]")) {
-    handleKeyPressForPopover(evt, activeElement.closest("[role=\"dialog\"]"));
-  } else {
-    handleKeyPressForMainContent(evt, conditionBuilderRef, variant);
-  }
+  handleKeyPressForPopover(evt, popoverRef === null || popoverRef === void 0 ? void 0 : popoverRef.current, conditionBuilderRef);
 };
+
 //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(blockClass, "__item-date"))) === null || _evt$target$closest === void 0 ? void 0 : _evt$target$closest.length) || ((_evt$target$closest2 = evt.target.closest(".".concat(blockClass, "__item-time"))) === null || _evt$target$closest2 === void 0 ? void 0 : _evt$target$closest2.length));
+  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) {
+var handleKeyPressForPopover = function handleKeyPressForPopover(evt, parentContainer, conditionBuilderRef) {
   var _parentContainer$quer;
   var key = evt.key;
   var isHoldingShiftKey = checkForHoldingKey(evt, 'shiftKey');
@@ -35,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();
@@ -70,40 +72,41 @@ 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);
+          focusThisField(evt, conditionBuilderRef);
           (_document$activeEleme2 = document.activeElement) === null || _document$activeEleme2 === void 0 || _document$activeEleme2.click();
         }
       }
       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$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') {
+        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
-          if (allCellsInRow.length === 1) {
-            handleRowNavigationTree(evt, conditionBuilderRef, variant);
-            //focus next row
-          } else {
-            var _allCellsInRow$;
-            (_allCellsInRow$ = allCellsInRow[0]) === null || _allCellsInRow$ === void 0 || _allCellsInRow$.focus();
-          }
+
+          //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]);
+            focusThisItem(allCellsInRow[currentItemIndex + 1], conditionBuilderRef);
           }
         }
       } else {
@@ -114,17 +117,17 @@ var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, co
       evt.preventDefault();
       if (variant == 'tree') {
         if (evt.target.getAttribute('role') !== 'row') {
-          var _evt$target$closest4;
+          var _evt$target$closest2;
           //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);
+          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(allItems[_currentItemIndex - 1]);
+            focusThisItem(_allCellsInRow[_currentItemIndex - 1], conditionBuilderRef);
           } else {
             //focus the row
             var wrapper = evt.target.closest("[role=\"row\"]");
-            wrapper.focus();
+            manageTabIndexAndFocus(wrapper, conditionBuilderRef);
           }
         }
       } else {
@@ -140,6 +143,12 @@ var handleKeyPressForMainContent = function handleKeyPressForMainContent(evt, co
         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) {
@@ -155,9 +164,9 @@ var getRowIndex = function getRowIndex(element, conditionBuilderRef) {
 var handleRowNavigation = function handleRowNavigation(evt, conditionBuilderRef, variant) {
   var rows = getRows(conditionBuilderRef);
   var currentRowIndex = getRowIndex(evt.target, conditionBuilderRef);
-  navigateToNextRowCell(evt, currentRowIndex, rows, variant);
+  navigateToNextRowCell(evt, currentRowIndex, rows, variant, conditionBuilderRef);
 };
-function handleRowNavigationTree(evt, conditionBuilderRef, variant) {
+var handleRowNavigationTree = function handleRowNavigationTree(evt, conditionBuilderRef, variant) {
   var rows = getRows(conditionBuilderRef);
   var currentRowIndex = getRowIndex(evt.target, conditionBuilderRef);
   var nextRowIndex = currentRowIndex;
@@ -175,15 +184,13 @@ function handleRowNavigationTree(evt, conditionBuilderRef, variant) {
       nextRowIndex = rows.length - 1;
     }
     if (nextRowIndex !== currentRowIndex) {
-      rows[currentRowIndex].setAttribute('tabindex', '-1');
-      rows[nextRowIndex].setAttribute('tabindex', '0');
-      rows[nextRowIndex].focus();
+      manageTabIndexAndFocus(rows[nextRowIndex], conditionBuilderRef);
     }
   } else {
-    navigateToNextRowCell(evt, currentRowIndex, rows, variant);
+    navigateToNextRowCell(evt, currentRowIndex, rows, variant, conditionBuilderRef);
   }
-}
-var navigateToNextRowCell = function navigateToNextRowCell(evt, currentRowIndex, rows, variant) {
+};
+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;
@@ -196,21 +203,20 @@ var navigateToNextRowCell = function navigateToNextRowCell(evt, currentRowIndex,
   var nextRow = rows[nextRowIndex];
   var itemName = evt.target.dataset.name;
   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();
+    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)
-    nextRow === null || nextRow === void 0 || nextRow.focus();
+    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);
+      traverseClockVise(eachElem, index, allElements, null, null, conditionBuilderRef);
     } else {
-      traverseReverse(eachElem, index, allElements);
+      traverseReverse(eachElem, index, allElements, null, null, conditionBuilderRef);
     }
   });
 };
 
-export { handleKeyDown };
+export { handleKeyDown, handleKeyDownForPopover };