@deque/cauldron-react 7.1.0-canary.b7d2a9c6 → 7.1.0-canary.b914451f

package/lib/components/Accordion/Accordion.d.ts

@@ -10,7 +10,7 @@ declare const AccordionTrigger: {
     ({ children, ...triggerProps }: AccordionTriggerProps): React.JSX.Element;
     displayName: string;
 };
-interface AccordionContentProps extends React.HTMLAttributes<HTMLDivElement> {
+interface AccordionContentProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'onToggle'> {
     children: React.ReactNode | React.ReactNode[];
     className?: string;
 }

package/lib/components/ActionList/ActionList.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { type ActionListSelectionType, type onActionCallbackFunction } from './ActionListContext';
-interface ActionListProps extends React.HTMLAttributes<HTMLUListElement> {
+interface ActionListProps extends Omit<React.HTMLAttributes<HTMLUListElement>, 'defaultValue' | 'onSelect'> {
     children: React.ReactNode;
     /** Limits the amount of selections that can be made within an action list */
     selectionType?: ActionListSelectionType | null;

package/lib/components/ActionMenu/ActionMenu.d.ts

@@ -1,13 +1,19 @@
 import React from 'react';
+import type { onActionCallbackFunction } from '../ActionList/ActionListContext';
+interface ActionMenuListProps {
+    ref?: React.Ref<HTMLElement>;
+    onAction?: onActionCallbackFunction;
+    [key: string]: unknown;
+}
 type ActionMenuTriggerProps = Pick<React.HTMLAttributes<HTMLButtonElement>, 'children' | 'onClick' | 'onKeyDown' | 'aria-expanded' | 'aria-haspopup' | 'aria-controls'> & {
-    ref: React.RefObject<HTMLButtonElement>;
+    ref: React.RefObject<HTMLButtonElement | null>;
 };
 type ActionMenuTriggerFunction = (props: ActionMenuTriggerProps, open: boolean) => React.ReactElement;
 declare const ActionMenu: React.ForwardRefExoticComponent<{
-    children: React.ReactElement;
+    children: React.ReactElement<ActionMenuListProps>;
     trigger: React.ReactElement | ActionMenuTriggerFunction;
     /** Render the action menu in a different location in the dom. */
-    portal?: HTMLElement | React.RefObject<HTMLElement> | undefined;
+    portal?: HTMLElement | React.RefObject<HTMLElement | null> | undefined;
     /**
      * Controls whether the menu should render as a child of the trigger, as opposed to
      * rendering as a sibling. Intended for use with nested menu patterns, for example
@@ -17,7 +23,7 @@ declare const ActionMenu: React.ForwardRefExoticComponent<{
      */
     renderInTrigger?: boolean | undefined;
 } & Pick<{
-    target: HTMLElement | React.RefObject<HTMLElement> | React.MutableRefObject<HTMLElement>;
+    target: HTMLElement | React.RefObject<HTMLElement | null> | React.MutableRefObject<HTMLElement | null>;
     placement?: "auto" | import("@floating-ui/utils").Placement | "auto-start" | "auto-end" | undefined;
     open?: boolean | undefined;
     onOpenChange?: ((open: boolean) => void) | undefined;
@@ -31,7 +37,7 @@ declare const ActionMenu: React.ForwardRefExoticComponent<{
         returnFocus?: boolean | undefined;
         returnFocusElement?: import("../../types").ElementOrRef<HTMLElement> | undefined;
     } | undefined;
-    portal?: HTMLElement | React.RefObject<HTMLElement> | undefined;
+    portal?: HTMLElement | React.RefObject<HTMLElement | null> | undefined;
     children?: React.ReactNode;
 } & React.HTMLAttributes<HTMLElement> & {
     as?: React.ElementType<any, keyof React.JSX.IntrinsicElements> | undefined;

package/lib/components/AnchoredOverlay/index.d.ts

@@ -3,7 +3,7 @@ import React from 'react';
 import useFocusTrap from '../../utils/useFocusTrap';
 declare const AnchoredOverlay: React.ForwardRefExoticComponent<{
     /** A target element or ref to attach the overlay anchor element. */
-    target: HTMLElement | React.RefObject<HTMLElement> | React.MutableRefObject<HTMLElement>;
+    target: HTMLElement | React.RefObject<HTMLElement | null> | React.MutableRefObject<HTMLElement | null>;
     /** Positional placement value to anchor the overlay element relative to its anchored target. */
     placement?: "auto" | Placement | "auto-start" | "auto-end" | undefined;
     /** Determines if the overlay anchor is currently visible. */
@@ -21,7 +21,7 @@ declare const AnchoredOverlay: React.ForwardRefExoticComponent<{
     /** When `focusTrap` is true, optional arguments to configure the focus trap. */
     focusTrapOptions?: Parameters<typeof useFocusTrap>[1];
     /** Render the anchored overlay in a different location in the dom. */
-    portal?: HTMLElement | React.RefObject<HTMLElement> | undefined;
+    portal?: HTMLElement | React.RefObject<HTMLElement | null> | undefined;
     children?: React.ReactNode;
 } & React.HTMLAttributes<HTMLElement> & {
     as?: React.ElementType<any, keyof React.JSX.IntrinsicElements> | undefined;

package/lib/components/ClickOutsideListener/index.d.ts

@@ -4,7 +4,7 @@ export interface ClickOutsideListenerProps<T extends HTMLElement = HTMLElement>
     onClickOutside: (e: MouseEvent | TouchEvent) => void;
     mouseEvent?: 'mousedown' | 'click' | 'mouseup' | false;
     touchEvent?: 'touchstart' | 'touchend' | false;
-    target?: T | React.RefObject<T> | React.MutableRefObject<T>;
+    target?: T | React.RefObject<T | null> | React.MutableRefObject<T | null>;
 }
 declare const _default: React.ForwardRefExoticComponent<ClickOutsideListenerProps<HTMLElement> & React.RefAttributes<HTMLElement>>;
 export default _default;

package/lib/components/Combobox/Combobox.d.ts

@@ -19,7 +19,7 @@ interface BaseComboboxProps extends Omit<React.InputHTMLAttributes<HTMLInputElem
     autocomplete?: 'none' | 'manual' | 'automatic';
     onActiveChange?: (option: ListboxOption) => void;
     renderNoResults?: (() => React.JSX.Element) | React.ReactElement;
-    portal?: React.RefObject<HTMLElement> | HTMLElement;
+    portal?: React.RefObject<HTMLElement | null> | HTMLElement;
     inputRef?: React.Ref<HTMLInputElement>;
     description?: React.ReactNode;
 }

package/lib/components/Dialog/DialogContext.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 interface DialogContextValue {
     headingId: string;
-    headingRef: React.RefObject<HTMLHeadingElement>;
+    headingRef: React.RefObject<HTMLHeadingElement | null>;
     headingLevel: number;
     onClose: () => void;
     forceAction: boolean;

package/lib/components/Dialog/index.d.ts

@@ -11,7 +11,7 @@ export interface DialogProps extends React.HTMLAttributes<HTMLDivElement> {
         level: number | undefined;
     };
     closeButtonText?: string;
-    portal?: React.RefObject<HTMLElement> | HTMLElement;
+    portal?: React.RefObject<HTMLElement | null> | HTMLElement;
     scrollable?: boolean;
 }
 declare const Dialog: React.ForwardRefExoticComponent<DialogProps & React.RefAttributes<HTMLDivElement>>;

package/lib/components/Drawer/index.d.ts

@@ -10,7 +10,7 @@ export interface DrawerProps<T extends HTMLElement = HTMLElement> extends React.
         returnFocus?: ElementOrRef<T>;
     };
     onClose?: () => void;
-    portal?: React.RefObject<HTMLElement> | HTMLElement;
+    portal?: React.RefObject<HTMLElement | null> | HTMLElement;
 }
 declare const Drawer: React.ForwardRefExoticComponent<DrawerProps<HTMLElement> & React.RefAttributes<HTMLDivElement>>;
 export default Drawer;

package/lib/components/ExpandCollapsePanel/ExpandCollapsePanel.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export interface ExpandCollapsePanelProps extends React.HTMLAttributes<HTMLDivElement> {
+export interface ExpandCollapsePanelProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'onToggle'> {
     open?: boolean;
     children: React.ReactNode;
     animationTiming?: number | boolean;

package/lib/components/Listbox/Listbox.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { ListboxOption } from './ListboxContext';
 import type { ListboxValue } from './ListboxOption';
-import type { PolymorphicProps, PolymorphicComponent } from '../../utils/polymorphicComponent';
+import type { PolymorphicProps, PolymorphicComponentProps } from '../../utils/polymorphicComponent';
 interface BaseListboxProps extends PolymorphicProps<Omit<React.HTMLAttributes<HTMLElement>, 'onSelect' | 'defaultValue'>> {
     navigation?: 'cycle' | 'bound';
     focusStrategy?: 'lastSelected' | 'first' | 'last';
@@ -30,5 +30,10 @@ interface MultiSelectListboxProps extends BaseListboxProps {
         value: ListboxValue[];
     }) => void;
 }
-declare const Listbox: PolymorphicComponent<SingleSelectListboxProps | MultiSelectListboxProps>;
+type ListboxComponent = Omit<React.ForwardRefExoticComponent<SingleSelectListboxProps | MultiSelectListboxProps>, keyof CallableFunction> & {
+    <T extends React.ElementType = React.ElementType>(props: PolymorphicComponentProps<MultiSelectListboxProps, T>): React.ReactElement | null;
+    <T extends React.ElementType = React.ElementType>(props: PolymorphicComponentProps<SingleSelectListboxProps, T>): React.ReactElement | null;
+    <T extends React.ElementType = React.ElementType>(props: PolymorphicComponentProps<SingleSelectListboxProps | MultiSelectListboxProps, T>): React.ReactElement | null;
+};
+declare const Listbox: ListboxComponent;
 export default Listbox;

package/lib/components/MenuBar/index.d.ts

@@ -12,6 +12,7 @@ export default class TopBar extends React.Component<MenuBarProps, MenuBarState>
         thin: boolean;
         hasTrigger: boolean;
     };
+    private menuBarRef;
     constructor(props: MenuBarProps);
     componentDidMount(): void;
     componentWillUnmount(): void;

package/lib/components/Popover/index.d.ts

@@ -3,13 +3,13 @@ import { Cauldron } from '../../types';
 import AnchoredOverlay from '../AnchoredOverlay';
 export type PopoverVariant = 'prompt' | 'custom';
 type BaseProps = React.HTMLAttributes<HTMLDivElement> & {
-    target: React.RefObject<HTMLElement> | HTMLElement;
+    target: React.RefObject<HTMLElement | null> | HTMLElement;
     variant?: PopoverVariant;
     show: boolean;
     onClose: () => void;
     placement?: React.ComponentProps<typeof AnchoredOverlay>['placement'];
     /** Render the popover in a different location in the dom. */
-    portal?: React.RefObject<HTMLElement> | HTMLElement;
+    portal?: React.RefObject<HTMLElement | null> | HTMLElement;
 };
 type CustomProps = BaseProps & {
     variant: 'custom';

package/lib/components/Table/TableContext.d.ts

@@ -10,6 +10,6 @@ type TableProvider = {
     columns: Array<Column>;
 };
 declare const TableContext: React.Context<TableContext>;
-declare function TableProvider({ children, layout, columns }: TableProvider): JSX.Element;
+declare function TableProvider({ children, layout, columns }: TableProvider): React.JSX.Element;
 declare function useTable(): TableContext;
 export { TableProvider, useTable };

package/lib/components/Tabs/Tab.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 interface TabProps extends React.HTMLAttributes<HTMLLIElement> {
-    target: React.RefObject<HTMLDivElement> | HTMLElement;
+    target: React.RefObject<HTMLDivElement | null> | HTMLElement;
     id?: string;
     children?: React.ReactNode;
 }

package/lib/components/Tooltip/index.d.ts

@@ -3,14 +3,14 @@ import AnchoredOverlay from '../AnchoredOverlay';
 export interface TooltipProps extends React.HTMLAttributes<HTMLDivElement> {
     children: React.ReactNode;
     className?: string;
-    target: React.RefObject<HTMLElement> | HTMLElement;
+    target: React.RefObject<HTMLElement | null> | HTMLElement;
     variant?: 'text' | 'info' | 'big';
     association?: 'aria-labelledby' | 'aria-describedby' | 'none';
     show?: boolean | undefined;
     defaultShow?: boolean;
     placement?: React.ComponentProps<typeof AnchoredOverlay>['placement'];
     /** Render the tooltip in a different location in the dom. */
-    portal?: React.RefObject<HTMLElement> | HTMLElement;
+    portal?: React.RefObject<HTMLElement | null> | HTMLElement;
     hideElementOnHidden?: boolean;
 }
 declare function Tooltip({ id: propId, placement: initialPlacement, children, portal, target, association, variant, show: showProp, defaultShow, hideElementOnHidden, className, ...props }: TooltipProps): React.JSX.Element;

package/lib/index.js

@@ -495,24 +495,25 @@ var Accordion = function (_a) {
     var childrenArray = React__default["default"].Children.toArray(children);
     var trigger = childrenArray.find(function (child) {
         return typeof child === 'string' ||
-            child.type === AccordionTrigger;
+            (React__default["default"].isValidElement(child) && child.type === AccordionTrigger);
     });
     var panelElement = childrenArray.find(function (child) {
         return typeof child === 'string' ||
-            child.type === AccordionContent;
+            (React__default["default"].isValidElement(child) && child.type === AccordionContent);
     });
-    var isValid = !!(React__default["default"].isValidElement(trigger) && React__default["default"].isValidElement(panelElement));
-    if (!isValid) {
+    if (!React__default["default"].isValidElement(trigger) ||
+        !React__default["default"].isValidElement(panelElement)) {
         console.warn('Must provide <AccordionTrigger /> and <AccordionContent /> element(s). You provided:', {
             trigger: trigger,
             panelElement: panelElement,
-            isValid: isValid
+            isValid: false
         });
         return null;
     }
+    var panelProps = panelElement.props;
     return (React__default["default"].createElement("div", tslib.__assign({ className: "Accordion" }, props),
-        React__default["default"].createElement(ExpandCollapsePanel, tslib.__assign({ id: panelElement.props.id || "".concat(elementId, "-panel"), open: open, onToggle: onToggle, animationTiming: animationTiming }, panelElement.props),
-            React__default["default"].createElement(PanelTrigger$1, tslib.__assign({ iconCollapsed: "triangle-right", iconExpanded: "triangle-down", className: classNames__default["default"]('Accordion__trigger', trigger.props.className), "aria-controls": panelElement.props.id || "".concat(elementId, "-panel"), heading: trigger.props.heading }, trigger.props), trigger),
+        React__default["default"].createElement(ExpandCollapsePanel, tslib.__assign({ id: panelProps.id || "".concat(elementId, "-panel"), open: open, onToggle: onToggle, animationTiming: animationTiming }, panelProps),
+            React__default["default"].createElement(PanelTrigger$1, tslib.__assign({ iconCollapsed: "triangle-right", iconExpanded: "triangle-down", className: classNames__default["default"]('Accordion__trigger', trigger.props.className), "aria-controls": panelProps.id || "".concat(elementId, "-panel"), heading: trigger.props.heading }, trigger.props), trigger),
             panelElement)));
 };
 Accordion.displayName = 'Accordion';
@@ -578,7 +579,9 @@ var Scrim = /** @class */ (function (_super) {
         if (destroy) {
             return null;
         }
-        return (React__default["default"].createElement("div", { ref: function (el) { return (_this.el = el); }, className: "Scrim ".concat(animationClass) }));
+        return (React__default["default"].createElement("div", { ref: function (el) {
+                _this.el = el;
+            }, className: "Scrim ".concat(animationClass) }));
     };
     return Scrim;
 }(React__default["default"].Component));
@@ -672,6 +675,7 @@ var TopBar$1 = /** @class */ (function (_super) {
     tslib.__extends(TopBar, _super);
     function TopBar(props) {
         var _this = _super.call(this, props) || this;
+        _this.menuBarRef = React__default["default"].createRef();
         _this.onResize = function () {
             var wide = isWide();
             if (wide === _this.state.wide) {
@@ -720,10 +724,10 @@ var TopBar$1 = /** @class */ (function (_super) {
     };
     TopBar.prototype.onKeyDown = function (e) {
         var key = keyname__default["default"](e.which);
-        // This is a temporary workaround until have an opportunity to refactor or replace menubar
-        // see: https://github.com/dequelabs/cauldron/issues/1934
-        // eslint-disable-next-line react/no-find-dom-node
-        var menuBarElement = reactDom.findDOMNode(this);
+        var menuBarElement = this.menuBarRef.current;
+        if (!menuBarElement) {
+            return;
+        }
         var menuItems = Array.from(menuBarElement.children);
         // account for hidden side bar trigger (hamburger)
         if (this.state.wide && this.props.hasTrigger) {
@@ -750,7 +754,7 @@ var TopBar$1 = /** @class */ (function (_super) {
         // disabling no-unused-vars to prevent thin/hasTrigger from being passed through to div
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         var _a = this.props, children = _a.children, className = _a.className; _a.thin; _a.hasTrigger; tslib.__rest(_a, ["children", "className", "thin", "hasTrigger"]);
-        return (React__default["default"].createElement("ul", { role: "menubar", onKeyDown: this.onKeyDown, className: className }, React.Children.map(children, this.renderChild)));
+        return (React__default["default"].createElement("ul", { role: "menubar", onKeyDown: this.onKeyDown, className: className, ref: this.menuBarRef }, React.Children.map(children, this.renderChild)));
     };
     TopBar.defaultProps = {
         thin: false,
@@ -806,9 +810,16 @@ function resolveElement(elementOrRef) {
     return null;
 }
 
+function getChildRef(child, version) {
+    if (version === void 0) { version = React__default["default"].version; }
+    return parseInt(version, 10) >= 19
+        ? child.props.ref
+        : child.ref;
+}
+
 function ClickOutsideListener(_a, ref) {
     var children = _a.children, _b = _a.mouseEvent, mouseEvent = _b === void 0 ? 'click' : _b, _c = _a.touchEvent, touchEvent = _c === void 0 ? 'touchend' : _c, target = _a.target, _d = _a.onClickOutside, onClickOutside = _d === void 0 ? function () { return null; } : _d;
-    var childElementRef = React.useRef();
+    var childElementRef = React.useRef(null);
     var handleEvent = function (event) {
         if (event.defaultPrevented) {
             return;
@@ -831,9 +842,8 @@ function ClickOutsideListener(_a, ref) {
         childElementRef.current = node;
         // Ref for this component should pass-through to the child node
         setRef(ref, node);
-        // If child has its own ref, we want to update
-        // its ref with the newly cloned node
-        var childRef = children.ref;
+        // Forward the child's own ref. In React 19 ref lives in props; in 16–18 it's element.ref.
+        var childRef = getChildRef(children);
         setRef(childRef, node);
     };
     React.useEffect(function () {
@@ -1342,7 +1352,7 @@ var AriaIsolate = /** @class */ (function () {
 
 /**
  * When a component needs to track an internal ref on a component that has a
- * forwarded ref, useSharedRef will return a MutableRefObject<T> that will
+ * forwarded ref, useSharedRef will return a RefObject<T | null> that will
  * correctly invoke the parent ref as well providing an internal ref.
  *
  * @example
@@ -1355,7 +1365,7 @@ var AriaIsolate = /** @class */ (function () {
  * })
  */
 function useSharedRef(ref) {
-    var internalRef = React.useRef();
+    var internalRef = React.useRef(null);
     React.useEffect(function () {
         setRef(ref, internalRef.current);
         return function () { return setRef(ref, null); };
@@ -1488,7 +1498,7 @@ function useFocusTrap(target, options) {
     if (options === void 0) { options = {}; }
     var _a = options.disabled, disabled = _a === void 0 ? false : _a, _b = options.returnFocus, returnFocus = _b === void 0 ? true : _b, initialFocusElementOrRef = options.initialFocusElement, returnFocusElement = options.returnFocusElement;
     var focusTrap = React.useRef(null);
-    var returnFocusElementRef = React.useRef();
+    var returnFocusElementRef = React.useRef(null);
     function restoreFocusToReturnFocusElement() {
         var _a;
         var resolvedReturnFocusElement = resolveElement(returnFocusElement);
@@ -1538,7 +1548,7 @@ var Dialog = React.forwardRef(function (_a, ref) {
     var dialogRef = useSharedRef(dialogRefProp || ref);
     var _g = tslib.__read(nextId.useId(1, 'dialog-title-'), 1), headingId = _g[0];
     var headingRef = React.useRef(null);
-    var isolatorRef = React.useRef();
+    var isolatorRef = React.useRef(null);
     var headingLevel = typeof heading === 'object' && 'level' in heading && heading.level
         ? heading.level
         : 2;
@@ -2133,7 +2143,7 @@ var looksLikeLink = function (props) {
 };
 var IconButton = React.forwardRef(function (_a, ref) {
     var _b = _a.as, Component = _b === void 0 ? 'button' : _b, icon = _a.icon, label = _a.label, _c = _a.tooltipProps, tooltipPropsProp = _c === void 0 ? {} : _c, className = _a.className, _d = _a.variant, variant = _d === void 0 ? 'secondary' : _d, disabled = _a.disabled, _e = _a.tabIndex, tabIndex = _e === void 0 ? 0 : _e, large = _a.large, other = tslib.__rest(_a, ["as", "icon", "label", "tooltipProps", "className", "variant", "disabled", "tabIndex", "large"]);
-    var internalRef = React.useRef();
+    var internalRef = React.useRef(null);
     React.useImperativeHandle(ref, function () { return internalRef.current; });
     // Configure additional properties based on the type of the Component
     // for accessibility
@@ -2695,7 +2705,7 @@ Checkbox.displayName = 'Checkbox';
  */
 function TooltipTabstop(_a) {
     var children = _a.children, className = _a.className, tooltip = _a.tooltip, variant = _a.variant, association = _a.association, show = _a.show, placement = _a.placement, portal = _a.portal, hideElementOnHidden = _a.hideElementOnHidden, buttonProps = tslib.__rest(_a, ["children", "className", "tooltip", "variant", "association", "show", "placement", "portal", "hideElementOnHidden"]);
-    var buttonRef = React.useRef();
+    var buttonRef = React.useRef(null);
     return (React__default["default"].createElement(React__default["default"].Fragment, null,
         React__default["default"].createElement("button", tslib.__assign({ type: "button", ref: buttonRef, "aria-disabled": "true", className: classNames__default["default"]('TooltipTabstop', className) }, buttonProps), children),
         React__default["default"].createElement(Tooltip, { target: buttonRef, variant: variant, association: association, show: show, placement: placement, portal: portal, hideElementOnHidden: hideElementOnHidden }, tooltip)));
@@ -3539,7 +3549,7 @@ var TwoColumnPanel = React.forwardRef(function (_a, ref) {
     var closeButtonRef = React.useRef(null);
     var columnLeftRef = React.useRef(null);
     var columnRightRef = React.useRef(null);
-    var columnLeft = React__default["default"].Children.toArray(children).find(function (child) { return child.type === ColumnLeft; });
+    var columnLeft = React__default["default"].Children.toArray(children).find(function (child) { return React__default["default"].isValidElement(child) && child.type === ColumnLeft; });
     var togglePanel = function () {
         var prefersReducedMotion = 'matchMedia' in window &&
             typeof matchMedia === 'function' &&
@@ -3572,16 +3582,17 @@ var TwoColumnPanel = React.forwardRef(function (_a, ref) {
     var ColumnLeftComponent;
     var columnLeftId;
     if (React.isValidElement(columnLeft)) {
-        var ref_1 = columnLeft.props.ref || columnLeftRef;
+        var columnLeftProps = columnLeft.props;
+        var ref_1 = columnLeftProps.ref || columnLeftRef;
         var id = (columnLeftId =
-            columnLeft.props.id || nextId.useId(undefined, 'sidebar-')[0]);
+            columnLeftProps.id || nextId.useId(undefined, 'sidebar-')[0]);
         var CloseButton = (React__default["default"].createElement("div", { className: "TwoColumnPanel__Close" },
             React__default["default"].createElement("button", { type: "button", onClick: togglePanel, ref: closeButtonRef, "aria-label": hideCollapsedPanelLabel },
                 React__default["default"].createElement(Icon, { type: "close" })),
             React__default["default"].createElement(Tooltip, { target: closeButtonRef, association: "aria-labelledby", hideElementOnHidden: true }, hideCollapsedPanelLabel)));
         var children_1 = tslib.__spreadArray([
             CloseButton
-        ], tslib.__read(React__default["default"].Children.toArray(columnLeft.props.children)), false);
+        ], tslib.__read(React__default["default"].Children.toArray(columnLeftProps.children)), false);
         ColumnLeftComponent = React.cloneElement(columnLeft, { id: id, ref: ref_1, tabIndex: -1 }, children_1.map(function (child, index) {
             return React.cloneElement(child, {
                 key: child.key
@@ -3590,17 +3601,18 @@ var TwoColumnPanel = React.forwardRef(function (_a, ref) {
             });
         }));
     }
-    var columnRight = React__default["default"].Children.toArray(children).find(function (child) { return child.type === ColumnRight; });
+    var columnRight = React__default["default"].Children.toArray(children).find(function (child) { return React__default["default"].isValidElement(child) && child.type === ColumnRight; });
     var ColumnRightComponent;
     if (React.isValidElement(columnRight)) {
-        var ref_2 = columnRight.props.ref || columnRightRef;
+        var columnRightProps = columnRight.props;
+        var ref_2 = columnRightProps.ref || columnRightRef;
         var ToggleButton = (React__default["default"].createElement("div", { className: "TwoColumnPanel__ButtonToggle" },
             React__default["default"].createElement("button", { type: "button", onClick: togglePanel, ref: toggleButtonRef, "aria-label": !isCollapsed ? hideCollapsedPanelLabel : showCollapsedPanelLabel, "aria-expanded": !isCollapsed, "aria-controls": columnLeftId },
                 React__default["default"].createElement(Icon, { type: !isCollapsed ? 'chevron-double-left' : 'chevron-double-right' })),
             React__default["default"].createElement(Tooltip, { target: toggleButtonRef, association: "aria-labelledby", hideElementOnHidden: true }, !isCollapsed ? hideCollapsedPanelLabel : showCollapsedPanelLabel)));
         var children_2 = tslib.__spreadArray([
             ToggleButton
-        ], tslib.__read(React__default["default"].Children.toArray(columnRight.props.children)), false);
+        ], tslib.__read(React__default["default"].Children.toArray(columnRightProps.children)), false);
         ColumnRightComponent = React.cloneElement(columnRight, { ref: ref_2, tabIndex: -1 }, children_2.map(function (child, index) {
             return React.cloneElement(child, {
                 key: child.key
@@ -3786,7 +3798,8 @@ var Listbox = React.forwardRef(function (_a, ref) {
         }
     }, [activeOption]);
     React.useEffect(function () {
-        if (isActiveControlled && controlledActiveOption !== activeOption) {
+        if (isActiveControlled &&
+            (controlledActiveOption === null || controlledActiveOption === void 0 ? void 0 : controlledActiveOption.element) !== (activeOption === null || activeOption === void 0 ? void 0 : activeOption.element)) {
             setActiveOption(controlledActiveOption || null);
         }
     }, [isActiveControlled, controlledActiveOption]);
@@ -3932,11 +3945,11 @@ function isElementPreceding(a, b) {
 }
 var ListboxOption = React.forwardRef(function (_a, ref) {
     var _b;
-    var _c;
-    var propId = _a.id, className = _a.className, _d = _a.as, Component = _d === void 0 ? 'li' : _d, children = _a.children, value = _a.value, disabled = _a.disabled, selectedProp = _a.selected, _e = _a.activeClass, activeClass = _e === void 0 ? 'ListboxOption--active' : _e, onClick = _a.onClick, props = tslib.__rest(_a, ["id", "className", "as", "children", "value", "disabled", "selected", "activeClass", "onClick"]);
-    var _f = useListboxContext(), active = _f.active, selected = _f.selected, setOptions = _f.setOptions, onSelect = _f.onSelect;
+    var _c, _d;
+    var propId = _a.id, className = _a.className, _e = _a.as, Component = _e === void 0 ? 'li' : _e, children = _a.children, value = _a.value, disabled = _a.disabled, selectedProp = _a.selected, _f = _a.activeClass, activeClass = _f === void 0 ? 'ListboxOption--active' : _f, onClick = _a.onClick, props = tslib.__rest(_a, ["id", "className", "as", "children", "value", "disabled", "selected", "activeClass", "onClick"]);
+    var _g = useListboxContext(), active = _g.active, selected = _g.selected, setOptions = _g.setOptions, onSelect = _g.onSelect;
     var listboxOptionRef = useSharedRef(ref);
-    var _g = tslib.__read(propId ? [propId] : nextId.useId(1, 'listbox-option'), 1), id = _g[0];
+    var _h = tslib.__read(propId ? [propId] : nextId.useId(1, 'listbox-option'), 1), id = _h[0];
     var isActive = (active === null || active === void 0 ? void 0 : active.element) === listboxOptionRef.current;
     var isSelected = typeof selectedProp === 'boolean'
         ? selectedProp
@@ -3944,15 +3957,15 @@ var ListboxOption = React.forwardRef(function (_a, ref) {
             !!selected.find(function (option) { return option.element === listboxOptionRef.current; });
     var optionValue = typeof value !== 'undefined'
         ? value
-        : (_c = listboxOptionRef.current) === null || _c === void 0 ? void 0 : _c.innerText;
+        : ((_d = (_c = listboxOptionRef.current) === null || _c === void 0 ? void 0 : _c.textContent) !== null && _d !== void 0 ? _d : undefined);
     React.useEffect(function () {
         var element = listboxOptionRef.current;
         setOptions(function (options) {
             var e_1, _a;
-            var option = { element: element, value: optionValue };
             // istanbul ignore next
             if (!element)
                 return options;
+            var option = { element: element, value: optionValue };
             // Elements are frequently appended, so check to see if the newly rendered
             // element follows the last element first before any other checks
             if (!options.length ||
@@ -4139,7 +4152,7 @@ var ComboboxOption = React.forwardRef(function (_a, ref) {
     // istanbul ignore next
     React.useLayoutEffect(function () {
         var intersectionEntry = intersectionRef.current;
-        if (!intersectionEntry || !isActive) {
+        if (!intersectionEntry || !isActive || !comboboxOptionRef.current) {
             return;
         }
         var rect = comboboxOptionRef.current.getBoundingClientRect();
@@ -4155,10 +4168,10 @@ var ComboboxOption = React.forwardRef(function (_a, ref) {
         }
     }, [isActive]);
     React.useEffect(function () {
-        var _a;
+        var _a, _b;
         var comboboxValue = typeof propValue !== 'undefined'
             ? propValue
-            : (_a = comboboxOptionRef.current) === null || _a === void 0 ? void 0 : _a.innerText;
+            : ((_b = (_a = comboboxOptionRef.current) === null || _a === void 0 ? void 0 : _a.textContent) !== null && _b !== void 0 ? _b : undefined);
         var value = typeof formValue === 'undefined' ? comboboxValue : formValue;
         setFormValues(function (prev) {
             var formValues = prev.filter(function (fv) { return fv !== value; });
@@ -4177,12 +4190,14 @@ var ComboboxOption = React.forwardRef(function (_a, ref) {
         });
     }, [selectedValues, formValue]);
     React.useEffect(function () {
-        var _a;
+        var _a, _b;
         if (isMatching) {
             var comboboxValue_1 = typeof propValue !== 'undefined'
                 ? propValue
-                : (_a = comboboxOptionRef.current) === null || _a === void 0 ? void 0 : _a.innerText;
+                : ((_b = (_a = comboboxOptionRef.current) === null || _a === void 0 ? void 0 : _a.textContent) !== null && _b !== void 0 ? _b : undefined);
             setMatchingOptions(function (options) {
+                if (!comboboxOptionRef.current)
+                    return options;
                 return new Map(options.set(comboboxOptionRef.current, {
                     value: comboboxValue_1,
                     displayValue: children,
@@ -4322,6 +4337,17 @@ var Combobox = React.forwardRef(function (_a, ref) {
             return value === lastSelectedValue;
         }) || [], 2), element = _a[0], option = _a[1];
         if (autocomplete === 'manual') {
+            // In multiselect, the listbox manages its own active option via
+            // keyboard navigation. When the last-selected value no longer
+            // matches any option (e.g. after deselecting the only selected
+            // option), preserve the existing active descendant so the next
+            // Enter keypress can re-toggle the highlighted option.
+            if (multiselect &&
+                !element &&
+                activeDescendant &&
+                matchingOptions.has(activeDescendant.element)) {
+                return;
+            }
             setActiveDescendant(!element ? null : tslib.__assign({ element: element }, option));
         }
         else if (autocomplete === 'automatic' &&
@@ -4501,6 +4527,7 @@ var Combobox = React.forwardRef(function (_a, ref) {
         });
     }, [disabled, selectedValues, onSelectionChange]);
     var handlePillKeyDown = React.useCallback(function (event) {
+        var _a, _b;
         if (!PillKeys.includes(event.key)) {
             return;
         }
@@ -4518,7 +4545,7 @@ var Combobox = React.forwardRef(function (_a, ref) {
             handleRemovePill(pillsRef.current[focusedIndex], selectedValues[focusedIndex]);
             var nextIndex = focusedIndex + 1;
             if (nextIndex == pillsLength) {
-                inputRef.current.focus();
+                (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
             }
             else {
                 pillsRef.current[nextIndex].focus();
@@ -4527,7 +4554,7 @@ var Combobox = React.forwardRef(function (_a, ref) {
         else if (isArrowLeft || isArrowRight) {
             var nextIndex = Math.max(focusedIndex + (isArrowLeft ? -1 : 1), 0);
             if (isArrowRight && nextIndex === pillsLength) {
-                inputRef.current.focus();
+                (_b = inputRef.current) === null || _b === void 0 ? void 0 : _b.focus();
             }
             else {
                 pillsRef.current[nextIndex].focus();
@@ -4815,10 +4842,12 @@ var TextEllipsis = React__default["default"].forwardRef(function (_a, ref) {
                     : overflowElement.clientWidth < overflowElement.scrollWidth);
             });
         };
+        if (!sharedRef.current)
+            return;
         var observer = new ResizeObserver(listener);
         observer.observe(sharedRef.current);
         return function () {
-            observer === null || observer === void 0 ? void 0 : observer.disconnect();
+            observer.disconnect();
         };
     }, []);
     React.useEffect(function () {
@@ -4863,7 +4892,7 @@ var Drawer = React.forwardRef(function (_a, ref) {
         openRef.current = open;
     }, [open, setIsTransitioning]);
     React.useEffect(function () {
-        if (!isModal) {
+        if (!isModal || !drawerRef.current) {
             return;
         }
         var isolator = new AriaIsolate(drawerRef.current);
@@ -5044,7 +5073,7 @@ function getActiveElement(root) {
  */
 function useMnemonics(_a) {
     var elementOrRef = _a.elementOrRef, matchingElementsSelector = _a.matchingElementsSelector, onMatch = _a.onMatch, _b = _a.enabled, enabled = _b === void 0 ? true : _b;
-    var containerRef = React.useRef();
+    var containerRef = React.useRef(null);
     React.useEffect(function () {
         if (elementOrRef instanceof HTMLElement) {
             containerRef.current = elementOrRef;
@@ -5054,7 +5083,8 @@ function useMnemonics(_a) {
         }
     }, [elementOrRef]);
     React.useEffect(function () {
-        if (!enabled || !containerRef.current) {
+        var listenerTarget = containerRef.current;
+        if (!enabled || !listenerTarget) {
             return;
         }
         var keyboardHandler = function (event) {
@@ -5067,14 +5097,14 @@ function useMnemonics(_a) {
             if (event.key.length !== 1 || !/[a-z\d]/i.test(event.key)) {
                 return;
             }
-            var container = containerRef.current;
-            if (!container) {
+            var currentContainer = containerRef.current;
+            if (!currentContainer) {
                 return;
             }
             // Prevent default behavior and stop propagation for mnemonic keys
             event.preventDefault();
             event.stopPropagation();
-            var elements = Array.from(container.querySelectorAll(matchingElementsSelector !== null && matchingElementsSelector !== void 0 ? matchingElementsSelector : focusable__default["default"]));
+            var elements = Array.from(currentContainer.querySelectorAll(matchingElementsSelector !== null && matchingElementsSelector !== void 0 ? matchingElementsSelector : focusable__default["default"]));
             var matchingElements = elements.filter(function (element) {
                 return getAccessibleLabel(element).toLowerCase()[0] ===
                     event.key.toLowerCase();
@@ -5082,7 +5112,7 @@ function useMnemonics(_a) {
             if (!matchingElements.length) {
                 return;
             }
-            var currentActiveElement = getActiveElement(containerRef.current);
+            var currentActiveElement = getActiveElement(currentContainer);
             var nextActiveElement = null;
             if (currentActiveElement) {
                 nextActiveElement = matchingElements.find(function (element) {
@@ -5096,17 +5126,15 @@ function useMnemonics(_a) {
                 onMatch(nextActiveElement !== null && nextActiveElement !== void 0 ? nextActiveElement : matchingElements[0]);
             }
         };
-        var container = containerRef.current;
-        container.addEventListener('keydown', keyboardHandler);
-        return function () { return container.removeEventListener('keydown', keyboardHandler); };
+        listenerTarget.addEventListener('keydown', keyboardHandler);
+        return function () { return listenerTarget.removeEventListener('keydown', keyboardHandler); };
     }, [enabled, containerRef, matchingElementsSelector, onMatch]);
     return containerRef;
 }
 
 var ActionList = React.forwardRef(function (_a, ref) {
     var _b = _a.selectionType, selectionType = _b === void 0 ? null : _b, onAction = _a.onAction, className = _a.className, children = _a.children, props = tslib.__rest(_a, ["selectionType", "onAction", "className", "children"]);
-    var actionListContext = useActionListContext();
-    var activeElement = React.useRef();
+    var activeElement = React.useRef(null);
     var _c = tslib.__read(React.useState(), 2), activeOption = _c[0], setActiveOption = _c[1];
     var handleActiveChange = React.useCallback(function (value) {
         activeElement.current = value === null || value === void 0 ? void 0 : value.element;
@@ -5117,22 +5145,18 @@ var ActionList = React.forwardRef(function (_a, ref) {
             onAction(key, event);
         }
     }, [onAction]);
+    var handleMnemonicMatch = React.useCallback(function (element) {
+        setActiveOption(function (prev) {
+            return (prev === null || prev === void 0 ? void 0 : prev.element) === element ? prev : { element: element };
+        });
+    }, []);
     var containerRef = useMnemonics({
-        onMatch: function (element) {
-            setActiveOption({
-                element: element
-            });
-        },
+        onMatch: handleMnemonicMatch,
         matchingElementsSelector: props.role === 'menu'
             ? '[role=menuitem],[role=menuitemcheckbox],[role=menuitemradio]'
             : '[role=option]'
     });
-    return (
-    // Note: we should be able to use listbox without passing a prop
-    // value for "multiselect"
-    // see: https://github.com/dequelabs/cauldron/issues/1890
-    // @ts-expect-error this should be allowed
-    React__default["default"].createElement(Listbox, tslib.__assign({ ref: function (element) {
+    return (React__default["default"].createElement(Listbox, tslib.__assign({ ref: function (element) {
             if (ref) {
                 setRef(ref, element);
             }
@@ -5141,7 +5165,7 @@ var ActionList = React.forwardRef(function (_a, ref) {
         /* Listbox comes with an explicit role of "listbox", but we want to either
          * use the role from props, or default to the intrinsic role */
         // eslint-disable-next-line jsx-a11y/aria-role
-        role: undefined, "aria-multiselectable": actionListContext.role === 'listbox' ? undefined : null, className: classNames__default["default"]('ActionList', className), activeOption: activeOption }, props, { onActiveChange: handleActiveChange, navigation: "bound" }),
+        role: undefined, "aria-multiselectable": undefined, className: classNames__default["default"]('ActionList', className), activeOption: activeOption }, props, { onActiveChange: handleActiveChange, navigation: "bound" }),
         React__default["default"].createElement(ActionListProvider, { role: props.role || 'list', onAction: handleAction, selectionType: selectionType }, children)));
 });
 ActionList.displayName = 'ActionList';
@@ -5159,7 +5183,7 @@ var ActionListItem = React.forwardRef(function (_a, ref) {
     });
     var isActive = !!(active === null || active === void 0 ? void 0 : active.element) && active.element === actionListItemRef.current;
     var handleAction = React.useCallback(function (event) {
-        var _a;
+        var _a, _b;
         if (event.defaultPrevented) {
             return;
         }
@@ -5172,7 +5196,7 @@ var ActionListItem = React.forwardRef(function (_a, ref) {
         }
         // istanbul ignore else
         if (typeof onActionListAction === 'function') {
-            onActionListAction(actionKey || ((_a = labelRef === null || labelRef === void 0 ? void 0 : labelRef.current) === null || _a === void 0 ? void 0 : _a.innerText.trim()) || '', event);
+            onActionListAction(actionKey || ((_b = (_a = labelRef.current) === null || _a === void 0 ? void 0 : _a.textContent) === null || _b === void 0 ? void 0 : _b.trim()) || '', event);
         }
     }, [onAction, onActionListAction, selectionType, actionKey]);
     var listItemRole = undefined;
@@ -5196,7 +5220,7 @@ var ActionListItem = React.forwardRef(function (_a, ref) {
     // istanbul ignore next
     React.useLayoutEffect(function () {
         var intersectionEntry = intersectionRef.current;
-        if (!intersectionEntry || !isActive) {
+        if (!intersectionEntry || !isActive || !actionListItemRef.current) {
             return;
         }
         var rect = actionListItemRef.current.getBoundingClientRect();
@@ -5295,9 +5319,10 @@ var ActionMenu = React.forwardRef(function (_a, ref) {
     var _e = tslib.__read(React.useState('first'), 2), focusStrategy = _e[0], setFocusStrategy = _e[1];
     var triggerRef = React.useRef(null);
     var actionMenuRef = useSharedRef(ref);
-    var actionMenuListRef = useSharedRef(actionMenuList.props.ref);
-    var _f = tslib.__read(nextId.useId(1, 'menu-trigger'), 1), triggerId = _f[0];
-    var _g = tslib.__read(nextId.useId(1, 'menu'), 1), menuId = _g[0];
+    var _f = actionMenuList.props, actionListRef = _f.ref, actionListOnAction = _f.onAction;
+    var actionMenuListRef = useSharedRef(actionListRef !== null && actionListRef !== void 0 ? actionListRef : null);
+    var _g = tslib.__read(nextId.useId(1, 'menu-trigger'), 1), triggerId = _g[0];
+    var _h = tslib.__read(nextId.useId(1, 'menu'), 1), menuId = _h[0];
     var handleTriggerClick = React.useCallback(function (event) {
         // istanbul ignore else
         if (!event.defaultPrevented) {
@@ -5344,11 +5369,10 @@ var ActionMenu = React.forwardRef(function (_a, ref) {
         if (!event.defaultPrevented) {
             setOpen(false);
         }
-        var onAction = actionMenuList.props.onAction;
-        if (typeof onAction === 'function') {
-            onAction(key, event);
+        if (typeof actionListOnAction === 'function') {
+            actionListOnAction(key, event);
         }
-    }, [actionMenuList.props.onAction]);
+    }, [actionListOnAction]);
     React.useEffect(function () {
         var _a, _b;
         if (open) {

package/lib/types.d.ts

@@ -11,4 +11,4 @@ export declare namespace Cauldron {
  * Explicit equivalent of Exclude<ReactNode, boolean | null | undefined>
  */
 export type ContentNode = string | number | ReactPortal | ReactElement;
-export type ElementOrRef<E extends Element> = E | React.RefObject<E> | React.MutableRefObject<E>;
+export type ElementOrRef<E extends Element> = E | React.RefObject<E | null> | React.MutableRefObject<E | null>;

package/lib/utils/getChildRef.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare function getChildRef(child: React.ReactElement, version?: string): React.Ref<HTMLElement> | null | undefined;

package/lib/utils/polymorphicComponent.d.ts

@@ -3,7 +3,7 @@ type Merge<P1 = {}, P2 = {}> = Omit<P1, keyof P2> & P2;
 export type PolymorphicProps<Props = {}, ElementType extends React.ElementType = React.ElementType> = Props & {
     as?: ElementType;
 };
-export type PolymorphicComponentProps<Props = {}, ElementType extends React.ElementType = React.ElementType> = Merge<ElementType extends keyof JSX.IntrinsicElements ? React.PropsWithRef<JSX.IntrinsicElements[ElementType]> : ElementType extends React.ElementType ? React.ComponentPropsWithRef<ElementType> : never, PolymorphicProps<Props, ElementType>>;
+export type PolymorphicComponentProps<Props = {}, ElementType extends React.ElementType = React.ElementType> = Merge<ElementType extends keyof React.JSX.IntrinsicElements ? React.PropsWithRef<React.JSX.IntrinsicElements[ElementType]> : ElementType extends React.ElementType ? React.ComponentPropsWithRef<ElementType> : never, PolymorphicProps<Props, ElementType>>;
 export type PolymorphicComponent<Props = {}, ElementType extends React.ElementType = React.ElementType> = Merge<React.ForwardRefExoticComponent<Props>, {
     <T extends React.ElementType = ElementType>(props: PolymorphicComponentProps<Props, T>): React.ReactElement | null;
 }>;

package/lib/utils/useFocusTrap.d.ts

@@ -30,5 +30,5 @@ export default function useFocusTrap<TargetElement extends Element = Element, Fo
      * can be provided to override the default active element behavior.
      */
     returnFocusElement?: ElementOrRef<FocusElement>;
-}): React.RefObject<Readonly<FocusTrap>>;
+}): React.RefObject<Readonly<FocusTrap> | null>;
 export {};

package/lib/utils/useMnemonics.d.ts

@@ -1,4 +1,4 @@
-import type { RefObject } from 'react';
+import type { MutableRefObject } from 'react';
 import type { ElementOrRef } from '../types';
 type useMnemonicsOptions = {
     /**
@@ -19,7 +19,7 @@ type useMnemonicsOptions = {
      */
     enabled?: boolean;
 };
-type useMnemonicsResults<T extends HTMLElement> = RefObject<T>;
+type useMnemonicsResults<T extends HTMLElement> = MutableRefObject<T | null>;
 /**
  * A hook that provides mnemonic navigation for keyboard users.
  *

package/lib/utils/useSharedRef.d.ts

@@ -1,7 +1,7 @@
-import { MutableRefObject, Ref } from 'react';
+import { RefObject, Ref } from 'react';
 /**
  * When a component needs to track an internal ref on a component that has a
- * forwarded ref, useSharedRef will return a MutableRefObject<T> that will
+ * forwarded ref, useSharedRef will return a RefObject<T | null> that will
  * correctly invoke the parent ref as well providing an internal ref.
  *
  * @example
@@ -13,4 +13,4 @@ import { MutableRefObject, Ref } from 'react';
  *   return (<div ref={internalRef}>...</div>)
  * })
  */
-export default function useSharedRef<T>(ref: Ref<T>): MutableRefObject<T>;
+export default function useSharedRef<T>(ref: Ref<T>): RefObject<T | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deque/cauldron-react",
-  "version": "7.1.0-canary.b7d2a9c6",
+  "version": "7.1.0-canary.b914451f",
   "license": "MPL-2.0",
   "description": "Fully accessible react components library for Deque Cauldron",
   "homepage": "https://cauldron.dequelabs.com/",
@@ -18,6 +18,7 @@
     "prebuild:lib": "node scripts/buildIconTypes.js",
     "build:lib": "rollup -c",
     "build:css": "postcss --output=lib/cauldron.css src/index.css",
+    "typecheck": "tsc --noEmit --skipLibCheck",
     "dev": "concurrently 'yarn build:css --watch' 'rollup -c --watch'",
     "prepublishOnly": "NODE_ENV=production yarn build",
     "test": "jest --maxWorkers=1 --coverage",
@@ -26,6 +27,7 @@
     "figma:publish:dry-run": "figma connect publish --dry-run"
   },
   "dependencies": {
+    "@floating-ui/dom": "^1.0.0",
     "@floating-ui/react-dom": "^2.1.2",
     "classnames": "^2.2.6",
     "focusable": "^2.3.0",
@@ -41,7 +43,7 @@
     "@babel/preset-env": "^7.22.10",
     "@babel/preset-react": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
-    "@figma/code-connect": "^1.4.4",
+    "@figma/code-connect": "^1.4.5",
     "@rollup/plugin-commonjs": "^14.0.0",
     "@rollup/plugin-dynamic-import-vars": "^1.4.2",
     "@rollup/plugin-typescript": "^11.1.2",
@@ -54,8 +56,8 @@
     "@types/jest": "^29.5.11",
     "@types/jest-axe": "^3.5.4",
     "@types/node": "^17.0.42",
-    "@types/react": "^18.0.12",
-    "@types/react-dom": "^18.0.5",
+    "@types/react": "^19.0.0",
+    "@types/react-dom": "^19.0.0",
     "@types/react-syntax-highlighter": "^15.5.13",
     "@types/sinon": "^10",
     "autoprefixer": "^9.7.6",
@@ -70,8 +72,8 @@
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "prop-types": "^15.8.1",
-    "react": "^18",
-    "react-dom": "^18",
+    "react": "^19",
+    "react-dom": "^19",
     "rollup": "^2.23.0",
     "sinon": "^10.0.0",
     "ts-node": "^10.9.2",
@@ -82,7 +84,7 @@
     "url": "git+https://github.com/dequelabs/cauldron.git"
   },
   "peerDependencies": {
-    "react": ">=16.6 <= 18",
-    "react-dom": ">=16.6 <= 18"
+    "react": ">=16.6 <20",
+    "react-dom": ">=16.6 <20"
   }
 }