focus-trap 7.0.0 → 7.1.0

package/index.js

@@ -1,38 +1,37 @@
 import { tabbable, focusable, isFocusable, isTabbable } from 'tabbable';
 
-const activeFocusTraps = (function () {
-  const trapQueue = [];
-  return {
-    activateTrap(trap) {
-      if (trapQueue.length > 0) {
-        const activeTrap = trapQueue[trapQueue.length - 1];
-        if (activeTrap !== trap) {
-          activeTrap.pause();
-        }
+const rooTrapStack = [];
+
+const activeFocusTraps = {
+  activateTrap(trapStack, trap) {
+    if (trapStack.length > 0) {
+      const activeTrap = trapStack[trapStack.length - 1];
+      if (activeTrap !== trap) {
+        activeTrap.pause();
       }
+    }
 
-      const trapIndex = trapQueue.indexOf(trap);
-      if (trapIndex === -1) {
-        trapQueue.push(trap);
-      } else {
-        // move this existing trap to the front of the queue
-        trapQueue.splice(trapIndex, 1);
-        trapQueue.push(trap);
-      }
-    },
+    const trapIndex = trapStack.indexOf(trap);
+    if (trapIndex === -1) {
+      trapStack.push(trap);
+    } else {
+      // move this existing trap to the front of the queue
+      trapStack.splice(trapIndex, 1);
+      trapStack.push(trap);
+    }
+  },
 
-    deactivateTrap(trap) {
-      const trapIndex = trapQueue.indexOf(trap);
-      if (trapIndex !== -1) {
-        trapQueue.splice(trapIndex, 1);
-      }
+  deactivateTrap(trapStack, trap) {
+    const trapIndex = trapStack.indexOf(trap);
+    if (trapIndex !== -1) {
+      trapStack.splice(trapIndex, 1);
+    }
 
-      if (trapQueue.length > 0) {
-        trapQueue[trapQueue.length - 1].unpause();
-      }
-    },
-  };
-})();
+    if (trapStack.length > 0) {
+      trapStack[trapStack.length - 1].unpause();
+    }
+  },
+};
 
 const isSelectableInput = function (node) {
   return (
@@ -100,6 +99,8 @@ const createFocusTrap = function (elements, userOptions) {
   //  should be safe code to execute if the `document` option isn't specified
   const doc = userOptions?.document || document;
 
+  const trapStack = userOptions?.trapStack || rooTrapStack;
+
   const config = {
     returnFocusOnDeactivate: true,
     escapeDeactivates: true,
@@ -582,7 +583,7 @@ const createFocusTrap = function (elements, userOptions) {
     }
 
     // There can be only one listening focus trap at a time
-    activeFocusTraps.activateTrap(trap);
+    activeFocusTraps.activateTrap(trapStack, trap);
 
     // Delay ensures that the focused element doesn't capture the event
     // that caused the focus trap activation.
@@ -702,7 +703,7 @@ const createFocusTrap = function (elements, userOptions) {
       state.active = false;
       state.paused = false;
 
-      activeFocusTraps.deactivateTrap(trap);
+      activeFocusTraps.deactivateTrap(trapStack, trap);
 
       const onDeactivate = getOption(options, 'onDeactivate');
       const onPostDeactivate = getOption(options, 'onPostDeactivate');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "focus-trap",
-  "version": "7.0.0",
+  "version": "7.1.0",
   "description": "Trap focus within a DOM node.",
   "main": "dist/focus-trap.js",
   "module": "dist/focus-trap.esm.js",
@@ -63,37 +63,37 @@
   },
   "homepage": "https://github.com/focus-trap/focus-trap#readme",
   "dependencies": {
-    "tabbable": "^6.0.0"
+    "tabbable": "^6.0.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.18.10",
-    "@babel/core": "^7.18.10",
-    "@babel/eslint-parser": "^7.18.9",
-    "@babel/preset-env": "^7.18.10",
-    "@changesets/cli": "^2.24.3",
-    "@rollup/plugin-babel": "^5.3.1",
-    "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-node-resolve": "^13.3.0",
+    "@babel/cli": "^7.19.3",
+    "@babel/core": "^7.20.2",
+    "@babel/eslint-parser": "^7.19.1",
+    "@babel/preset-env": "^7.20.2",
+    "@changesets/cli": "^2.25.2",
+    "@rollup/plugin-babel": "^6.0.2",
+    "@rollup/plugin-commonjs": "^23.0.2",
+    "@rollup/plugin-node-resolve": "^15.0.1",
     "@testing-library/cypress": "^8.0.3",
     "@types/jquery": "^3.5.14",
-    "all-contributors-cli": "^6.20.0",
-    "babel-loader": "^8.2.5",
+    "all-contributors-cli": "^6.24.0",
+    "babel-loader": "^9.1.0",
     "cross-env": "^7.0.3",
-    "cypress": "^10.6.0",
+    "cypress": "^10.11.0",
     "cypress-plugin-tab": "^1.0.5",
-    "eslint": "^8.22.0",
+    "eslint": "^8.27.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-jest": "^26.8.3",
+    "eslint-plugin-jest": "^27.1.4",
     "onchange": "^7.1.0",
     "prettier": "^2.7.1",
-    "rollup": "^2.78.0",
+    "rollup": "^2.79.1",
     "rollup-plugin-inject-process-env": "^1.3.1",
     "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-serve": "^2.0.1",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-terser": "^7.0.1",
     "start-server-and-test": "^1.14.0",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.4"
   }
 }