@zag-js/popover 0.78.1 → 0.78.2

package/dist/index.js

@@ -6,9 +6,9 @@ var popper = require('@zag-js/popper');
 var ariaHidden = require('@zag-js/aria-hidden');
 var core = require('@zag-js/core');
 var dismissable = require('@zag-js/dismissable');
+var focusTrap = require('@zag-js/focus-trap');
 var removeScroll = require('@zag-js/remove-scroll');
 var utils = require('@zag-js/utils');
-var focusTrap = require('focus-trap');
 var types = require('@zag-js/types');
 
 // src/popover.anatomy.ts
@@ -337,29 +337,14 @@ function machine(userContext) {
         },
         trapFocus(ctx2) {
           if (!ctx2.modal) return;
-          let trap;
-          domQuery.nextTick(() => {
-            const contentEl = dom.getContentEl(ctx2);
-            if (!contentEl) return;
-            trap = focusTrap.createFocusTrap(contentEl, {
-              escapeDeactivates: false,
-              allowOutsideClick: true,
-              preventScroll: true,
-              returnFocusOnDeactivate: true,
-              document: dom.getDoc(ctx2),
-              fallbackFocus: contentEl,
-              initialFocus: domQuery.getInitialFocus({
-                root: dom.getContentEl(ctx2),
-                getInitialEl: ctx2.initialFocusEl,
-                enabled: ctx2.autoFocus
-              })
-            });
-            try {
-              trap.activate();
-            } catch {
-            }
+          const contentEl = () => dom.getContentEl(ctx2);
+          return focusTrap.trapFocus(contentEl, {
+            initialFocus: () => domQuery.getInitialFocus({
+              root: dom.getContentEl(ctx2),
+              getInitialEl: ctx2.initialFocusEl,
+              enabled: ctx2.autoFocus
+            })
           });
-          return () => trap?.deactivate();
         }
       },
       actions: {

package/dist/index.mjs

@@ -1,12 +1,12 @@
 import { createAnatomy } from '@zag-js/anatomy';
-import { createScope, getFocusables, isSafari, dataAttr, proxyTabFocus, nextTick, getInitialFocus, raf } from '@zag-js/dom-query';
+import { createScope, getFocusables, isSafari, dataAttr, proxyTabFocus, getInitialFocus, raf } from '@zag-js/dom-query';
 import { getPlacementStyles, getPlacement } from '@zag-js/popper';
 import { ariaHidden } from '@zag-js/aria-hidden';
 import { createMachine } from '@zag-js/core';
 import { trackDismissableElement } from '@zag-js/dismissable';
+import { trapFocus } from '@zag-js/focus-trap';
 import { preventBodyScroll } from '@zag-js/remove-scroll';
 import { createSplitProps, compact } from '@zag-js/utils';
-import { createFocusTrap } from 'focus-trap';
 import { createProps } from '@zag-js/types';
 
 // src/popover.anatomy.ts
@@ -335,29 +335,14 @@ function machine(userContext) {
         },
         trapFocus(ctx2) {
           if (!ctx2.modal) return;
-          let trap;
-          nextTick(() => {
-            const contentEl = dom.getContentEl(ctx2);
-            if (!contentEl) return;
-            trap = createFocusTrap(contentEl, {
-              escapeDeactivates: false,
-              allowOutsideClick: true,
-              preventScroll: true,
-              returnFocusOnDeactivate: true,
-              document: dom.getDoc(ctx2),
-              fallbackFocus: contentEl,
-              initialFocus: getInitialFocus({
-                root: dom.getContentEl(ctx2),
-                getInitialEl: ctx2.initialFocusEl,
-                enabled: ctx2.autoFocus
-              })
-            });
-            try {
-              trap.activate();
-            } catch {
-            }
+          const contentEl = () => dom.getContentEl(ctx2);
+          return trapFocus(contentEl, {
+            initialFocus: () => getInitialFocus({
+              root: dom.getContentEl(ctx2),
+              getInitialEl: ctx2.initialFocusEl,
+              enabled: ctx2.autoFocus
+            })
           });
-          return () => trap?.deactivate();
         }
       },
       actions: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zag-js/popover",
-  "version": "0.78.1",
+  "version": "0.78.2",
   "description": "Core logic for the popover widget implemented as a state machine",
   "keywords": [
     "js",
@@ -26,16 +26,16 @@
     "url": "https://github.com/chakra-ui/zag/issues"
   },
   "dependencies": {
-    "focus-trap": "7.6.2",
-    "@zag-js/anatomy": "0.78.1",
-    "@zag-js/aria-hidden": "0.78.1",
-    "@zag-js/core": "0.78.1",
-    "@zag-js/dom-query": "0.78.1",
-    "@zag-js/utils": "0.78.1",
-    "@zag-js/dismissable": "0.78.1",
-    "@zag-js/popper": "0.78.1",
-    "@zag-js/remove-scroll": "0.78.1",
-    "@zag-js/types": "0.78.1"
+    "@zag-js/anatomy": "0.78.2",
+    "@zag-js/aria-hidden": "0.78.2",
+    "@zag-js/core": "0.78.2",
+    "@zag-js/dom-query": "0.78.2",
+    "@zag-js/utils": "0.78.2",
+    "@zag-js/dismissable": "0.78.2",
+    "@zag-js/popper": "0.78.2",
+    "@zag-js/remove-scroll": "0.78.2",
+    "@zag-js/types": "0.78.2",
+    "@zag-js/focus-trap": "0.78.2"
   },
   "devDependencies": {
     "clean-package": "2.2.0"