react-magma-dom 4.2.0-next.0 → 4.2.0-next.1

package/dist/esm/index.js

@@ -9200,6 +9200,7 @@ var DatePicker = /*#__PURE__*/forwardRef(function (props, forwardedRef) {
       }
     } else {
       if (event.key === 'Escape') {
+        event.nativeEvent.stopImmediatePropagation();
         setCalendarOpened(false);
         iconRef.current.focus();
       }
@@ -9412,6 +9413,7 @@ var Dropdown = /*#__PURE__*/forwardRef(function (props, forwardedRef) {
   }
   function handleKeyDown(event) {
     if (event.key === 'Escape') {
+      event.nativeEvent.stopImmediatePropagation();
       closeDropdown(event);
     }
     if (event.key === 'ArrowDown') {
@@ -20184,10 +20186,16 @@ function ItemsList(props) {
       }
     }), ' ', i18n.combobox.loading);
   };
+  function handleEscape(event) {
+    if (event.key === 'Escape') {
+      event.nativeEvent.stopImmediatePropagation();
+    }
+  }
   return React__default.createElement(StyledCard$1, {
     hasDropShadow: true,
     isInverse: isInverse,
     isOpen: isOpen,
+    onKeyDown: handleEscape,
     style: menuStyle,
     theme: theme
   }, React__default.createElement(StyledList$1, Object.assign({
@@ -21014,7 +21022,7 @@ function InternalCombobox(props) {
     getToggleButtonProps = _useCombobox.getToggleButtonProps,
     getLabelProps = _useCombobox.getLabelProps,
     getMenuProps = _useCombobox.getMenuProps,
-    getInputProps = _useCombobox.getInputProps,
+    _getInputProps = _useCombobox.getInputProps,
     getComboboxProps = _useCombobox.getComboboxProps,
     highlightedIndex = _useCombobox.highlightedIndex,
     getItemProps = _useCombobox.getItemProps,
@@ -21035,6 +21043,16 @@ function InternalCombobox(props) {
     reset();
   }
   var clearIndicatorAriaLabel = i18n.combobox.clearIndicatorAriaLabel.replace(/\{labelText\}/g, labelText).replace(/\{selectedItem\}/g, itemToString(selectedItem));
+  function handleOnKeyDown(event) {
+    var count = document.querySelectorAll('[aria-modal="true"]').length;
+    if (event.key === 'Escape') {
+      if (count >= 1 && inputRef.current) {
+        inputRef.current.focus();
+      }
+      event.nativeEvent.stopImmediatePropagation();
+    }
+    onInputKeyDown && typeof onInputKeyDown === 'function' && onInputKeyDown(event);
+  }
   return createElement(SelectContainer, {
     descriptionId: ariaDescribedBy,
     errorMessage: errorMessage,
@@ -21053,7 +21071,11 @@ function InternalCombobox(props) {
     customComponents: customComponents,
     disabled: disabled,
     getComboboxProps: getComboboxProps,
-    getInputProps: getInputProps,
+    getInputProps: function getInputProps(options) {
+      return _extends({}, _getInputProps(_extends({}, options, getComboboxProps(_extends({
+        onKeyDown: handleOnKeyDown
+      }, innerRef)))));
+    },
     getToggleButtonProps: getToggleButtonProps,
     hasError: hasError,
     innerRef: ref,
@@ -21063,7 +21085,7 @@ function InternalCombobox(props) {
     isTypeahead: isTypeahead,
     onInputBlur: onInputBlur,
     onInputFocus: onInputFocus,
-    onInputKeyDown: onInputKeyDown,
+    onInputKeyDown: handleOnKeyDown,
     onInputKeyPress: onInputKeyPress,
     onInputKeyUp: onInputKeyUp,
     placeholder: placeholder,
@@ -21322,6 +21344,16 @@ function MultiCombobox(props) {
       size: theme.iconSizes.xSmall
     })));
   })) : null;
+  function handleOnKeyDown(event) {
+    var count = document.querySelectorAll('[aria-modal="true"]').length;
+    if (event.key === 'Escape') {
+      if (count >= 1 && inputRef.current) {
+        inputRef.current.focus();
+      }
+      event.nativeEvent.stopImmediatePropagation();
+    }
+    onInputKeyDown && typeof onInputKeyDown === 'function' && onInputKeyDown(event);
+  }
   return createElement(SelectContainer, {
     descriptionId: ariaDescribedBy,
     errorMessage: errorMessage,
@@ -21341,7 +21373,7 @@ function MultiCombobox(props) {
     getComboboxProps: getComboboxProps,
     getInputProps: function getInputProps(options) {
       return _extends({}, _getInputProps(_extends({}, options, getDropdownProps(_extends({
-        onKeyDown: onInputKeyDown
+        onKeyDown: handleOnKeyDown
       }, innerRef && {
         ref: innerRef
       })))));
@@ -21356,7 +21388,7 @@ function MultiCombobox(props) {
     innerRef: ref,
     onInputBlur: onInputBlur,
     onInputFocus: handleInputFocus,
-    onInputKeyDown: onInputKeyDown,
+    onInputKeyDown: handleOnKeyDown,
     onInputKeyPress: onInputKeyPress,
     onInputKeyUp: onInputKeyUp,
     placeholder: selectedItems.length > 0 ? null : placeholder,