Update: focus-trap to version 7.8.0 and bump pnpm version to 10.28.0

Author: jonnitto

Resources/Private/Bundled/Custom/Focus.js

@@ -434,7 +434,7 @@ var isFocusable = function isFocusable2(node, options) {
     return isNodeMatchingSelectorFocusable(options, node);
 };
 
-// node_modules/.pnpm/focus-trap@7.7.1/node_modules/focus-trap/dist/focus-trap.esm.js
+// node_modules/.pnpm/focus-trap@7.8.0/node_modules/focus-trap/dist/focus-trap.esm.js
 function _arrayLikeToArray(r, a) {
     (null == a || a > r.length) && (a = r.length);
     for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e];
@@ -698,9 +698,9 @@ var createFocusTrap = function createFocusTrap2(elements, userOptions) {
         // references to nodes that are siblings to the ancestors of this trap's containers.
         /** @type {Set<HTMLElement>} */
         adjacentElements: /* @__PURE__ */ new Set(),
-        // references to nodes that were inert before the trap was activated.
+        // references to nodes that were inert or aria-hidden before the trap was activated.
         /** @type {Set<HTMLElement>} */
-        alreadyInert: /* @__PURE__ */ new Set(),
+        alreadySilent: /* @__PURE__ */ new Set(),
         nodeFocusedBeforeActivation: null,
         mostRecentlyFocusedNode: null,
         active: false,
@@ -1150,7 +1150,7 @@ var createFocusTrap = function createFocusTrap2(elements, userOptions) {
             trap._setSubtreeIsolation(false);
         }
         state.adjacentElements.clear();
-        state.alreadyInert.clear();
+        state.alreadySilent.clear();
         var containerAncestors = /* @__PURE__ */ new Set();
         var adjacentElements = /* @__PURE__ */ new Set();
         var _iterator = _createForOfIteratorHelper(containers),
@@ -1255,7 +1255,10 @@ var createFocusTrap = function createFocusTrap2(elements, userOptions) {
             var preexistingTrap = activeFocusTraps.getActiveTrap(trapStack);
             var revertState = false;
             if (preexistingTrap && !preexistingTrap.paused) {
-                preexistingTrap._setSubtreeIsolation(false);
+                var _preexistingTrap$_set;
+                (_preexistingTrap$_set = preexistingTrap._setSubtreeIsolation) === null ||
+                    _preexistingTrap$_set === void 0 ||
+                    _preexistingTrap$_set.call(preexistingTrap, false);
                 revertState = true;
             }
             try {
@@ -1284,7 +1287,10 @@ var createFocusTrap = function createFocusTrap2(elements, userOptions) {
                 finishActivation();
             } catch (error) {
                 if (preexistingTrap === activeFocusTraps.getActiveTrap(trapStack) && revertState) {
-                    preexistingTrap._setSubtreeIsolation(true);
+                    var _preexistingTrap$_set2;
+                    (_preexistingTrap$_set2 = preexistingTrap._setSubtreeIsolation) === null ||
+                        _preexistingTrap$_set2 === void 0 ||
+                        _preexistingTrap$_set2.call(preexistingTrap, true);
                 }
                 throw error;
             }
@@ -1307,7 +1313,7 @@ var createFocusTrap = function createFocusTrap2(elements, userOptions) {
             if (!state.paused) {
                 trap._setSubtreeIsolation(false);
             }
-            state.alreadyInert.clear();
+            state.alreadySilent.clear();
             removeListeners();
             state.active = false;
             state.paused = false;
@@ -1408,16 +1414,39 @@ var createFocusTrap = function createFocusTrap2(elements, userOptions) {
             value: function value(isEnabled) {
                 if (config.isolateSubtrees) {
                     state.adjacentElements.forEach(function (el) {
+                        var _el$getAttribute;
                         if (isEnabled) {
-                            var isInitiallyInert = el.inert || el.hasAttribute("inert");
-                            if (isInitiallyInert) {
-                                state.alreadyInert.add(el);
+                            switch (config.isolateSubtrees) {
+                                case "aria-hidden":
+                                    if (
+                                        el.ariaHidden === "true" ||
+                                        ((_el$getAttribute = el.getAttribute("aria-hidden")) === null ||
+                                        _el$getAttribute === void 0
+                                            ? void 0
+                                            : _el$getAttribute.toLowerCase()) === "true"
+                                    ) {
+                                        state.alreadySilent.add(el);
+                                    }
+                                    el.setAttribute("aria-hidden", "true");
+                                    break;
+                                default:
+                                    if (el.inert || el.hasAttribute("inert")) {
+                                        state.alreadySilent.add(el);
+                                    }
+                                    el.setAttribute("inert", true);
+                                    break;
                             }
-                            el.inert = true;
                         } else {
-                            if (state.alreadyInert.has(el));
+                            if (state.alreadySilent.has(el));
                             else {
-                                el.inert = false;
+                                switch (config.isolateSubtrees) {
+                                    case "aria-hidden":
+                                        el.removeAttribute("aria-hidden");
+                                        break;
+                                    default:
+                                        el.removeAttribute("inert");
+                                        break;
+                                }
                             }
                         }
                     });