@tamagui/focus-scope 2.0.0-rc.4 → 2.0.0-rc.40

package/dist/jsx/FocusScope.native.js

@@ -4,40 +4,42 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var FocusScope_native_exports = {};
 __export(FocusScope_native_exports, {
   FocusScope: () => FocusScope
 });
 module.exports = __toCommonJS(FocusScope_native_exports);
-var import_react = __toESM(require("react"), 1),
-  FocusScope = /* @__PURE__ */import_react.default.forwardRef(function (props, _ref) {
-    return props.children;
-  });
+var import_react = __toESM(require("react"), 1);
+var FocusScope = /* @__PURE__ */import_react.default.forwardRef(function (props, _ref) {
+  return props.children;
+});
 //# sourceMappingURL=FocusScope.native.js.map

package/dist/jsx/FocusScope.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["FocusScope_native_exports","__export","FocusScope","module","exports","__toCommonJS","import_react","__toESM","require","default","forwardRef","props","_ref","children"],"sources":["../../src/FocusScope.native.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,yBAAA;AAAAC,QAAA,CAAAD,yBAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAL,yBAAA;AAAA,IAAAM,YAAA,GAAkBC,OAAA,CAAAC,OAAA;EACPN,UAAA,GAA2B,eAAAI,YAAA,CAAAG,OAAA,CAAMC,UAAA,CAAW,UAASC,KAAA,EAAOC,IAAA,EAAM;IACzE,OAAOD,KAAA,CAAME,QAAA;EACjB,CAAC","ignoreList":[]}
+{"version":3,"names":["FocusScope_native_exports","__export","FocusScope","module","exports","__toCommonJS","import_react","__toESM","require","default","forwardRef","props","_ref","children"],"sources":["../../src/FocusScope.native.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,yBAAA;AAAAC,QAAA,CAAAD,yBAAA;EAAAE,UAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAC,YAAA,CAAAL,yBAAA;AAAA,IAAAM,YAAA,GAAkBC,OAAA,CAAAC,OAAA;AACX,IAAIN,UAAA,GAA2B,eAAAI,YAAA,CAAAG,OAAA,CAAMC,UAAA,CAAW,UAASC,KAAA,EAAOC,IAAA,EAAM;EACzE,OAAOD,KAAA,CAAME,QAAA;AACjB,CAAC","ignoreList":[]}

package/dist/jsx/FocusScopeController.mjs

@@ -2,32 +2,32 @@ import { createContextScope } from "@tamagui/create-context";
 import { useEvent } from "@tamagui/use-event";
 import * as React from "react";
 import { jsx } from "react/jsx-runtime";
-const FOCUS_SCOPE_CONTROLLER_NAME = "FocusScopeController",
-  [createFocusScopeControllerContext, createFocusScopeControllerScope] = createContextScope(FOCUS_SCOPE_CONTROLLER_NAME),
-  [FocusScopeControllerProvider, useFocusScopeControllerContext] = createFocusScopeControllerContext(FOCUS_SCOPE_CONTROLLER_NAME);
+const FOCUS_SCOPE_CONTROLLER_NAME = "FocusScopeController";
+const [createFocusScopeControllerContext, createFocusScopeControllerScope] = createContextScope(FOCUS_SCOPE_CONTROLLER_NAME);
+const [FocusScopeControllerProvider, useFocusScopeControllerContext] = createFocusScopeControllerContext(FOCUS_SCOPE_CONTROLLER_NAME);
 function FocusScopeController(props) {
   const {
-      __scopeFocusScope,
-      children,
-      enabled,
-      loop,
-      trapped,
-      onMountAutoFocus,
-      onUnmountAutoFocus,
-      forceUnmount,
-      focusOnIdle
-    } = props,
-    stableOnMountAutoFocus = useEvent(onMountAutoFocus),
-    stableOnUnmountAutoFocus = useEvent(onUnmountAutoFocus),
-    contextValue = React.useMemo(() => ({
-      enabled,
-      loop,
-      trapped,
-      onMountAutoFocus: stableOnMountAutoFocus,
-      onUnmountAutoFocus: stableOnUnmountAutoFocus,
-      forceUnmount,
-      focusOnIdle
-    }), [enabled, loop, trapped, stableOnMountAutoFocus, stableOnUnmountAutoFocus, forceUnmount, focusOnIdle]);
+    __scopeFocusScope,
+    children,
+    enabled,
+    loop,
+    trapped,
+    onMountAutoFocus,
+    onUnmountAutoFocus,
+    forceUnmount,
+    focusOnIdle
+  } = props;
+  const stableOnMountAutoFocus = useEvent(onMountAutoFocus);
+  const stableOnUnmountAutoFocus = useEvent(onUnmountAutoFocus);
+  const contextValue = React.useMemo(() => ({
+    enabled,
+    loop,
+    trapped,
+    onMountAutoFocus: stableOnMountAutoFocus,
+    onUnmountAutoFocus: stableOnUnmountAutoFocus,
+    forceUnmount,
+    focusOnIdle
+  }), [enabled, loop, trapped, stableOnMountAutoFocus, stableOnUnmountAutoFocus, forceUnmount, focusOnIdle]);
   return /* @__PURE__ */jsx(FocusScopeControllerProvider, {
     scope: __scopeFocusScope,
     ...contextValue,

package/dist/jsx/FocusScopeController.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["createContextScope","useEvent","React","jsx","FOCUS_SCOPE_CONTROLLER_NAME","createFocusScopeControllerContext","createFocusScopeControllerScope","FocusScopeControllerProvider","useFocusScopeControllerContext","FocusScopeController","props","__scopeFocusScope","children","enabled","loop","trapped","onMountAutoFocus","onUnmountAutoFocus","forceUnmount","focusOnIdle","stableOnMountAutoFocus","stableOnUnmountAutoFocus","contextValue","useMemo","scope","FocusScopeControllerComponent"],"sources":["../../src/FocusScopeController.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,kBAAA,QAA0B;AACnC,SAASC,QAAA,QAAgB;AACzB,YAAYC,KAAA,MAAW;AA8DnB,SAAAC,GAAA;AA1DJ,MAAMC,2BAAA,GAA8B;EAE9B,CAACC,iCAAA,EAAmCC,+BAA+B,IACvEN,kBAAA,CAAmBI,2BAA2B;EAI1C,CAACG,4BAAA,EAA8BC,8BAA8B,IACjEH,iCAAA,CACED,2BACF;AAUF,SAASK,qBAAqBC,KAAA,EAA+C;EAC3E,MAAM;MACJC,iBAAA;MACAC,QAAA;MACAC,OAAA;MACAC,IAAA;MACAC,OAAA;MACAC,gBAAA;MACAC,kBAAA;MACAC,YAAA;MACAC;IACF,IAAIT,KAAA;IAEEU,sBAAA,GAAyBnB,QAAA,CAASe,gBAAgB;IAClDK,wBAAA,GAA2BpB,QAAA,CAASgB,kBAAkB;IAEtDK,YAAA,GAAepB,KAAA,CAAMqB,OAAA,CACzB,OAAO;MACLV,OAAA;MACAC,IAAA;MACAC,OAAA;MACAC,gBAAA,EAAkBI,sBAAA;MAClBH,kBAAA,EAAoBI,wBAAA;MACpBH,YAAA;MACAC;IACF,IACA,CACEN,OAAA,EACAC,IAAA,EACAC,OAAA,EACAK,sBAAA,EACAC,wBAAA,EACAH,YAAA,EACAC,WAAA,CAEJ;EAEA,OACE,eAAAhB,GAAA,CAACI,4BAAA;IAA6BiB,KAAA,EAAOb,iBAAA;IAAoB,GAAGW,YAAA;IACzDV;EAAA,CACH;AAEJ;AAEA,MAAMa,6BAAA,GAAgChB,oBAAA","ignoreList":[]}
+{"version":3,"names":["createContextScope","useEvent","React","jsx","FOCUS_SCOPE_CONTROLLER_NAME","createFocusScopeControllerContext","createFocusScopeControllerScope","FocusScopeControllerProvider","useFocusScopeControllerContext","FocusScopeController","props","__scopeFocusScope","children","enabled","loop","trapped","onMountAutoFocus","onUnmountAutoFocus","forceUnmount","focusOnIdle","stableOnMountAutoFocus","stableOnUnmountAutoFocus","contextValue","useMemo","scope","FocusScopeControllerComponent"],"sources":["../../src/FocusScopeController.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,kBAAA,QAA0B;AACnC,SAASC,QAAA,QAAgB;AACzB,YAAYC,KAAA,MAAW;AA8DnB,SAAAC,GAAA;AA1DJ,MAAMC,2BAAA,GAA8B;AAEpC,MAAM,CAACC,iCAAA,EAAmCC,+BAA+B,IACvEN,kBAAA,CAAmBI,2BAA2B;AAIhD,MAAM,CAACG,4BAAA,EAA8BC,8BAA8B,IACjEH,iCAAA,CACED,2BACF;AAUF,SAASK,qBAAqBC,KAAA,EAA+C;EAC3E,MAAM;IACJC,iBAAA;IACAC,QAAA;IACAC,OAAA;IACAC,IAAA;IACAC,OAAA;IACAC,gBAAA;IACAC,kBAAA;IACAC,YAAA;IACAC;EACF,IAAIT,KAAA;EAEJ,MAAMU,sBAAA,GAAyBnB,QAAA,CAASe,gBAAgB;EACxD,MAAMK,wBAAA,GAA2BpB,QAAA,CAASgB,kBAAkB;EAE5D,MAAMK,YAAA,GAAepB,KAAA,CAAMqB,OAAA,CACzB,OAAO;IACLV,OAAA;IACAC,IAAA;IACAC,OAAA;IACAC,gBAAA,EAAkBI,sBAAA;IAClBH,kBAAA,EAAoBI,wBAAA;IACpBH,YAAA;IACAC;EACF,IACA,CACEN,OAAA,EACAC,IAAA,EACAC,OAAA,EACAK,sBAAA,EACAC,wBAAA,EACAH,YAAA,EACAC,WAAA,CAEJ;EAEA,OACE,eAAAhB,GAAA,CAACI,4BAAA;IAA6BiB,KAAA,EAAOb,iBAAA;IAAoB,GAAGW,YAAA;IACzDV;EAAA,CACH;AAEJ;AAEA,MAAMa,6BAAA,GAAgChB,oBAAA","ignoreList":[]}

package/dist/jsx/FocusScopeController.native.js

@@ -4,33 +4,35 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf,
-  __hasOwnProp = Object.prototype.hasOwnProperty;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-    for (var name in all) __defProp(target, name, {
-      get: all[name],
-      enumerable: !0
-    });
-  },
-  __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  for (var name in all) __defProp(target, name, {
+    get: all[name],
+    enumerable: true
+  });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  };
+  }
+  return to;
+};
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-    value: mod,
-    enumerable: !0
-  }) : target, mod)),
-  __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-    value: !0
-  }), mod);
+// If the importer is in node compatibility mode or this is not an ESM
+// file that has been converted to a CommonJS file using a Babel-
+// compatible transform (i.e. "__esModule" has not been set), then set
+// "default" to the CommonJS "module.exports" for node compatibility.
+isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+  value: mod,
+  enumerable: true
+}) : target, mod));
+var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
+  value: true
+}), mod);
 var FocusScopeController_exports = {};
 __export(FocusScopeController_exports, {
   FocusScopeController: () => FocusScopeControllerComponent,
@@ -39,38 +41,38 @@ __export(FocusScopeController_exports, {
   useFocusScopeControllerContext: () => useFocusScopeControllerContext
 });
 module.exports = __toCommonJS(FocusScopeController_exports);
-var import_jsx_runtime = require("react/jsx-runtime"),
-  import_create_context = require("@tamagui/create-context"),
-  import_use_event = require("@tamagui/use-event"),
-  React = __toESM(require("react"), 1),
-  FOCUS_SCOPE_CONTROLLER_NAME = "FocusScopeController",
-  [createFocusScopeControllerContext, createFocusScopeControllerScope] = (0, import_create_context.createContextScope)(FOCUS_SCOPE_CONTROLLER_NAME),
-  [FocusScopeControllerProvider, useFocusScopeControllerContext] = createFocusScopeControllerContext(FOCUS_SCOPE_CONTROLLER_NAME);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_create_context = require("@tamagui/create-context");
+var import_use_event = require("@tamagui/use-event");
+var React = __toESM(require("react"), 1);
+var FOCUS_SCOPE_CONTROLLER_NAME = "FocusScopeController";
+var [createFocusScopeControllerContext, createFocusScopeControllerScope] = (0, import_create_context.createContextScope)(FOCUS_SCOPE_CONTROLLER_NAME);
+var [FocusScopeControllerProvider, useFocusScopeControllerContext] = createFocusScopeControllerContext(FOCUS_SCOPE_CONTROLLER_NAME);
 function FocusScopeController(props) {
   var {
-      __scopeFocusScope,
-      children,
+    __scopeFocusScope,
+    children,
+    enabled,
+    loop,
+    trapped,
+    onMountAutoFocus,
+    onUnmountAutoFocus,
+    forceUnmount,
+    focusOnIdle
+  } = props;
+  var stableOnMountAutoFocus = (0, import_use_event.useEvent)(onMountAutoFocus);
+  var stableOnUnmountAutoFocus = (0, import_use_event.useEvent)(onUnmountAutoFocus);
+  var contextValue = React.useMemo(function () {
+    return {
       enabled,
       loop,
       trapped,
-      onMountAutoFocus,
-      onUnmountAutoFocus,
+      onMountAutoFocus: stableOnMountAutoFocus,
+      onUnmountAutoFocus: stableOnUnmountAutoFocus,
       forceUnmount,
       focusOnIdle
-    } = props,
-    stableOnMountAutoFocus = (0, import_use_event.useEvent)(onMountAutoFocus),
-    stableOnUnmountAutoFocus = (0, import_use_event.useEvent)(onUnmountAutoFocus),
-    contextValue = React.useMemo(function () {
-      return {
-        enabled,
-        loop,
-        trapped,
-        onMountAutoFocus: stableOnMountAutoFocus,
-        onUnmountAutoFocus: stableOnUnmountAutoFocus,
-        forceUnmount,
-        focusOnIdle
-      };
-    }, [enabled, loop, trapped, stableOnMountAutoFocus, stableOnUnmountAutoFocus, forceUnmount, focusOnIdle]);
+    };
+  }, [enabled, loop, trapped, stableOnMountAutoFocus, stableOnUnmountAutoFocus, forceUnmount, focusOnIdle]);
   return /* @__PURE__ */(0, import_jsx_runtime.jsx)(FocusScopeControllerProvider, {
     scope: __scopeFocusScope,
     ...contextValue,

package/dist/jsx/FocusScopeController.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","FocusScopeController_exports","FocusScopeController","FocusScopeControllerComponent","FocusScopeControllerProvider","createFocusScopeControllerScope","useFocusScopeControllerContext","module","exports","import_jsx_runtime","require","import_create_context","import_use_event","React","FOCUS_SCOPE_CONTROLLER_NAME","createFocusScopeControllerContext","createContextScope","props","__scopeFocusScope","children","enabled","loop","trapped","onMountAutoFocus","onUnmountAutoFocus","forceUnmount","focusOnIdle","stableOnMountAutoFocus","useEvent","stableOnUnmountAutoFocus","contextValue","useMemo"],"sources":["../../src/FocusScopeController.tsx"],"sourcesContent":[null],"mappings":"AAAA,YAAS;;AACT,IAAAA,QAAS,GAAAC,MAAA,CAAAC,MAAgB;AACzB,IAAAC,SAAY,GAAAF,MAAA,CAAWG,cAAA;AA8DnB,IAAAC,gBAAA,GAAAJ,MAAA,CAAAK,wBAAA;AA1DJ,IAAAC,iBAAM,GAAAN,MAAA,CAAAO,mBAA8B;AAQlC,IACEC,YAAA,GAAAR,MAAA,CAAAS,cAAA;EAAAC,YAAA,GAAAV,MAAA,CAAAW,SAAA,CAAAC,cAAA;AACF,IAAAC,QAAA,GAAAA,CAAAC,MAAA,EAAAC,GAAA;IAUF,SAASC,IAAA,IAAAD,GAAA,EACPb,SAAM,CAAAY,MAAA,EAAAE,IAAA;MAAAC,GAAA,EAAAF,GAAA,CAAAC,IAAA;MAAAE,UAAA;IAAA;EAAA;EAAAC,WACJ,GAAAA,CAAAC,EAAA,EAAAC,IAAA,EAAAC,MAAA,EAAAC,IAAA;IAAA,IACAF,IAAA,WAAAA,IAAA,uBAAAA,IAAA,gBACA,SAAAG,GAAA,IAAAlB,iBAAA,CAAAe,IAAA,GACA,CAAAX,YAAA,CAAAe,IAAA,CAAAL,EAAA,EAAAI,GAAA,KAAAA,GAAA,KAAAF,MAAA,IAAApB,SAAA,CAAAkB,EAAA,EAAAI,GAAA;MAAAP,GAAA,EAAAA,CAAA,KAAAI,IAAA,CAAAG,GAAA;MAAAN,UAAA,IAAAK,IAAA,GAAAnB,gBAAA,CAAAiB,IAAA,EAAAG,GAAA,MAAAD,IAAA,CAAAL;IAAA;IAAA,OACAE,EAAA;EAAA;AACA,IACAM,OAAA,GAAAA,CAAAC,GAAA,EAAAC,UAAA,EAAAd,MAAA,MAAAA,MAAA,GAAAa,GAAA,WAAA5B,QAAA,CAAAS,YAAA,CAAAmB,GAAA,SAAAR,WAAA;EAAA;EACA;EAEF;EAK2B;EAClBS,UACL,KAAAD,GAAA,KAAAA,GAAA,CAAAE,UAAA,GAAA3B,SAAA,CAAAY,MAAA;IAAAgB,KAAA,EAAAH,GAAA;IAAAT,UAAA;EAAA,KAAAJ,MAAA,EAAAa,GACA;EAAAI,YACA,GAAAJ,GAAA,IAAAR,WAAA,CAAAjB,SAAA;IAAA4B,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAK,4BACkB;AAAAnB,QAClB,CAAAmB,4BAAoB;EAAAC,oBACpB,EAAAA,CAAA,KAAAC,6BAAA;EAAAC,4BACA,EAAAA,CAAA,KAAAA,4BAAA;EAAAC,+BACF,EAAAA,CAAA,KAAAA,+BAAA;EAAAC,8BACA,EAAAA,CAAA,KAAAA;AAAA;AACEC,MACA,CAAAC,OAAA,GAAAR,YAAA,CAAAC,4BAAA;AAAA,IAAAQ,kBACA,GAAAC,OAAA;EAAAC,qBAAA,GAAAD,OAAA;EAAAE,gBAAA,GAAAF,OAAA;EAAAG,KAAA,GAAAlB,OAAA,CAAAe,OAAA;EAAAI,2BAAA;EAAA,CAAAC,iCAAA,EAAAV,+BAAA,QAAAM,qBAAA,CAAAK,kBAAA,EAAAF,2BAAA;EAAA,CAAAV,4BAAA,EAAAE,8BAAA,IAAAS,iCAAA,CAAAD,2BAAA;AAAA,SACAZ,qBAAAe,KAAA;EAAA,IACA;MAAAC,iBAAA;MAAAC,QAAA;MAAAC,OAAA;MAAAC,IAAA;MAAAC,OAAA;MAAAC,gBAAA;MAAAC,kBAAA;MAAAC,YAAA;MAAAC;IAAA,IAAAT,KAAA;IAAAU,sBAAA,OAAAf,gBAAA,CAAAgB,QAAA,EAAAL,gBAAA;IAAAM,wBAAA,OAAAjB,gBAAA,CAAAgB,QAAA,EAAAJ,kBAAA;IAAAM,YAAA,GAAAjB,KAAA,CAAAkB,OAAA;MAAA,OACA;QACAX,OAAA;QACFC,IAAA;QACFC,OAAA;QAEAC,gBACE,EAAAI,sBAAC;QAILH,kBAAA,EAAAK,wBAAA;QAEMJ,YAAA","ignoreList":[]}
+{"version":3,"names":["__create","Object","create","__defProp","defineProperty","__getOwnPropDesc","getOwnPropertyDescriptor","__getOwnPropNames","getOwnPropertyNames","__getProtoOf","getPrototypeOf","__hasOwnProp","prototype","hasOwnProperty","__export","target","all","name","get","enumerable","__copyProps","to","from","except","desc","key","call","__toESM","mod","isNodeMode","__esModule","value","__toCommonJS","FocusScopeController_exports","FocusScopeController","FocusScopeControllerComponent","FocusScopeControllerProvider","createFocusScopeControllerScope","useFocusScopeControllerContext","module","exports","import_jsx_runtime","require","import_create_context","import_use_event","React","FOCUS_SCOPE_CONTROLLER_NAME","createFocusScopeControllerContext","createContextScope","props","__scopeFocusScope","children","enabled","loop","trapped","onMountAutoFocus","onUnmountAutoFocus","forceUnmount","focusOnIdle","stableOnMountAutoFocus","useEvent"],"sources":["../../src/FocusScopeController.tsx"],"sourcesContent":[null],"mappings":"AAAA,YAAS;;AACT,IAAAA,QAAS,GAAAC,MAAA,CAAAC,MAAgB;AACzB,IAAAC,SAAY,GAAAF,MAAA,CAAWG,cAAA;AA8DnB,IAAAC,gBAAA,GAAAJ,MAAA,CAAAK,wBAAA;AA1DJ,IAAAC,iBAAM,GAAAN,MAAA,CAAAO,mBAA8B;AAEpC,IAAAC,YAAO,GAAAR,MAAA,CAAAS,cAAA;AAKP,IAAAC,YAAO,GAAAV,MAAA,CAAAW,SAAA,CAAAC,cAA8B;AACnC,IACEC,QAAA,GAAAA,CAAAC,MAAA,EAAAC,GAAA;EACF,SAAAC,IAAA,IAAAD,GAAA,EAUFb,SAAS,CAAAY,MAAA,EAAAE,IAAA;IAAqBC,GAAA,EAAAF,GAA+C,CAAAC,IAAA;IAAAE,UAAA;EAAA;AAC3E;AAAM,IACJC,WAAA,GAAAA,CAAAC,EAAA,EAAAC,IAAA,EAAAC,MAAA,EAAAC,IAAA;EAAA,IACAF,IAAA,WAAAA,IAAA,wBAAAA,IAAA;IACA,SAAAG,GAAA,IAAAlB,iBAAA,CAAAe,IAAA,GACA,KAAAX,YAAA,CAAAe,IAAA,CAAAL,EAAA,EAAAI,GAAA,KAAAA,GAAA,KAAAF,MAAA,EACApB,SAAA,CAAAkB,EAAA,EAAAI,GAAA;MAAAP,GAAA,EAAAA,CAAA,KAAAI,IAAA,CAAAG,GAAA;MAAAN,UAAA,IAAAK,IAAA,GAAAnB,gBAAA,CAAAiB,IAAA,EAAAG,GAAA,MAAAD,IAAA,CAAAL;IAAA;EAAA;EACA,OACAE,EAAA;AAAA;AACA,IACAM,OAAA,GAAAA,CAAAC,GAAA,EAAAC,UAAA,EAAAd,MAAA,MAAAA,MAAA,GAAAa,GAAA,WAAA5B,QAAA,CAAAS,YAAA,CAAAmB,GAAA,SAAAR,WAAA;AACF;AAEA;AACA;AAEA;AAA2BS,UAClB,KAAAD,GAAA,KAAAA,GAAA,CAAAE,UAAA,GAAA3B,SAAA,CAAAY,MAAA;EAAAgB,KAAA,EAAAH,GAAA;EAAAT,UAAA;AAAA,KAAAJ,MAAA,EAAAa,GACL;AACA,IAAAI,YACA,GAAAJ,GAAA,IAAAR,WAAA,CAAAjB,SAAA;EAAA4B,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAK,4BACkB;AAAAnB,QAClB,CAAAmB,4BAAoB;EAAAC,oBACpB,EAAAA,CAAA,KAAAC,6BAAA;EAAAC,4BACA,EAAAA,CAAA,KAAAA,4BAAA;EAAAC,+BACF,EAAAA,CAAA,KAAAA,+BAAA;EAAAC,8BACA,EAAAA,CAAA,KAAAA;AAAA;AACEC,MACA,CAAAC,OAAA,GAAAR,YAAA,CAAAC,4BAAA;AAAA,IAAAQ,kBACA,GAAAC,OAAA;AAAA,IAAAC,qBACA,GAAAD,OAAA;AAAA,IAAAE,gBACA,GAAAF,OAAA;AAAA,IAAAG,KACA,GAAAlB,OAAA,CAAAe,OAAA;AAAA,IAAAI,2BACA;AAAA,IACF,CAAAC,iCAAA,EAAAV,+BAAA,QAAAM,qBAAA,CAAAK,kBAAA,EAAAF,2BAAA;AAAA,IACF,CAAAV,4BAAA,EAAAE,8BAAA,IAAAS,iCAAA,CAAAD,2BAAA;AAEA,SACEZ,oBAACA,CAAAe,KAAA;EAIL;IAAAC,iBAAA;IAAAC,QAAA;IAAAC,OAAA;IAAAC,IAAA;IAAAC,OAAA;IAAAC,gBAAA;IAAAC,kBAAA;IAAAC,YAAA;IAAAC;EAAA,IAAAT,KAAA;EAEA,IAAMU,sBAAA,OAAAf,gBAAgC,CAAAgB,QAAA,EAAAL,gBAAA","ignoreList":[]}

package/dist/jsx/index.js

@@ -1,3 +1,3 @@
-export * from "./FocusScope";
-export * from "./FocusScopeController";
+export * from "./FocusScope.mjs";
+export * from "./FocusScopeController.mjs";
 //# sourceMappingURL=index.js.map

package/dist/jsx/index.js.map

@@ -1,6 +1 @@
-{
-  "version": 3,
-  "sources": ["../../src/index.ts"],
-  "mappings": "AAAA,cAAc;AACd,cAAc;",
-  "names": []
-}
+{"version":3,"names":[],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc;AACd,cAAc","ignoreList":[]}

package/dist/jsx/index.native.js

@@ -5,15 +5,17 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-    if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
       get: () => from[key],
       enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
     });
-    return to;
-  },
-  __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+  }
+  return to;
+};
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var index_exports = {};
 module.exports = __toCommonJS(index_exports);

