@carbon/react 1.83.0 → 1.84.0

package/es/components/Modal/Modal.js

@@ -36,42 +36,41 @@ import { debounce } from '../../node_modules/es-toolkit/dist/compat/function/deb
 import { Text } from '../Text/Text.js';
 
 const ModalSizes = ['xs', 'sm', 'md', 'lg'];
-const Modal = /*#__PURE__*/React.forwardRef(function Modal(_ref, ref) {
-  let {
-    'aria-label': ariaLabelProp,
-    children,
-    className,
-    decorator,
-    modalHeading = '',
-    modalLabel = '',
-    modalAriaLabel,
-    passiveModal = false,
-    secondaryButtonText,
-    primaryButtonText,
-    open,
-    onRequestClose = noopFn,
-    onRequestSubmit = noopFn,
-    onSecondarySubmit,
-    primaryButtonDisabled = false,
-    danger,
-    alert,
-    secondaryButtons,
-    selectorPrimaryFocus = '[data-modal-primary-focus]',
-    selectorsFloatingMenus,
-    shouldSubmitOnEnter,
-    size,
-    hasScrollingContent = false,
-    closeButtonLabel = 'Close',
-    preventCloseOnClickOutside = false,
-    isFullWidth,
-    launcherButtonRef,
-    loadingStatus = 'inactive',
-    loadingDescription,
-    loadingIconDescription,
-    onLoadingSuccess = noopFn,
-    slug,
-    ...rest
-  } = _ref;
+const Modal = /*#__PURE__*/React.forwardRef(function Modal({
+  'aria-label': ariaLabelProp,
+  children,
+  className,
+  decorator,
+  modalHeading = '',
+  modalLabel = '',
+  modalAriaLabel,
+  passiveModal = false,
+  secondaryButtonText,
+  primaryButtonText,
+  open,
+  onRequestClose = noopFn,
+  onRequestSubmit = noopFn,
+  onSecondarySubmit,
+  primaryButtonDisabled = false,
+  danger,
+  alert,
+  secondaryButtons,
+  selectorPrimaryFocus = '[data-modal-primary-focus]',
+  selectorsFloatingMenus,
+  shouldSubmitOnEnter,
+  size,
+  hasScrollingContent = false,
+  closeButtonLabel = 'Close',
+  preventCloseOnClickOutside = false,
+  isFullWidth,
+  launcherButtonRef,
+  loadingStatus = 'inactive',
+  loadingDescription,
+  loadingIconDescription,
+  onLoadingSuccess = noopFn,
+  slug,
+  ...rest
+}, ref) {
   const prefix = usePrefix();
   const button = useRef(null);
   const secondaryButton = useRef(null);
@@ -126,12 +125,11 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal(_ref, ref) {
       onRequestClose(evt);
     }
   }
-  function handleBlur(_ref2) {
-    let {
-      target: oldActiveNode,
-      relatedTarget: currentActiveNode
-    } = _ref2;
-    if (open && oldActiveNode instanceof HTMLElement && currentActiveNode instanceof HTMLElement) {
+  function handleBlur({
+    target: oldActiveNode,
+    relatedTarget: currentActiveNode
+  }) {
+    if (!enableDialogElement && open && oldActiveNode instanceof HTMLElement && currentActiveNode instanceof HTMLElement) {
       const {
         current: bodyNode
       } = innerModal;
@@ -150,6 +148,23 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal(_ref, ref) {
         selectorsFloatingMenus
       });
     }
+
+    // Adjust scroll if needed so that element with focus is not obscured by gradient
+    const modalContent = document.querySelector(`.${prefix}--modal-content`);
+    if (!modalContent || !modalContent.classList.contains(`${prefix}--modal-scroll-content`) || !currentActiveNode || !modalContent.contains(currentActiveNode)) {
+      return;
+    }
+    const lastContent = modalContent.children[modalContent.children.length - 1];
+    const gradientSpacing = modalContent.scrollHeight - lastContent.offsetTop - lastContent.clientHeight;
+    for (let elem of modalContent.children) {
+      if (elem.contains(currentActiveNode)) {
+        const spaceBelow = modalContent.clientHeight - elem.offsetTop + modalContent.scrollTop - elem.clientHeight;
+        if (spaceBelow < gradientSpacing) {
+          modalContent.scrollTop = modalContent.scrollTop + (gradientSpacing - spaceBelow);
+        }
+        break;
+      }
+    }
   }
   const onSecondaryButtonClick = onSecondarySubmit ? onSecondarySubmit : onRequestClose;
   const modalClasses = cx(`${prefix}--modal`, {
@@ -316,17 +331,14 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal(_ref, ref) {
   }, hasScrollingContentProps), children), !passiveModal && /*#__PURE__*/React.createElement(ButtonSet, {
     className: footerClasses,
     "aria-busy": loadingActive
-  }, Array.isArray(secondaryButtons) && secondaryButtons.length <= 2 ? secondaryButtons.map((_ref3, i) => {
-    let {
-      buttonText,
-      onClick: onButtonClick
-    } = _ref3;
-    return /*#__PURE__*/React.createElement(Button, {
-      key: `${buttonText}-${i}`,
-      kind: "secondary",
-      onClick: onButtonClick
-    }, buttonText);
-  }) : secondaryButtonText && /*#__PURE__*/React.createElement(Button, {
+  }, Array.isArray(secondaryButtons) && secondaryButtons.length <= 2 ? secondaryButtons.map(({
+    buttonText,
+    onClick: onButtonClick
+  }, i) => /*#__PURE__*/React.createElement(Button, {
+    key: `${buttonText}-${i}`,
+    kind: "secondary",
+    onClick: onButtonClick
+  }, buttonText)) : secondaryButtonText && /*#__PURE__*/React.createElement(Button, {
     disabled: loadingActive,
     kind: "secondary",
     onClick: onSecondaryButtonClick,
@@ -375,17 +387,14 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal(_ref, ref) {
   }, hasScrollingContentProps), children), !passiveModal && /*#__PURE__*/React.createElement(ButtonSet, {
     className: footerClasses,
     "aria-busy": loadingActive
-  }, Array.isArray(secondaryButtons) && secondaryButtons.length <= 2 ? secondaryButtons.map((_ref4, i) => {
-    let {
-      buttonText,
-      onClick: onButtonClick
-    } = _ref4;
-    return /*#__PURE__*/React.createElement(Button, {
-      key: `${buttonText}-${i}`,
-      kind: "secondary",
-      onClick: onButtonClick
-    }, buttonText);
-  }) : secondaryButtonText && /*#__PURE__*/React.createElement(Button, {
+  }, Array.isArray(secondaryButtons) && secondaryButtons.length <= 2 ? secondaryButtons.map(({
+    buttonText,
+    onClick: onButtonClick
+  }, i) => /*#__PURE__*/React.createElement(Button, {
+    key: `${buttonText}-${i}`,
+    kind: "secondary",
+    onClick: onButtonClick
+  }, buttonText)) : secondaryButtonText && /*#__PURE__*/React.createElement(Button, {
     disabled: loadingActive,
     kind: "secondary",
     onClick: onSecondaryButtonClick,
@@ -412,7 +421,7 @@ const Modal = /*#__PURE__*/React.forwardRef(function Modal(_ref, ref) {
     level: 0,
     onKeyDown: handleKeyDown,
     onClick: composeEventHandlers([rest?.onClick, handleOnClick]),
-    onBlur: !enableDialogElement ? handleBlur : () => {},
+    onBlur: handleBlur,
     className: modalClasses,
     role: "presentation",
     ref: ref

package/es/components/ModalWrapper/ModalWrapper.js

@@ -19,8 +19,8 @@ import { match } from '../../internal/keyboard/match.js';
 let didWarnAboutDeprecation = false;
 process.env.NODE_ENV !== 'production';
 class ModalWrapper extends React.Component {
-  constructor() {
-    super(...arguments);
+  constructor(...args) {
+    super(...args);
     _defineProperty(this, "triggerButton", /*#__PURE__*/React.createRef());
     _defineProperty(this, "modal", /*#__PURE__*/React.createRef());
     _defineProperty(this, "state", {

package/es/components/MultiSelect/FilterableMultiSelect.js

@@ -17,7 +17,7 @@ import { sortingPropTypes } from './MultiSelectPropTypes.js';
 import ListBox from '../ListBox/index.js';
 import ListBoxSelection from '../ListBox/next/ListBoxSelection.js';
 import ListBoxTrigger from '../ListBox/next/ListBoxTrigger.js';
-import { Escape, Space, Enter, Delete, Tab, Home, End } from '../../internal/keyboard/keys.js';
+import { Space, Enter, Delete, Escape, Tab, Home, End } from '../../internal/keyboard/keys.js';
 import { match } from '../../internal/keyboard/match.js';
 import { defaultItemToString } from './tools/itemToString.js';
 import mergeRefs from '../../tools/mergeRefs.js';
@@ -61,48 +61,47 @@ const {
  * ends up just being defined as "string".)
  */
 
-const FilterableMultiSelect = /*#__PURE__*/forwardRef(function FilterableMultiSelect(_ref, ref) {
-  let {
-    autoAlign = false,
-    className: containerClassName,
-    clearSelectionDescription = 'Total items selected: ',
-    clearSelectionText = 'To clear selection, press Delete or Backspace',
-    compareItems = defaultCompareItems,
-    decorator,
-    direction = 'bottom',
-    disabled = false,
-    downshiftProps,
-    filterItems = defaultFilterItems,
-    helperText,
-    hideLabel,
-    id,
-    initialSelectedItems = [],
-    invalid,
-    invalidText,
-    items,
-    itemToElement: ItemToElement,
-    // needs to be capitalized for react to render it correctly
-    itemToString = defaultItemToString,
-    light,
-    locale = 'en',
-    onInputValueChange,
-    open = false,
-    onChange,
-    onMenuChange,
-    placeholder,
-    readOnly,
-    titleText,
-    type,
-    selectionFeedback = 'top-after-reopen',
-    selectedItems: selected,
-    size: size$1,
-    sortItems = defaultSortItems,
-    translateWithId,
-    useTitleInItem,
-    warn,
-    warnText,
-    slug
-  } = _ref;
+const FilterableMultiSelect = /*#__PURE__*/forwardRef(function FilterableMultiSelect({
+  autoAlign = false,
+  className: containerClassName,
+  clearSelectionDescription = 'Total items selected: ',
+  clearSelectionText = 'To clear selection, press Delete or Backspace',
+  compareItems = defaultCompareItems,
+  decorator,
+  direction = 'bottom',
+  disabled = false,
+  downshiftProps,
+  filterItems = defaultFilterItems,
+  helperText,
+  hideLabel,
+  id,
+  initialSelectedItems = [],
+  invalid,
+  invalidText,
+  items,
+  itemToElement: ItemToElement,
+  // needs to be capitalized for react to render it correctly
+  itemToString = defaultItemToString,
+  light,
+  locale = 'en',
+  onInputValueChange,
+  open = false,
+  onChange,
+  onMenuChange,
+  placeholder,
+  readOnly,
+  titleText,
+  type,
+  selectionFeedback = 'top-after-reopen',
+  selectedItems: selected,
+  size: size$1,
+  sortItems = defaultSortItems,
+  translateWithId,
+  useTitleInItem,
+  warn,
+  warnText,
+  slug
+}, ref) {
   const {
     isFluid
   } = useContext(FormContext);
@@ -138,11 +137,10 @@ const FilterableMultiSelect = /*#__PURE__*/forwardRef(function FilterableMultiSe
     middleware: [flip({
       crossAxis: false
     }), size({
-      apply(_ref2) {
-        let {
-          rects,
-          elements
-        } = _ref2;
+      apply({
+        rects,
+        elements
+      }) {
         Object.assign(elements.floating.style, {
           width: `${rects.reference.width}px`
         });
@@ -250,6 +248,27 @@ const FilterableMultiSelect = /*#__PURE__*/forwardRef(function FilterableMultiSe
       onMenuChange?.(isOpen);
     }
   }, [isOpen, onMenuChange, open]);
+  useEffect(() => {
+    const handleClickOutside = event => {
+      const target = event.target;
+      const wrapper = document.getElementById(id)?.closest(`.${prefix}--multi-select__wrapper`);
+
+      // If click is outside our component and menu is open or input is focused
+      if (wrapper && !wrapper.contains(target)) {
+        if (isOpen || inputFocused) {
+          setIsOpen(false);
+          setInputFocused(false);
+          setInputValue('');
+        }
+      }
+    };
+    if (inputFocused || isOpen) {
+      document.addEventListener('mousedown', handleClickOutside);
+    }
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, [isOpen, inputFocused]);
   const {
     getToggleButtonProps,
     getLabelProps,

package/es/components/MultiSelect/MultiSelect.js

@@ -58,46 +58,45 @@ const defaultItemToString = item => {
   }
   return '';
 };
-const MultiSelect = /*#__PURE__*/React.forwardRef((_ref, ref) => {
-  let {
-    autoAlign = false,
-    className: containerClassName,
-    decorator,
-    id,
-    items,
-    itemToElement,
-    itemToString = defaultItemToString,
-    titleText = false,
-    hideLabel,
-    helperText,
-    label,
-    type = 'default',
-    size: size$1,
-    disabled = false,
-    initialSelectedItems = [],
-    sortItems = defaultSortItems,
-    compareItems = defaultCompareItems,
-    clearSelectionText = 'To clear selection, press Delete or Backspace',
-    clearAnnouncement = 'all items have been cleared',
-    clearSelectionDescription = 'Total items selected: ',
-    light,
-    invalid,
-    invalidText,
-    warn,
-    warnText,
-    useTitleInItem,
-    translateWithId,
-    downshiftProps,
-    open = false,
-    selectionFeedback = 'top-after-reopen',
-    onChange,
-    onMenuChange,
-    direction = 'bottom',
-    selectedItems: selected,
-    readOnly,
-    locale = 'en',
-    slug
-  } = _ref;
+const MultiSelect = /*#__PURE__*/React.forwardRef(({
+  autoAlign = false,
+  className: containerClassName,
+  decorator,
+  id,
+  items,
+  itemToElement,
+  itemToString = defaultItemToString,
+  titleText = false,
+  hideLabel,
+  helperText,
+  label,
+  type = 'default',
+  size: size$1,
+  disabled = false,
+  initialSelectedItems = [],
+  sortItems = defaultSortItems,
+  compareItems = defaultCompareItems,
+  clearSelectionText = 'To clear selection, press Delete or Backspace',
+  clearAnnouncement = 'all items have been cleared',
+  clearSelectionDescription = 'Total items selected: ',
+  light,
+  invalid,
+  invalidText,
+  warn,
+  warnText,
+  useTitleInItem,
+  translateWithId,
+  downshiftProps,
+  open = false,
+  selectionFeedback = 'top-after-reopen',
+  onChange,
+  onMenuChange,
+  direction = 'bottom',
+  selectedItems: selected,
+  readOnly,
+  locale = 'en',
+  slug
+}, ref) => {
   const filteredItems = useMemo(() => {
     return items.filter(item => {
       if (typeof item === 'object' && item !== null) {
@@ -142,11 +141,10 @@ const MultiSelect = /*#__PURE__*/React.forwardRef((_ref, ref) => {
     middleware: [autoAlign && flip({
       crossAxis: false
     }), size({
-      apply(_ref2) {
-        let {
-          rects,
-          elements
-        } = _ref2;
+      apply({
+        rects,
+        elements
+      }) {
         Object.assign(elements.floating.style, {
           width: `${rects.reference.width}px`
         });

package/es/components/MultiSelect/tools/sorting.js

@@ -16,25 +16,21 @@
  * @returns {number} A negative number if itemA comes before itemB, a positive
  *   number if itemA comes after itemB, or 0 if they are equal.
  */
-const defaultCompareItems = (itemA, itemB, _ref) => {
-  let {
-    locale
-  } = _ref;
-  return itemA.localeCompare(itemB, locale, {
-    numeric: true
-  });
-};
+const defaultCompareItems = (itemA, itemB, {
+  locale
+}) => itemA.localeCompare(itemB, locale, {
+  numeric: true
+});
 
 /**
  * Default sorting algorithm for options in a selection control
  */
-const defaultSortItems = (items, _ref2) => {
-  let {
-    selectedItems = [],
-    itemToString,
-    compareItems,
-    locale = 'en'
-  } = _ref2;
+const defaultSortItems = (items, {
+  selectedItems = [],
+  itemToString,
+  compareItems,
+  locale = 'en'
+}) => {
   return items.sort((itemA, itemB) => {
     // Always place "select all" option at the beginning
     if (itemA.isSelectAll) return -1;