@carbon/ibm-products 2.45.0 → 2.46.0

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

@@ -1,4 +1,4 @@
-export function ConditionBuilderItem({ children, className, label, renderIcon, title, type, showToolTip, condition, popOverClassName, config, renderChildren, ...rest }: {
+export function ConditionBuilderItem({ children, className, label, renderIcon, title, type, showToolTip, condition, popOverClassName, config, renderChildren, onChange, ...rest }: {
     [x: string]: any;
     children: any;
     className: any;
@@ -11,6 +11,7 @@ export function ConditionBuilderItem({ children, className, label, renderIcon, t
     popOverClassName: any;
     config: any;
     renderChildren: any;
+    onChange: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace ConditionBuilderItem {
     namespace propTypes {
@@ -19,6 +20,7 @@ export namespace ConditionBuilderItem {
         let condition: PropTypes.Requireable<object>;
         let config: PropTypes.Requireable<object>;
         let label: PropTypes.Requireable<NonNullable<string | object | null | undefined>>;
+        let onChange: PropTypes.Requireable<(...args: any[]) => any>;
         let popOverClassName: PropTypes.Requireable<string>;
         let renderChildren: PropTypes.Requireable<(...args: any[]) => any>;
         let renderIcon: PropTypes.Requireable<object>;

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItem.js

@@ -17,12 +17,14 @@ var icons = require('@carbon/react/icons');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilderButton.js');
 var useTranslations = require('../utils/useTranslations.js');
+var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
+var handleKeyboardEvents = require('../utils/handleKeyboardEvents.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-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,
@@ -35,30 +37,29 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     popOverClassName = _ref.popOverClassName,
     config = _ref.config,
     renderChildren = _ref.renderChildren,
+    onChange = _ref.onChange,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
-  var contentRef = React.useRef(null);
   var popoverRef = React.useRef(null);
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
-  var _useTranslations = useTranslations.useTranslations(['invalidText', 'addConditionText', label, 'invalidDateText']),
-    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 4),
+  var _useTranslations = useTranslations.useTranslations(['invalidText', 'addConditionText', label]),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 3),
     invalidText = _useTranslations2[0],
     addConditionText = _useTranslations2[1],
-    labelText = _useTranslations2[2],
-    invalidDateText = _useTranslations2[3];
+    labelText = _useTranslations2[2];
+  var _useContext = React.useContext(ConditionBuilderProvider.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 ? DataConfigs.valueRenderers[type](label, config) : labelText;
     return {
@@ -97,27 +98,46 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
   }, [condition, label]);
   React.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) {
+    handleKeyboardEvents.handleKeyDownForPopover(evt, conditionBuilderRef, popoverRef);
+    if (evt.key === 'Escape') {
+      manageInvalidSelection();
+    }
   };
   return /*#__PURE__*/React__default["default"].createElement(react.Popover, {
     open: open,
     isTabTip: true,
     role: "gridcell",
-    className: popOverClassName,
+    className: "".concat(popOverClassName, " ").concat(DataConfigs.blockClass, "__popover"),
     ref: popoverRef,
     onRequestClose: closePopover
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
@@ -132,13 +152,13 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     isInvalid: isInvalid,
     condition: condition
   }, rest)), open && /*#__PURE__*/React__default["default"].createElement(react.PopoverContent, {
-    className: "".concat(DataConfigs.blockClass, "__item__content"),
+    className: "".concat(DataConfigs.blockClass, "__popover-content-wrapper"),
     role: "dialog",
-    "aria-label": title
+    "aria-label": title,
+    onKeyDown: handleKeyDownHandler
   }, /*#__PURE__*/React__default["default"].createElement(react.Layer, null, /*#__PURE__*/React__default["default"].createElement("h1", {
     className: "".concat(DataConfigs.blockClass, "__item__title")
   }, title), /*#__PURE__*/React__default["default"].createElement("div", {
-    ref: contentRef,
     className: "".concat(DataConfigs.blockClass, "__popover-content")
   }, renderChildren ? renderChildren(popoverRef) : children))));
 };
@@ -164,6 +184,10 @@ ConditionBuilderItem.propTypes = {
    * text to be displayed in the field
    */
   label: index["default"].oneOfType([index["default"].string, index["default"].array, index["default"].object]),
+  /**
+   * callback to update the current condition of the state tree
+   */
+  onChange: index["default"].func,
   /**
    * class name for popover
    */

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

@@ -32,7 +32,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["default"].createElement("div", {
     className: "".concat(blockClass, "__item-date ")

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

@@ -30,7 +30,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 {
@@ -44,8 +44,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["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__item-number")

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

@@ -121,14 +121,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(_rollupPluginBabelHelpers.toConsumableArray(selection), [option]), evt);
+        onChange([].concat(_rollupPluginBabelHelpers.toConsumableArray(updatedSelections), [option]));
       }
     } else {
       onChange(option, evt);

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

@@ -14,13 +14,14 @@ var React = require('react');
 var react = require('@carbon/react');
 var index = require('../../../../node_modules/prop-types/index.js');
 var DataConfigs = require('../../ConditionBuilderContext/DataConfigs.js');
+var util = require('../../utils/util.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
 var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
-  var _conditionState$value, _conditionState$prope;
+  var _conditionState$prope;
   var conditionState = _ref.conditionState,
     _onChange = _ref.onChange,
     config = _ref.config,
@@ -28,7 +29,7 @@ var ConditionBuilderItemText = function ConditionBuilderItemText(_ref) {
   var inputProps = _rollupPluginBabelHelpers.objectSpread2({
     labelText: conditionState.property,
     hideLabel: true,
-    value: (_conditionState$value = conditionState.value) !== null && _conditionState$value !== void 0 ? _conditionState$value : '',
+    value: util.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/lib/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/lib/components/ConditionBuilder/ConditionGroupBuilder/ConditionGroupBuilder.js

@@ -42,14 +42,15 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     aria = _ref.aria,
     onRemove = _ref.onRemove,
     onChange = _ref.onChange,
-    conditionBuilderRef = _ref.conditionBuilderRef,
     className = _ref.className;
-  var _useTranslations = useTranslations.useTranslations(['condition_builder_group', 'conditionText']),
-    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 2),
+  var _useTranslations = useTranslations.useTranslations(['conditionBuilderGroupText', 'conditionText', 'conditionBuilderText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 3),
     conditionBuilderGroupText = _useTranslations2[0],
-    conditionText = _useTranslations2[1];
+    conditionText = _useTranslations2[1],
+    conditionBuilderText = _useTranslations2[2];
   var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    conditionBuilderRef = _useContext.conditionBuilderRef;
   var _useState = React.useState(-1),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     showConditionPreview = _useState2[0],
@@ -62,11 +63,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(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.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(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+          conditions: [].concat(_rollupPluginBabelHelpers.toConsumableArray(groupedItems.conditions), _rollupPluginBabelHelpers.toConsumableArray(groupedItems.groups))
+        }));
+      } else {
+        onChange(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, group), {}, {
+          conditions: group.conditions.filter(function (condition) {
+            return conditionId !== condition.id;
+          })
+        }));
+      }
     } else {
       onRemove(evt);
     }
@@ -96,11 +128,9 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     //or focus the next one.
     var currentGroupCloseButtons = (_e$currentTarget$clos = e.currentTarget.closest(".".concat(DataConfigs.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();
+      util.manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex - 1], conditionBuilderRef);
     } else {
-      var _currentGroupCloseBut2;
-      (_currentGroupCloseBut2 = currentGroupCloseButtons[conditionIndex + 1]) === null || _currentGroupCloseBut2 === void 0 || _currentGroupCloseBut2.focus();
+      util.manageTabIndexAndFocus(currentGroupCloseButtons[conditionIndex + 1], conditionBuilderRef);
     }
   };
   var handleFocusOnCloseTree = function handleFocusOnCloseTree(evt) {
@@ -116,11 +146,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(DataConfigs.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();
+      util.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(DataConfigs.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();
+      util.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 {
@@ -128,10 +156,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, "\"]"));
+          util.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();
+        util.manageTabIndexAndFocus(prevRows[prevRows.length - 2], conditionBuilderRef);
       }
     }
   };
@@ -188,7 +224,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
     }, /*#__PURE__*/React__default["default"].createElement("div", {
       className: "".concat(DataConfigs.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["default"].createElement("div", {
         key: eachCondition.id,
@@ -242,7 +278,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         label: conditionText
       },
       onChange: function onChange(v, evt) {
-        util.focusThisField(evt);
+        util.focusThisField(evt, conditionBuilderRef);
         onStatementChangeHandler(v);
       },
       config: {
@@ -254,7 +290,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
       }, eachCondition.conditions ? /*#__PURE__*/React__default["default"].createElement("div", {
         className: cx__default["default"]("".concat(DataConfigs.blockClass, "__condition-block subgroup  ").concat(DataConfigs.blockClass, "__gap"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__gap-bottom"), group.conditions.length < conditionIndex + 1))
       }, /*#__PURE__*/React__default["default"].createElement(ConditionConnector["default"], {
-        className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__groupConnector"),
+        className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom ").concat(DataConfigs.blockClass, "__groupConnector"),
         operator: group.groupOperator,
         "aria-hidden": true
       }), /*#__PURE__*/React__default["default"].createElement(ConditionGroupBuilder, {
@@ -270,8 +306,7 @@ var ConditionGroupBuilder = function ConditionGroupBuilder(_ref) {
         },
         onRemove: function onRemove(e) {
           onRemoveHandler(eachCondition.id, e);
-        },
-        conditionBuilderRef: conditionBuilderRef
+        }
       })) : /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(ConditionBlock["default"], {
         conjunction: conditionIndex > 0 ? group.groupOperator : undefined,
         aria: {
@@ -326,11 +361,6 @@ ConditionGroupBuilder.propTypes = {
    * Provide an optional class to be applied to the containing node.
    */
   className: index["default"].string,
-  /**
-  className: PropTypes.string,
-   * ref of condition builder
-   */
-  conditionBuilderRef: index["default"].object,
   group: index["default"].object,
   /**
    * callback to update the current condition of the state tree

package/lib/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;