@carbon/ibm-products 2.43.1 → 2.43.2-canary.100

package/es/components/TagOverflow/TagOverflow.js

@@ -6,7 +6,7 @@
  */
 
 import { objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2, extends as _extends, defineProperty as _defineProperty } from '../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useRef, useState, useCallback, useEffect } from 'react';
+import React__default, { forwardRef, useRef, useState, useCallback, useEffect, createElement } from 'react';
 import PropTypes from '../../node_modules/prop-types/index.js';
 import cx from 'classnames';
 import { getDevtoolsProps } from '../../global/js/utils/devtools.js';
@@ -18,52 +18,36 @@ import { useResizeObserver } from '../../global/js/hooks/useResizeObserver.js';
 import { TagOverflowPopover } from './TagOverflowPopover.js';
 import { TagOverflowModal } from './TagOverflowModal.js';
 
-var _excluded = ["items", "tagComponent", "align", "showAllTagsLabel", "allTagsModalSearchLabel", "allTagsModalSearchPlaceholderText", "allTagsModalTarget", "allTagsModalTitle", "className", "containingElementRef", "measurementOffset", "maxVisible", "multiline", "overflowAlign", "overflowClassName", "overflowType", "onOverflowTagChange"],
+var _excluded = ["align", "allTagsModalSearchLabel", "allTagsModalSearchPlaceholderText", "allTagsModalTarget", "allTagsModalTitle", "className", "containingElementRef", "items", "maxVisible", "measurementOffset", "multiline", "overflowAlign", "overflowClassName", "overflowType", "onOverflowTagChange", "showAllTagsLabel", "tagComponent"],
   _excluded2 = ["className", "id"],
   _excluded3 = ["tagType"],
   _excluded4 = ["id", "label", "tagType", "onClose"];
 var blockClass = "".concat(pkg.prefix, "--tag-overflow");
 var componentName = 'TagOverflow';
 var allTagsModalSearchThreshold = 10;
-
-// Default values for props
-var defaults = {
-  items: [],
-  align: 'start',
-  measurementOffset: 0,
-  overflowAlign: 'bottom',
-  overflowType: 'default',
-  onOverflowTagChange: function onOverflowTagChange() {}
-};
-
-/**
- * TODO: A description of the component.
- */
-var TagOverflow = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
-  var _ref$items = _ref.items,
-    items = _ref$items === void 0 ? defaults.items : _ref$items,
-    tagComponent = _ref.tagComponent,
-    _ref$align = _ref.align,
-    align = _ref$align === void 0 ? defaults.align : _ref$align,
-    showAllTagsLabel = _ref.showAllTagsLabel,
-    allTagsModalSearchLabel = _ref.allTagsModalSearchLabel,
-    allTagsModalSearchPlaceholderText = _ref.allTagsModalSearchPlaceholderText,
-    allTagsModalTarget = _ref.allTagsModalTarget,
-    allTagsModalTitle = _ref.allTagsModalTitle,
-    className = _ref.className,
-    containingElementRef = _ref.containingElementRef,
-    _ref$measurementOffse = _ref.measurementOffset,
-    measurementOffset = _ref$measurementOffse === void 0 ? defaults.measurementOffset : _ref$measurementOffse,
-    maxVisible = _ref.maxVisible,
-    multiline = _ref.multiline,
-    _ref$overflowAlign = _ref.overflowAlign,
-    overflowAlign = _ref$overflowAlign === void 0 ? defaults.overflowAlign : _ref$overflowAlign,
-    overflowClassName = _ref.overflowClassName,
-    _ref$overflowType = _ref.overflowType,
-    overflowType = _ref$overflowType === void 0 ? defaults.overflowType : _ref$overflowType,
-    _ref$onOverflowTagCha = _ref.onOverflowTagChange,
-    onOverflowTagChange = _ref$onOverflowTagCha === void 0 ? defaults.onOverflowTagChange : _ref$onOverflowTagCha,
-    rest = _objectWithoutProperties(_ref, _excluded);
+var TagOverflow = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _props$align = props.align,
+    align = _props$align === void 0 ? 'start' : _props$align,
+    allTagsModalSearchLabel = props.allTagsModalSearchLabel,
+    allTagsModalSearchPlaceholderText = props.allTagsModalSearchPlaceholderText,
+    allTagsModalTarget = props.allTagsModalTarget,
+    allTagsModalTitle = props.allTagsModalTitle,
+    className = props.className,
+    containingElementRef = props.containingElementRef,
+    items = props.items,
+    maxVisible = props.maxVisible,
+    _props$measurementOff = props.measurementOffset,
+    measurementOffset = _props$measurementOff === void 0 ? 0 : _props$measurementOff,
+    multiline = props.multiline,
+    _props$overflowAlign = props.overflowAlign,
+    overflowAlign = _props$overflowAlign === void 0 ? 'bottom' : _props$overflowAlign,
+    overflowClassName = props.overflowClassName,
+    _props$overflowType = props.overflowType,
+    overflowType = _props$overflowType === void 0 ? 'default' : _props$overflowType,
+    onOverflowTagChange = props.onOverflowTagChange,
+    showAllTagsLabel = props.showAllTagsLabel,
+    tagComponent = props.tagComponent,
+    rest = _objectWithoutProperties(props, _excluded);
   var localContainerRef = useRef(null);
   var containerRef = ref || localContainerRef;
   var itemRefs = useRef(null);
