@navikt/ds-react 7.33.0 → 7.33.1

package/esm/overlays/dismissablelayer/DismissableLayer.js

@@ -9,120 +9,74 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { forwardRef, useEffect, useRef, useState, } from "react";
+import React, { forwardRef, useContext, useEffect, useState } from "react";
 import { Slot } from "../../slot/Slot.js";
+import { omit } from "../../util/index.js";
+import { composeEventHandlers } from "../../util/composeEventHandlers.js";
 import { useMergeRefs } from "../../util/hooks/index.js";
-import { createDescendantContext } from "../../util/hooks/descendants/useDescendant.js";
 import { ownerDocument } from "../../util/owner.js";
+import { getSortedLayers } from "./util/sort-layers.js";
 import { useEscapeKeydown } from "./util/useEscapeKeydown.js";
 import { useFocusOutside } from "./util/useFocusOutside.js";
 import { usePointerDownOutside } from "./util/usePointerDownOutside.js";
-export const [DismissableDescendantsProvider, useDismissableDescendantsContext, useDismissableDescendants, useDismissableDescendant,] = createDescendantContext();
-/**
- * Number of layers with `disableOutsidePointerEvents` set to `true` currently enabled.
- */
-let bodyLockCount = 0;
+const DismissableLayer = forwardRef((_a, forwardedRef) => {
+    var { enabled = true } = _a, restProps = __rest(_a, ["enabled"]);
+    if (!enabled) {
+        const Component = restProps.asChild ? Slot : "div";
+        return (React.createElement(Component, Object.assign({}, omit(restProps, [
+            "asChild",
+            "disableOutsidePointerEvents",
+            "onDismiss",
+            "onEscapeKeyDown",
+            "onFocusOutside",
+            "onInteractOutside",
+            "onPointerDownOutside",
+            "safeZone",
+        ]), { ref: forwardedRef })));
+    }
+    return React.createElement(DismissableLayerInternal, Object.assign({}, restProps, { ref: forwardedRef }));
+});
+const BranchedLayerContext = React.createContext(null);
+/* ------------------------ DismissableLayerInternal ------------------------ */
+const CONTEXT_UPDATE_EVENT = "dismissableLayer.update";
 let originalBodyPointerEvents;
