one 1.25.10 → 1.25.12

package/dist/cjs/views/ScrollBehavior.cjs

@@ -99,7 +99,7 @@ function configure(props) {
     return;
   }
   disable?.();
-  const initialLocation = `${window.location.pathname}${window.location.search}${window.location.hash}`;
+  const initialLocation = `${window.location.pathname}${window.location.search}`;
   let isFirstStateChange = true;
   previousPathname = window.location.pathname;
   const popStateController = new AbortController();
@@ -115,10 +115,11 @@ function configure(props) {
     }
   });
   const disposeOnRootState = (0, import_router.subscribeToRootState)(state => {
+    const currentHref = import_router.routeInfo?.unstable_globalHref ?? "";
+    const currentPathname = import_router.routeInfo?.pathname ?? "";
     if (isFirstStateChange) {
       isFirstStateChange = false;
-      const currentLocation = `${window.location.pathname}${window.location.search}${window.location.hash}`;
-      if (currentLocation === initialLocation) {
+      if (currentHref === initialLocation) {
         return;
       }
     }
@@ -128,7 +129,6 @@ function configure(props) {
     const {
       hash
     } = state;
-    const currentPathname = window.location.pathname;
     if (hash) {
       setTimeout(() => {
         scrollToHash(hash);

package/dist/cjs/views/ScrollBehavior.native.js

@@ -124,7 +124,7 @@ function configure(props) {
     return;
   }
   disable === null || disable === void 0 ? void 0 : disable();
-  var initialLocation = `${window.location.pathname}${window.location.search}${window.location.hash}`;
+  var initialLocation = `${window.location.pathname}${window.location.search}`;
   var isFirstStateChange = true;
   previousPathname = window.location.pathname;
   var popStateController = new AbortController();
@@ -140,11 +140,13 @@ function configure(props) {
     }
   });
   var disposeOnRootState = (0, import_router.subscribeToRootState)(function (state) {
+    var _ref, _ref1;
     var _state_linkOptions;
+    var currentHref = (_ref = import_router.routeInfo === null || import_router.routeInfo === void 0 ? void 0 : import_router.routeInfo.unstable_globalHref) !== null && _ref !== void 0 ? _ref : "";
+    var currentPathname = (_ref1 = import_router.routeInfo === null || import_router.routeInfo === void 0 ? void 0 : import_router.routeInfo.pathname) !== null && _ref1 !== void 0 ? _ref1 : "";
     if (isFirstStateChange) {
       isFirstStateChange = false;
-      var currentLocation = `${window.location.pathname}${window.location.search}${window.location.hash}`;
-      if (currentLocation === initialLocation) {
+      if (currentHref === initialLocation) {
         return;
       }
     }
@@ -154,7 +156,6 @@ function configure(props) {
     var {
       hash
     } = state;
-    var currentPathname = window.location.pathname;
     if (hash) {
       setTimeout(function () {
         scrollToHash(hash);

package/dist/cjs/views/ScrollBehavior.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","ScrollBehavior_exports","__export","ScrollBehavior","registerScrollGroup","module","exports","import_react","require","import_lastAction","import_router","KEY","GROUP_KEY","getState","JSON","parse","sessionStorage","getItem","getGroupState","activeGroups","Set","groupId","add","delete","getGroupKey","pathname","longestMatch","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","group","startsWith","length","err","return","restorePosition","positions","saved","window","location","setTimeout","scrollTo","error","console","removeItem","restoreGroupPosition","didPop","previousPathname","rememberScrollPosition","state","scrollY","setItem","stringify","groupKey","groupState","disable","configure","props","addEventListener","initialLocation","search","hash","isFirstStateChange","popStateController","AbortController","setLastAction","signal","disposeOnLoadState","subscribeToLoadingState","disposeOnRootState","subscribeToRootState","_state_linkOptions","currentLocation","linkOptions","scroll","currentPathname","scrollToHash","_state_linkOptions1","prevGroup","currentGroup","scrollGroup","abort"],"sources":["../../../src/views/ScrollBehavior.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,sBAAA;AAAAC,QAAA,CAAAD,sBAAA;EAAAE,cAAA,EAAAA,CAAA,KAAAA,cAAA;EAAAC,mBAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAV,YAA0B,CAAAK,sBAAA;AAC1B,IAAAM,YAAA,GAAAC,OAA8B;AAC9B,IAAAC,iBAA8D,GAAAD,OAAA;AAE9D,IAAAE,aAAY,GAAAF,OAAA;AACZ,IAAAG,GAAM,WAAY;AAElB,IAAAC,SAAM,kBAAsB;AAC5B,IAAAC,QAAM,YAAAA,CAAA,EAAgB;EAGtB,OAAIC,IAAA,CAAAC,KAA4B,CAAAC,cAAA,CAAAC,OAAI,CAAIN,GAAA;AASjC;AACL,IAAAO,aAAa,GAAI,SAAAA,CAAA,EAAO;EACxB,OAAOJ,IAAA,CAAAC,KAAM,CAAAC,cAAA,CAAAC,OAAA,CAAAL,SAAA;AACX;AAA2B,IAC7BO,YAAA,sBAAAC,GAAA;AACF,SAAAhB,oBAAAiB,OAAA;EAEAF,YAAS,CAAAG,GAAA,CAAAD,OAAY;EAEnB,OAAI;IACJF,YAAW,CAAAI,MAAS,CAAAF,OAAA;EAClB;AAIE;AAAe,SACjBG,YAAAC,QAAA;EACF,IAAAC,YAAA;EACA,IAAAC,yBAAO;IAAAC,iBAAA;IAAAC,cAAA;EACT;IAEA,KAAS,IAAAC,SAAA,GAAAX,YAAkB,CAAAY,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MACrB,IAAAS,KAAA,GAAAH,KAAA,CAAAjC,KAAA;MACF,IAAM,CAAAyB,QAAA,KAAYW,KAAA,IAASX,QAAA,CAAAY,UAAA,IAAAD,KAAA,WAAAV,YAAA,IAAAU,KAAA,CAAAE,MAAA,GAAAZ,YAAA,CAAAY,MAAA;QAC3BZ,YAAc,GAAAU,KAAU;MACxB;IACE;EACE,SAAAG,GAAA,EAAO;IAAiBX,iBACzB;IACHC,cAAA,GAAAU,GAAA;EACF,UAAS;IACP;MACA,KAAAZ,yBAA6B,IAAAG,SAAA,CAAAU,MAAA;QAC/BV,SAAA,CAAAU,MAAA;MACF;IAEA,UAAS;MACH,IAAAZ,iBAAA;QACF,MAAMC,cAAY;MAClB;IACA;EACE;EACE,OAAAH,YAAO;AAAiB;AACzB,SACHe,gBAAA;EACF;IACE,IAAAC,SAAQ,GAAM7B,QAAA;IACd,IAAA8B,KAAA,GAAAD,SAAe,CAAAE,MAAW,CAAAC,QAAS,CAAApB,QAAA;IACrC,WAAAkB,KAAA;MACFG,UAAA;QAEIF,MAAS,CAAAG,QAAA,IAAAJ,KAAA;MACT;IAEJ;EACE,SAASK,KAAA;IACTC,OAAM,CAAAD,KAAA,kCAA2B,EAAAA,KAAA;IAGjChC,cAAc,CAAAkC,UAAS,CAAAvC,GAAA;EACvB;AACA;AAGA,SAAMwC,oBAAWA,CAAA9B,OAAY,EAAQ;EACrC,IAAI;IACF,IAAAqB,SAAM,GAAAxB,aAAa;IACnB,IAAAyB,KAAA,GAAWD,SAAQ,CAAArB,OAAI,CAAO;IAC9B,WAAAsB,KAAe,aAAQ;MACzBG,UAAA;QAEAF,MAAA,CAAAG,QAAmB,IAAAJ,KAAA;MACrB;IAMI;EAEJ,SAASK,KAAA;IACPC,OAAI,CAAAD,KAAO,8CAAkC3B,OAAkB,IAAA2B,KAAA;IAC7DhC,cAAA,CAAAkC,UAAA,CAAAtC,SAAA;EACF;AAEA;AAEA,IAAAwC,MAAM;AAEN,IAAAC,gBAAI,OAAqB;AACzB,SAAAC,sBAA0BA,CAAA;EAE1BF,MAAM;EAEN,IAAA3B,QAAO,GAAAmB,MAAA,CAAAC,QAAA,CAAApB,QAAA;EAAA,IACL8B,KAAA,GAAA1C,QAAA;EAAA0C,KACA,CAAA9B,QAAM,IAAAmB,MAAA,CAAAY,OAAA;EACJxC,cAAS,CAAAyC,OAAA,CAAA9C,GAAA,EAAAG,IAAA,CAAA4C,SAAA,CAAAH,KAAA;EACT,IAAAI,QAAA,GAAAnC,WAAA,CAAAC,QAAA;EAAc,IAChBkC,QAAA;IACA,IAAAC,UAAA,GAAA1C,aAAA;IAAA0C,UACU,CAAAD,QAAA,IAAAf,MAAmB,CAAAY,OAAA;IAC7BxC,cAAA,CAAAyC,OAAA,CAAA7C,SAAA,EAAAE,IAAA,CAAA4C,SAAA,CAAAE,UAAA;EACF;EAEAP,gBAAM,GAAA5B,QAAA;AACJ;AACE,IAAAoC,OAAA;AAAuB,SACzBC,UAAAC,KAAA;EACF,IAAC,OAAAnB,MAAA,qBAAAA,MAAA,CAAAoB,gBAAA;IAED;EACE;EACEH,OAAA,aAAAA,OAAqB,uBAAAA,OAAA;EAMrB,IAAAI,eAAM,MAAArB,MACD,CAAAC,QAAO,CAAApB,QAAS,GAAAmB,MAAW,CAAAC,QAAO,CAAAqB,MAAS,GAAAtB,MAAS,CAAAC,QAAO,CAAAsB,IAAA,EAAS;EACzE,IAAAC,kBAAI,OAAoB;EACtBf,gBAAA,GAAAT,MAAA,CAAAC,QAAA,CAAApB,QAAA;EAAA,IACF4C,kBAAA,OAAAC,eAAA;EAAA1B,MACF,CAAAoB,gBAAA;IAEAZ,MAAI,OAAM;IACR,IAAA3C,iBAAA,CAAA8D,aAAA;EAAA,GACF;IAEAC,MAAM,EAAEH,kBAAS,CAAAG;EACjB;EAEA,IAAAC,kBAAU,OAAA/D,aAAA,CAAAgE,uBAAA,YAAAnB,KAAA;IACR,IAAAA,KAAA,KAAW,SAAM;MACfD,sBAAiB;IAAA;EAClB,EACH;EACE,IAAAqB,kBAAU,IAAY,GAAAjE,aAAW,CAAAkE,oBAAA,YAAArB,KAAA;IAE/B,IAAAsB,kBAAgB;IAAA,IAClBT,kBAAA;MACFA,kBAAO;MAGL,IAAAU,eAAkB,MAAAlC,MAAA,CAAAC,QAAmB,CAAApB,QAAY,GAAAmB,MAAA,CAAAC,QAAgB,CAAAqB,MAAI,GAAAtB,MAAA,CAAAC,QAAA,CAAAsB,IAAA;MACrE,IAAAW,eAAM,KAAeb,eAAY;QAEjC;MAEE;IAAiC;IAGjC,MAAAY,kBAAA,GAAqBtB,KAAM,CAAAwB,WAAY,UAAW,IAAAF,kBAAA,uBAAAA,kBAAA,CAAAG,MAAA;MACpD;IAEE;IAAoB,IACtB;MAAAb;IAAA,IAAAZ,KAAA;IACF,IAAA0B,eAAA,GAAArC,MAAA,CAAAC,QAAA,CAAApB,QAAA;IAEA,IAAA0C,IAAA;MACDrB,UAAA;QAEDoC,YAAgB,CAAAf,IAAA;MACd;IACA,WAAAf,MAAA,EAAmB;MACnB,IAAAW,KAAA,CAAAF,OAAmB;QACrBpB,eAAA;MAEA;IACF;MAEA,IAAS0C,mBAA2B;MAC9B,IAACC,SAAS,GAAK/B,gBAAiB,GAAA7B,WAAA,CAAA6B,gBAAA;MACpC,IAAMgC,YAAU,GAAO7D,WAAA,CAAAyD,eAAA;MACvB,IAAMG,SAAK,IAASC,YAAA,IAAiBD,SAAA,KAAAC,YAAA;QAChClC,oBAAI,CAAAkC,YAAA;MACN,YAAAF,mBAA2B,GAAA5B,KAAW,CAAAwB,WAAA,cAAAI,mBAAA,uBAAAA,mBAAA,CAAAG,WAAA;QAC3CnC,oBAAA,CAAAI,KAAA,CAAAwB,WAAA,CAAAO,WAAA;MAEO,OAAS;QACV1C,MAAQ,CAAAG,QAAI;MACd;IACE;IACEM,gBAAA,GAAa4B,eAAgB;EAAI;EACnCpB,OACG,YAAAA,CAAA;IAELQ,kBAAA,CAAAkB,KAAA;IACEd,kBAAO,CAAU;IACnBE,kBAAkB;EACpB;EAEA,OAAOd,OAAA;AACT","ignoreList":[]}
+{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","ScrollBehavior_exports","__export","ScrollBehavior","registerScrollGroup","module","exports","import_react","require","import_lastAction","import_router","KEY","GROUP_KEY","getState","JSON","parse","sessionStorage","getItem","getGroupState","activeGroups","Set","groupId","add","delete","getGroupKey","pathname","longestMatch","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","group","startsWith","length","err","return","restorePosition","positions","saved","window","location","setTimeout","scrollTo","error","console","removeItem","restoreGroupPosition","didPop","previousPathname","rememberScrollPosition","state","scrollY","setItem","stringify","groupKey","groupState","disable","configure","props","addEventListener","initialLocation","search","isFirstStateChange","popStateController","AbortController","setLastAction","signal","disposeOnLoadState","subscribeToLoadingState","disposeOnRootState","subscribeToRootState","_ref","_ref1","_state_linkOptions","currentHref","routeInfo","unstable_globalHref","currentPathname","linkOptions","scroll","hash","scrollToHash","_state_linkOptions1","prevGroup","currentGroup","scrollGroup","abort"],"sources":["../../../src/views/ScrollBehavior.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/cjs/views/ScrollBehavior.test.cjs

@@ -30,10 +30,19 @@ const subscriptions = import_vitest.vi.hoisted(() => ({
   loading: void 0,
   root: void 0
 }));
+const router = import_vitest.vi.hoisted(() => ({
+  routeInfo: {
+    unstable_globalHref: "/",
+    pathname: "/"
+  }
+}));
 import_vitest.vi.mock("../router/lastAction", () => ({
   setLastAction: import_vitest.vi.fn()
 }));
 import_vitest.vi.mock("../router/router", () => ({
+  get routeInfo() {
+    return router.routeInfo;
+  },
   subscribeToLoadingState: subscriber => {
     subscriptions.loading = subscriber;
     return () => {
@@ -51,6 +60,15 @@ globalThis.IS_REACT_ACT_ENVIRONMENT = true;
 let renderer;
 let location;
 let scrollTo;
+function navigate(pathname, search = "") {
+  router.routeInfo = {
+    unstable_globalHref: `${pathname}${search}`,
+    pathname
+  };
+  (0, import_react_test_renderer.act)(() => subscriptions.root?.({}));
+  location.pathname = pathname;
+  location.search = search;
+}
 (0, import_vitest.beforeEach)(() => {
   process.env.VITE_ENVIRONMENT = "client";
   location = {
@@ -58,6 +76,10 @@ let scrollTo;
     search: "",
     hash: ""
   };
+  router.routeInfo = {
+    unstable_globalHref: "/",
+    pathname: "/"
+  };
   scrollTo = import_vitest.vi.fn();
   const windowMock = Object.assign(new EventTarget(), {
     location,
@@ -91,13 +113,11 @@ let scrollTo;
     (0, import_vitest.expect)(scrollTo).not.toHaveBeenCalled();
   });
   (0, import_vitest.it)("scrolls to the top when the first state notification is a real navigation", () => {
-    location.pathname = "/compat/react-native-gesture-handler";
-    (0, import_react_test_renderer.act)(() => subscriptions.root?.({}));
+    navigate("/compat/react-native-gesture-handler");
     (0, import_vitest.expect)(scrollTo).toHaveBeenCalledWith(0, 0);
   });
   (0, import_vitest.it)("handles a query change as a first navigation", () => {
-    location.search = "?platform=ios";
-    (0, import_react_test_renderer.act)(() => subscriptions.root?.({}));
+    navigate("/", "?platform=ios");
     (0, import_vitest.expect)(scrollTo).toHaveBeenCalledWith(0, 0);
   });
 });
@@ -105,13 +125,10 @@ let scrollTo;
   (0, import_vitest.it)("preserves position between routes in the same group", () => {
     import_vitest.vi.useFakeTimers();
     const unregister = (0, import_ScrollBehavior.registerScrollGroup)("/compat/react-native-gesture-handler");
-    (0, import_react_test_renderer.act)(() => subscriptions.root?.({}));
-    location.pathname = "/compat/react-native-gesture-handler";
-    (0, import_react_test_renderer.act)(() => subscriptions.root?.({}));
+    navigate("/compat/react-native-gesture-handler");
     scrollTo.mockClear();
     (0, import_react_test_renderer.act)(() => subscriptions.loading?.("loading"));
-    location.pathname = "/compat/react-native-gesture-handler/pan-gesture";
-    (0, import_react_test_renderer.act)(() => subscriptions.root?.({}));
+    navigate("/compat/react-native-gesture-handler/pan-gesture");
     import_vitest.vi.runAllTimers();
     (0, import_vitest.expect)(scrollTo).toHaveBeenCalledWith(0, 500);
     unregister();
@@ -119,13 +136,10 @@ let scrollTo;
   });
   (0, import_vitest.it)("does not match a different route whose slug has the same prefix", () => {
     const unregister = (0, import_ScrollBehavior.registerScrollGroup)("/compat/react-native");
-    (0, import_react_test_renderer.act)(() => subscriptions.root?.({}));
-    location.pathname = "/compat/react-native/core";
-    (0, import_react_test_renderer.act)(() => subscriptions.root?.({}));
+    navigate("/compat/react-native/core");
     scrollTo.mockClear();
     (0, import_react_test_renderer.act)(() => subscriptions.loading?.("loading"));
-    location.pathname = "/compat/react-native-gesture-handler";
-    (0, import_react_test_renderer.act)(() => subscriptions.root?.({}));
+    navigate("/compat/react-native-gesture-handler");
     (0, import_vitest.expect)(scrollTo).toHaveBeenCalledWith(0, 0);
     unregister();
   });

package/dist/cjs/views/ScrollBehavior.test.native.js

@@ -35,6 +35,14 @@ var subscriptions = import_vitest.vi.hoisted(function () {
     root: void 0
   };
 });
+var router = import_vitest.vi.hoisted(function () {
+  return {
+    routeInfo: {
+      unstable_globalHref: "/",
+      pathname: "/"
+    }
+  };
+});
 import_vitest.vi.mock("../router/lastAction", function () {
   return {
     setLastAction: import_vitest.vi.fn()
@@ -42,6 +50,9 @@ import_vitest.vi.mock("../router/lastAction", function () {
 });
 import_vitest.vi.mock("../router/router", function () {
   return {
+    get routeInfo() {
+      return router.routeInfo;
+    },
     subscribeToLoadingState: function (subscriber) {
       subscriptions.loading = subscriber;
       return function () {
@@ -60,6 +71,19 @@ globalThis.IS_REACT_ACT_ENVIRONMENT = true;
 var renderer;
 var location;
 var scrollTo;
+function navigate(pathname) {
+  var search = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+  router.routeInfo = {
+    unstable_globalHref: `${pathname}${search}`,
+    pathname
+  };
+  (0, import_react_test_renderer.act)(function () {
+    var _subscriptions_root;
+    return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
+  });
+  location.pathname = pathname;
+  location.search = search;
+}
 (0, import_vitest.beforeEach)(function () {
   process.env.VITE_ENVIRONMENT = "client";
   location = {
@@ -67,6 +91,10 @@ var scrollTo;
     search: "",
     hash: ""
   };
+  router.routeInfo = {
+    unstable_globalHref: "/",
+    pathname: "/"
+  };
   scrollTo = import_vitest.vi.fn();
   var windowMock = Object.assign(new EventTarget(), {
     location,
@@ -112,19 +140,11 @@ var scrollTo;
     (0, import_vitest.expect)(scrollTo).not.toHaveBeenCalled();
   });
   (0, import_vitest.it)("scrolls to the top when the first state notification is a real navigation", function () {
-    location.pathname = "/compat/react-native-gesture-handler";
-    (0, import_react_test_renderer.act)(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native-gesture-handler");
     (0, import_vitest.expect)(scrollTo).toHaveBeenCalledWith(0, 0);
   });
   (0, import_vitest.it)("handles a query change as a first navigation", function () {
-    location.search = "?platform=ios";
-    (0, import_react_test_renderer.act)(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/", "?platform=ios");
     (0, import_vitest.expect)(scrollTo).toHaveBeenCalledWith(0, 0);
   });
 });
@@ -132,25 +152,13 @@ var scrollTo;
   (0, import_vitest.it)("preserves position between routes in the same group", function () {
     import_vitest.vi.useFakeTimers();
     var unregister = (0, import_ScrollBehavior.registerScrollGroup)("/compat/react-native-gesture-handler");
-    (0, import_react_test_renderer.act)(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
-    location.pathname = "/compat/react-native-gesture-handler";
-    (0, import_react_test_renderer.act)(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native-gesture-handler");
     scrollTo.mockClear();
     (0, import_react_test_renderer.act)(function () {
       var _subscriptions_loading;
       return (_subscriptions_loading = subscriptions.loading) === null || _subscriptions_loading === void 0 ? void 0 : _subscriptions_loading.call(subscriptions, "loading");
     });
-    location.pathname = "/compat/react-native-gesture-handler/pan-gesture";
-    (0, import_react_test_renderer.act)(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native-gesture-handler/pan-gesture");
     import_vitest.vi.runAllTimers();
     (0, import_vitest.expect)(scrollTo).toHaveBeenCalledWith(0, 500);
     unregister();
@@ -158,25 +166,13 @@ var scrollTo;
   });
   (0, import_vitest.it)("does not match a different route whose slug has the same prefix", function () {
     var unregister = (0, import_ScrollBehavior.registerScrollGroup)("/compat/react-native");
-    (0, import_react_test_renderer.act)(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
-    location.pathname = "/compat/react-native/core";
-    (0, import_react_test_renderer.act)(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native/core");
     scrollTo.mockClear();
     (0, import_react_test_renderer.act)(function () {
       var _subscriptions_loading;
       return (_subscriptions_loading = subscriptions.loading) === null || _subscriptions_loading === void 0 ? void 0 : _subscriptions_loading.call(subscriptions, "loading");
     });
-    location.pathname = "/compat/react-native-gesture-handler";
-    (0, import_react_test_renderer.act)(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native-gesture-handler");
     (0, import_vitest.expect)(scrollTo).toHaveBeenCalledWith(0, 0);
     unregister();
   });

package/dist/cjs/views/ScrollBehavior.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["import_jsx_runtime","require","import_react","__toESM","import_react_test_renderer","import_vitest","import_ScrollBehavior","subscriptions","vi","hoisted","loading","root","mock","setLastAction","fn","subscribeToLoadingState","subscriber","subscribeToRootState","globalThis","IS_REACT_ACT_ENVIRONMENT","renderer","location","scrollTo","beforeEach","process","env","VITE_ENVIRONMENT","pathname","search","hash","windowMock","Object","assign","EventTarget","scrollY","storage","Map","stubGlobal","getElementById","getItem","key","_storage_get","get","setItem","value","set","removeItem","delete","act","default","create","jsx","ScrollBehavior","afterEach","unmount","useRealTimers","unstubAllGlobals","describe","it","_subscriptions_root","call","expect","not","toHaveBeenCalled","toHaveBeenCalledWith"],"sources":["../../../src/views/ScrollBehavior.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["import_jsx_runtime","require","import_react","__toESM","import_react_test_renderer","import_vitest","import_ScrollBehavior","subscriptions","vi","hoisted","loading","root","router","routeInfo","unstable_globalHref","pathname","mock","setLastAction","fn","subscribeToLoadingState","subscriber","subscribeToRootState","globalThis","IS_REACT_ACT_ENVIRONMENT","renderer","location","scrollTo","navigate","search","arguments","length","act","_subscriptions_root","call","beforeEach","process","env","VITE_ENVIRONMENT","hash","windowMock","Object","assign","EventTarget","scrollY","storage","Map","stubGlobal","getElementById","getItem","key","_storage_get","get","setItem","value","set","removeItem","delete","default","create","jsx","ScrollBehavior","afterEach","unmount","useRealTimers","unstubAllGlobals"],"sources":["../../../src/views/ScrollBehavior.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/views/ScrollBehavior.mjs

@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 import { setLastAction } from "../router/lastAction.mjs";
-import { subscribeToLoadingState, subscribeToRootState } from "../router/router.mjs";
+import { routeInfo, subscribeToLoadingState, subscribeToRootState } from "../router/router.mjs";
 const KEY = "one-sr";
 const GROUP_KEY = "one-sr-groups";
 const getState = () => JSON.parse(sessionStorage.getItem(KEY) || "{}");
@@ -71,7 +71,7 @@ function configure(props) {
     return;
   }
   disable?.();
-  const initialLocation = `${window.location.pathname}${window.location.search}${window.location.hash}`;
+  const initialLocation = `${window.location.pathname}${window.location.search}`;
   let isFirstStateChange = true;
   previousPathname = window.location.pathname;
   const popStateController = new AbortController();
@@ -87,10 +87,11 @@ function configure(props) {
     }
   });
   const disposeOnRootState = subscribeToRootState(state => {
+    const currentHref = routeInfo?.unstable_globalHref ?? "";
+    const currentPathname = routeInfo?.pathname ?? "";
     if (isFirstStateChange) {
       isFirstStateChange = false;
-      const currentLocation = `${window.location.pathname}${window.location.search}${window.location.hash}`;
-      if (currentLocation === initialLocation) {
+      if (currentHref === initialLocation) {
         return;
       }
     }
@@ -100,7 +101,6 @@ function configure(props) {
     const {
       hash
     } = state;
-    const currentPathname = window.location.pathname;
     if (hash) {
       setTimeout(() => {
         scrollToHash(hash);

package/dist/esm/views/ScrollBehavior.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","setLastAction","subscribeToLoadingState","subscribeToRootState","KEY","GROUP_KEY","getState","JSON","parse","sessionStorage","getItem","getGroupState","activeGroups","Set","registerScrollGroup","groupId","add","delete","getGroupKey","pathname","longestMatch","group","startsWith","length","restorePosition","positions","saved","window","location","setTimeout","scrollTo","error","console","removeItem","restoreGroupPosition","didPop","previousPathname","rememberScrollPosition","state","scrollY","setItem","stringify","groupKey","groupState","disable","configure","props","addEventListener","initialLocation","search","hash","isFirstStateChange","popStateController","AbortController","signal","disposeOnLoadState","disposeOnRootState","currentLocation","linkOptions","scroll","currentPathname","scrollToHash","prevGroup","currentGroup","scrollGroup","abort","id","slice","el","document","getElementById","scrollIntoView","behavior","ScrollBehavior","process","env","VITE_ENVIRONMENT"],"sources":["../../../src/views/ScrollBehavior.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","setLastAction","routeInfo","subscribeToLoadingState","subscribeToRootState","KEY","GROUP_KEY","getState","JSON","parse","sessionStorage","getItem","getGroupState","activeGroups","Set","registerScrollGroup","groupId","add","delete","getGroupKey","pathname","longestMatch","group","startsWith","length","restorePosition","positions","saved","window","location","setTimeout","scrollTo","error","console","removeItem","restoreGroupPosition","didPop","previousPathname","rememberScrollPosition","state","scrollY","setItem","stringify","groupKey","groupState","disable","configure","props","addEventListener","initialLocation","search","isFirstStateChange","popStateController","AbortController","signal","disposeOnLoadState","disposeOnRootState","currentHref","unstable_globalHref","currentPathname","linkOptions","scroll","hash","scrollToHash","prevGroup","currentGroup","scrollGroup","abort","id","slice","el","document","getElementById","scrollIntoView","behavior","ScrollBehavior","process","env","VITE_ENVIRONMENT"],"sources":["../../../src/views/ScrollBehavior.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAC1B,SAASC,aAAA,QAAqB;AAC9B,SAASC,SAAA,EAAWC,uBAAA,EAAyBC,oBAAA,QAA4B;AAEzE,MAAMC,GAAA,GAAM;AACZ,MAAMC,SAAA,GAAY;AAElB,MAAMC,QAAA,GAAWA,CAAA,KAAMC,IAAA,CAAKC,KAAA,CAAMC,cAAA,CAAeC,OAAA,CAAQN,GAAG,KAAK,IAAI;AACrE,MAAMO,aAAA,GAAgBA,CAAA,KAAMJ,IAAA,CAAKC,KAAA,CAAMC,cAAA,CAAeC,OAAA,CAAQL,SAAS,KAAK,IAAI;AAGhF,IAAIO,YAAA,GAA4B,mBAAIC,GAAA,CAAI;AASjC,SAASC,oBAAoBC,OAAA,EAAiB;EACnDH,YAAA,CAAaI,GAAA,CAAID,OAAO;EACxB,OAAO,MAAM;IACXH,YAAA,CAAaK,MAAA,CAAOF,OAAO;EAC7B;AACF;AAEA,SAASG,YAAYC,QAAA,EAAiC;EAEpD,IAAIC,YAAA,GAA8B;EAClC,WAAWC,KAAA,IAAST,YAAA,EAAc;IAChC,KACGO,QAAA,KAAaE,KAAA,IAASF,QAAA,CAASG,UAAA,CAAW,GAAGD,KAAK,GAAG,OACrD,CAACD,YAAA,IAAgBC,KAAA,CAAME,MAAA,GAASH,YAAA,CAAaG,MAAA,GAC9C;MACAH,YAAA,GAAeC,KAAA;IACjB;EACF;EACA,OAAOD,YAAA;AACT;AAEA,SAASI,gBAAA,EAAkB;EACzB,IAAI;IACF,MAAMC,SAAA,GAAYnB,QAAA,CAAS;IAC3B,MAAMoB,KAAA,GAAQD,SAAA,CAAUE,MAAA,CAAOC,QAAA,CAAST,QAAQ;IAChD,IAAI,OAAOO,KAAA,KAAU,UAAU;MAC7BG,UAAA,CAAW,MAAM;QACfF,MAAA,CAAOG,QAAA,CAAS,GAAGJ,KAAK;MAC1B,CAAC;IACH;EACF,SAASK,KAAA,EAAO;IACdC,OAAA,CAAQD,KAAA,CAAM,mCAAmCA,KAAK;IACtDtB,cAAA,CAAewB,UAAA,CAAW7B,GAAG;EAC/B;AACF;AAEA,SAAS8B,qBAAqBnB,OAAA,EAAiB;EAC7C,IAAI;IACF,MAAMU,SAAA,GAAYd,aAAA,CAAc;IAChC,MAAMe,KAAA,GAAQD,SAAA,CAAUV,OAAO;IAC/B,IAAI,OAAOW,KAAA,KAAU,UAAU;MAC7BG,UAAA,CAAW,MAAM;QACfF,MAAA,CAAOG,QAAA,CAAS,GAAGJ,KAAK;MAC1B,CAAC;IACH;EACF,SAASK,KAAA,EAAO;IACdC,OAAA,CAAQD,KAAA,CAAM,6CAA6ChB,OAAO,IAAIgB,KAAK;IAC3EtB,cAAA,CAAewB,UAAA,CAAW5B,SAAS;EACrC;AACF;AAEA,IAAI8B,MAAA,GAAS;AACb,IAAIC,gBAAA,GAAkC;AAEtC,SAASC,uBAAA,EAAyB;EAChCF,MAAA,GAAS;EACT,MAAMhB,QAAA,GAAWQ,MAAA,CAAOC,QAAA,CAAST,QAAA;EAGjC,MAAMmB,KAAA,GAAQhC,QAAA,CAAS;EACvBgC,KAAA,CAAMnB,QAAQ,IAAIQ,MAAA,CAAOY,OAAA;EACzB9B,cAAA,CAAe+B,OAAA,CAAQpC,GAAA,EAAKG,IAAA,CAAKkC,SAAA,CAAUH,KAAK,CAAC;EAGjD,MAAMI,QAAA,GAAWxB,WAAA,CAAYC,QAAQ;EACrC,IAAIuB,QAAA,EAAU;IACZ,MAAMC,UAAA,GAAahC,aAAA,CAAc;IACjCgC,UAAA,CAAWD,QAAQ,IAAIf,MAAA,CAAOY,OAAA;IAC9B9B,cAAA,CAAe+B,OAAA,CAAQnC,SAAA,EAAWE,IAAA,CAAKkC,SAAA,CAAUE,UAAU,CAAC;EAC9D;EAEAP,gBAAA,GAAmBjB,QAAA;AACrB;AAMA,IAAIyB,OAAA,GAA+B;AAEnC,SAASC,UAAUC,KAAA,EAA4B;EAC7C,IAAI,OAAOnB,MAAA,KAAW,eAAe,CAACA,MAAA,CAAOoB,gBAAA,EAAkB;IAC7D;EACF;EAEAH,OAAA,GAAU;EAGV,MAAMI,eAAA,GAAkB,GAAGrB,MAAA,CAAOC,QAAA,CAAST,QAAQ,GAAGQ,MAAA,CAAOC,QAAA,CAASqB,MAAM;EAC5E,IAAIC,kBAAA,GAAqB;EACzBd,gBAAA,GAAmBT,MAAA,CAAOC,QAAA,CAAST,QAAA;EAEnC,MAAMgC,kBAAA,GAAqB,IAAIC,eAAA,CAAgB;EAE/CzB,MAAA,CAAOoB,gBAAA,CACL,YACA,MAAM;IACJZ,MAAA,GAAS;IACTnC,aAAA,CAAc;EAChB,GACA;IACEqD,MAAA,EAAQF,kBAAA,CAAmBE;EAC7B,CACF;EAEA,MAAMC,kBAAA,GAAqBpD,uBAAA,CAAyBoC,KAAA,IAAU;IAC5D,IAAIA,KAAA,KAAU,WAAW;MACvBD,sBAAA,CAAuB;IACzB;EACF,CAAC;EAED,MAAMkB,kBAAA,GAAqBpD,oBAAA,CAAsBmC,KAAA,IAAU;IAKzD,MAAMkB,WAAA,GAAcvD,SAAA,EAAWwD,mBAAA,IAAuB;IACtD,MAAMC,eAAA,GAAkBzD,SAAA,EAAWkB,QAAA,IAAY;IAE/C,IAAI+B,kBAAA,EAAoB;MACtBA,kBAAA,GAAqB;MAMrB,IAAIM,WAAA,KAAgBR,eAAA,EAAiB;QACnC;MACF;IACF;IAEA,IAAIV,KAAA,CAAMqB,WAAA,EAAaC,MAAA,KAAW,OAAO;MACvC;IACF;IAEA,MAAM;MAAEC;IAAK,IAAIvB,KAAA;IAEjB,IAAIuB,IAAA,EAAM;MACRhC,UAAA,CAAW,MAAM;QACfiC,YAAA,CAAaD,IAAI;MACnB,CAAC;IACH,WAAW1B,MAAA,EAAQ;MACjB,IAAIW,KAAA,CAAMF,OAAA,KAAY,WAAW;QAE/BpB,eAAA,CAAgB;MAClB;IACF,OAAO;MAGL,MAAMuC,SAAA,GAAY3B,gBAAA,GAAmBlB,WAAA,CAAYkB,gBAAgB,IAAI;MACrE,MAAM4B,YAAA,GAAe9C,WAAA,CAAYwC,eAAe;MAEhD,IAAIK,SAAA,IAAaC,YAAA,IAAgBD,SAAA,KAAcC,YAAA,EAAc;QAE3D9B,oBAAA,CAAqB8B,YAAY;MACnC,WAAW1B,KAAA,CAAMqB,WAAA,EAAaM,WAAA,EAAa;QAEzC/B,oBAAA,CAAqBI,KAAA,CAAMqB,WAAA,CAAYM,WAAW;MACpD,OAAO;QAELtC,MAAA,CAAOG,QAAA,CAAS,GAAG,CAAC;MACtB;IACF;IAEAM,gBAAA,GAAmBsB,eAAA;EACrB,CAAC;EAEDd,OAAA,GAAUA,CAAA,KAAM;IACdO,kBAAA,CAAmBe,KAAA,CAAM;IACzBZ,kBAAA,CAAmB;IACnBC,kBAAA,CAAmB;EACrB;EAEA,OAAOX,OAAA;AACT;AAEA,SAASkB,aAAaD,IAAA,EAAc;EAClC,IAAI,CAACA,IAAA,IAAQ,CAACA,IAAA,CAAKvC,UAAA,CAAW,GAAG,GAAG;EACpC,MAAM6C,EAAA,GAAKN,IAAA,CAAKO,KAAA,CAAM,CAAC;EACvB,MAAMC,EAAA,GAAKC,QAAA,CAASC,cAAA,CAAeJ,EAAE;EACrC,IAAI,CAACE,EAAA,EAAI;EACTA,EAAA,CAAGG,cAAA,CAAe;IAAEC,QAAA,EAAU;EAAU,CAAC;AAC3C;AAEO,SAASC,eAAe5B,KAAA,EAA4B;EACzD,IAAI6B,OAAA,CAAQC,GAAA,CAAIC,gBAAA,KAAqB,UAAU;IAC7C9E,SAAA,CAAU,MAAM;MACd,IAAI4B,MAAA,CAAOC,QAAA,CAASiC,IAAA,EAAM;QACxBC,YAAA,CAAanC,MAAA,CAAOC,QAAA,CAASiC,IAAI;MACnC;IACF,GAAG,EAAE;IAEL9D,SAAA,CAAU,MAAM;MACd,OAAO8C,SAAA,CAAUC,KAAK;IACxB,GAAG,CAACA,KAAA,CAAMF,OAAO,CAAC;EACpB;EAEA,OAAO;AACT","ignoreList":[]}

package/dist/esm/views/ScrollBehavior.native.js

@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 import { setLastAction } from "../router/lastAction.native.js";
-import { subscribeToLoadingState, subscribeToRootState } from "../router/router.native.js";
+import { routeInfo, subscribeToLoadingState, subscribeToRootState } from "../router/router.native.js";
 var KEY = "one-sr";
 var GROUP_KEY = "one-sr-groups";
 var getState = function () {
@@ -94,7 +94,7 @@ function configure(props) {
     return;
   }
   disable === null || disable === void 0 ? void 0 : disable();
-  var initialLocation = `${window.location.pathname}${window.location.search}${window.location.hash}`;
+  var initialLocation = `${window.location.pathname}${window.location.search}`;
   var isFirstStateChange = true;
   previousPathname = window.location.pathname;
   var popStateController = new AbortController();
@@ -110,11 +110,13 @@ function configure(props) {
     }
   });
   var disposeOnRootState = subscribeToRootState(function (state) {
+    var _ref, _ref1;
     var _state_linkOptions;
+    var currentHref = (_ref = routeInfo === null || routeInfo === void 0 ? void 0 : routeInfo.unstable_globalHref) !== null && _ref !== void 0 ? _ref : "";
+    var currentPathname = (_ref1 = routeInfo === null || routeInfo === void 0 ? void 0 : routeInfo.pathname) !== null && _ref1 !== void 0 ? _ref1 : "";
     if (isFirstStateChange) {
       isFirstStateChange = false;
-      var currentLocation = `${window.location.pathname}${window.location.search}${window.location.hash}`;
-      if (currentLocation === initialLocation) {
+      if (currentHref === initialLocation) {
         return;
       }
     }
@@ -124,7 +126,6 @@ function configure(props) {
     var {
       hash
     } = state;
-    var currentPathname = window.location.pathname;
     if (hash) {
       setTimeout(function () {
         scrollToHash(hash);

package/dist/esm/views/ScrollBehavior.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","setLastAction","subscribeToLoadingState","subscribeToRootState","KEY","GROUP_KEY","getState","JSON","parse","sessionStorage","getItem","getGroupState","activeGroups","Set","registerScrollGroup","groupId","add","delete","getGroupKey","pathname","longestMatch","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","group","value","startsWith","length","err","return","restorePosition","positions","saved","window","location","setTimeout","scrollTo","error","console","removeItem","restoreGroupPosition","didPop","previousPathname","rememberScrollPosition","state","scrollY","setItem","stringify","groupKey","groupState","disable","configure","props","addEventListener","initialLocation","search","hash","isFirstStateChange","popStateController","AbortController","signal","disposeOnLoadState","disposeOnRootState","_state_linkOptions","currentLocation","linkOptions","scroll","currentPathname","scrollToHash","_state_linkOptions1","prevGroup","currentGroup","scrollGroup","abort"],"sources":["../../../src/views/ScrollBehavior.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useEffect","setLastAction","routeInfo","subscribeToLoadingState","subscribeToRootState","KEY","GROUP_KEY","getState","JSON","parse","sessionStorage","getItem","getGroupState","activeGroups","Set","registerScrollGroup","groupId","add","delete","getGroupKey","pathname","longestMatch","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_iterator","Symbol","iterator","_step","next","done","group","value","startsWith","length","err","return","restorePosition","positions","saved","window","location","setTimeout","scrollTo","error","console","removeItem","restoreGroupPosition","didPop","previousPathname","rememberScrollPosition","state","scrollY","setItem","stringify","groupKey","groupState","disable","configure","props","addEventListener","initialLocation","search","isFirstStateChange","popStateController","AbortController","signal","disposeOnLoadState","disposeOnRootState","_ref","_ref1","_state_linkOptions","currentHref","unstable_globalHref","currentPathname","linkOptions","scroll","hash","scrollToHash","_state_linkOptions1","prevGroup","currentGroup","scrollGroup","abort"],"sources":["../../../src/views/ScrollBehavior.tsx"],"sourcesContent":[null],"mappings":"AAAA,SAASA,SAAA,QAAiB;AAC1B,SAASC,aAAA,QAAqB;AAC9B,SAASC,SAAA,EAAWC,uBAAA,EAAyBC,oBAAA,QAA4B;AAEzE,IAAAC,GAAM,WAAM;AACZ,IAAAC,SAAM,kBAAY;AAElB,IAAAC,QAAM,YAAAA,CAAA,EAAiB;EACvB,OAAMC,IAAA,CAAAC,KAAA,CAAAC,cAA2B,CAAAC,OAAM,CAAAN,GAAA,SAAe;AAGtD;AASO,IAAAO,aAAS,YAAAA,CAAA,EAAoB;EAClC,OAAAJ,IAAA,CAAAC,KAAiB,CAAAC,cAAO,CAAAC,OAAA,CAAAL,SAAA;AACxB;AACE,IAAAO,YAAA,GAAa,eAAc,IAAAC,GAAA;AAAA,SAC7BC,oBAAAC,OAAA;EACFH,YAAA,CAAAI,GAAA,CAAAD,OAAA;EAEA,OAAS;IAEPH,YAAI,CAAAK,MAA8B,CAAAF,OAAA;EAClC;AACE;AAIE,SAAAG,YAAeC,QAAA;EAAA,IACjBC,YAAA;EACF,IAAAC,yBAAA;IAAAC,iBAAA;IAAAC,cAAA;EACA;IACF,SAAAC,SAAA,GAAAZ,YAAA,CAAAa,MAAA,CAAAC,QAAA,KAAAC,KAAA,IAAAN,yBAAA,IAAAM,KAAA,GAAAH,SAAA,CAAAI,IAAA,IAAAC,IAAA,GAAAR,yBAAA;MAEA,IAASS,KAAA,GAAAH,KAAA,CAAAI,KAAkB;MACrB,KAAAZ,QAAA,KAAAW,KAAA,IAAAX,QAAA,CAAAa,UAAA,IAAAF,KAAA,WAAAV,YAAA,IAAAU,KAAA,CAAAG,MAAA,GAAAb,YAAA,CAAAa,MAAA;QACFb,YAAM,GAAYU,KAAA;MAClB;IACA;EACE,SAAAI,GAAA;IACEZ,iBAAO,GAAS,IAAG;IAAKC,cACzB,GAAAW,GAAA;EAAA,UACH;IACF;MACE,KAAAb,yBAAc,IAAAG,SAAA,CAAAW,MAAmC,IAAK;QACtDX,SAAA,CAAAW,MAAe;MACjB;IACF;MAEA,IAASb,iBAAA;QACH,MAAAC,cAAA;MACF;IACA;EACA;EACE,OAAAH,YAAW;AACT;AAAwB,SACzBgB,gBAAA;EAAA,IACH;IACF,IAAAC,SAAS,GAAO/B,QAAA;IACd,IAAAgC,KAAQ,GAAAD,SAAM,CAAAE,MAAA,CAAAC,QAAA,CAAArB,QAAA;IACd,WAAAmB,KAAe,aAAW;MAC5BG,UAAA;QACFF,MAAA,CAAAG,QAAA,IAAAJ,KAAA;MAEI;IACA;EAEJ,SAASK,KAAA;IACPC,OAAS,CAAAD,KAAA,oCAAAA,KAAA;IACTlC,cAAM,CAAWoC,UAAO,CAAAzC,GAAA;EAGxB;AACA;AACA,SAAA0C,oBAAuBA,CAAK/B,OAAK;EAGjC;IACA,IAAIsB,SAAU,GAAA1B,aAAA;IACZ,IAAA2B,KAAM,GAAAD,SAAa,CAAAtB,OAAA;IACnB,WAAWuB,KAAA,KAAQ,QAAI,EAAO;MAC9BG,UAAA,aAAuB;QACzBF,MAAA,CAAAG,QAAA,IAAAJ,KAAA;MAEA;IACF;EAMA,EAAI,OAAAK,KAA+B;IAEnCC,OAAS,CAAAD,KAAA,8CAAsC5B,OAAA,IAAA4B,KAAA;IAC7ClC,cAAW,CAAAoC,UAAW,CAAAxC,SAAe,CAAC;EACpC;AAAA;AAGF,IAAA0C,MAAA,GAAU;AAGV,IAAAC,gBAAM,OAAkB;AACxB,SAAIC,sBAAqBA,CAAA;EACzBF,MAAA;EAEA,IAAA5B,QAAM,GAAAoB,MAAA,CAAAC,QAAqB,CAAIrB,QAAA;EAE/B,IAAA+B,KAAO,GAAA5C,QAAA;EAAA4C,KACL,CAAA/B,QAAA,IAAAoB,MAAA,CAAAY,OAAA;EAAA1C,cACM,CAAA2C,OAAA,CAAAhD,GAAA,EAAAG,IAAA,CAAA8C,SAAA,CAAAH,KAAA;EACJ,IAAAI,QAAA,GAASpC,WAAA,CAAAC,QAAA;EACT,IAAAmC,QAAA;IACF,IAAAC,UAAA,GAAA5C,aAAA;IACA4C,UAAA,CAAAD,QAAA,IAAAf,MAAA,CAAAY,OAAA;IAAA1C,cACU,CAAA2C,OAAA,CAAA/C,SAAmB,EAAAE,IAAA,CAAA8C,SAAA,CAAAE,UAAA;EAAA;EAE/BP,gBAAA,GAAA7B,QAAA;AAEA;AACE,IAAAqC,OAAI,OAAU;AACZ,SAAAC,UAAAC,KAAA;EAAuB,IACzB,OAAAnB,MAAA,qBAAAA,MAAA,CAAAoB,gBAAA;IACD;EAED;EAKEH,OAAA,KAAM,QAAAA,OAAc,UAAW,aAAAA,OAAuB;EACtD,IAAAI,eAAM,MAAArB,MAAkB,CAAAC,QAAW,CAAArB,QAAY,GAAAoB,MAAA,CAAAC,QAAA,CAAAqB,MAAA;EAE/C,IAAAC,kBAAI,OAAoB;EACtBd,gBAAA,GAAAT,MAAqB,CAAAC,QAAA,CAAArB,QAAA;EAMrB,IAAA4C,kBAAI,GAAgB,IAAAC,eAAiB;EACnCzB,MAAA,CAAAoB,gBAAA;IAAAZ,MACF;IACF/C,aAAA;EAEA;IACEiE,MAAA,EAAAF,kBAAA,CAAAE;EAAA,EACF;EAEA,IAAAC,kBAAiB,GAAAhE,uBAAA,WAAAgD,KAAA;IAEjB,IAAIA,KAAA,KAAM;MACRD,sBAAiB;IACf;EAAiB;EAClB,IACHkB,kBAAmB,GAAAhE,oBAAA,WAAA+C,KAAA;IACjB,IAAAkB,IAAI,EAAAC,KAAM;IAER,IAAAC,kBAAgB;IAAA,IAClBC,WAAA,IAAAH,IAAA,GAAAnE,SAAA,aAAAA,SAAA,uBAAAA,SAAA,CAAAuE,mBAAA,cAAAJ,IAAA,cAAAA,IAAA;IACF,IAAAK,eAAO,IAAAJ,KAAA,GAAApE,SAAA,aAAAA,SAAA,uBAAAA,SAAA,CAAAkB,QAAA,cAAAkD,KAAA,cAAAA,KAAA;IAGL,IAAAP,kBAAkB;MAClBA,kBAAM,GAAe;MAErB,IAAIS,WAAA,KAAaX,eAAgB;QAE/B;MACF;IAEE;IAAkD,IACpD,EAAAU,kBAAO,GAAApB,KAAA,CAAAwB,WAAA,cAAAJ,kBAAA,uBAAAA,kBAAA,CAAAK,MAAA;MAEL;IAAoB;IAExB;MAAAC;IAAA,IAAA1B,KAAA;IAEA,IAAA0B,IAAA;MACDnC,UAAA;QAEDoC,YAAgB,CAAAD,IAAA;MACd;IACA,WAAA7B,MAAA,EAAmB;MACnB,IAAAW,KAAA,CAAAF,OAAmB;QACrBpB,eAAA;MAEA;IACF;MAEA,IAAS0C,mBAA2B;MAC9B,IAACC,SAAS,GAAK/B,gBAAiB,GAAA9B,WAAA,CAAA8B,gBAAA;MACpC,IAAMgC,YAAU,GAAO9D,WAAA,CAAAuD,eAAA;MACvB,IAAMM,SAAK,IAASC,YAAA,IAAiBD,SAAA,KAAAC,YAAA;QAChClC,oBAAI,CAAAkC,YAAA;MACN,YAAAF,mBAA2B,GAAA5B,KAAW,CAAAwB,WAAA,cAAAI,mBAAA,uBAAAA,mBAAA,CAAAG,WAAA;QAC3CnC,oBAAA,CAAAI,KAAA,CAAAwB,WAAA,CAAAO,WAAA;MAEO,OAAS;QACV1C,MAAQ,CAAAG,QAAI;MACd;IACE;IACEM,gBAAA,GAAayB,eAAgB;EAAI;EACnCjB,OACG,YAAAA,CAAA;IAELO,kBAAgB,CAAAmB,KAAA;IACdhB,kBAAO,CAAU;IACnBC,kBAAkB;EACpB;EAEA,OAAOX,OAAA;AACT","ignoreList":[]}

package/dist/esm/views/ScrollBehavior.test.mjs

@@ -6,10 +6,19 @@ const subscriptions = vi.hoisted(() => ({
   loading: void 0,
   root: void 0
 }));
+const router = vi.hoisted(() => ({
+  routeInfo: {
+    unstable_globalHref: "/",
+    pathname: "/"
+  }
+}));
 vi.mock("../router/lastAction", () => ({
   setLastAction: vi.fn()
 }));
 vi.mock("../router/router", () => ({
+  get routeInfo() {
+    return router.routeInfo;
+  },
   subscribeToLoadingState: subscriber => {
     subscriptions.loading = subscriber;
     return () => {
@@ -27,6 +36,15 @@ globalThis.IS_REACT_ACT_ENVIRONMENT = true;
 let renderer;
 let location;
 let scrollTo;
+function navigate(pathname, search = "") {
+  router.routeInfo = {
+    unstable_globalHref: `${pathname}${search}`,
+    pathname
+  };
+  act(() => subscriptions.root?.({}));
+  location.pathname = pathname;
+  location.search = search;
+}
 beforeEach(() => {
   process.env.VITE_ENVIRONMENT = "client";
   location = {
@@ -34,6 +52,10 @@ beforeEach(() => {
     search: "",
     hash: ""
   };
+  router.routeInfo = {
+    unstable_globalHref: "/",
+    pathname: "/"
+  };
   scrollTo = vi.fn();
   const windowMock = Object.assign(new EventTarget(), {
     location,
@@ -67,13 +89,11 @@ describe("ScrollBehavior initial navigation", () => {
     expect(scrollTo).not.toHaveBeenCalled();
   });
   it("scrolls to the top when the first state notification is a real navigation", () => {
-    location.pathname = "/compat/react-native-gesture-handler";
-    act(() => subscriptions.root?.({}));
+    navigate("/compat/react-native-gesture-handler");
     expect(scrollTo).toHaveBeenCalledWith(0, 0);
   });
   it("handles a query change as a first navigation", () => {
-    location.search = "?platform=ios";
-    act(() => subscriptions.root?.({}));
+    navigate("/", "?platform=ios");
     expect(scrollTo).toHaveBeenCalledWith(0, 0);
   });
 });
@@ -81,13 +101,10 @@ describe("ScrollBehavior groups", () => {
   it("preserves position between routes in the same group", () => {
     vi.useFakeTimers();
     const unregister = registerScrollGroup("/compat/react-native-gesture-handler");
-    act(() => subscriptions.root?.({}));
-    location.pathname = "/compat/react-native-gesture-handler";
-    act(() => subscriptions.root?.({}));
+    navigate("/compat/react-native-gesture-handler");
     scrollTo.mockClear();
     act(() => subscriptions.loading?.("loading"));
-    location.pathname = "/compat/react-native-gesture-handler/pan-gesture";
-    act(() => subscriptions.root?.({}));
+    navigate("/compat/react-native-gesture-handler/pan-gesture");
     vi.runAllTimers();
     expect(scrollTo).toHaveBeenCalledWith(0, 500);
     unregister();
@@ -95,13 +112,10 @@ describe("ScrollBehavior groups", () => {
   });
   it("does not match a different route whose slug has the same prefix", () => {
     const unregister = registerScrollGroup("/compat/react-native");
-    act(() => subscriptions.root?.({}));
-    location.pathname = "/compat/react-native/core";
-    act(() => subscriptions.root?.({}));
+    navigate("/compat/react-native/core");
     scrollTo.mockClear();
     act(() => subscriptions.loading?.("loading"));
-    location.pathname = "/compat/react-native-gesture-handler";
-    act(() => subscriptions.root?.({}));
+    navigate("/compat/react-native-gesture-handler");
     expect(scrollTo).toHaveBeenCalledWith(0, 0);
     unregister();
   });

package/dist/esm/views/ScrollBehavior.test.mjs.map

@@ -1 +1 @@
-{"version":3,"names":["TestRenderer","act","afterEach","beforeEach","describe","expect","it","vi","registerScrollGroup","ScrollBehavior","jsx","subscriptions","hoisted","loading","root","mock","setLastAction","fn","subscribeToLoadingState","subscriber","subscribeToRootState","globalThis","IS_REACT_ACT_ENVIRONMENT","renderer","location","scrollTo","process","env","VITE_ENVIRONMENT","pathname","search","hash","windowMock","Object","assign","EventTarget","scrollY","storage","Map","stubGlobal","getElementById","getItem","key","get","setItem","value","set","removeItem","delete","create","unmount","useRealTimers","unstubAllGlobals","not","toHaveBeenCalled","toHaveBeenCalledWith","useFakeTimers","unregister","mockClear","runAllTimers"],"sources":["../../../src/views/ScrollBehavior.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["TestRenderer","act","afterEach","beforeEach","describe","expect","it","vi","registerScrollGroup","ScrollBehavior","jsx","subscriptions","hoisted","loading","root","router","routeInfo","unstable_globalHref","pathname","mock","setLastAction","fn","subscribeToLoadingState","subscriber","subscribeToRootState","globalThis","IS_REACT_ACT_ENVIRONMENT","renderer","location","scrollTo","navigate","search","process","env","VITE_ENVIRONMENT","hash","windowMock","Object","assign","EventTarget","scrollY","storage","Map","stubGlobal","getElementById","getItem","key","get","setItem","value","set","removeItem","delete","create","unmount","useRealTimers","unstubAllGlobals","not","toHaveBeenCalled","toHaveBeenCalledWith","useFakeTimers","unregister","mockClear","runAllTimers"],"sources":["../../../src/views/ScrollBehavior.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/views/ScrollBehavior.test.native.js

@@ -9,6 +9,14 @@ var subscriptions = vi.hoisted(function () {
     root: void 0
   };
 });
+var router = vi.hoisted(function () {
+  return {
+    routeInfo: {
+      unstable_globalHref: "/",
+      pathname: "/"
+    }
+  };
+});
 vi.mock("../router/lastAction", function () {
   return {
     setLastAction: vi.fn()
@@ -16,6 +24,9 @@ vi.mock("../router/lastAction", function () {
 });
 vi.mock("../router/router", function () {
   return {
+    get routeInfo() {
+      return router.routeInfo;
+    },
     subscribeToLoadingState: function (subscriber) {
       subscriptions.loading = subscriber;
       return function () {
@@ -34,6 +45,19 @@ globalThis.IS_REACT_ACT_ENVIRONMENT = true;
 var renderer;
 var location;
 var scrollTo;
+function navigate(pathname) {
+  var search = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "";
+  router.routeInfo = {
+    unstable_globalHref: `${pathname}${search}`,
+    pathname
+  };
+  act(function () {
+    var _subscriptions_root;
+    return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
+  });
+  location.pathname = pathname;
+  location.search = search;
+}
 beforeEach(function () {
   process.env.VITE_ENVIRONMENT = "client";
   location = {
@@ -41,6 +65,10 @@ beforeEach(function () {
     search: "",
     hash: ""
   };
+  router.routeInfo = {
+    unstable_globalHref: "/",
+    pathname: "/"
+  };
   scrollTo = vi.fn();
   var windowMock = Object.assign(new EventTarget(), {
     location,
@@ -86,19 +114,11 @@ describe("ScrollBehavior initial navigation", function () {
     expect(scrollTo).not.toHaveBeenCalled();
   });
   it("scrolls to the top when the first state notification is a real navigation", function () {
-    location.pathname = "/compat/react-native-gesture-handler";
-    act(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native-gesture-handler");
     expect(scrollTo).toHaveBeenCalledWith(0, 0);
   });
   it("handles a query change as a first navigation", function () {
-    location.search = "?platform=ios";
-    act(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/", "?platform=ios");
     expect(scrollTo).toHaveBeenCalledWith(0, 0);
   });
 });
@@ -106,25 +126,13 @@ describe("ScrollBehavior groups", function () {
   it("preserves position between routes in the same group", function () {
     vi.useFakeTimers();
     var unregister = registerScrollGroup("/compat/react-native-gesture-handler");
-    act(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
-    location.pathname = "/compat/react-native-gesture-handler";
-    act(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native-gesture-handler");
     scrollTo.mockClear();
     act(function () {
       var _subscriptions_loading;
       return (_subscriptions_loading = subscriptions.loading) === null || _subscriptions_loading === void 0 ? void 0 : _subscriptions_loading.call(subscriptions, "loading");
     });
-    location.pathname = "/compat/react-native-gesture-handler/pan-gesture";
-    act(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native-gesture-handler/pan-gesture");
     vi.runAllTimers();
     expect(scrollTo).toHaveBeenCalledWith(0, 500);
     unregister();
@@ -132,25 +140,13 @@ describe("ScrollBehavior groups", function () {
   });
   it("does not match a different route whose slug has the same prefix", function () {
     var unregister = registerScrollGroup("/compat/react-native");
-    act(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
-    location.pathname = "/compat/react-native/core";
-    act(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native/core");
     scrollTo.mockClear();
     act(function () {
       var _subscriptions_loading;
       return (_subscriptions_loading = subscriptions.loading) === null || _subscriptions_loading === void 0 ? void 0 : _subscriptions_loading.call(subscriptions, "loading");
     });
-    location.pathname = "/compat/react-native-gesture-handler";
-    act(function () {
-      var _subscriptions_root;
-      return (_subscriptions_root = subscriptions.root) === null || _subscriptions_root === void 0 ? void 0 : _subscriptions_root.call(subscriptions, {});
-    });
+    navigate("/compat/react-native-gesture-handler");
     expect(scrollTo).toHaveBeenCalledWith(0, 0);
     unregister();
   });

package/dist/esm/views/ScrollBehavior.test.native.js.map

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","React","TestRenderer","act","afterEach","beforeEach","describe","expect","it","vi","registerScrollGroup","ScrollBehavior","subscriptions","hoisted","loading","root","mock","setLastAction","fn","subscribeToLoadingState","subscriber","subscribeToRootState","globalThis","IS_REACT_ACT_ENVIRONMENT","renderer","location","scrollTo","process","env","VITE_ENVIRONMENT","pathname","search","hash","windowMock","Object","assign","EventTarget","scrollY","storage","Map","stubGlobal","getElementById","getItem","key","_storage_get","get","setItem","value","set","removeItem","delete","create","unmount","useRealTimers","unstubAllGlobals","_subscriptions_root","call","not","toHaveBeenCalled","toHaveBeenCalledWith"],"sources":["../../../src/views/ScrollBehavior.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","React","TestRenderer","act","afterEach","beforeEach","describe","expect","it","vi","registerScrollGroup","ScrollBehavior","subscriptions","hoisted","loading","root","router","routeInfo","unstable_globalHref","pathname","mock","setLastAction","fn","subscribeToLoadingState","subscriber","subscribeToRootState","globalThis","IS_REACT_ACT_ENVIRONMENT","renderer","location","scrollTo","navigate","search","arguments","length","_subscriptions_root","call","process","env","VITE_ENVIRONMENT","hash","windowMock","Object","assign","EventTarget","scrollY","storage","Map","stubGlobal","getElementById","getItem","key","_storage_get","get","setItem","value","set","removeItem","delete","create","unmount","useRealTimers","unstubAllGlobals"],"sources":["../../../src/views/ScrollBehavior.test.tsx"],"sourcesContent":[null],"mappings":"AACA,SAAOA,GAAA,IAAAC,IAAA,QAAgB,mBAAW;AAClC,OAAAC,KAAS,aAAW;AAwCpB,OAAAC,YAAS,IAAAC,GAAA,QAAqB,qBAAsB;AA6CjB,SAAAC,SAAA,EAAAC,UAAA,EAAAC,QAAA,EAAAC,MAAA,EAAAC,EAAA,EAAAC,EAAA;AAnFnC,SAAMC,mBAAmB,EAAAC,cAAe;AAAA,IACtCC,aAAS,GAAAH,EAAA,CAAAI,OAAA;EACT,OAAM;IACNC,OAAA;IAOFC,IAAM,OAAS;EACb;AAGF,EAAE;AAEF,IAAGC,MAAK,GAAAP,EAAA,CAAAI,OAAA,aAAwB;EAC9B;IACAI,SAAA;MAECC,mBAAK,KAAoB;MACtBC,QAAA;IACF;EACF;AAAA,EACA;AACEV,EAAA,CAAAW,IAAA,uBAAwB;EACxB;IACEC,aAAA,EAAAZ,EAAc,CAAAa,EAAA;EAAU;AAC1B,EACF;AAAAb,EACA,CAAAW,IAAA,mBAAuB;EACrB;IACA,IAAAH,SAAaA,CAAA;MACX,OAAAD,MAAA,CAAcC,SAAO;IACvB;IACFM,uBAAA,WAAAA,CAAAC,UAAA;MACAZ,aAAA,CAAAE,OAAA,GAAAU,UAAA;MAIA,OAAmB;QAQjBZ,aAAA,CAAAE,OAAA;MACA;IACA;IAIJW,oBAAkB,WAAAA,CAAkBD,UAAa;MAC/CZ,aAAO,CAAAG,IAAc,GAAAS,UAAA;MACjB,OAAM;QACVZ,aAAS,CAAWG,IAAA;MACpB;IACF;EAEA;AACE;AACAW,UAAA,CAAAC,wBAA4B,GAAQ,IAAI;AACxC,IAAAC,QAAO;AACP,IAAAC,QAAA;AAEA,IAAAC,QAAM;AAA8C,SAClDC,SAAAZ,QAAA;EAAA,IACAa,MAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,iBAAAA,SAAA;EAAAjB,MACA,CAAAC,SAAS;IACVC,mBAAA,KAAAC,QAAA,GAAAa,MAAA;IACDb;EAEA;EACAhB,GAAG,aAAW;IACd,IAAGgC,mBAAW;IACZ,QAAAA,mBAAkC,GAAIvB,aAAQ,CAAAG,IAAA,cAAAoB,mBAAA,uBAAAA,mBAAA,CAAAC,IAAA,CAAAxB,aAAA;EAAA,EAC9C;EAA+DiB,QAC/D,CAAAV,QAAa,GAAAA,QAAgB;EAC/BU,QAAC,CAAAG,MAAA,GAAAA,MAAA;AAED;AACE3B,UAAA,aAAW;EACbgC,OAAC,CAAAC,GAAA,CAAAC,gBAAA;EACFV,QAAA;IAEDV,QAAU,KAAM;IACda,MAAI,EAAM;IACVQ,IAAA;EACA;EACAxB,MAAG,CAAAC,SAAA;IACHC,mBAAmB;IACpBC,QAAA;EAED;EACEW,QAAG,GAAArB,EAAA,CAAAa,EAAA;EACD,IAAAmB,UAAU,GAAAC,MAAA,CAAAC,MAAc,KAASC,WAAC;IAElCf,QAAO;IACRC,QAAA;IAEDe,OAAG;EACD;EAEA,IAAAC,OAAO,kBAAU,IAAAC,GAAA;EACnBtC,EAAC,CAAAuC,UAAA,WAAAP,UAAA;EAEDhC,EAAA,CAAGuC,UAAA;IACDC,cAAc,EAAAxC,EAAA,CAAAa,EAAA;EAEd;EACFb,EAAC,CAAAuC,UAAA;IACFE,OAAA,WAAAA,CAAAC,GAAA;MAED,IAASC,YAAA;MACJ,QAAAA,YAAA,GAAAN,OAAA,CAAAO,GAAA,CAAAF,GAAA,eAAAC,YAA6D,cAAAA,YAAA;IAC9D;IACAE,OAAM,WAAAA,CAAAH,GAAa,EAAAI,KAAA;MAEnB,OAAST,OAAA,CAAAU,GAAA,CAAAL,GAAA,EAAAI,KAAA;IACT;IAEAE,UAAU,WAAAA,CAAAN,GAAc;MACxB,OAASL,OAAA,CAAAY,MAAA,CAAAP,GAAA;IACT;EAEA;EAEAhD,GAAA,aAAW;IACXyB,QAAG,GAAA1B,YAAc,CAAAyD,MAAA,gBAAA3D,IAAA,CAAAW,cAAA;EACnB,CAAC;AAED;AACEP,SAAA,CAAM;EAEND,GAAA,aAAS;IACT,OAAAyB,QAAS,KAAU,QAAAA,QAAA,uBAAAA,QAAA,CAAAgC,OAAA;EAEnB;EACAhC,QAAA,GAAS;EAETnB,EAAA,CAAAoD,aAAO,CAAQ;EAEfpD,EAAA,CAAAqD,gBAAW;EACb,OAACzB,OAAA,CAAAC,GAAA,CAAAC,gBAAA;AACH,CAAC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.25.10",
+  "version": "1.25.12",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -193,18 +193,18 @@
     "@cloudflare/vite-plugin": "^1.33.1",
     "@swc/core": "^1.14.0",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/color-scheme": "1.25.10",
-    "@vxrn/compiler": "1.25.10",
-    "@vxrn/resolve": "1.25.10",
-    "@vxrn/tslib-lite": "1.25.10",
-    "@vxrn/use-isomorphic-layout-effect": "1.25.10",
-    "@vxrn/vite-plugin-metro": "1.25.10",
+    "@vxrn/color-scheme": "1.25.12",
+    "@vxrn/compiler": "1.25.12",
+    "@vxrn/resolve": "1.25.12",
+    "@vxrn/tslib-lite": "1.25.12",
+    "@vxrn/use-isomorphic-layout-effect": "1.25.12",
+    "@vxrn/vite-plugin-metro": "1.25.12",
     "babel-dead-code-elimination": "1.0.10",
     "babel-plugin-module-resolver": "^5.0.2",
     "babel-preset-expo": "~57.0.5",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.25.10",
+    "create-vxrn": "1.25.12",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~57.0.5",
     "expo-modules-core": "~57.0.10",
@@ -224,7 +224,7 @@
     "tsconfig-paths": "^4",
     "use-latest-callback": "^0.2.3",
     "vite": "^8.2.2",
-    "vxrn": "1.25.10",
+    "vxrn": "1.25.12",
     "web-streams-polyfill": "^4.3.0",
     "ws": "^8.21.0",
     "xxhashjs": "^0.2.2"

package/src/views/ScrollBehavior.test.tsx

@@ -7,11 +7,25 @@ const subscriptions = vi.hoisted(() => ({
   root: undefined as ((state: any) => void) | undefined,
 }))
 
+// the router's committed route. updateState writes this and then notifies root
+// state subscribers, so it is current inside the subscriber while
+// window.location still points at the route being left — react-navigation's
+// linking listener writes the URL after. every test below drives the two in
+// that order.
+const router = vi.hoisted(() => ({
+  routeInfo: { unstable_globalHref: '/', pathname: '/' } as
+    | { unstable_globalHref: string; pathname: string }
+    | undefined,
+}))
+
 vi.mock('../router/lastAction', () => ({
   setLastAction: vi.fn(),
 }))
 
 vi.mock('../router/router', () => ({
+  get routeInfo() {
+    return router.routeInfo
+  },
   subscribeToLoadingState: (subscriber: typeof subscriptions.loading) => {
     subscriptions.loading = subscriber
     return () => {
@@ -40,9 +54,19 @@ let renderer: TestRenderer.ReactTestRenderer | undefined
 let location: MockLocation
 let scrollTo: ReturnType<typeof vi.fn>
 
+// one navigation, in the order the router performs it: commit the route, notify
+// subscribers, then let the linking listener catch the URL up.
+function navigate(pathname: string, search = '') {
+  router.routeInfo = { unstable_globalHref: `${pathname}${search}`, pathname }
+  act(() => subscriptions.root?.({}))
+  location.pathname = pathname
+  location.search = search
+}
+
 beforeEach(() => {
   process.env.VITE_ENVIRONMENT = 'client'
   location = { pathname: '/', search: '', hash: '' }
+  router.routeInfo = { unstable_globalHref: '/', pathname: '/' }
   scrollTo = vi.fn()
 
   const windowMock = Object.assign(new EventTarget(), {
@@ -81,17 +105,13 @@ describe('ScrollBehavior initial navigation', () => {
   })
 
   it('scrolls to the top when the first state notification is a real navigation', () => {
-    location.pathname = '/compat/react-native-gesture-handler'
-
-    act(() => subscriptions.root?.({}))
+    navigate('/compat/react-native-gesture-handler')
 
     expect(scrollTo).toHaveBeenCalledWith(0, 0)
   })
 
   it('handles a query change as a first navigation', () => {
-    location.search = '?platform=ios'
-
-    act(() => subscriptions.root?.({}))
+    navigate('/', '?platform=ios')
 
     expect(scrollTo).toHaveBeenCalledWith(0, 0)
   })
@@ -102,14 +122,11 @@ describe('ScrollBehavior groups', () => {
     vi.useFakeTimers()
     const unregister = registerScrollGroup('/compat/react-native-gesture-handler')
 
-    act(() => subscriptions.root?.({}))
-    location.pathname = '/compat/react-native-gesture-handler'
-    act(() => subscriptions.root?.({}))
+    navigate('/compat/react-native-gesture-handler')
     scrollTo.mockClear()
 
     act(() => subscriptions.loading?.('loading'))
-    location.pathname = '/compat/react-native-gesture-handler/pan-gesture'
-    act(() => subscriptions.root?.({}))
+    navigate('/compat/react-native-gesture-handler/pan-gesture')
     vi.runAllTimers()
 
     expect(scrollTo).toHaveBeenCalledWith(0, 500)
@@ -121,14 +138,11 @@ describe('ScrollBehavior groups', () => {
   it('does not match a different route whose slug has the same prefix', () => {
     const unregister = registerScrollGroup('/compat/react-native')
 
-    act(() => subscriptions.root?.({}))
-    location.pathname = '/compat/react-native/core'
-    act(() => subscriptions.root?.({}))
+    navigate('/compat/react-native/core')
     scrollTo.mockClear()
 
     act(() => subscriptions.loading?.('loading'))
-    location.pathname = '/compat/react-native-gesture-handler'
-    act(() => subscriptions.root?.({}))
+    navigate('/compat/react-native-gesture-handler')
 
     expect(scrollTo).toHaveBeenCalledWith(0, 0)
 

package/src/views/ScrollBehavior.tsx

@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 import { setLastAction } from '../router/lastAction'
-import { subscribeToLoadingState, subscribeToRootState } from '../router/router'
+import { routeInfo, subscribeToLoadingState, subscribeToRootState } from '../router/router'
 
 const KEY = 'one-sr'
 const GROUP_KEY = 'one-sr-groups'
@@ -105,8 +105,8 @@ function configure(props: ScrollBehaviorProps) {
 
   disable?.()
 
-  const initialLocation =
-    `${window.location.pathname}${window.location.search}${window.location.hash}`
+  // routeInfo carries no hash, so the mount comparison below is pathname+search
+  const initialLocation = `${window.location.pathname}${window.location.search}`
   let isFirstStateChange = true
   previousPathname = window.location.pathname
 
@@ -130,16 +130,21 @@ function configure(props: ScrollBehaviorProps) {
   })
 
   const disposeOnRootState = subscribeToRootState((state) => {
+    // updateState refreshes routeInfo and then notifies these subscribers, all
+    // before react-navigation's linking listener writes the new URL. so
+    // window.location here still reports the route being left, and the router's
+    // own route info is the only current view of where we just navigated to.
+    const currentHref = routeInfo?.unstable_globalHref ?? ''
+    const currentPathname = routeInfo?.pathname ?? ''
+
     if (isFirstStateChange) {
       isFirstStateChange = false
 
       // Depending on navigator mount timing, the initial state notification may
       // happen before or after this effect subscribes. Only ignore it when the
-      // browser is still at the URL where ScrollBehavior mounted. Otherwise this
+      // router is still on the route where ScrollBehavior mounted. Otherwise this
       // is the first real navigation and must receive normal scroll handling.
-      const currentLocation =
-        `${window.location.pathname}${window.location.search}${window.location.hash}`
-      if (currentLocation === initialLocation) {
+      if (currentHref === initialLocation) {
         return
       }
     }
@@ -149,7 +154,6 @@ function configure(props: ScrollBehaviorProps) {
     }
 
     const { hash } = state
-    const currentPathname = window.location.pathname
 
     if (hash) {
       setTimeout(() => {

package/types/views/ScrollBehavior.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScrollBehavior.d.ts","sourceRoot":"","sources":["../../src/views/ScrollBehavior.tsx"],"names":[],"mappings":"AAaA;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,cAKlD;AAqED,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9B,CAAA;AAwGD,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,QAcxD"}
+{"version":3,"file":"ScrollBehavior.d.ts","sourceRoot":"","sources":["../../src/views/ScrollBehavior.tsx"],"names":[],"mappings":"AAaA;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,cAKlD;AAqED,KAAK,mBAAmB,GAAG;IACzB,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9B,CAAA;AA4GD,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,QAcxD"}