@@ -100,7 +84,9 @@ var TagOverflow = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     setShowAllModalOpen(false);
   };
   var handleResize = function handleResize() {
-    setContainerWidth(resizeElm.current.offsetWidth);
+    if (typeof resizeElm !== 'function' && resizeElm.current) {
+      setContainerWidth(resizeElm.current.offsetWidth);
+    }
   };
   useResizeObserver(resizeElm, handleResize);
   var getMap = function getMap() {
@@ -116,7 +102,6 @@ var TagOverflow = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     }
   };
   var getVisibleItems = useCallback(function () {
-    var _overflowRef$current;
     if (!itemRefs.current) {
       return items;
     }
@@ -128,13 +113,13 @@ var TagOverflow = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     var optionalContainingElement = containingElementRef === null || containingElementRef === void 0 ? void 0 : containingElementRef.current;
     var measurementOffsetValue = typeof measurementOffset === 'number' ? measurementOffset : 0;
     var spaceAvailable = optionalContainingElement ? optionalContainingElement.offsetWidth - measurementOffsetValue : containerWidth;
-    var overflowContainerWidth = ((_overflowRef$current = overflowRef.current) === null || _overflowRef$current === void 0 ? void 0 : _overflowRef$current.offsetWidth) > overflowIndicatorWidth ? overflowRef.current.offsetWidth : overflowIndicatorWidth;
+    var overflowContainerWidth = overflowRef && overflowRef.current && overflowRef.current.offsetWidth > overflowIndicatorWidth ? overflowRef.current.offsetWidth : overflowIndicatorWidth;
     var maxWidth = spaceAvailable - overflowContainerWidth;
     var childrenWidth = 0;
     var maxReached = false;
     return items.reduce(function (prev, cur) {
       if (!maxReached) {
-        var itemWidth = map.get(cur.id) + itemOffset;
+        var itemWidth = (map ? Number(map.get(cur.id)) : 0) + itemOffset;
         var fits = itemWidth + childrenWidth < maxWidth;
         if (fits) {
           childrenWidth += itemWidth;
@@ -145,12 +130,13 @@ var TagOverflow = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
       }
       return prev;
     }, []);
-  }, [itemRefs, overflowRef, containerWidth, items, multiline, maxVisible, containingElementRef, measurementOffset]);
-  var getCustomComponent = function getCustomComponent(item) {
+  }, [containerWidth, containingElementRef, items, maxVisible, measurementOffset, multiline]);
+  var getCustomComponent = function getCustomComponent(item, tagComponent) {
     var className = item.className,
       id = item.id,
       other = _objectWithoutProperties(item, _excluded2);
-    return /*#__PURE__*/React__default.createElement(tagComponent, _objectSpread2(_objectSpread2({}, other), {}, {
+    return /*#__PURE__*/createElement(tagComponent, _objectSpread2(_objectSpread2({}, other), {}, {
+      key: id,
       className: cx("".concat(blockClass, "__item"), className),
       ref: function ref(node) {
         return itemRefHandler(id, node);
@@ -164,9 +150,9 @@ var TagOverflow = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
       visibleItemsArr = (_visibleItemsArr = visibleItemsArr) === null || _visibleItemsArr === void 0 ? void 0 : _visibleItemsArr.slice(0, maxVisible);
     }
     var hiddenItems = items === null || items === void 0 ? void 0 : items.slice(visibleItemsArr.length);
-    var overflowItemsArr = hiddenItems === null || hiddenItems === void 0 ? void 0 : hiddenItems.map(function (_ref2) {
-      var tagType = _ref2.tagType,
-        other = _objectWithoutProperties(_ref2, _excluded3);
+    var overflowItemsArr = hiddenItems === null || hiddenItems === void 0 ? void 0 : hiddenItems.map(function (_ref) {
+      var tagType = _ref.tagType,
+        other = _objectWithoutProperties(_ref, _excluded3);
       return _objectSpread2({
         type: tagType
       }, other);
@@ -174,10 +160,10 @@ var TagOverflow = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     setVisibleItems(visibleItemsArr);
     setOverflowItems(overflowItemsArr);
     onOverflowTagChange === null || onOverflowTagChange === void 0 || onOverflowTagChange(overflowItemsArr);
-  }, [containerWidth, items, maxVisible, getVisibleItems, onOverflowTagChange]);
+  }, [getVisibleItems, items, maxVisible, onOverflowTagChange]);
   var handleTagOnClose = useCallback(function (onClose, index) {
     onClose === null || onClose === void 0 || onClose();
-    if (index <= visibleItems.length - 1) {
+    if (index <= (visibleItems === null || visibleItems === void 0 ? void 0 : visibleItems.length) - 1) {
       setPopoverOpen(false);
     }
   }, [visibleItems]);
@@ -185,10 +171,10 @@ var TagOverflow = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
     className: cx(blockClass, className, "".concat(blockClass, "--align-").concat(align), _defineProperty({}, "".concat(blockClass, "--multiline"), multiline)),
     ref: containerRef,
     role: "main"
-  }, getDevtoolsProps(componentName)), visibleItems.length > 0 && visibleItems.map(function (item, index) {
+  }, getDevtoolsProps(componentName)), (visibleItems === null || visibleItems === void 0 ? void 0 : visibleItems.length) > 0 && visibleItems.map(function (item, index) {
     // Render custom components
     if (tagComponent) {
-      return getCustomComponent(item);
+      return getCustomComponent(item, tagComponent);
     } else {
       var id = item.id,
         label = item.label,
@@ -215,7 +201,7 @@ var TagOverflow = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
   }), /*#__PURE__*/React__default.createElement("span", {
     className: "".concat(blockClass, "__indicator"),
     ref: overflowRef
-  }, overflowItems.length > 0 && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(TagOverflowPopover, {
+  }, (overflowItems === null || overflowItems === void 0 ? void 0 : overflowItems.length) > 0 && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__PURE__*/React__default.createElement(TagOverflowPopover, {
     allTagsModalSearchThreshold: allTagsModalSearchThreshold,
     className: overflowClassName,
     onShowAllClick: handleShowAllClick,
@@ -251,9 +237,9 @@ var tagTypes = Object.keys(TYPES);
  * The strings shown in the showAllModal are only shown if we have more than allTagsModalSearchLThreshold
  * @returns null if no problems
  */
-var string_required_if_more_than_10_tags = isRequiredIf(PropTypes.string, function (_ref3) {
-  var items = _ref3.items;
-  return items && items.length > allTagsModalSearchThreshold;
+var string_required_if_more_than_10_tags = isRequiredIf(PropTypes.string, function (_ref2) {
+  var items = _ref2.items;
+  return (items === null || items === void 0 ? void 0 : items.length) > allTagsModalSearchThreshold;
 });
 
 // The types and DocGen commentary for the component props,
@@ -284,11 +270,6 @@ TagOverflow.propTypes = {
    * Provide an optional class to be applied to the containing node.
    */
   className: PropTypes.string,
-  /**
-   * Optional ref for custom resize container to measure available space
-   * Default will measure the available space of the TagSet container itself.
-   */
-  containingElementRef: PropTypes.object,
   /**
    * The items to be shown in the TagOverflow. Each item is specified as an object with properties:
    * **label**\* (required) to supply the content,
@@ -299,6 +280,7 @@ TagOverflow.propTypes = {
    * If you want to render a custom component, pass it as tagComponent prop and
    * then pass the props required for your custom component as the properties of item object
    */
+  //@ts-ignore
   items: PropTypes.arrayOf(PropTypes.shape({
     id: PropTypes.string.isRequired,
     label: PropTypes.string.isRequired,
@@ -342,6 +324,7 @@ TagOverflow.propTypes = {
   /** Component definition of the items to be rendered inside TagOverflow.
    * If this is not passed, items will be rendered as Tag component
    */
+  //@ts-ignore
   tagComponent: PropTypes.elementType
 };
 

package/es/components/TagOverflow/TagOverflowModal.js

@@ -14,8 +14,7 @@ import { pkg } from '../../settings.js';
 import { prepareProps } from '../../global/js/utils/props-helper.js';
 import { usePortalTarget } from '../../global/js/hooks/usePortalTarget.js';
 
-var _excluded = ["allTags", "className", "title", "onClose", "open", "overflowType", "portalTarget", "searchLabel", "searchPlaceholder"],
-  _excluded2 = ["label", "id", "filter"];
+var _excluded = ["allTags", "className", "title", "onClose", "open", "overflowType", "portalTarget", "searchLabel", "searchPlaceholder"];
 var componentName = 'TagOverflowModal';
 var blockClass = "".concat(pkg.prefix, "--tag-overflow-modal");
 
@@ -77,13 +76,12 @@ var TagOverflowModal = function TagOverflowModal(_ref) {
   }, getFilteredItems().map(function (_ref2) {
     var label = _ref2.label,
       id = _ref2.id,
-      filter = _ref2.filter,
-      other = _objectWithoutProperties(_ref2, _excluded2);
+      filter = _ref2.filter;
     var isFilterable = overflowType === 'tag' ? filter : false;
-    return /*#__PURE__*/React__default.createElement(Tag, _extends({}, other, {
+    return /*#__PURE__*/React__default.createElement(Tag, {
       key: id,
       filter: isFilterable
-    }), label);
+    }, label);
   })), /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__fade")
   })));

package/es/components/TagOverflow/TagOverflowPopover.d.ts

@@ -1,2 +1,14 @@
-export const TagOverflowPopover: React.ForwardRefExoticComponent<React.RefAttributes<any>>;
 import React from 'react';
+import { TagOverflowItem } from './TagOverflow';
+export interface Props {
+    allTagsModalSearchThreshold?: number;
+    className?: string;
+    onShowAllClick: () => void;
+    overflowAlign?: string;
+    overflowTags: TagOverflowItem[];
+    overflowType?: string;
+    popoverOpen?: boolean;
+    setPopoverOpen?: (x: boolean) => void;
+    showAllTagsLabel?: string;
+}
+export declare const TagOverflowPopover: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLDivElement>>;

package/es/components/TagOverflow/TagOverflowPopover.js

@@ -6,7 +6,7 @@
  */
 
 import { objectWithoutProperties as _objectWithoutProperties, extends as _extends, defineProperty as _defineProperty } from '../../_virtual/_rollupPluginBabelHelpers.js';
-import React__default, { useRef } from 'react';
+import React__default, { forwardRef, useRef } from 'react';
 import PropTypes from '../../node_modules/prop-types/index.js';
 import cx from 'classnames';
 import { Popover, Tag, PopoverContent, Link } from '@carbon/react';
@@ -17,52 +17,48 @@ var _excluded = ["allTagsModalSearchThreshold", "className", "onShowAllClick", "
   _excluded2 = ["label", "id", "tagType", "filter", "onClose"];
 var componentName = 'TagOverflowPopover';
 var blockClass = "".concat(pkg.prefix, "--tag-overflow-popover");
-
-// Default values for props
-var defaults = {
-  allTagsModalSearchThreshold: 10,
-  overflowAlign: 'bottom'
-};
-var TagOverflowPopover = /*#__PURE__*/React__default.forwardRef(function (_ref, ref) {
-  var _ref$allTagsModalSear = _ref.allTagsModalSearchThreshold,
-    allTagsModalSearchThreshold = _ref$allTagsModalSear === void 0 ? defaults.allTagsModalSearchThreshold : _ref$allTagsModalSear,
-    className = _ref.className,
-    onShowAllClick = _ref.onShowAllClick,
-    _ref$overflowAlign = _ref.overflowAlign,
-    overflowAlign = _ref$overflowAlign === void 0 ? defaults.overflowAlign : _ref$overflowAlign,
-    overflowTags = _ref.overflowTags,
-    overflowType = _ref.overflowType,
-    showAllTagsLabel = _ref.showAllTagsLabel,
-    popoverOpen = _ref.popoverOpen,
-    setPopoverOpen = _ref.setPopoverOpen,
-    rest = _objectWithoutProperties(_ref, _excluded);
-  var localRef = useRef();
+var TagOverflowPopover = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _overflowTags$length;
+  var allTagsModalSearchThreshold = props.allTagsModalSearchThreshold,
+    className = props.className,
+    onShowAllClick = props.onShowAllClick,
+    overflowAlign = props.overflowAlign,
+    overflowTags = props.overflowTags,
+    overflowType = props.overflowType,
+    showAllTagsLabel = props.showAllTagsLabel,
+    popoverOpen = props.popoverOpen,
+    setPopoverOpen = props.setPopoverOpen,
+    rest = _objectWithoutProperties(props, _excluded);
+  var localRef = useRef(null);
   var overflowTagContent = useRef(null);
   useClickOutside(ref || localRef, function () {
     if (popoverOpen) {
-      setPopoverOpen(false);
+      setPopoverOpen === null || setPopoverOpen === void 0 || setPopoverOpen(false);
     }
   });
   var handleShowAllTagsClick = function handleShowAllTagsClick(evt) {
     evt.stopPropagation();
     evt.preventDefault();
-    setPopoverOpen(false);
-    onShowAllClick();
+    setPopoverOpen === null || setPopoverOpen === void 0 || setPopoverOpen(false);
+    onShowAllClick === null || onShowAllClick === void 0 || onShowAllClick();
   };
-  var handleEscKeyPress = function handleEscKeyPress(event) {
-    var key = event.key;
+  var handleEscKeyPress = function handleEscKeyPress(evt) {
+    var key = evt.key;
     if (key === 'Escape') {
-      setPopoverOpen(false);
+      setPopoverOpen === null || setPopoverOpen === void 0 || setPopoverOpen(false);
     }
   };
   var getOverflowPopoverItems = function getOverflowPopoverItems() {
-    return overflowTags.filter(function (_, index) {
-      return overflowTags.length > allTagsModalSearchThreshold ? index < allTagsModalSearchThreshold : index <= allTagsModalSearchThreshold;
+    var thresh = allTagsModalSearchThreshold !== null && allTagsModalSearchThreshold !== void 0 ? allTagsModalSearchThreshold : 0;
+    return overflowTags === null || overflowTags === void 0 ? void 0 : overflowTags.filter(function (_, index) {
+      return (overflowTags === null || overflowTags === void 0 ? void 0 : overflowTags.length) > thresh ? index < thresh : index <= thresh;
     });
   };
+  var visibleItems = getOverflowPopoverItems();
+  var hasItems = (visibleItems === null || visibleItems === void 0 ? void 0 : visibleItems.length) > 0;
   return /*#__PURE__*/React__default.createElement("span", _extends({}, rest, {
-    "aria-hidden": overflowTags.length === 0,
-    className: cx(blockClass, _defineProperty({}, "".concat(blockClass, "--hidden"), overflowTags.length === 0)),
+    "aria-hidden": (overflowTags === null || overflowTags === void 0 ? void 0 : overflowTags.length) === 0,
+    className: cx(blockClass, _defineProperty({}, "".concat(blockClass, "--hidden"), (overflowTags === null || overflowTags === void 0 ? void 0 : overflowTags.length) === 0)),
     ref: ref || localRef
   }), /*#__PURE__*/React__default.createElement(Popover, {
     align: overflowAlign,
@@ -73,21 +69,21 @@ var TagOverflowPopover = /*#__PURE__*/React__default.forwardRef(function (_ref,
     open: popoverOpen
   }, /*#__PURE__*/React__default.createElement(Tag, {
     onClick: function onClick() {
-      return setPopoverOpen(!popoverOpen);
+      return setPopoverOpen === null || setPopoverOpen === void 0 ? void 0 : setPopoverOpen(!popoverOpen);
     },
     className: cx("".concat(blockClass, "__trigger"))
-  }, "+", overflowTags.length), /*#__PURE__*/React__default.createElement(PopoverContent, null, /*#__PURE__*/React__default.createElement("div", {
+  }, "+", overflowTags === null || overflowTags === void 0 ? void 0 : overflowTags.length), /*#__PURE__*/React__default.createElement(PopoverContent, null, /*#__PURE__*/React__default.createElement("div", {
     ref: overflowTagContent,
     className: "".concat(blockClass, "__content")
   }, /*#__PURE__*/React__default.createElement("ul", {
     className: "".concat(blockClass, "__tag-list")
-  }, getOverflowPopoverItems().map(function (_ref2) {
-    var label = _ref2.label,
-      id = _ref2.id,
-      tagType = _ref2.tagType,
-      filter = _ref2.filter,
-      _onClose = _ref2.onClose,
-      other = _objectWithoutProperties(_ref2, _excluded2);
+  }, hasItems && visibleItems.map(function (_ref) {
+    var label = _ref.label,
+      id = _ref.id,
+      tagType = _ref.tagType,
+      filter = _ref.filter,
+      _onClose = _ref.onClose,
+      other = _objectWithoutProperties(_ref, _excluded2);
     var typeValue = overflowType === 'tag' ? 'high-contrast' : tagType;
     var isFilterable = overflowType === 'tag' ? filter : false;
     return /*#__PURE__*/React__default.createElement("li", {
@@ -100,7 +96,7 @@ var TagOverflowPopover = /*#__PURE__*/React__default.forwardRef(function (_ref,
       type: typeValue,
       filter: isFilterable
     }), label) : label);
-  })), overflowTags.length > allTagsModalSearchThreshold && /*#__PURE__*/React__default.createElement(Link, {
+  })), ((_overflowTags$length = overflowTags === null || overflowTags === void 0 ? void 0 : overflowTags.length) !== null && _overflowTags$length !== void 0 ? _overflowTags$length : 0) > (allTagsModalSearchThreshold !== null && allTagsModalSearchThreshold !== void 0 ? allTagsModalSearchThreshold : 0) && /*#__PURE__*/React__default.createElement(Link, {
     className: "".concat(blockClass, "__show-all-tags-link"),
     href: "",
     onClick: handleShowAllTagsClick,
@@ -128,6 +124,7 @@ TagOverflowPopover.propTypes = {
   /**
    * tags shown in overflow
    */
+  //@ts-ignore
   overflowTags: PropTypes.arrayOf(PropTypes.object).isRequired,
   /**
    * Type of rendering displayed inside of the tag overflow component

package/es/components/Tearsheet/Tearsheet.d.ts

@@ -99,9 +99,16 @@ interface TearsheetProps extends PropsWithChildren {
      */
     portalTarget: ReactNode;
     /**
-     * Specify a CSS selector that matches the DOM element that should be focused when the Modal opens
+     * Specify a CSS selector that matches the DOM element that should be
+     * focused when the Modal opens.
      */
     selectorPrimaryFocus?: string;
+    /**
+     * Specify the CSS selectors that match the floating menus.
+     *
+     * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+     */
+    selectorsFloatingMenus?: string[];
     /**
      * The main title of the tearsheet, displayed in the header area.
      */

package/es/components/Tearsheet/Tearsheet.js

@@ -190,9 +190,17 @@ Tearsheet.propTypes = _objectSpread2({
   /**@ts-ignore */
   portalTarget: portalType,
   /**
-   * Specify a CSS selector that matches the DOM element that should be focused when the Modal opens
+   * Specify a CSS selector that matches the DOM element that should be
+   * focused when the Modal opens.
    */
   selectorPrimaryFocus: PropTypes.string,
+  /**
+   * Specify the CSS selectors that match the floating menus.
+   *
+   * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+   */
+  /**@ts-ignore*/
+  selectorsFloatingMenus: PropTypes.arrayOf(PropTypes.string),
   /**
    * The main title of the tearsheet, displayed in the header area.
    */

package/es/components/Tearsheet/TearsheetNarrow.d.ts

@@ -64,6 +64,17 @@ interface TearsheetNarrowBaseProps extends PropsWithChildren {
      * The DOM element that the tearsheet should be rendered within. Defaults to document.body.
      */
     portalTarget?: ReactNode;
+    /**
+     * Specify a CSS selector that matches the DOM element that should be
+     * focused when the Modal opens.
+     */
+    selectorPrimaryFocus?: string;
+    /**
+     * Specify the CSS selectors that match the floating menus.
+     *
+     * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+     */
+    selectorsFloatingMenus?: string[];
     /**
      * The main title of the tearsheet, displayed in the header area.
      */

package/es/components/Tearsheet/TearsheetNarrow.js

@@ -148,6 +148,18 @@ TearsheetNarrow.propTypes = _objectSpread2({
    */
   /**@ts-ignore */
   portalTarget: portalType,
+  /**
+   * Specify a CSS selector that matches the DOM element that should be
+   * focused when the Modal opens.
+   */
+  selectorPrimaryFocus: PropTypes.string,
+  /**
+   * Specify the CSS selectors that match the floating menus.
+   *
+   * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+   */
+  /**@ts-ignore*/
+  selectorsFloatingMenus: PropTypes.arrayOf(PropTypes.string),
   /**
    * The main title of the tearsheet, displayed in the header area.
    */

package/es/components/Tearsheet/TearsheetShell.d.ts

@@ -9,7 +9,7 @@ import React, { PropsWithChildren, ReactNode, RefObject } from 'react';
 import PropTypes from 'prop-types';
 import { type ButtonProps } from '@carbon/react';
 interface TearsheetShellProps extends PropsWithChildren {
-    actions?: ButtonProps[];
+    actions?: ButtonProps<any>[];
     ariaLabel?: string;
     /**
      * An optional class or classes to be added to the outermost element.
@@ -81,7 +81,17 @@ interface TearsheetShellProps extends PropsWithChildren {
      * The DOM element that the tearsheet should be rendered within. Defaults to document.body.
      */
     portalTarget?: ReactNode;
+    /**
+     * Specify a CSS selector that matches the DOM element that should be
+     * focused when the Modal opens.
+     */
     selectorPrimaryFocus?: string;
+    /**
+     * Specify the CSS selectors that match the floating menus.
+     *
+     * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+     */
+    selectorsFloatingMenus?: string[];
     /**
      * Specifies the width of the tearsheet, 'narrow' or 'wide'.
      */

package/es/components/Tearsheet/TearsheetShell.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { objectSpread2 as _objectSpread2, objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, extends as _extends, defineProperty as _defineProperty } from '../../_virtual/_rollupPluginBabelHelpers.js';
+import { objectSpread2 as _objectSpread2, objectWithoutProperties as _objectWithoutProperties, slicedToArray as _slicedToArray, extends as _extends, defineProperty as _defineProperty, toConsumableArray as _toConsumableArray } from '../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useRef, useState, useEffect } from 'react';
 import { useResizeObserver } from '../../global/js/hooks/useResizeObserver.js';
 import PropTypes from '../../node_modules/prop-types/index.js';
@@ -16,11 +16,11 @@ import { getNodeTextContent } from '../../global/js/utils/getNodeTextContent.js'
 import { Button, usePrefix, ComposedModal, ModalHeader, Layer } from '@carbon/react';
 import { Wrap } from '../../global/js/utils/Wrap.js';
 import { usePortalTarget } from '../../global/js/hooks/usePortalTarget.js';
-import { useFocus } from '../../global/js/hooks/useFocus.js';
+import { useFocus, getSpecificElement } from '../../global/js/hooks/useFocus.js';
 import { usePreviousValue } from '../../global/js/hooks/usePreviousValue.js';
 import { ActionSet } from '../ActionSet/ActionSet.js';
 
-var _excluded = ["actions", "ariaLabel", "children", "className", "closeIconDescription", "description", "hasCloseIcon", "headerActions", "influencer", "influencerPosition", "influencerWidth", "label", "navigation", "onClose", "open", "portalTarget", "selectorPrimaryFocus", "size", "slug", "title", "verticalPosition", "launcherButtonRef"];
+var _excluded = ["actions", "ariaLabel", "children", "className", "closeIconDescription", "description", "hasCloseIcon", "headerActions", "influencer", "influencerPosition", "influencerWidth", "label", "navigation", "onClose", "open", "portalTarget", "selectorPrimaryFocus", "selectorsFloatingMenus", "size", "slug", "title", "verticalPosition", "launcherButtonRef"];
 
 // The block part of our conventional BEM class names (bc__E--M).
 var bc = "".concat(pkg.prefix, "--tearsheet");
@@ -79,6 +79,8 @@ var TearsheetShell = /*#__PURE__*/React__default.forwardRef(function (_ref, ref)
     open = _ref.open,
     portalTargetIn = _ref.portalTarget,
     selectorPrimaryFocus = _ref.selectorPrimaryFocus,
+    _ref$selectorsFloatin = _ref.selectorsFloatingMenus,
+    selectorsFloatingMenus = _ref$selectorsFloatin === void 0 ? [] : _ref$selectorsFloatin,
     size = _ref.size,
     slug = _ref.slug,
     title = _ref.title,
@@ -138,7 +140,8 @@ var TearsheetShell = /*#__PURE__*/React__default.forwardRef(function (_ref, ref)
   // Callback to give the tearsheet the opportunity to claim focus
   handleStackChange.claimFocus = function () {
     if (selectorPrimaryFocus) {
-      return specifiedElement === null || specifiedElement === void 0 ? void 0 : specifiedElement.focus();
+      var _getSpecificElement;
+      return (_getSpecificElement = getSpecificElement(modalRef === null || modalRef === void 0 ? void 0 : modalRef.current, selectorPrimaryFocus)) === null || _getSpecificElement === void 0 ? void 0 : _getSpecificElement.focus();
     }
     firstElement === null || firstElement === void 0 || firstElement.focus();
   };
@@ -164,10 +167,13 @@ var TearsheetShell = /*#__PURE__*/React__default.forwardRef(function (_ref, ref)
   useEffect(function () {
     if (open && position !== depth) {
       setTimeout(function () {
+        if (selectorPrimaryFocus) {
+          return specifiedElement === null || specifiedElement === void 0 ? void 0 : specifiedElement.focus();
+        }
         firstElement === null || firstElement === void 0 || firstElement.focus();
       }, 0);
     }
-  }, [position, depth, firstElement, open]);
+  }, [position, depth, firstElement, open, specifiedElement, selectorPrimaryFocus]);
   useEffect(function () {
     var notify = function notify() {
       return stack.all.forEach(function (handler) {
@@ -249,7 +255,7 @@ var TearsheetShell = /*#__PURE__*/React__default.forwardRef(function (_ref, ref)
       onKeyDown: keyDownListener,
       preventCloseOnClickOutside: !isPassive,
       ref: modalRef,
-      selectorsFloatingMenus: [".".concat(carbonPrefix, "--overflow-menu-options"), ".".concat(carbonPrefix, "--tooltip"), '.flatpickr-calendar', ".".concat(bc, "__container")],
+      selectorsFloatingMenus: [".".concat(carbonPrefix, "--overflow-menu-options"), ".".concat(carbonPrefix, "--tooltip"), '.flatpickr-calendar', ".".concat(bc, "__container")].concat(_toConsumableArray(selectorsFloatingMenus)),
       size: "sm"
     }), includeHeader && /*#__PURE__*/React__default.createElement(ModalHeader, {
       className: cx("".concat(bc, "__header"), _defineProperty(_defineProperty({}, "".concat(bc, "__header--with-close-icon"), effectiveHasCloseIcon), "".concat(bc, "__header--with-nav"), navigation)),
@@ -311,7 +317,9 @@ var TearsheetShell = /*#__PURE__*/React__default.forwardRef(function (_ref, ref)
 // The display name of the component, used by React. Note that displayName
 // is used in preference to relying on function.name.
 TearsheetShell.displayName = componentName;
-var portalType = typeof Element === 'undefined' ? PropTypes.object : PropTypes.instanceOf(Element);
+var portalType = typeof Element === 'undefined' ? PropTypes.object :
+// eslint-disable-next-line ssr-friendly/no-dom-globals-in-module-scope
+PropTypes.instanceOf(Element);
 var deprecatedProps = {
   /**
    * **Deprecated**
@@ -354,6 +362,7 @@ TearsheetShell.propTypes = _objectSpread2({
     label: PropTypes.string,
     loading: PropTypes.bool,
     // we duplicate this Button prop to improve the DocGen here
+    /**@ts-ignore*/
     onClick: Button.propTypes.onClick
   }))),
   /**
@@ -445,6 +454,18 @@ TearsheetShell.propTypes = _objectSpread2({
    */
   /**@ts-ignore*/
   portalTarget: portalType,
+  /**
+   * Specify a CSS selector that matches the DOM element that should be
+   * focused when the Modal opens.
+   */
+  selectorPrimaryFocus: PropTypes.string,
+  /**
+   * Specify the CSS selectors that match the floating menus.
+   *
+   * See https://react.carbondesignsystem.com/?path=/docs/components-composedmodal--overview#focus-management
+   */
+  /**@ts-ignore*/
+  selectorsFloatingMenus: PropTypes.arrayOf(PropTypes.string),
   /**
    * Specifies the width of the tearsheet, 'narrow' or 'wide'.
    */

package/es/components/Toolbar/ToolbarButton.js

@@ -28,7 +28,7 @@ var ToolbarButton = /*#__PURE__*/forwardRef(function (_ref, ref) {
     rest = _objectWithoutProperties(_ref, _excluded);
   var Icon = renderIcon;
   return /*#__PURE__*/React__default.createElement(IconButton, _extends({
-    align: ((_useContext = useContext(ToolbarContext)) === null || _useContext === void 0 ? void 0 : _useContext.vertical) && 'right'
+    align: (_useContext = useContext(ToolbarContext)) !== null && _useContext !== void 0 && _useContext.vertical ? 'right' : 'top'
   }, rest, {
     label: iconDescription,
     ref: ref,