-const DismissableLayer = forwardRef((props, ref) => {
-    const context = useDismissableDescendantsContext(false);
-    /**
-     * To correctly handle nested DismissableLayer,
-     * we only initialize the `Descendants`-API for the root layer to aboid resetting context
-     */
-    return context ? (React.createElement(DismissableLayerNode, Object.assign({ ref: ref }, props))) : (React.createElement(DismissableRoot, null,
-        React.createElement(DismissableLayerNode, Object.assign({ ref: ref }, props))));
+const DismissableLayerContext = React.createContext({
+    layers: new Set(),
+    branchedLayers: new Map(),
+    layersWithOutsidePointerEventsDisabled: new Set(),
 });
-/**
- * DismissableRoot
- *
- * Used to initialize the `Descendants`-API at the root layer.
- * All subsequent layers will use the same context.
- */
-const DismissableRoot = ({ children }) => {
-    const descendants = useDismissableDescendants();
-    return (React.createElement(DismissableDescendantsProvider, { value: descendants }, children));
-};
-const DismissableLayerNode = forwardRef((_a, ref) => {
-    var { children, asChild, onEscapeKeyDown, onPointerDownOutside, onFocusOutside, onInteractOutside, onDismiss, safeZone, disableOutsidePointerEvents = false, enabled = true } = _a, rest = __rest(_a, ["children", "asChild", "onEscapeKeyDown", "onPointerDownOutside", "onFocusOutside", "onInteractOutside", "onDismiss", "safeZone", "disableOutsidePointerEvents", "enabled"]);
-    const [, setForce] = useState({});
-    const { register, index, descendants } = useDismissableDescendant({
-        disableOutsidePointerEvents,
-        disabled: !enabled,
-        forceUpdate: () => setForce({}),
-    });
-    /**
-     * `node` will be set to the ref of the component or nested component
-     * Ex: If
-     * ```
-     * <DismissableLayer asChild>
-     *   <Popover />
-     * </DismissableLayer>
-     * ```
-     * `node` will in this case be the Popover-element.
-     * We use State her and not ref since we want to trigger a rerender when the node changes.
-     */
-    const [node, setNode] = useState(null);
-    const mergedRefs = useMergeRefs(setNode, register, ref);
+const DismissableLayerInternal = forwardRef((_a, forwardedRef) => {
+    var { children, disableOutsidePointerEvents, onDismiss, onInteractOutside, onEscapeKeyDown, onFocusOutside, onPointerDownOutside, safeZone, asChild } = _a, restProps = __rest(_a, ["children", "disableOutsidePointerEvents", "onDismiss", "onInteractOutside", "onEscapeKeyDown", "onFocusOutside", "onPointerDownOutside", "safeZone", "asChild"]);
+    const context = useContext(DismissableLayerContext);
+    const [, forceRerender] = useState({});
+    const [node, setNode] = React.useState(null);
+    const mergedRefs = useMergeRefs(forwardedRef, setNode);
     const ownerDoc = ownerDocument(node);
-    const hasInteractedOutsideRef = useRef(false);
-    const hasPointerDownOutsideRef = useRef(false);
-    const pointerState = (() => {
-        let lastIndex = -1;
-        const descendantNodes = descendants.enabledValues();
-        descendantNodes.forEach((obj, _index) => {
-            if (obj.disableOutsidePointerEvents) {
-                lastIndex = _index;
-            }
-        });
-        return {
-            /**
-             * Makes sure we stop events at the highest layer with pointer events disabled.
-             * If not checked, we risk closing every layer when clicking outside the layer.
-             */
-            isPointerEventsEnabled: index >= lastIndex,
-            /**
-             * If we find a node with `disableOutsidePointerEvents` we want to disable pointer events on the body.
-             */
-            isBodyPointerEventsDisabled: bodyLockCount > 0,
-            pointerStyle: (index >= lastIndex && bodyLockCount > 0
-                ? "auto"
-                : undefined),
-        };
-    })();
+    /* Layer handling */
+    const layers = getSortedLayers(context.layers, context.branchedLayers);
+    const highestLayerWithOutsidePointerEventsDisabledIndex = findHighestLayerIndex(layers, context.layersWithOutsidePointerEventsDisabled);
+    const index = node ? layers.indexOf(node) : -1;
+    const isBodyPointerEventsDisabled = context.layersWithOutsidePointerEventsDisabled.size > 0;
+    const shouldEnablePointerEvents = highestLayerWithOutsidePointerEventsDisabledIndex === -1 ||
+        index >= highestLayerWithOutsidePointerEventsDisabledIndex;
     /**
-     * We want to prevent the Layer from closing when the trigger, anchor element, or its child elements are interacted with.
-     *
-     * To achieve this, we check if the event target is the trigger, anchor or a child. If it is, we prevent default event behavior.
-     *
-     * The `pointerDownOutside` and `focusOutside` handlers already check if the event target is within the DismissableLayer (`node`).
-     * However, since we don't add a `tabIndex` to the Popover/Tooltip, the `focusOutside` handler doesn't correctly handle focus events.
-     * Therefore, we also need to check that neither the trigger (`anchor`) nor the DismissableLayer (`dismissable`) are the event targets.
+     * We want to prevent the Layer from closing when the trigger/anchor element or its child elements are interacted with.
+     * To achieve this, we check if the event target is the trigger/anchor or a child. If it is, we prevent default event behavior.
      */
     function handleOutsideEvent(event) {
-        var _a, _b;
-        if ((!(safeZone === null || safeZone === void 0 ? void 0 : safeZone.anchor) && !(safeZone === null || safeZone === void 0 ? void 0 : safeZone.dismissable)) || !enabled) {
+        if (!(safeZone === null || safeZone === void 0 ? void 0 : safeZone.anchor)) {
             return;
         }
+        let hasPointerDownOutside = false;
         if (!event.defaultPrevented) {
-            hasInteractedOutsideRef.current = true;
             if (event.detail.originalEvent.type === "pointerdown") {
-                hasPointerDownOutsideRef.current = true;
+                hasPointerDownOutside = true;
             }
         }
         const target = event.target;
-        /**
-         * pointerdown-events works as expected, but focus-events does not.
-         * For focus-event we need to also check `safeZone.dismissable` (the Popover/Tooltip itself) since it does not have a tabIndex.
-         */
-        if (event.detail.originalEvent.type === "pointerdown") {
-            const targetIsTrigger = ((_a = safeZone === null || safeZone === void 0 ? void 0 : safeZone.anchor) === null || _a === void 0 ? void 0 : _a.contains(target)) || target === (safeZone === null || safeZone === void 0 ? void 0 : safeZone.anchor);
-            targetIsTrigger && event.preventDefault();
-        }
-        else {
-            const targetIsNotTrigger = target instanceof HTMLElement &&
-                ![safeZone === null || safeZone === void 0 ? void 0 : safeZone.anchor, safeZone === null || safeZone === void 0 ? void 0 : safeZone.dismissable].some((element) => element === null || element === void 0 ? void 0 : element.contains(target)) &&
-                !target.contains((_b = safeZone === null || safeZone === void 0 ? void 0 : safeZone.dismissable) !== null && _b !== void 0 ? _b : null);
-            !targetIsNotTrigger && event.preventDefault();
+        const targetIsAnchor = safeZone.anchor.contains(target) || target === safeZone.anchor;
+        if (targetIsAnchor) {
+            event.preventDefault();
         }
         /**
          * In Safari, if the trigger element is inside a container with tabIndex={0}, a click on the trigger
@@ -133,18 +87,16 @@ const DismissableLayerNode = forwardRef((_a, ref) => {
          * 'pointerdownoutside' event is sufficient to indicate interaction outside the DismissableLayer.
          */
         if (event.detail.originalEvent.type === "focusin" &&
-            hasPointerDownOutsideRef.current) {
+            hasPointerDownOutside) {
             event.preventDefault();
         }
-        hasPointerDownOutsideRef.current = false;
-        hasInteractedOutsideRef.current = false;
     }
     const pointerDownOutside = usePointerDownOutside((event) => {
-        if (!pointerState.isPointerEventsEnabled || !enabled) {
+        if (!shouldEnablePointerEvents) {
             return;
         }
         /**
-         * We call these before letting `handleOutsideEvent` do its checks to give consumer a chance to preventDefault based certain cases.
+         * We call these before letting `handleOutsideEvent` do its checks to give consumer a chance to preventDefault.
          */
         onPointerDownOutside === null || onPointerDownOutside === void 0 ? void 0 : onPointerDownOutside(event);
         onInteractOutside === null || onInteractOutside === void 0 ? void 0 : onInteractOutside(event);
@@ -152,19 +104,13 @@ const DismissableLayerNode = forwardRef((_a, ref) => {
          * Add safeZone to prevent closing when interacting with trigger/anchor or its children.
          */
         safeZone && handleOutsideEvent(event);
-        /**
-         * Both `onPointerDownOutside` and `onInteractOutside` are able to preventDefault the event, thus stopping call for `onDismiss`.
-         */
         if (!event.defaultPrevented && onDismiss) {
             onDismiss();
         }
     }, ownerDoc);
     const focusOutside = useFocusOutside((event) => {
-        if (!enabled) {
-            return;
-        }
         /**
-         * We call these before letting `handleOutsideEvent` do its checks to give consumer a chance to preventDefault based certain cases.
+         * We call these before letting `handleOutsideEvent` do its checks to give consumer a chance to preventDefault.
          */
         onFocusOutside === null || onFocusOutside === void 0 ? void 0 : onFocusOutside(event);
         onInteractOutside === null || onInteractOutside === void 0 ? void 0 : onInteractOutside(event);
@@ -172,24 +118,16 @@ const DismissableLayerNode = forwardRef((_a, ref) => {
          * Add safeZone to prevent closing when interacting with trigger/anchor or its children.
          */
         safeZone && handleOutsideEvent(event);
-        /**
-         * Both `onFocusOutside` and `onInteractOutside` are able to preventDefault the event, thus stopping call for `onDismiss`.
-         */
         if (!event.defaultPrevented && onDismiss) {
             onDismiss();
         }
     }, ownerDoc);
     useEscapeKeydown((event) => {
-        if (!enabled) {
-            return;
-        }
         /**
          * The deepest nested element will always be last in the descendants list.
          * This allows us to only close the highest layer when pressing escape.
-         *
-         * In some cases a layer might still exist, but be disabled. We want to ignore these layers.
          */
-        const isHighestLayer = index === descendants.enabledCount() - 1;
+        const isHighestLayer = index === context.layers.size - 1;
         if (!isHighestLayer) {
             return;
         }
@@ -207,34 +145,104 @@ const DismissableLayerNode = forwardRef((_a, ref) => {
         }
     }, ownerDoc);
     /**
-     * If `disableOutsidePointerEvents` is true,
-     * we want to disable pointer events on the body when the first layer is opened.
+     * Handles registering `layers` and `layersWithOutsidePointerEventsDisabled`.
      */
-    // biome-ignore lint/correctness/useExhaustiveDependencies: Every time the descendants change, we want to update the body pointer events since we might have added or removed a layer.
     useEffect(() => {
-        if (!node || !enabled || !disableOutsidePointerEvents)
+        if (!node) {
             return;
-        if (bodyLockCount === 0) {
-            originalBodyPointerEvents = ownerDoc.body.style.pointerEvents;
-            ownerDoc.body.style.pointerEvents = "none";
         }
-        bodyLockCount++;
+        if (disableOutsidePointerEvents) {
+            if (context.layersWithOutsidePointerEventsDisabled.size === 0) {
+                originalBodyPointerEvents = ownerDoc.body.style.pointerEvents;
+                ownerDoc.body.style.pointerEvents = "none";
+            }
+            context.layersWithOutsidePointerEventsDisabled.add(node);
+        }
+        context.layers.add(node);
+        dispatchUpdate();
         return () => {
-            if (bodyLockCount === 1) {
+            if (disableOutsidePointerEvents &&
+                context.layersWithOutsidePointerEventsDisabled.size === 1) {
                 ownerDoc.body.style.pointerEvents = originalBodyPointerEvents;
             }
-            bodyLockCount--;
         };
-    }, [node, ownerDoc, disableOutsidePointerEvents, descendants, enabled]);
+    }, [node, disableOutsidePointerEvents, context, ownerDoc]);
+    /**
+     * We purposefully prevent combining this effect with the `disableOutsidePointerEvents` effect
+     * because a change to `disableOutsidePointerEvents` would remove this layer from the stack
+     * and add it to the end again so the layering order wouldn't be creation order.
+     * We only want them to be removed from context stacks when unmounted.
+     */
+    useEffect(() => {
+        return () => {
+            if (!node) {
+                return;
+            }
+            context.layers.delete(node);
+            context.layersWithOutsidePointerEventsDisabled.delete(node);
+            dispatchUpdate();
+        };
+    }, [node, context]);
+    const parentBranchedLayer = useContext(BranchedLayerContext);
+    /**
+     * Handles registering and unregistering branched (nested) layers.
+     * When this layer has a parent, we register it as a child of the parent.
+     */
+    useEffect(() => {
+        if (!node || !parentBranchedLayer || node === parentBranchedLayer) {
+            return;
+        }
+        if (!context.branchedLayers.has(parentBranchedLayer)) {
+            context.branchedLayers.set(parentBranchedLayer, new Set());
+        }
+        const branchedChildren = context.branchedLayers.get(parentBranchedLayer);
+        branchedChildren.add(node);
+        dispatchUpdate();
+        return () => {
+            // Remove this node from the parent's children
+            branchedChildren.delete(node);
+            // If the parent has no more children, remove the parent from branchedLayers
+            if (branchedChildren.size === 0) {
+                context.branchedLayers.delete(parentBranchedLayer);
+            }
+            dispatchUpdate();
+        };
+    }, [node, parentBranchedLayer, context]);
     /**
-     * To make sure pointerEvents are enabled for all parents and siblings when the layer is removed from the DOM
+     * Synchronizes layer state across all mounted `DismissableLayer` instances.
+     * All layers re-render on every context change to recalculate their position and pointer-events.
      */
-    // biome-ignore lint/correctness/useExhaustiveDependencies: We explicitly want to run this on unmount, including every time the node updates to make sure we don't lock the application behind pointer-events: none.
     useEffect(() => {
-        return () => descendants.values().forEach((x) => x.forceUpdate());
-    }, [descendants, node]);
+        const handleUpdate = () => forceRerender({});
+        document.addEventListener(CONTEXT_UPDATE_EVENT, handleUpdate);
+        return () => document.removeEventListener(CONTEXT_UPDATE_EVENT, handleUpdate);
+    }, []);
     const Comp = asChild ? Slot : "div";
-    return (React.createElement(Comp, Object.assign({ ref: mergedRefs }, rest, { onFocusCapture: focusOutside.onFocusCapture, onBlurCapture: focusOutside.onBlurCapture, onPointerDownCapture: pointerDownOutside.onPointerDownCapture, style: Object.assign({ pointerEvents: pointerState.pointerStyle }, rest.style) }), children));
+    return (React.createElement(BranchedLayerContext.Provider, { value: node },
+        React.createElement(Comp, Object.assign({}, restProps, { ref: mergedRefs, style: Object.assign({ pointerEvents: isBodyPointerEventsDisabled
+                    ? shouldEnablePointerEvents
+                        ? "auto"
+                        : "none"
+                    : undefined }, restProps.style), onFocusCapture: composeEventHandlers(restProps.onFocusCapture, focusOutside.onFocusCapture), onBlurCapture: composeEventHandlers(restProps.onBlurCapture, focusOutside.onBlurCapture), onPointerDownCapture: composeEventHandlers(restProps.onPointerDownCapture, pointerDownOutside.onPointerDownCapture) }), children)));
 });
+/**
+ * Dispatches a custom event to inform all `DismissableLayer` components to update.
+ */
+function dispatchUpdate() {
+    const event = new CustomEvent(CONTEXT_UPDATE_EVENT);
+    document.dispatchEvent(event);
+}
+/**
+ * Returns the index of the last layer that is found in the given subset.
+ * Returns -1 if no layers are found.
+ */
+function findHighestLayerIndex(orderedLayers, layersWithOutsidePointerEventsDisabled) {
+    for (let i = orderedLayers.length - 1; i >= 0; i -= 1) {
+        if (layersWithOutsidePointerEventsDisabled.has(orderedLayers[i])) {
+            return i;
+        }
+    }
+    return -1;
+}
 export { DismissableLayer };
 //# sourceMappingURL=DismissableLayer.js.map

package/esm/overlays/dismissablelayer/DismissableLayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"DismissableLayer.js","sourceRoot":"","sources":["../../../src/overlays/dismissablelayer/DismissableLayer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DismissableLayer.js","sourceRoot":"","sources":["../../../src/overlays/dismissablelayer/DismissableLayer.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAMjD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAmDrE,MAAM,gBAAgB,GAAG,UAAU,CACjC,CAAC,EAAuD,EAAE,YAAY,EAAE,EAAE;QAAzE,EAAE,OAAO,GAAG,IAAI,OAAuC,EAAlC,SAAS,cAA9B,WAAgC,CAAF;IAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;QACnD,OAAO,CACL,oBAAC,SAAS,oBACJ,IAAI,CAAC,SAAS,EAAE;YAClB,SAAS;YACT,6BAA6B;YAC7B,WAAW;YACX,iBAAiB;YACjB,gBAAgB;YAChB,mBAAmB;YACnB,sBAAsB;YACtB,UAAU;SACX,CAAC,IACF,GAAG,EAAE,YAAY,IACjB,CACH,CAAC;IACJ,CAAC;IAED,OAAO,oBAAC,wBAAwB,oBAAK,SAAS,IAAE,GAAG,EAAE,YAAY,IAAI,CAAC;AACxE,CAAC,CACF,CAAC;AAMF,MAAM,oBAAoB,GACxB,KAAK,CAAC,aAAa,CAAiC,IAAI,CAAC,CAAC;AAE5D,gFAAgF;AAChF,MAAM,oBAAoB,GAAG,yBAAyB,CAAC;AACvD,IAAI,yBAAiC,CAAC;AAEtC,MAAM,uBAAuB,GAAG,KAAK,CAAC,aAAa,CAAC;IAClD,MAAM,EAAE,IAAI,GAAG,EAA2B;IAC1C,cAAc,EAAE,IAAI,GAAG,EAGpB;IACH,sCAAsC,EAAE,IAAI,GAAG,EAA2B;CAC3E,CAAC,CAAC;AAEH,MAAM,wBAAwB,GAAG,UAAU,CAIzC,CACE,EAWwB,EACxB,YAAY,EACZ,EAAE;QAbF,EACE,QAAQ,EACR,2BAA2B,EAC3B,SAAS,EACT,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,oBAAoB,EACpB,QAAQ,EACR,OAAO,OAEe,EADnB,SAAS,cAVd,iKAWC,CADa;IAId,MAAM,OAAO,GAAG,UAAU,CAAC,uBAAuB,CAAC,CAAC;IAEpD,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CACpC,IAAI,CACL,CAAC;IACF,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;IAErC,oBAAoB;IACpB,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACvE,MAAM,iDAAiD,GACrD,qBAAqB,CACnB,MAAM,EACN,OAAO,CAAC,sCAAsC,CAC/C,CAAC;IACJ,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,2BAA2B,GAC/B,OAAO,CAAC,sCAAsC,CAAC,IAAI,GAAG,CAAC,CAAC;IAC1D,MAAM,yBAAyB,GAC7B,iDAAiD,KAAK,CAAC,CAAC;QACxD,KAAK,IAAI,iDAAiD,CAAC;IAE7D;;;OAGG;IACH,SAAS,kBAAkB,CACzB,KAAgD;QAEhD,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,CAAA,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,IAAI,qBAAqB,GAAG,KAAK,CAAC;QAElC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBACtD,qBAAqB,GAAG,IAAI,CAAC;YAC/B,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAAqB,CAAC;QAE3C,MAAM,cAAc,GAClB,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,KAAK,QAAQ,CAAC,MAAM,CAAC;QAEjE,IAAI,cAAc,EAAE,CAAC;YACnB,KAAK,CAAC,cAAc,EAAE,CAAC;QACzB,CAAC;QAED;;;;;;;WAOG;QACH,IACE,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,KAAK,SAAS;YAC7C,qBAAqB,EACrB,CAAC;YACD,KAAK,CAAC,cAAc,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,CAAC,KAAK,EAAE,EAAE;QACzD,IAAI,CAAC,yBAAyB,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED;;WAEG;QACH,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAG,KAAK,CAAC,CAAC;QAC9B,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,KAAK,CAAC,CAAC;QAE3B;;WAEG;QACH,QAAQ,IAAI,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEtC,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,SAAS,EAAE,CAAC;YACzC,SAAS,EAAE,CAAC;QACd,CAAC;IACH,CAAC,EAAE,QAAQ,CAAC,CAAC;IAEb,MAAM,YAAY,GAAG,eAAe,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7C;;WAEG;QACH,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,KAAK,CAAC,CAAC;QACxB,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,KAAK,CAAC,CAAC;QAE3B;;WAEG;QACH,QAAQ,IAAI,kBAAkB,CAAC,KAAK,CAAC,CAAC;QAEtC,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,SAAS,EAAE,CAAC;YACzC,SAAS,EAAE,CAAC;QACd,CAAC;IACH,CAAC,EAAE,QAAQ,CAAC,CAAC;IAEb,gBAAgB,CAAC,CAAC,KAAK,EAAE,EAAE;QACzB;;;WAGG;QACH,MAAM,cAAc,GAAG,KAAK,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;QACzD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED;;WAEG;QACH,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,KAAK,CAAC,CAAC;QACzB;;;WAGG;QACH,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,SAAS,EAAE,CAAC;YACzC,KAAK,CAAC,cAAc,EAAE,CAAC;YACvB,SAAS,EAAE,CAAC;QACd,CAAC;IACH,CAAC,EAAE,QAAQ,CAAC,CAAC;IAEb;;OAEG;IACH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAED,IAAI,2BAA2B,EAAE,CAAC;YAChC,IAAI,OAAO,CAAC,sCAAsC,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBAC9D,yBAAyB,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;gBAC9D,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC;YAC7C,CAAC;YACD,OAAO,CAAC,sCAAsC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzB,cAAc,EAAE,CAAC;QAEjB,OAAO,GAAG,EAAE;YACV,IACE,2BAA2B;gBAC3B,OAAO,CAAC,sCAAsC,CAAC,IAAI,KAAK,CAAC,EACzD,CAAC;gBACD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,GAAG,yBAAyB,CAAC;YAChE,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,EAAE,2BAA2B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IAE3D;;;;;OAKG;IACH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,OAAO;YACT,CAAC;YAED,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5B,OAAO,CAAC,sCAAsC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5D,cAAc,EAAE,CAAC;QACnB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAEpB,MAAM,mBAAmB,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAE7D;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,IAAI,IAAI,CAAC,mBAAmB,IAAI,IAAI,KAAK,mBAAmB,EAAE,CAAC;YAClE,OAAO;QACT,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,mBAAmB,CAAE,CAAC;QAC1E,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC3B,cAAc,EAAE,CAAC;QAEjB,OAAO,GAAG,EAAE;YACV,8CAA8C;YAC9C,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAE9B,4EAA4E;YAC5E,IAAI,gBAAgB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBAChC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YACrD,CAAC;YAED,cAAc,EAAE,CAAC;QACnB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,IAAI,EAAE,mBAAmB,EAAE,OAAO,CAAC,CAAC,CAAC;IAEzC;;;OAGG;IACH,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC7C,QAAQ,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;QAC9D,OAAO,GAAG,EAAE,CACV,QAAQ,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;IACrE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAEpC,OAAO,CACL,oBAAC,oBAAoB,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI;QACxC,oBAAC,IAAI,oBACC,SAAS,IACb,GAAG,EAAE,UAAU,EACf,KAAK,kBACH,aAAa,EAAE,2BAA2B;oBACxC,CAAC,CAAC,yBAAyB;wBACzB,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,MAAM;oBACV,CAAC,CAAC,SAAS,IACV,SAAS,CAAC,KAAK,GAEpB,cAAc,EAAE,oBAAoB,CAClC,SAAS,CAAC,cAAc,EACxB,YAAY,CAAC,cAAc,CAC5B,EACD,aAAa,EAAE,oBAAoB,CACjC,SAAS,CAAC,aAAa,EACvB,YAAY,CAAC,aAAa,CAC3B,EACD,oBAAoB,EAAE,oBAAoB,CACxC,SAAS,CAAC,oBAAoB,EAC9B,kBAAkB,CAAC,oBAAoB,CACxC,KAEA,QAAQ,CACJ,CACuB,CACjC,CAAC;AACJ,CAAC,CACF,CAAC;AAEF;;GAEG;AACH,SAAS,cAAc;IACrB,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,oBAAoB,CAAC,CAAC;IACpD,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAED;;;GAGG;AACH,SAAS,qBAAqB,CAC5B,aAAwC,EACxC,sCAAoE;IAEpE,KAAK,IAAI,CAAC,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACtD,IAAI,sCAAsC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACjE,OAAO,CAAC,CAAC;QACX,CAAC;IACH,CAAC;IAED,OAAO,CAAC,CAAC,CAAC;AACZ,CAAC;AAED,OAAO,EAAE,gBAAgB,EAA8B,CAAC"}

package/esm/overlays/dismissablelayer/util/sort-layers.d.ts

@@ -0,0 +1,18 @@
+type DismissableLayerElement = HTMLDivElement;
+/**
+ * Returns an array of layers sorted such that parents appear before their children.
+ *
+ * **Why**:
+ * - mount order for parent-child relationships is unstable due to portals
+ * - event handling relies on parents being before children in the array
+ *
+ * This function ensures that for any parent-child relationship, the parent layer
+ * will always appear before its child layer in the returned array,
+ * resulting in consistent behavior.
+ *
+ * @param layers - A set of DismissableLayerElements to be sorted.
+ * @param branchedLayers - A map where each key is a parent layer and its value is a set of child layers.
+ * @returns An array of DismissableLayerElements sorted by parent-child relationships.
+ */
+declare function getSortedLayers(layers: Set<DismissableLayerElement>, branchedLayers: Map<DismissableLayerElement, Set<DismissableLayerElement>>): DismissableLayerElement[];
+export { getSortedLayers };

package/esm/overlays/dismissablelayer/util/sort-layers.js

@@ -0,0 +1,49 @@
+/**
+ * Returns an array of layers sorted such that parents appear before their children.
+ *
+ * **Why**:
+ * - mount order for parent-child relationships is unstable due to portals
+ * - event handling relies on parents being before children in the array
+ *
+ * This function ensures that for any parent-child relationship, the parent layer
+ * will always appear before its child layer in the returned array,
+ * resulting in consistent behavior.
+ *
+ * @param layers - A set of DismissableLayerElements to be sorted.
+ * @param branchedLayers - A map where each key is a parent layer and its value is a set of child layers.
+ * @returns An array of DismissableLayerElements sorted by parent-child relationships.
+ */
+function getSortedLayers(layers, branchedLayers) {
+    const sorted = [];
+    const visited = new Set();
+    const parentMap = new Map();
+    branchedLayers.forEach((children, parent) => {
+        children.forEach((child) => {
+            if (child !== parent) {
+                parentMap.set(child, parent);
+            }
+        });
+    });
+    const walk = (layer) => {
+        if (visited.has(layer)) {
+            return;
+        }
+        const parent = parentMap.get(layer);
+        if (parent && !visited.has(parent)) {
+            walk(parent);
+            if (visited.has(layer)) {
+                return;
+            }
+        }
+        visited.add(layer);
+        sorted.push(layer);
+        const children = branchedLayers.get(layer);
+        if (children) {
+            children.forEach(walk);
+        }
+    };
+    layers.forEach(walk);
+    return sorted;
+}
+export { getSortedLayers };
+//# sourceMappingURL=sort-layers.js.map

package/esm/overlays/dismissablelayer/util/sort-layers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sort-layers.js","sourceRoot":"","sources":["../../../../src/overlays/dismissablelayer/util/sort-layers.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;GAcG;AACH,SAAS,eAAe,CACtB,MAAoC,EACpC,cAA0E;IAE1E,MAAM,MAAM,GAA8B,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,GAAG,EAA2B,CAAC;IACnD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAoD,CAAC;IAE9E,cAAc,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;QAC1C,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACzB,IAAI,KAAK,KAAK,MAAM,EAAE,CAAC;gBACrB,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,CAAC,KAA8B,EAAE,EAAE;QAC9C,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,CAAC;YACb,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO;YACT,CAAC;QACH,CAAC;QAED,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEnB,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAErB,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/esm/overlays/floating-menu/Menu.d.ts

@@ -35,16 +35,12 @@ declare const MenuContent: React.ForwardRefExoticComponent<MenuContentInternalTy
 type FocusScopeProps = React.ComponentPropsWithoutRef<typeof FocusBoundary>;
 type DismissableLayerProps = React.ComponentPropsWithoutRef<typeof DismissableLayer>;
 type MenuContentInternalPrivateProps = {
-    onOpenAutoFocus?: FocusScopeProps["onMountAutoFocus"];
+    initialFocus?: FocusScopeProps["initialFocus"];
     onDismiss?: DismissableLayerProps["onDismiss"];
     disableOutsidePointerEvents?: DismissableLayerProps["disableOutsidePointerEvents"];
 };
 interface MenuContentInternalProps extends MenuContentInternalPrivateProps, Omit<React.ComponentPropsWithoutRef<typeof Floating.Content>, "dir" | "onPlaced"> {
-    /**
-     * Event handler called when auto-focusing after close.
-     * Can be prevented.
-     */
-    onCloseAutoFocus?: FocusScopeProps["onUnmountAutoFocus"];
+    returnFocus?: FocusScopeProps["returnFocus"];
     onEntryFocus?: RovingFocusProps["onEntryFocus"];
     onEscapeKeyDown?: DismissableLayerProps["onEscapeKeyDown"];
     onPointerDownOutside?: DismissableLayerProps["onPointerDownOutside"];
@@ -68,7 +64,9 @@ type PortalProps = React.ComponentPropsWithoutRef<typeof Portal>;
 type MenuPortalProps = PortalProps & {
     children: React.ReactElement;
 };
-declare const MenuPortal: React.ForwardRefExoticComponent<MenuPortalProps & React.RefAttributes<HTMLDivElement>>;
+declare const MenuPortal: React.ForwardRefExoticComponent<Omit<import("../../portal/index.js").PortalProps & React.RefAttributes<HTMLDivElement>, "ref"> & {
+    children: React.ReactElement;
+} & React.RefAttributes<HTMLDivElement>>;
 interface MenuRadioGroupProps extends MenuGroupProps {
     value?: string;
     onValueChange?: (value: string) => void;

package/esm/overlays/floating-menu/Menu.js

@@ -103,19 +103,13 @@ const MenuRootContentModal = forwardRef((props, ref) => {
         onFocusOutside: composeEventHandlers(props.onFocusOutside, (event) => event.preventDefault(), { checkForDefaultPrevented: false }), onDismiss: () => context.onOpenChange(false) })));
 });
 const MenuContentInternal = forwardRef((_a, forwardedRef) => {
-    var { onOpenAutoFocus, onCloseAutoFocus, disableOutsidePointerEvents, onEntryFocus, onEscapeKeyDown, onPointerDownOutside, onFocusOutside, onInteractOutside, onDismiss, safeZone } = _a, rest = __rest(_a, ["onOpenAutoFocus", "onCloseAutoFocus", "disableOutsidePointerEvents", "onEntryFocus", "onEscapeKeyDown", "onPointerDownOutside", "onFocusOutside", "onInteractOutside", "onDismiss", "safeZone"]);
+    var { initialFocus, returnFocus, disableOutsidePointerEvents, onEntryFocus, onEscapeKeyDown, onPointerDownOutside, onFocusOutside, onInteractOutside, onDismiss, safeZone } = _a, rest = __rest(_a, ["initialFocus", "returnFocus", "disableOutsidePointerEvents", "onEntryFocus", "onEscapeKeyDown", "onPointerDownOutside", "onFocusOutside", "onInteractOutside", "onDismiss", "safeZone"]);
     const descendants = useMenuDescendantsContext();
     const context = useMenuContext();
     const rootContext = useMenuRootContext();
     const contentRef = useRef(null);
     const composedRefs = useMergeRefs(forwardedRef, contentRef, context.onContentChange);
-    return (React.createElement(FocusBoundary, { onMountAutoFocus: composeEventHandlers(onOpenAutoFocus, (event) => {
-            var _a;
-            // when opening, explicitly focus the content area only and leave
-            // `onEntryFocus` in  control of focusing first item
-            event.preventDefault();
-            (_a = contentRef.current) === null || _a === void 0 ? void 0 : _a.focus({ preventScroll: true });
-        }), onUnmountAutoFocus: onCloseAutoFocus, 
+    return (React.createElement(FocusBoundary, { initialFocus: initialFocus !== null && initialFocus !== void 0 ? initialFocus : contentRef, returnFocus: returnFocus, 
         /* Focus trapping is handled in `Floating.Content: onKeyDown */
         trapped: false, loop: false },
         React.createElement(DismissableLayer, { asChild: true, disableOutsidePointerEvents: disableOutsidePointerEvents, onEscapeKeyDown: onEscapeKeyDown, onPointerDownOutside: onPointerDownOutside, onFocusOutside: onFocusOutside, onInteractOutside: onInteractOutside, onDismiss: onDismiss, safeZone: safeZone },
@@ -257,7 +251,7 @@ const MenuPortal = forwardRef(({ children, rootElement }, ref) => {
     if (!context.open) {
         return null;
     }
-    return (React.createElement(Portal, { asChild: true, rootElement: rootElement, ref: ref }, children));
+    return (React.createElement(Portal, { rootElement: rootElement, ref: ref }, children));
 });
 /* -------------------------------------------------------------------------- */
 /*                                 Menu Radio                                 */
@@ -375,16 +369,14 @@ const MenuSubContent = forwardRef((props, forwardedRef) => {
     const ref = useRef(null);
     const composedRefs = useMergeRefs(forwardedRef, ref);
     return (React.createElement(MenuDescendantsProvider, { value: descendants },
-        React.createElement(MenuContentInternal, Object.assign({ id: subContext.contentId, "aria-labelledby": subContext.triggerId }, props, { ref: composedRefs, align: "start", side: "right", disableOutsidePointerEvents: false, onOpenAutoFocus: (event) => {
-                var _a;
-                // when opening a submenu, focus content for keyboard users only
+        React.createElement(MenuContentInternal, Object.assign({ id: subContext.contentId, "aria-labelledby": subContext.triggerId }, props, { ref: composedRefs, align: "start", side: "right", disableOutsidePointerEvents: false, initialFocus: () => {
                 if (rootContext.isUsingKeyboardRef.current) {
-                    (_a = ref.current) === null || _a === void 0 ? void 0 : _a.focus();
+                    return ref.current;
                 }
-                event.preventDefault();
+                return false;
             }, 
             /* Since we manually focus Subtrigger, we prevent use of auto-focus */
-            onCloseAutoFocus: (event) => event.preventDefault(), onEscapeKeyDown: composeEventHandlers(props.onEscapeKeyDown, (event) => {
+            returnFocus: false, onEscapeKeyDown: composeEventHandlers(props.onEscapeKeyDown, (event) => {
                 rootContext.onClose();
                 // Ensure pressing escape in submenu doesn't escape full screen mode
                 event.preventDefault();