package/dist/jsx/types.native.js

@@ -5,14 +5,16 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from == "object" || typeof from == "function") for (let key of __getOwnPropNames(from)) !__hasOwnProp.call(to, key) && key !== except && __defProp(to, key, {
-    get: () => from[key],
-    enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-  });
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from)) if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
+      get: () => from[key],
+      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+    });
+  }
   return to;
 };
 var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
-  value: !0
+  value: true
 }), mod);
 var types_exports = {};
 module.exports = __toCommonJS(types_exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/focus-scope",
-  "version": "2.0.0-rc.4",
+  "version": "2.0.0-rc.40",
   "source": "src/index.ts",
   "files": [
     "src",
@@ -16,15 +16,12 @@
     "./package.json": "./package.json",
     ".": {
       "types": "./types/index.d.ts",
-      "react-native": {
-        "module": "./dist/esm/index.native.js",
-        "import": "./dist/esm/index.native.js",
-        "require": "./dist/cjs/index.native.js"
-      },
+      "react-native": "./dist/esm/index.native.js",
+      "browser": "./dist/esm/index.mjs",
       "module": "./dist/esm/index.mjs",
       "import": "./dist/esm/index.mjs",
       "require": "./dist/cjs/index.cjs",
-      "default": "./dist/cjs/index.native.js"
+      "default": "./dist/esm/index.mjs"
     }
   },
   "publishConfig": {
@@ -37,15 +34,15 @@
     "clean:build": "tamagui-build clean:build"
   },
   "dependencies": {
-    "@tamagui/compose-refs": "2.0.0-rc.4",
-    "@tamagui/constants": "2.0.0-rc.4",
-    "@tamagui/create-context": "2.0.0-rc.4",
-    "@tamagui/start-transition": "2.0.0-rc.4",
-    "@tamagui/use-async": "2.0.0-rc.4",
-    "@tamagui/use-event": "2.0.0-rc.4"
+    "@tamagui/compose-refs": "2.0.0-rc.40",
+    "@tamagui/constants": "2.0.0-rc.40",
+    "@tamagui/create-context": "2.0.0-rc.40",
+    "@tamagui/start-transition": "2.0.0-rc.40",
+    "@tamagui/use-async": "2.0.0-rc.40",
+    "@tamagui/use-event": "2.0.0-rc.40"
   },
   "devDependencies": {
-    "@tamagui/build": "2.0.0-rc.4",
+    "@tamagui/build": "2.0.0-rc.40",
     "react": ">=19"
   },
   "peerDependencies": {

package/src/FocusScope.tsx

@@ -201,15 +201,23 @@ export function useFocusScope(
   )
   const composedRefs = useComposedRefs(forwardedRef, setContainerRef)
 
-  // Clean up trap on unmount only - trap setup is handled in ref callback
+  // Clean up trap when trapped becomes false or on unmount
   useIsomorphicLayoutEffect(() => {
+    if (!trapped) {
+      // immediately invalidate any pending rAFs
+      focusScope.stopped = true
+      if (trapCleanupRef.current) {
+        trapCleanupRef.current()
+        trapCleanupRef.current = null
+      }
+    }
     return () => {
       if (trapCleanupRef.current) {
         trapCleanupRef.current()
         trapCleanupRef.current = null
       }
     }
-  }, [])
+  }, [trapped, focusScope])
 
   useAsyncEffect(
     async (signal) => {
@@ -217,11 +225,18 @@ export function useFocusScope(
       if (!container) return
       if (forceUnmount) return
 
-      // reset stopped flag when effect starts
-      focusScope.stopped = false
+      // only reset stopped flag when trap is actually active
+      // otherwise a prop change (trapped: true -> false) would reset it
+      // and allow a pending rAF to steal focus
+      if (trapped) {
+        focusScope.stopped = false
+      }
       focusScopesStack.add(focusScope)
       const previouslyFocusedElement = document.activeElement as HTMLElement | null
-      const hasFocusedCandidate = container.contains(previouslyFocusedElement)
+      const hasFocusedCandidate =
+        container.contains(previouslyFocusedElement) &&
+        previouslyFocusedElement !== null &&
+        !isHidden(previouslyFocusedElement, { upTo: container })
 
       if (!hasFocusedCandidate) {
         const mountEvent = new CustomEvent(AUTOFOCUS_ON_MOUNT, EVENT_OPTIONS)
@@ -278,7 +293,19 @@ export function useFocusScope(
         container.addEventListener(AUTOFOCUS_ON_UNMOUNT, onUnmountAutoFocus)
         container.dispatchEvent(unmountEvent)
         if (!unmountEvent.defaultPrevented) {
-          focus(previouslyFocusedElement ?? document.body, { select: true })
+          // check if focus has already moved to a valid element outside this scope
+          // (e.g. another component's autoFocus ran during the same commit)
+          // if so, respect that focus rather than stealing it back
+          const currentFocus = document.activeElement as HTMLElement | null
+          const focusHasMovedOutside =
+            currentFocus &&
+            currentFocus !== document.body &&
+            currentFocus !== container &&
+            !container.contains(currentFocus)
+
+          if (!focusHasMovedOutside) {
+            focus(previouslyFocusedElement ?? document.body, { select: true })
+          }
         }
         // we need to remove the listener after we `dispatchEvent`
         container.removeEventListener(AUTOFOCUS_ON_UNMOUNT, onUnmountAutoFocus)

package/types/FocusScope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FocusScope.d.ts","sourceRoot":"","sources":["../src/FocusScope.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,SAAS,CAAA;AAY3D,KAAK,iBAAiB,GAAG,cAAc,CAAA;AAEvC,QAAA,MAAM,UAAU,wFAiCf,CAAA;AAuFD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,eAAe,EACtB,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC;;uBAwNzC,KAAK,CAAC,aAAa;;EAY9B;AA+ID,OAAO,EAAE,UAAU,EAAE,CAAA;AAErB,YAAY,EAAE,eAAe,EAAE,CAAA"}
+{"version":3,"file":"FocusScope.d.ts","sourceRoot":"","sources":["../src/FocusScope.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,EAAE,eAAe,EAAe,MAAM,SAAS,CAAA;AAY3D,KAAK,iBAAiB,GAAG,cAAc,CAAA;AAEvC,QAAA,MAAM,UAAU,wFAiCf,CAAA;AAuFD,wBAAgB,aAAa,CAC3B,KAAK,EAAE,eAAe,EACtB,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,iBAAiB,CAAC;;uBAmPzC,KAAK,CAAC,aAAa;;EAY9B;AA+ID,OAAO,EAAE,UAAU,EAAE,CAAA;AAErB,YAAY,EAAE,eAAe,EAAE,CAAA"}