@deque/cauldron-react 7.5.0-canary.b12b7518 → 7.5.0-canary.cacd23dd

package/lib/index.js

@@ -1886,6 +1886,12 @@ var preventTopOverflowMiddleware = {
         });
     }
 };
+// Element-resize tracking is split out of `whileElementsMounted` so it can be
+// scoped to the open state. This function's identity must stay stable:
+// floating-ui keys its positioning effect on whether one was passed, and a
+// re-run calls `update()` again, which on close pulls focus back out of the
+// trigger.
+var autoUpdateWithoutElementResize = function (reference, floating, update) { return dom.autoUpdate(reference, floating, update, { elementResize: false }); };
 var AnchoredOverlay = React.forwardRef(function (_a, refProp) {
     var _b, _c;
     var as = _a.as, _d = _a.placement, initialPlacement = _d === void 0 ? 'auto' : _d, target = _a.target, children = _a.children, style = _a.style, _e = _a.open, open = _e === void 0 ? false : _e, offset = _a.offset, focusTrap = _a.focusTrap, focusTrapOptions = _a.focusTrapOptions, onOpenChange = _a.onOpenChange, onPlacementChange = _a.onPlacementChange, onShiftChange = _a.onShiftChange, portal = _a.portal, props = tslib.__rest(_a, ["as", "placement", "target", "children", "style", "open", "offset", "focusTrap", "focusTrapOptions", "onOpenChange", "onPlacementChange", "onShiftChange", "portal"]);
@@ -1914,8 +1920,35 @@ var AnchoredOverlay = React.forwardRef(function (_a, refProp) {
         elements: {
             reference: resolveElement(target)
         },
-        whileElementsMounted: dom.autoUpdate
-    }), refs = _f.refs, floatingStyles = _f.floatingStyles, placement = _f.placement, middlewareData = _f.middlewareData;
+        whileElementsMounted: autoUpdateWithoutElementResize
+    }), refs = _f.refs, floatingStyles = _f.floatingStyles, placement = _f.placement, middlewareData = _f.middlewareData, update = _f.update, elements = _f.elements;
+    // Observing the target while the overlay is closed measures it for the
+    // first time mid-layout, which leaves a ResizeObserver notification
+    // undelivered and has the browser report an uncaught error.
+    React.useEffect(function () {
+        var reference = elements.reference, floating = elements.floating;
+        if (!open ||
+            !reference ||
+            !floating ||
+            typeof ResizeObserver !== 'function') {
+            return;
+        }
+        // Deferred a task: starting it re-positions, and a render in the middle
+        // of the open sequence loses the overlay's initial focus target.
+        var stopObserving;
+        var timeout = setTimeout(function () {
+            stopObserving = dom.autoUpdate(reference, floating, update, {
+                ancestorScroll: false,
+                ancestorResize: false,
+                layoutShift: false,
+                elementResize: true
+            });
+        });
+        return function () {
+            clearTimeout(timeout);
+            stopObserving === null || stopObserving === void 0 ? void 0 : stopObserving();
+        };
+    }, [open, elements, update]);
     useEscapeKey({
         active: open,
         capture: true,
@@ -3787,6 +3820,20 @@ var Listbox = React.forwardRef(function (_a, ref) {
     var listboxRef = useSharedRef(ref);
     var isControlled = typeof value !== 'undefined';
     var isActiveControlled = typeof controlledActiveOption !== 'undefined';
+    var hasActiveChangeHandler = typeof onActiveChange === 'function';
+    React.useEffect(function () {
+        if (process.env.NODE_ENV !== 'production' &&
+            isActiveControlled &&
+            hasActiveChangeHandler) {
+            console.warn('Listbox received both `activeOption` and `onActiveChange`. Do not ' +
+                'write the option reported by `onActiveChange` back into ' +
+                '`activeOption`: the two copies then race, and a stale downward ' +
+                'sync can revert a newer value and re-render without settling. ' +
+                'Let Listbox own the active option, or use `activeOption` only as ' +
+                'a one-shot request. ' +
+                'See https://github.com/dequelabs/cauldron/issues/2512');
+        }
+    }, [isActiveControlled, hasActiveChangeHandler]);
     React.useLayoutEffect(function () {
         if (!isControlled && selectedOptions.length > 0) {
             return;
@@ -3928,7 +3975,7 @@ var Listbox = React.forwardRef(function (_a, ref) {
             var firstOption = !focusDisabledOptions
                 ? options.find(function (option) { return !isDisabledOption(option); })
                 : options[0];
-            if (firstOption) {
+            if (firstOption && firstOption.element !== (activeOption === null || activeOption === void 0 ? void 0 : activeOption.element)) {
                 setActiveOption(firstOption);
             }
             return;
@@ -3937,7 +3984,7 @@ var Listbox = React.forwardRef(function (_a, ref) {
             var lastOption = !focusDisabledOptions
                 ? tslib.__spreadArray([], tslib.__read(options), false).reverse().find(function (option) { return !isDisabledOption(option); })
                 : options[options.length - 1];
-            if (lastOption) {
+            if (lastOption && lastOption.element !== (activeOption === null || activeOption === void 0 ? void 0 : activeOption.element)) {
                 setActiveOption(lastOption);
             }
             return;
@@ -5158,21 +5205,24 @@ function useMnemonics(_a) {
 
 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 activeElement = React.useRef(null);
+    // Listbox owns the active option. ActionList must not mirror it back down
+    // as a controlled prop: the two copies then race, and a downward sync
+    // carrying an already-stale value can revert a newer one and oscillate.
+    // `activeOption` below is only a one-shot mnemonic request, never a
+    // mirror. See cauldron#2512; cauldron#2522 tracks making `activeOption`
+    // properly controlled so this constraint lives in the interface instead.
     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;
-        setActiveOption(value);
-    }, []);
     var handleAction = React.useCallback(function (key, event) {
         if (typeof onAction === 'function') {
             onAction(key, event);
         }
     }, [onAction]);
+    // A new object every match, even for the same element: this is a one-shot
+    // request to Listbox rather than a mirror of its state, so re-using the
+    // previous object would leave the controlled prop unchanged and the
+    // request would never reach Listbox.
     var handleMnemonicMatch = React.useCallback(function (element) {
-        setActiveOption(function (prev) {
-            return (prev === null || prev === void 0 ? void 0 : prev.element) === element ? prev : { element: element };
-        });
+        setActiveOption({ element: element });
     }, []);
     var containerRef = useMnemonics({
         onMatch: handleMnemonicMatch,
@@ -5189,7 +5239,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": undefined, 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, { navigation: "bound" }),
         React__default["default"].createElement(ActionListProvider, { role: props.role || 'list', onAction: handleAction, selectionType: selectionType }, children)));
 });
 ActionList.displayName = 'ActionList';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deque/cauldron-react",
-  "version": "7.5.0-canary.b12b7518",
+  "version": "7.5.0-canary.cacd23dd",
   "license": "MPL-2.0",
   "description": "Fully accessible react components library for Deque Cauldron",
   "homepage": "https://cauldron.dequelabs.com/",
@@ -37,7 +37,7 @@
     "@rollup/plugin-typescript": "^11.1.2",
     "@svgr/rollup": "^6.1.2",
     "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.6.2",
+    "@testing-library/jest-dom": "^7.0.0",
     "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.5.2",
     "@types/classnames": "^2.2.10",