@zag-js/focus-visible 1.44.0 → 1.45.0

package/dist/index.d.mts

@@ -1,7 +1,8 @@
 type Modality = "keyboard" | "pointer" | "virtual";
 type RootNode = Document | ShadowRoot | Node;
 interface GlobalListenerData {
-    focus: VoidFunction;
+    /** Unset when the prototype's `focus` could not be read, so there is nothing to restore. */
+    focus: VoidFunction | undefined;
 }
 declare let listenerMap: Map<Window, GlobalListenerData>;
 /**

package/dist/index.d.ts

@@ -1,7 +1,8 @@
 type Modality = "keyboard" | "pointer" | "virtual";
 type RootNode = Document | ShadowRoot | Node;
 interface GlobalListenerData {
-    focus: VoidFunction;
+    /** Unset when the prototype's `focus` could not be read, so there is nothing to restore. */
+    focus: VoidFunction | undefined;
 }
 declare let listenerMap: Map<Window, GlobalListenerData>;
 /**

package/dist/index.js

@@ -128,24 +128,30 @@ function handleWindowBlur() {
   pendingLabelControl = null;
   hasBlurredWindowRecently = true;
 }
-function setupGlobalFocusEvents(root) {
-  if (typeof window === "undefined" || listenerMap.get((0, import_dom_query.getWindow)(root))) {
-    return;
-  }
-  const win = (0, import_dom_query.getWindow)(root);
-  const doc = (0, import_dom_query.getDocument)(root);
-  let focus = win.HTMLElement.prototype.focus;
-  function patchedFocus() {
-    hasEventBeforeFocus = true;
-    focus.apply(this, arguments);
-  }
+function patchFocusMethod(win) {
   try {
+    let patchedFocus2 = function() {
+      hasEventBeforeFocus = true;
+      nativeFocus.apply(this, arguments);
+    };
+    var patchedFocus = patchedFocus2;
+    const nativeFocus = win.HTMLElement.prototype.focus;
     Object.defineProperty(win.HTMLElement.prototype, "focus", {
       configurable: true,
-      value: patchedFocus
+      value: patchedFocus2
     });
+    return nativeFocus;
   } catch {
+    return void 0;
+  }
+}
+function setupGlobalFocusEvents(root) {
+  if (typeof window === "undefined" || listenerMap.get((0, import_dom_query.getWindow)(root))) {
+    return;
   }
+  const win = (0, import_dom_query.getWindow)(root);
+  const doc = (0, import_dom_query.getDocument)(root);
+  const nativeFocus = patchFocusMethod(win);
   doc.addEventListener("keydown", handleKeyboardEvent, true);
   doc.addEventListener("keyup", handleKeyboardEvent, true);
   doc.addEventListener("click", handleClickEvent, true);
@@ -167,7 +173,7 @@ function setupGlobalFocusEvents(root) {
     },
     { once: true }
   );
-  listenerMap.set(win, { focus });
+  listenerMap.set(win, { focus: nativeFocus });
 }
 var tearDownWindowFocusTracking = (root, loadListener) => {
   const win = (0, import_dom_query.getWindow)(root);
@@ -179,12 +185,14 @@ var tearDownWindowFocusTracking = (root, loadListener) => {
   if (!listenerData) {
     return;
   }
-  try {
-    Object.defineProperty(win.HTMLElement.prototype, "focus", {
-      configurable: true,
-      value: listenerData.focus
-    });
-  } catch {
+  if (listenerData.focus) {
+    try {
+      Object.defineProperty(win.HTMLElement.prototype, "focus", {
+        configurable: true,
+        value: listenerData.focus
+      });
+    } catch {
+    }
   }
   doc.removeEventListener("keydown", handleKeyboardEvent, true);
   doc.removeEventListener("keyup", handleKeyboardEvent, true);

package/dist/index.mjs

@@ -98,24 +98,30 @@ function handleWindowBlur() {
   pendingLabelControl = null;
   hasBlurredWindowRecently = true;
 }
-function setupGlobalFocusEvents(root) {
-  if (typeof window === "undefined" || listenerMap.get(getWindow(root))) {
-    return;
-  }
-  const win = getWindow(root);
-  const doc = getDocument(root);
-  let focus = win.HTMLElement.prototype.focus;
-  function patchedFocus() {
-    hasEventBeforeFocus = true;
-    focus.apply(this, arguments);
-  }
+function patchFocusMethod(win) {
   try {
+    let patchedFocus2 = function() {
+      hasEventBeforeFocus = true;
+      nativeFocus.apply(this, arguments);
+    };
+    var patchedFocus = patchedFocus2;
+    const nativeFocus = win.HTMLElement.prototype.focus;
     Object.defineProperty(win.HTMLElement.prototype, "focus", {
       configurable: true,
-      value: patchedFocus
+      value: patchedFocus2
     });
+    return nativeFocus;
   } catch {
+    return void 0;
+  }
+}
+function setupGlobalFocusEvents(root) {
+  if (typeof window === "undefined" || listenerMap.get(getWindow(root))) {
+    return;
   }
+  const win = getWindow(root);
+  const doc = getDocument(root);
+  const nativeFocus = patchFocusMethod(win);
   doc.addEventListener("keydown", handleKeyboardEvent, true);
   doc.addEventListener("keyup", handleKeyboardEvent, true);
   doc.addEventListener("click", handleClickEvent, true);
@@ -137,7 +143,7 @@ function setupGlobalFocusEvents(root) {
     },
     { once: true }
   );
-  listenerMap.set(win, { focus });
+  listenerMap.set(win, { focus: nativeFocus });
 }
 var tearDownWindowFocusTracking = (root, loadListener) => {
   const win = getWindow(root);
@@ -149,12 +155,14 @@ var tearDownWindowFocusTracking = (root, loadListener) => {
   if (!listenerData) {
     return;
   }
-  try {
-    Object.defineProperty(win.HTMLElement.prototype, "focus", {
-      configurable: true,
-      value: listenerData.focus
-    });
-  } catch {
+  if (listenerData.focus) {
+    try {
+      Object.defineProperty(win.HTMLElement.prototype, "focus", {
+        configurable: true,
+        value: listenerData.focus
+      });
+    } catch {
+    }
   }
   doc.removeEventListener("keydown", handleKeyboardEvent, true);
   doc.removeEventListener("keyup", handleKeyboardEvent, true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zag-js/focus-visible",
-  "version": "1.44.0",
+  "version": "1.45.0",
   "description": "Focus visible polyfill utility based on WICG",
   "keywords": [
     "js",
@@ -28,7 +28,7 @@
   "clean-package": "../../../clean-package.config.json",
   "main": "dist/index.js",
   "dependencies": {
-    "@zag-js/dom-query": "1.44.0"
+    "@zag-js/dom-query": "1.45.0"
   },
   "devDependencies": {
     "clean-package": "2.2.0"