@carbon/react 1.50.0-rc.0 → 1.51.0-rc.0

package/es/components/Accordion/AccordionItem.js

@@ -9,7 +9,7 @@ import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js
 import { ChevronRight } from '@carbon/icons-react';
 import cx from 'classnames';
 import PropTypes from 'prop-types';
-import React__default, { useState, useContext, useRef } from 'react';
+import React__default, { useState, useContext } from 'react';
 import '../Text/index.js';
 import { useId } from '../../internal/useId.js';
 import deprecate from '../../prop-types/deprecate.js';
@@ -51,7 +51,15 @@ function AccordionItem(_ref) {
   });
   const Toggle = renderToggle || renderExpando; // remove renderExpando in next major release
 
-  const content = useRef(null);
+  const content = React__default.useCallback(node => {
+    if (!node) {
+      return;
+    }
+    if (isOpen) {
+      // accordion closes
+      node.style.maxBlockSize = '';
+    }
+  }, [isOpen]);
   if (open !== prevIsOpen) {
     setIsOpen(open);
     setPrevIsOpen(open);
@@ -60,19 +68,6 @@ function AccordionItem(_ref) {
   // When the AccordionItem heading is clicked, toggle the open state of the
   // panel
   function onClick(event) {
-    // type guard for ref
-    if (!content.current) {
-      return;
-    }
-    if (isOpen) {
-      // accordion closes
-      content.current.style.maxBlockSize = '';
-    } else {
-      // accordion opens
-      content.current.style.maxBlockSize =
-      // Scroll height plus top/bottom padding
-      content.current.scrollHeight + 32 + 'px';
-    }
     const nextValue = !isOpen;
     setIsOpen(nextValue);
     if (onHeadingClick) {

package/es/components/ChatButton/ChatButton.Skeleton.js

@@ -0,0 +1,40 @@
+/**
+ * Copyright IBM Corp. 2016, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import PropTypes from 'prop-types';
+import React__default from 'react';
+import cx from 'classnames';
+import { usePrefix } from '../../internal/usePrefix.js';
+
+const ChatButtonSkeleton = _ref => {
+  let {
+    className,
+    size,
+    ...rest
+  } = _ref;
+  const prefix = usePrefix();
+  const skeletonClasses = cx(className, `${prefix}--skeleton`, `${prefix}--btn`, `${prefix}--chat-btn`, {
+    [`${prefix}--layout--size-${size}`]: size
+  });
+  return /*#__PURE__*/React__default.createElement("div", _extends({
+    className: skeletonClasses
+  }, rest));
+};
+ChatButtonSkeleton.propTypes = {
+  /**
+   * Specify an optional className to add.
+   */
+  className: PropTypes.string,
+  /**
+   * Specify the size of the `ChatButtonSkeleton`, from the following list of sizes:
+   */
+  size: PropTypes.oneOf(['sm', 'md', 'lg'])
+};
+var ChatButtonSkeleton$1 = ChatButtonSkeleton;
+
+export { ChatButtonSkeleton$1 as default };

package/es/components/ChatButton/ChatButton.js

@@ -0,0 +1,81 @@
+/**
+ * Copyright IBM Corp. 2016, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import PropTypes from 'prop-types';
+import React__default from 'react';
+import cx from 'classnames';
+import Button from '../Button/Button.js';
+import '../Button/Button.Skeleton.js';
+import { usePrefix } from '../../internal/usePrefix.js';
+
+const ChatButton = /*#__PURE__*/React__default.forwardRef(function ChatButton(_ref, ref) {
+  let {
+    className,
+    children,
+    disabled,
+    isQuickAction,
+    isSelected,
+    kind,
+    size,
+    ...other
+  } = _ref;
+  const prefix = usePrefix();
+  const classNames = cx(className, {
+    [`${prefix}--chat-btn`]: true,
+    [`${prefix}--chat-btn--quick-action`]: isQuickAction,
+    [`${prefix}--chat-btn--quick-action--selected`]: isSelected
+  });
+  const allowedSizes = ['sm', 'md', 'lg'];
+  if (isQuickAction) {
+    kind = 'ghost';
+    size = 'sm';
+  } else {
+    // Do not allow size larger than `lg`
+    size = allowedSizes.includes(size) ? size : 'lg';
+  }
+  return /*#__PURE__*/React__default.createElement(Button, _extends({
+    disabled: disabled,
+    className: classNames,
+    kind: kind,
+    ref: ref,
+    size: size
+  }, other), children);
+});
+ChatButton.propTypes = {
+  /**
+   * Provide the contents of your Select
+   */
+  children: PropTypes.node,
+  /**
+   * Specify an optional className to be applied to the node containing the label and the select box
+   */
+  className: PropTypes.string,
+  /**
+   * Specify whether the `ChatButton` should be disabled
+   */
+  disabled: PropTypes.bool,
+  /**
+   * Specify whether the `ChatButton` should be rendered as a quick action button
+   */
+  isQuickAction: PropTypes.bool,
+  /**
+   * Specify whether the quick action `ChatButton` should be rendered as selected. This disables the input
+   */
+  isSelected: PropTypes.bool,
+  /**
+   * Specify the kind of `ChatButton` you want to create
+   */
+  kind: PropTypes.oneOf(['primary', 'secondary', 'danger', 'ghost', 'tertiary']),
+  /**
+   * Specify the size of the `ChatButton`, from the following list of sizes:
+   */
+  size: PropTypes.oneOf(['sm', 'md', 'lg'])
+};
+var ChatButton$1 = ChatButton;
+
+export { ChatButton$1 as default };

package/es/components/ComposedModal/ComposedModal.js

@@ -6,11 +6,14 @@
  */
 
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useState, useRef, useEffect } from 'react';
+import React__default, { useRef, useState, useEffect } from 'react';
 import { isElement } from 'react-is';
 import PropTypes from 'prop-types';
 import { ModalHeader } from './ModalHeader.js';
 import { ModalFooter } from './ModalFooter.js';
+import debounce from 'lodash.debounce';
+import useIsomorphicEffect from '../../internal/useIsomorphicEffect.js';
+import mergeRefs from '../../tools/mergeRefs.js';
 import cx from 'classnames';
 import toggleClass from '../../tools/toggleClass.js';
 import requiredIfGivenPropIsTruthy from '../../prop-types/requiredIfGivenPropIsTruthy.js';
@@ -28,18 +31,39 @@ const ModalBody = /*#__PURE__*/React__default.forwardRef(function ModalBody(_ref
     ...rest
   } = _ref;
   const prefix = usePrefix();
-  const contentClass = cx(`${prefix}--modal-content`, hasForm && `${prefix}--modal-content--with-form`, hasScrollingContent && `${prefix}--modal-scroll-content`, customClassName);
-  const hasScrollingContentProps = hasScrollingContent ? {
+  const contentRef = useRef(null);
+  const [isScrollable, setIsScrollable] = useState(false);
+  const contentClass = cx({
+    [`${prefix}--modal-content`]: true,
+    [`${prefix}--modal-content--with-form`]: hasForm,
+    [`${prefix}--modal-scroll-content`]: hasScrollingContent || isScrollable,
+    customClassName
+  });
+  useIsomorphicEffect(() => {
+    if (contentRef.current) {
+      setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
+    }
+    function handler() {
+      if (contentRef.current) {
+        setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
+      }
+    }
+    const debouncedHandler = debounce(handler, 200);
+    window.addEventListener('resize', debouncedHandler);
+    return () => {
+      debouncedHandler.cancel();
+      window.removeEventListener('resize', debouncedHandler);
+    };
+  }, []);
+  const hasScrollingContentProps = hasScrollingContent || isScrollable ? {
     tabIndex: 0,
     role: 'region'
   } : {};
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement("div", _extends({
+  return /*#__PURE__*/React__default.createElement("div", _extends({
     className: contentClass
   }, hasScrollingContentProps, rest, {
-    ref: ref
-  }), children), hasScrollingContent && /*#__PURE__*/React__default.createElement("div", {
-    className: `${prefix}--modal-content--overflow-indicator`
-  }));
+    ref: mergeRefs(contentRef, ref)
+  }), children);
 });
 ModalBody.propTypes = {
   /**

package/es/components/Copy/Copy.js

@@ -41,7 +41,7 @@ function Copy(_ref) {
     handleFadeOut();
   }, [handleFadeOut]);
   const handleAnimationEnd = event => {
-    if (event.animationName === 'hide-feedback') {
+    if (event.animationName === `${prefix}--hide-feedback`) {
       setAnimation('');
     }
   };

package/es/components/DataTable/DataTable.d.ts

@@ -53,6 +53,7 @@ export interface DataTableRow<ColTypes extends any[]> {
 export interface DataTableHeader {
     key: string;
     header: React.ReactNode;
+    slug?: React.ReactElement;
 }
 export interface DataTableRenderProps<RowType, ColTypes extends any[]> {
     headers: Array<DataTableHeader>;
@@ -152,6 +153,12 @@ export interface DataTableRenderProps<RowType, ColTypes extends any[]> {
         stickyHeader?: boolean;
         useStaticWidth?: boolean;
     };
+    getCellProps: (getCellPropsArgs: {
+        cell: DataTableCell<ColTypes>;
+    }) => {
+        [key: string]: unknown;
+        hasSlugHeader?: boolean;
+    };
     onInputChange: (e: React.ChangeEvent<HTMLInputElement>, defaultValue?: string) => void;
     sortBy: (headerKey: string) => void;
     selectAll: () => void;
@@ -334,6 +341,7 @@ declare class DataTable<RowType, ColTypes extends any[]> extends React.Component
         sortDirection: DataTableSortState;
         isSortable: boolean | undefined;
         isSortHeader: boolean;
+        slug: React.ReactElement<any, string | React.JSXElementConstructor<any>> | undefined;
         onClick: (event: any) => void;
     };
     /**
@@ -468,6 +476,19 @@ declare class DataTable<RowType, ColTypes extends any[]> extends React.Component
         stickyHeader: boolean | undefined;
         useStaticWidth: boolean | undefined;
     };
+    /**
+     * Get the props associated with the given table cell.
+     *
+     * @param {object} config
+     * @param {object} config.cell the cell we want the props for
+     * @returns {object}
+     */
+    getCellProps: ({ cell, ...rest }: {
+        [x: string]: any;
+        cell: any;
+    }) => {
+        hasSlugHeader: any;
+    };
     /**
      * Helper utility to get all the currently selected rows
      * @returns {Array<string>} the array of rowIds that are currently selected

package/es/components/DataTable/DataTable.js

@@ -103,6 +103,7 @@ class DataTable extends React__default.Component {
         sortDirection,
         isSortable,
         isSortHeader: sortHeaderKey === header.key,
+        slug: header.slug,
         onClick: event => {
           const nextSortState = getNextSortState(this.props, this.state, {
             key: header.key
@@ -339,6 +340,23 @@ class DataTable extends React__default.Component {
         useStaticWidth
       };
     });
+    /**
+     * Get the props associated with the given table cell.
+     *
+     * @param {object} config
+     * @param {object} config.cell the cell we want the props for
+     * @returns {object}
+     */
+    _defineProperty(this, "getCellProps", _ref4 => {
+      let {
+        cell,
+        ...rest
+      } = _ref4;
+      return {
+        ...rest,
+        hasSlugHeader: cell.hasSlugHeader
+      };
+    });
     /**
      * Helper utility to get all the currently selected rows
      * @returns {Array<string>} the array of rowIds that are currently selected
@@ -612,6 +630,7 @@ class DataTable extends React__default.Component {
       getBatchActionProps: this.getBatchActionProps,
       getTableProps: this.getTableProps,
       getTableContainerProps: this.getTableContainerProps,
+      getCellProps: this.getCellProps,
       // Custom event handlers
       onInputChange: this.handleOnInputValueChange,
       // Expose internal state change actions

package/es/components/DataTable/TableCell.d.ts

@@ -4,7 +4,32 @@
  * This source code is licensed under the Apache-2.0 license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { TdHTMLAttributes } from 'react';
-export type TableCellProps = TdHTMLAttributes<HTMLTableCellElement>;
-declare const TableCell: React.FC<TableCellProps>;
+import React from 'react';
+import { ReactAttr } from '../../types/common';
+interface TableCellProps extends ReactAttr<HTMLTableCellElement> {
+    /**
+     * Pass in children that will be embedded in the table header label
+     */
+    children?: React.ReactNode;
+    /**
+     * Specify an optional className to be applied to the container node
+     */
+    className?: string;
+    /**
+     * The width of the expanded row's internal cell
+     */
+    colSpan?: number;
+    /**
+     * Specify if the table cell is in an AI column
+     */
+    hasSlugHeader?: boolean;
+    /**
+     * The id of the matching th node in the table head. Addresses a11y concerns outlined here: https://www.ibm.com/able/guidelines/ci162/info_and_relationships.html and https://www.w3.org/TR/WCAG20-TECHS/H43
+     */
+    headers?: string;
+}
+declare const TableCell: {
+    ({ children, className, hasSlugHeader, colSpan, ...rest }: TableCellProps): import("react/jsx-runtime").JSX.Element;
+    displayName: string;
+};
 export default TableCell;

package/es/components/DataTable/TableCell.js

@@ -5,11 +5,28 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import wrapComponent from '../../tools/wrapComponent.js';
+import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import React__default from 'react';
+import cx from 'classnames';
+import { usePrefix } from '../../internal/usePrefix.js';
 
-const TableCell = wrapComponent({
-  name: 'TableCell',
-  type: 'td'
-});
+const TableCell = _ref => {
+  let {
+    children,
+    className,
+    hasSlugHeader,
+    colSpan,
+    ...rest
+  } = _ref;
+  const prefix = usePrefix();
+  const tableCellClassNames = cx(className, {
+    [`${prefix}--table-cell--column-slug`]: hasSlugHeader
+  });
+  return /*#__PURE__*/React__default.createElement("td", _extends({
+    className: tableCellClassNames ? tableCellClassNames : undefined,
+    colSpan: colSpan
+  }, rest), children);
+};
+TableCell.displayName = 'TableCell';
 
 export { TableCell as default };

package/es/components/DataTable/TableExpandRow.js

@@ -48,7 +48,7 @@ const TableExpandRow = /*#__PURE__*/React__default.forwardRef((_ref, ref) => {
     [`${prefix}--parent-row`]: true,
     [`${prefix}--expandable-row`]: isExpanded,
     [`${prefix}--data-table--selected`]: isSelected,
-    [`${prefix}--parent-row--slug`]: rowHasSlug
+    [`${prefix}--data-table--slug-row`]: rowHasSlug
   }, rowClassName);
   const previousValue = isExpanded ? 'collapsed' : undefined;
   return /*#__PURE__*/React__default.createElement("tr", _extends({}, rest, {

package/es/components/DataTable/TableHeader.js

@@ -124,13 +124,13 @@ const TableHeader = /*#__PURE__*/React__default.forwardRef(function TableHeader(
     className: `${prefix}--table-sort__flex`
   }, /*#__PURE__*/React__default.createElement("div", {
     className: `${prefix}--table-header-label`
-  }, children), normalizedSlug, /*#__PURE__*/React__default.createElement(ArrowUp, {
+  }, children), /*#__PURE__*/React__default.createElement(ArrowUp, {
     size: 20,
     className: `${prefix}--table-sort__icon`
   }), /*#__PURE__*/React__default.createElement(ArrowsVertical, {
     size: 20,
     className: `${prefix}--table-sort__icon-unsorted`
-  }))));
+  }), normalizedSlug)));
 });
 TableHeader.propTypes = {
   /**

package/es/components/DataTable/TableRow.js

@@ -13,10 +13,21 @@ import { usePrefix } from '../../internal/usePrefix.js';
 
 const TableRow = props => {
   const prefix = usePrefix();
+  let rowHasSlug;
+  if (props?.children) {
+    React__default.Children.toArray(props.children).map(child => {
+      if (child.type?.displayName === 'TableSlugRow') {
+        if (child.props.slug) {
+          rowHasSlug = true;
+        }
+      }
+    });
+  }
   // Remove unnecessary props if provided to this component, these are
   // only useful in `TableExpandRow`
   const className = cx(props.className, {
-    [`${prefix}--data-table--selected`]: props.isSelected
+    [`${prefix}--data-table--selected`]: props.isSelected,
+    [`${prefix}--data-table--slug-row`]: rowHasSlug
   });
   const cleanProps = {
     ...omit(props, ['ariaLabel', 'aria-label', 'aria-controls', 'onExpand', 'isExpanded', 'isSelected']),

package/es/components/DataTable/TableToolbarSearch.d.ts

@@ -6,12 +6,12 @@
  */
 import PropTypes from 'prop-types';
 import { ChangeEvent, FocusEvent, ReactNode } from 'react';
-export interface TableToolbarSearchProps {
-    children?: ReactNode;
-    /**
-     * Provide an optional class name for the search container
-     */
-    className?: string;
+import { SearchProps } from '../Search';
+import { InternationalProps } from '../../types/common';
+export type TableToolbarTranslationKey = 'carbon.table.toolbar.search.label' | 'carbon.table.toolbar.search.placeholder';
+type ExcludedInheritedProps = 'defaultValue' | 'labelText' | 'onBlur' | 'onChange' | 'onExpand' | 'onFocus' | 'tabIndex';
+export type TableToolbarSearchHandleExpand = (event: FocusEvent<HTMLInputElement>, newValue?: boolean) => void;
+export interface TableToolbarSearchProps extends Omit<SearchProps, ExcludedInheritedProps>, InternationalProps<TableToolbarTranslationKey> {
     /**
      * Specifies if the search should initially render in an expanded state
      */
@@ -20,70 +20,43 @@ export interface TableToolbarSearchProps {
      * Provide an optional default value for the Search component
      */
     defaultValue?: string;
-    /**
-     * Specifies if the search should be disabled
-     */
-    disabled?: boolean;
     /**
      * Specifies if the search should expand
      */
     expanded?: boolean;
-    /**
-     * Provide an optional id for the search container
-     */
-    id?: string;
     /**
      * Provide an optional label text for the Search component icon
      */
-    labelText?: string;
+    labelText?: ReactNode;
     /**
      * Provide an optional function to be called when the search input loses focus, this will be
      * passed the event as the first parameter and a function to handle the expanding of the search
      * input as the second
      */
-    onBlur?: (event: FocusEvent<HTMLInputElement>, handleExpand: (event: FocusEvent<HTMLInputElement>, value: boolean) => void) => void;
+    onBlur?(event: FocusEvent<HTMLInputElement>, handleExpand: TableToolbarSearchHandleExpand): void;
     /**
      * Provide an optional hook that is called each time the input is updated
      */
     onChange?: (event: '' | ChangeEvent<HTMLInputElement>, value?: string) => void;
-    /**
-     * Optional callback called when the search value is cleared.
-     */
-    onClear?: () => void;
     /**
      * Provide an optional hook that is called each time the input is expanded
      */
-    onExpand?: (event: FocusEvent<HTMLInputElement>, value: boolean) => void;
+    onExpand?(event: FocusEvent<HTMLInputElement>, newExpand: boolean): void;
     /**
      * Provide an optional function to be called when the search input gains focus, this will be
      * passed the event as the first parameter and a function to handle the expanding of the search
      * input as the second.
      */
-    onFocus?: (event: FocusEvent<HTMLInputElement>, handleExpand: (event: FocusEvent<HTMLInputElement>, value: boolean) => void) => void;
+    onFocus?(event: FocusEvent<HTMLInputElement>, handleExpand: TableToolbarSearchHandleExpand): void;
     /**
-     * Whether the search should be allowed to expand
+     * Whether the search should be allowed to expand.
      */
     persistent?: boolean;
-    /**
-     * Provide an optional placeholder text for the Search component
-     */
-    placeholder?: string;
     /**
      * Provide an optional className for the overall container of the Search
      */
     searchContainerClass?: string;
-    /**
-     * Specify the size of the Search
-     */
-    size?: 'sm' | 'md' | 'lg';
-    /**
-     * Optional prop to specify the tabIndex of the <Search> (in expanded state) or the container (in collapsed state)
-     */
     tabIndex?: number | string;
-    /**
-     * Provide custom text for the component for each translation id
-     */
-    translateWithId?: (id: string) => string;
 }
 declare const TableToolbarSearch: {
     ({ className, searchContainerClass, onChange: onChangeProp, onClear, translateWithId: t, placeholder, labelText, expanded: expandedProp, defaultExpanded, defaultValue, disabled, onExpand, persistent, id, onBlur, onFocus, size, tabIndex, ...rest }: TableToolbarSearchProps): import("react/jsx-runtime").JSX.Element;

package/es/components/DataTable/TableToolbarSearch.js

@@ -48,7 +48,7 @@ const TableToolbarSearch = _ref => {
   const {
     current: controlled
   } = useRef(expandedProp !== undefined);
-  const [expandedState, setExpandedState] = useState(defaultExpanded || defaultValue);
+  const [expandedState, setExpandedState] = useState(Boolean(defaultExpanded || defaultValue));
   const expanded = controlled ? expandedProp : expandedState;
   const [value, setValue] = useState(defaultValue || '');
   const uniqueId = useMemo(getInstanceId, []);

package/es/components/DataTable/tools/normalize.js

@@ -48,7 +48,8 @@ const normalize = function (rows, headers) {
     }
     headers.forEach((_ref, i) => {
       let {
-        key
+        key,
+        slug
       } = _ref;
       const id = getCellId(row.id, key);
       // Initialize the cell info and state values, namely for editing
@@ -59,6 +60,7 @@ const normalize = function (rows, headers) {
         isEditing: false,
         isValid: true,
         errors: null,
+        hasSlugHeader: !!slug,
         info: {
           header: key
         }

package/es/components/Modal/Modal.js

@@ -7,7 +7,7 @@
 
 import { extends as _extends } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import PropTypes from 'prop-types';
-import React__default, { useRef, useEffect } from 'react';
+import React__default, { useRef, useState, useEffect } from 'react';
 import cx from 'classnames';
 import { Close } from '@carbon/icons-react';
 import toggleClass from '../../tools/toggleClass.js';
@@ -17,6 +17,8 @@ import ButtonSet from '../ButtonSet/ButtonSet.js';
 import InlineLoading from '../InlineLoading/InlineLoading.js';
 import requiredIfGivenPropIsTruthy from '../../prop-types/requiredIfGivenPropIsTruthy.js';
 import wrapFocus, { elementOrParentIsFloatingMenu } from '../../internal/wrapFocus.js';
+import debounce from 'lodash.debounce';
+import useIsomorphicEffect from '../../internal/useIsomorphicEffect.js';
 import setupGetInstanceId from '../../tools/setupGetInstanceId.js';
 import { usePrefix } from '../../internal/usePrefix.js';
 import { IconButton } from '../IconButton/index.js';
@@ -66,9 +68,11 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
   const prefix = usePrefix();
   const button = useRef(null);
   const secondaryButton = useRef();
+  const contentRef = useRef(null);
   const innerModal = useRef(null);
   const startTrap = useRef(null);
   const endTrap = useRef(null);
+  const [isScrollable, setIsScrollable] = useState(false);
   const modalInstanceId = `modal-${getInstanceId()}`;
   const modalLabelId = `${prefix}--modal-header__label--${modalInstanceId}`;
   const modalHeadingId = `${prefix}--modal-header__heading--${modalInstanceId}`;
@@ -134,7 +138,7 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
     [`${prefix}--modal-container--full-width`]: isFullWidth
   });
   const contentClasses = cx(`${prefix}--modal-content`, {
-    [`${prefix}--modal-scroll-content`]: hasScrollingContent
+    [`${prefix}--modal-scroll-content`]: hasScrollingContent || isScrollable
   });
   const footerClasses = cx(`${prefix}--modal-footer`, {
     [`${prefix}--modal-footer--three-button`]: Array.isArray(secondaryButtons) && secondaryButtons.length === 2
@@ -146,7 +150,7 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
   const modalHeadingStr = asStringOrUndefined(modalHeading);
   const ariaLabel = modalLabelStr || ariaLabelProp || modalAriaLabel || modalHeadingStr;
   const getAriaLabelledBy = modalLabel ? modalLabelId : modalHeadingId;
-  const hasScrollingContentProps = hasScrollingContent ? {
+  const hasScrollingContentProps = hasScrollingContent || isScrollable ? {
     tabIndex: 0,
     role: 'region',
     'aria-label': ariaLabel,
@@ -194,6 +198,22 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
       focusButton(innerModal.current);
     }
   }, [open, selectorPrimaryFocus, danger, prefix]);
+  useIsomorphicEffect(() => {
+    if (contentRef.current) {
+      setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
+    }
+    function handler() {
+      if (contentRef.current) {
+        setIsScrollable(contentRef.current.scrollHeight > contentRef.current.clientHeight);
+      }
+    }
+    const debouncedHandler = debounce(handler, 200);
+    window.addEventListener('resize', debouncedHandler);
+    return () => {
+      debouncedHandler.cancel();
+      window.removeEventListener('resize', debouncedHandler);
+    };
+  }, []);
 
   // Slug is always size `lg`
   let normalizedSlug;
@@ -237,11 +257,10 @@ const Modal = /*#__PURE__*/React__default.forwardRef(function Modal(_ref, ref) {
     id: modalHeadingId,
     className: `${prefix}--modal-header__heading`
   }, modalHeading), normalizedSlug, !passiveModal && modalButton), /*#__PURE__*/React__default.createElement("div", _extends({
+    ref: contentRef,
     id: modalBodyId,
     className: contentClasses
-  }, hasScrollingContentProps), children), hasScrollingContent && /*#__PURE__*/React__default.createElement("div", {
-    className: `${prefix}--modal-content--overflow-indicator`
-  }), !passiveModal && /*#__PURE__*/React__default.createElement(ButtonSet, {
+  }, hasScrollingContentProps), children), !passiveModal && /*#__PURE__*/React__default.createElement(ButtonSet, {
     className: footerClasses,
     "aria-busy": loadingActive
   }, Array.isArray(secondaryButtons) && secondaryButtons.length <= 2 ? secondaryButtons.map((_ref3, i) => {