one 1.1.449 → 1.1.450

package/dist/cjs/views/Navigator.cjs

@@ -47,7 +47,6 @@ var import_native = require("@react-navigation/native"),
   import_Route = require("../router/Route.cjs"),
   import_useScreens = require("../router/useScreens.cjs"),
   import_Screen = require("./Screen.cjs"),
-  import_OneStackRouter = require("./OneStackRouter.cjs"),
   import_jsx_runtime = require("react/jsx-runtime");
 const NavigatorContext = React.createContext(null);
 process.env.NODE_ENV !== "production" && (NavigatorContext.displayName = "NavigatorContext");
@@ -81,7 +80,7 @@ function QualifiedNavigator({
   children,
   screens,
   contextKey,
-  router = import_OneStackRouter.CustomStackRouter
+  router = import_native.StackRouter
 }) {
   const {
       state,

package/dist/cjs/views/Navigator.js

@@ -31,7 +31,7 @@ __export(Navigator_exports, {
   useSlot: () => useSlot
 });
 module.exports = __toCommonJS(Navigator_exports);
-var import_native = require("@react-navigation/native"), React = __toESM(require("react"), 1), import_react_native_safe_area_context = require("react-native-safe-area-context"), import_withLayoutContext = require("../layouts/withLayoutContext"), import_Route = require("../router/Route"), import_useScreens = require("../router/useScreens"), import_Screen = require("./Screen"), import_OneStackRouter = require("./OneStackRouter"), import_jsx_runtime = require("react/jsx-runtime");
+var import_native = require("@react-navigation/native"), React = __toESM(require("react"), 1), import_react_native_safe_area_context = require("react-native-safe-area-context"), import_withLayoutContext = require("../layouts/withLayoutContext"), import_Route = require("../router/Route"), import_useScreens = require("../router/useScreens"), import_Screen = require("./Screen"), import_jsx_runtime = require("react/jsx-runtime");
 const NavigatorContext = React.createContext(null);
 process.env.NODE_ENV !== "production" && (NavigatorContext.displayName = "NavigatorContext");
 function Navigator({ initialRouteName, screenOptions, children, router }) {
@@ -57,7 +57,7 @@ function QualifiedNavigator({
   children,
   screens,
   contextKey,
-  router = import_OneStackRouter.CustomStackRouter
+  router = import_native.StackRouter
 }) {
   const { state, navigation, descriptors, NavigationContent } = (0, import_native.useNavigationBuilder)(router, {
     // Used for getting the parent with navigation.getParent('/normalized/path')

package/dist/cjs/views/Navigator.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Navigator.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAAyD,qCACzD,QAAuB,8BACvB,wCAA6B,2CAC7B,2BAAwC,yCACxC,eAA8B,4BAC9B,oBAAiC,iCACjC,gBAAuB,qBACvB,wBAAkC,6BA0C9B;AArCG,MAAM,mBAAmB,MAAM,cAM5B,IAAI;AAEV,QAAQ,IAAI,aAAa,iBAC3B,iBAAiB,cAAc;AAW1B,SAAS,UAAU,EAAE,kBAAkB,eAAe,UAAU,OAAO,GAAmB;AAC/F,QAAM,iBAAa,4BAAc,GAG3B,EAAE,SAAS,UAAU,UAAU,QAAI,kDAAwB,UAAU;AAAA,IACzE,mBAAmB;AAAA,IACnB;AAAA,EACF,CAAC,GAEK,aAAS,oCAAiB,WAAW,CAAC,CAAC;AAE7C,SAAK,OAAO,SAMV;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT;AAAA,MACA;AAAA,MAEC;AAAA;AAAA,EACH,KAbA,QAAQ,KAAK,iBAAiB,UAAU,oBAAoB,GACrD;AAcX;AAEA,SAAS,mBAAmB;AAAA,EAC1B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS;AACX,GAAwE;AACtE,QAAM,EAAE,OAAO,YAAY,aAAa,kBAAkB,QAAI,oCAAqB,QAAQ;AAAA;AAAA,IAEzF,IAAI;AAAA,IACJ,UAAU;AAAA,IACV;AAAA,IACA;AAAA,EACF,CAAC,GAEK,QAAQ,MAAM,QAAQ,OACnB;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACC,CAAC,YAAY,OAAO,YAAY,aAAa,MAAM,CAAC;AAEvD,SACE,4CAAC,iBAAiB,UAAjB,EAA0B,OACzB,sDAAC,qBAAmB,UAAS,GAC/B;AAEJ;AAEO,SAAS,sBAAsB;AACpC,QAAM,UAAU,MAAM,WAAW,gBAAgB;AACjD,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,yDAAyD;AAE3E,SAAO;AACT;AAEO,SAAS,UAAU;AACxB,QAAM,UAAU,oBAAoB,GAE9B,EAAE,OAAO,YAAY,IAAI,SAEzB,UAAU,MAAM,OAAO,KAAK,CAAC,OAAO,MACjC,MAAM,UAAU,CACxB;AAED,SAAK,UAIE,YAAY,QAAQ,GAAG,GAAG,OAAO,KAAK,OAHpC;AAIX;AAGO,MAAM,OAAO,MAAM,KAAK,SAAc,OAAyC;AACpF,QAAM,iBAAa,4BAAc;AAIjC,SAHgB,MAAM,WAAW,gBAAgB,GAGpC,eAAe,aAGxB,4CAAC,aAAW,GAAG,OACb,sDAAC,iBAAc,GACjB,IAIG,4CAAC,iBAAc;AACxB,CAAC;AAEM,SAAS,gBAAgB;AAC9B,SAAO,QAAQ;AACjB;AAEO,SAAS,mBAAmB;AACjC,SACE,4CAAC,sDAAa,OAAO,EAAE,MAAM,EAAE,GAC7B,sDAAC,aACC,sDAAC,iBAAc,GACjB,GACF;AAEJ;AAEA,UAAU,OAAO;AACjB,UAAU,aAAa;AAGvB,UAAU,SAAS;",
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACA,oBAAsE,qCACtE,QAAuB,8BACvB,wCAA6B,2CAC7B,2BAAwC,yCACxC,eAA8B,4BAC9B,oBAAiC,iCACjC,gBAAuB,qBA0CnB;AArCG,MAAM,mBAAmB,MAAM,cAM5B,IAAI;AAEV,QAAQ,IAAI,aAAa,iBAC3B,iBAAiB,cAAc;AAW1B,SAAS,UAAU,EAAE,kBAAkB,eAAe,UAAU,OAAO,GAAmB;AAC/F,QAAM,iBAAa,4BAAc,GAG3B,EAAE,SAAS,UAAU,UAAU,QAAI,kDAAwB,UAAU;AAAA,IACzE,mBAAmB;AAAA,IACnB;AAAA,EACF,CAAC,GAEK,aAAS,oCAAiB,WAAW,CAAC,CAAC;AAE7C,SAAK,OAAO,SAMV;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT;AAAA,MACA;AAAA,MAEC;AAAA;AAAA,EACH,KAbA,QAAQ,KAAK,iBAAiB,UAAU,oBAAoB,GACrD;AAcX;AAEA,SAAS,mBAAmB;AAAA,EAC1B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS;AACX,GAAwE;AACtE,QAAM,EAAE,OAAO,YAAY,aAAa,kBAAkB,QAAI,oCAAqB,QAAQ;AAAA;AAAA,IAEzF,IAAI;AAAA,IACJ,UAAU;AAAA,IACV;AAAA,IACA;AAAA,EACF,CAAC,GAEK,QAAQ,MAAM,QAAQ,OACnB;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACC,CAAC,YAAY,OAAO,YAAY,aAAa,MAAM,CAAC;AAEvD,SACE,4CAAC,iBAAiB,UAAjB,EAA0B,OACzB,sDAAC,qBAAmB,UAAS,GAC/B;AAEJ;AAEO,SAAS,sBAAsB;AACpC,QAAM,UAAU,MAAM,WAAW,gBAAgB;AACjD,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,yDAAyD;AAE3E,SAAO;AACT;AAEO,SAAS,UAAU;AACxB,QAAM,UAAU,oBAAoB,GAE9B,EAAE,OAAO,YAAY,IAAI,SAEzB,UAAU,MAAM,OAAO,KAAK,CAAC,OAAO,MACjC,MAAM,UAAU,CACxB;AAED,SAAK,UAIE,YAAY,QAAQ,GAAG,GAAG,OAAO,KAAK,OAHpC;AAIX;AAGO,MAAM,OAAO,MAAM,KAAK,SAAc,OAAyC;AACpF,QAAM,iBAAa,4BAAc;AAIjC,SAHgB,MAAM,WAAW,gBAAgB,GAGpC,eAAe,aAGxB,4CAAC,aAAW,GAAG,OACb,sDAAC,iBAAc,GACjB,IAIG,4CAAC,iBAAc;AACxB,CAAC;AAEM,SAAS,gBAAgB;AAC9B,SAAO,QAAQ;AACjB;AAEO,SAAS,mBAAmB;AACjC,SACE,4CAAC,sDAAa,OAAO,EAAE,MAAM,EAAE,GAC7B,sDAAC,aACC,sDAAC,iBAAc,GACjB,GACF;AAEJ;AAEA,UAAU,OAAO;AACjB,UAAU,aAAa;AAGvB,UAAU,SAAS;",
   "names": []
 }

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

@@ -32,7 +32,7 @@ __export(Navigator_exports, {
   useSlot: () => useSlot
 });
 module.exports = __toCommonJS(Navigator_exports);
-var import_jsx_runtime = require("react/jsx-runtime"), import_native = require("@react-navigation/native"), React = __toESM(require("react"), 1), import_react_native_safe_area_context = require("react-native-safe-area-context"), import_withLayoutContext = require("../layouts/withLayoutContext"), import_Route = require("../router/Route"), import_useScreens = require("../router/useScreens"), import_Screen = require("./Screen"), import_OneStackRouter = require("./OneStackRouter"), NavigatorContext = /* @__PURE__ */ React.createContext(null);
+var import_jsx_runtime = require("react/jsx-runtime"), import_native = require("@react-navigation/native"), React = __toESM(require("react"), 1), import_react_native_safe_area_context = require("react-native-safe-area-context"), import_withLayoutContext = require("../layouts/withLayoutContext"), import_Route = require("../router/Route"), import_useScreens = require("../router/useScreens"), import_Screen = require("./Screen"), NavigatorContext = /* @__PURE__ */ React.createContext(null);
 process.env.NODE_ENV !== "production" && (NavigatorContext.displayName = "NavigatorContext");
 function Navigator(param) {
   var { initialRouteName, screenOptions, children, router } = param, contextKey = (0, import_Route.useContextKey)(), { screens, children: otherSlot } = (0, import_withLayoutContext.useFilterScreenChildren)(children, {
@@ -49,7 +49,7 @@ function Navigator(param) {
   }) : (console.warn(`Navigator at "${contextKey}" has no children.`), null);
 }
 function QualifiedNavigator(param) {
-  var { initialRouteName, screenOptions, children, screens, contextKey, router = import_OneStackRouter.CustomStackRouter } = param, { state, navigation, descriptors, NavigationContent } = (0, import_native.useNavigationBuilder)(router, {
+  var { initialRouteName, screenOptions, children, screens, contextKey, router = import_native.StackRouter } = param, { state, navigation, descriptors, NavigationContent } = (0, import_native.useNavigationBuilder)(router, {
     // Used for getting the parent with navigation.getParent('/normalized/path')
     id: contextKey,
     children: screens,

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Users/n8/one/packages/one/src/views/Navigator.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;uDACA,gBAAyD,qCACzD,QAAuB,8BACvB,wCAA6B,2CAC7B,2BAAwC,yCACxC,eAA8B,4BAC9B,oBAAiC,iCACjC,gBAAuB,qBACvB,wBAAkC,6BAKrBA,mBAAmBC,sBAAMC,cAM5B,IAAA;AAENC,QAAQC,IAAIC,aAAa,iBAC3BL,iBAAiBM,cAAc;AAW1B,SAASC,UAAU,OAAqE;MAArE,EAAEC,kBAAkBC,eAAeC,UAAUC,OAAM,IAAnD,OAClBC,iBAAaC,4BAAAA,GAGb,EAAEC,SAASJ,UAAUK,UAAS,QAAKC,kDAAwBN,UAAU;IACzEO,mBAAmB;IACnBL;EACF,CAAA,GAEMM,aAASC,oCAAiBL,WAAW,CAAA,CAAE;AAE7C,SAAKI,OAAOE,SAMV,uCAAAC,KAACC,oBAAAA;IACCd;IACAC;IACAK,SAASI;IACTN;IACAD;cAECI;QAZHQ,QAAQC,KAAK,iBAAiBZ,UAAAA,oBAA8B,GACrD;AAcX;AAEA,SAASU,mBAAmB,OAO0C;MAP1C,EAC1Bd,kBACAC,eACAC,UACAI,SACAF,YACAD,SAASc,wCAAiB,IANA,OAQpB,EAAEC,OAAOC,YAAYC,aAAaC,kBAAiB,QAAKC,oCAAqBnB,QAAQ;;IAEzFoB,IAAInB;IACJF,UAAUI;IACVL;IACAD;EACF,CAAA,GAEMwB,QAAQ/B,MAAMgC,QAAQ,WAAA;AAC1B,WAAO;MACLrB;MACAc;MACAC;MACAC;MACAjB;IACF;EACF,GAAG;IAACC;IAAYc;IAAOC;IAAYC;IAAajB;GAAO;AAEvD,SACE,uCAAAU,KAACrB,iBAAiBkC,UAAQ;IAACF;cACzB,uCAAAX,KAACQ,mBAAAA;;;;AAGP;AAEO,SAASM,sBAAAA;AACd,MAAMC,UAAUnC,MAAMoC,WAAWrC,gBAAAA;AACjC,MAAI,CAACoC;AACH,UAAM,IAAIE,MAAM,yDAAA;AAElB,SAAOF;AACT;AAEO,SAASG,UAAAA;MAaPX,0BAZDQ,UAAUD,oBAAAA,GAEV,EAAET,OAAOE,YAAW,IAAKQ,SAEzBI,UAAUd,MAAMe,OAAOC,KAAK,SAACC,OAAOC,GAAAA;AACxC,WAAOlB,MAAMmB,UAAUD;EACzB,CAAA;AAEA,MAAI,CAACJ;AACH,WAAO;MAGFZ;AAAP,UAAOA,mCAAAA,2BAAAA,YAAYY,QAAQM,GAAG,OAAC,QAAxBlB,6BAAAA,SAAAA,SAAAA,yBAA0BmB,OAAM,OAAA,QAAhCnB,oCAAAA,SAAAA,kCAAsC;AAC/C;AAGO,IAAMoB,OAAO/C,sBAAMgD,KAAK,SAAcC,OAAuC;AAClF,MAAMtC,iBAAaC,4BAAAA,GACbuB,UAAUnC,MAAMoC,WAAWrC,gBAAAA;AAGjC,UAAIoC,WAAAA,OAAAA,SAAAA,QAASxB,gBAAeA,aAGxB,uCAAAS,KAACd,WAAAA;IAAW,GAAG2C;cACb,uCAAA7B,KAAC8B,eAAAA,CAAAA,CAAAA;OAKA,uCAAA9B,KAAC8B,eAAAA,CAAAA,CAAAA;AACV,CAAA;AAEO,SAASA,gBAAAA;AACd,SAAOZ,QAAAA;AACT;AAEO,SAASa,mBAAAA;AACd,SACE,uCAAA/B,KAACgC,oDAAAA;IAAaC,OAAO;MAAEC,MAAM;IAAE;cAC7B,uCAAAlC,KAACd,WAAAA;gBACC,uCAAAc,KAAC8B,eAAAA,CAAAA,CAAAA;;;AAIT;AAEA5C,UAAUyC,OAAOA;AACjBzC,UAAU8B,aAAaF;AAGvB5B,UAAUiD,SAASA;",
-  "names": ["NavigatorContext", "React", "createContext", "process", "env", "NODE_ENV", "displayName", "Navigator", "initialRouteName", "screenOptions", "children", "router", "contextKey", "useContextKey", "screens", "otherSlot", "useFilterScreenChildren", "isCustomNavigator", "sorted", "useSortedScreens", "length", "_jsx", "QualifiedNavigator", "console", "warn", "CustomStackRouter", "state", "navigation", "descriptors", "NavigationContent", "useNavigationBuilder", "id", "value", "useMemo", "Provider", "useNavigatorContext", "context", "useContext", "Error", "useSlot", "current", "routes", "find", "route", "i", "index", "key", "render", "Slot", "memo", "props", "QualifiedSlot", "DefaultNavigator", "SafeAreaView", "style", "flex", "Screen"]
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;uDACA,gBAAsE,qCACtE,QAAuB,8BACvB,wCAA6B,2CAC7B,2BAAwC,yCACxC,eAA8B,4BAC9B,oBAAiC,iCACjC,gBAAuB,qBAKVA,mBAAmBC,sBAAMC,cAM5B,IAAA;AAENC,QAAQC,IAAIC,aAAa,iBAC3BL,iBAAiBM,cAAc;AAW1B,SAASC,UAAU,OAAqE;MAArE,EAAEC,kBAAkBC,eAAeC,UAAUC,OAAM,IAAnD,OAClBC,iBAAaC,4BAAAA,GAGb,EAAEC,SAASJ,UAAUK,UAAS,QAAKC,kDAAwBN,UAAU;IACzEO,mBAAmB;IACnBL;EACF,CAAA,GAEMM,aAASC,oCAAiBL,WAAW,CAAA,CAAE;AAE7C,SAAKI,OAAOE,SAMV,uCAAAC,KAACC,oBAAAA;IACCd;IACAC;IACAK,SAASI;IACTN;IACAD;cAECI;QAZHQ,QAAQC,KAAK,iBAAiBZ,UAAAA,oBAA8B,GACrD;AAcX;AAEA,SAASU,mBAAmB,OAO0C;MAP1C,EAC1Bd,kBACAC,eACAC,UACAI,SACAF,YACAD,SAASc,0BAAW,IANM,OAQpB,EAAEC,OAAOC,YAAYC,aAAaC,kBAAiB,QAAKC,oCAAqBnB,QAAQ;;IAEzFoB,IAAInB;IACJF,UAAUI;IACVL;IACAD;EACF,CAAA,GAEMwB,QAAQ/B,MAAMgC,QAAQ,WAAA;AAC1B,WAAO;MACLrB;MACAc;MACAC;MACAC;MACAjB;IACF;EACF,GAAG;IAACC;IAAYc;IAAOC;IAAYC;IAAajB;GAAO;AAEvD,SACE,uCAAAU,KAACrB,iBAAiBkC,UAAQ;IAACF;cACzB,uCAAAX,KAACQ,mBAAAA;;;;AAGP;AAEO,SAASM,sBAAAA;AACd,MAAMC,UAAUnC,MAAMoC,WAAWrC,gBAAAA;AACjC,MAAI,CAACoC;AACH,UAAM,IAAIE,MAAM,yDAAA;AAElB,SAAOF;AACT;AAEO,SAASG,UAAAA;MAaPX,0BAZDQ,UAAUD,oBAAAA,GAEV,EAAET,OAAOE,YAAW,IAAKQ,SAEzBI,UAAUd,MAAMe,OAAOC,KAAK,SAACC,OAAOC,GAAAA;AACxC,WAAOlB,MAAMmB,UAAUD;EACzB,CAAA;AAEA,MAAI,CAACJ;AACH,WAAO;MAGFZ;AAAP,UAAOA,mCAAAA,2BAAAA,YAAYY,QAAQM,GAAG,OAAC,QAAxBlB,6BAAAA,SAAAA,SAAAA,yBAA0BmB,OAAM,OAAA,QAAhCnB,oCAAAA,SAAAA,kCAAsC;AAC/C;AAGO,IAAMoB,OAAO/C,sBAAMgD,KAAK,SAAcC,OAAuC;AAClF,MAAMtC,iBAAaC,4BAAAA,GACbuB,UAAUnC,MAAMoC,WAAWrC,gBAAAA;AAGjC,UAAIoC,WAAAA,OAAAA,SAAAA,QAASxB,gBAAeA,aAGxB,uCAAAS,KAACd,WAAAA;IAAW,GAAG2C;cACb,uCAAA7B,KAAC8B,eAAAA,CAAAA,CAAAA;OAKA,uCAAA9B,KAAC8B,eAAAA,CAAAA,CAAAA;AACV,CAAA;AAEO,SAASA,gBAAAA;AACd,SAAOZ,QAAAA;AACT;AAEO,SAASa,mBAAAA;AACd,SACE,uCAAA/B,KAACgC,oDAAAA;IAAaC,OAAO;MAAEC,MAAM;IAAE;cAC7B,uCAAAlC,KAACd,WAAAA;gBACC,uCAAAc,KAAC8B,eAAAA,CAAAA,CAAAA;;;AAIT;AAEA5C,UAAUyC,OAAOA;AACjBzC,UAAU8B,aAAaF;AAGvB5B,UAAUiD,SAASA;",
+  "names": ["NavigatorContext", "React", "createContext", "process", "env", "NODE_ENV", "displayName", "Navigator", "initialRouteName", "screenOptions", "children", "router", "contextKey", "useContextKey", "screens", "otherSlot", "useFilterScreenChildren", "isCustomNavigator", "sorted", "useSortedScreens", "length", "_jsx", "QualifiedNavigator", "console", "warn", "StackRouter", "state", "navigation", "descriptors", "NavigationContent", "useNavigationBuilder", "id", "value", "useMemo", "Provider", "useNavigatorContext", "context", "useContext", "Error", "useSlot", "current", "routes", "find", "route", "i", "index", "key", "render", "Slot", "memo", "props", "QualifiedSlot", "DefaultNavigator", "SafeAreaView", "style", "flex", "Screen"]
 }

package/dist/cjs/views/OneStackRouter.cjs

@@ -32,18 +32,7 @@ const CustomStackRouter = options => {
     if (action.type === "NAVIGATE" && next?.routes) {
       const outRoutes = next.routes,
         firstRoute = outRoutes[0];
-      if (firstRoute.name.includes("[...") && outRoutes.every(x => x.name === firstRoute.name)) {
-        const next2 = {
-          ...firstRoute
-        };
-        next2.params = outRoutes[outRoutes.length - 1].params;
-        const routes = [next2];
-        return {
-          ...next2,
-          routes,
-          preloadedRoutes: state.preloadedRoutes.filter(route => routes[routes.length - 1].key !== route.key)
-        };
-      }
+      firstRoute.name.includes("[...") && outRoutes.every(x => x.name === firstRoute.name);
     }
     return next;
   }, router;

package/dist/cjs/views/OneStackRouter.js

@@ -24,18 +24,7 @@ const CustomStackRouter = (options) => {
     const next = og(state, action, options2);
     if (action.type === "NAVIGATE" && next?.routes) {
       const outRoutes = next.routes, firstRoute = outRoutes[0];
-      if (firstRoute.name.includes("[...") && outRoutes.every((x) => x.name === firstRoute.name)) {
-        const next2 = { ...firstRoute };
-        next2.params = outRoutes[outRoutes.length - 1].params;
-        const routes = [next2];
-        return {
-          ...next2,
-          routes,
-          preloadedRoutes: state.preloadedRoutes.filter(
-            (route) => routes[routes.length - 1].key !== route.key
-          )
-        };
-      }
+      firstRoute.name.includes("[...") && outRoutes.every((x) => x.name === firstRoute.name);
     }
     return next;
   }, router;

package/dist/cjs/views/OneStackRouter.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/OneStackRouter.tsx"],
-  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,oBAAqD;AAE9C,MAAM,oBAAoB,CAAC,YAAgC;AAChE,QAAM,aAAS,2BAAY,OAAO,GAE5B,KAAK,OAAO,kBAAkB,KAAK,MAAM;AAE/C,gBAAO,oBAAoB,CAAC,OAAO,QAAQA,aAAY;AACrD,UAAM,OAAO,GAAG,OAAO,QAAQA,QAAO;AASpC,QAAI,OAAO,SAAS,cACd,MAAM,QAAQ;AAChB,YAAM,YAAY,KAAK,QAEjB,aAAa,UAAU,CAAC;AAC9B,UAAI,WAAW,KAAK,SAAS,MAAM,KAC7B,UAAU,MAAM,CAAC,MAAM,EAAE,SAAS,WAAW,IAAI,GAAG;AAEtD,cAAMC,QAAO,EAAE,GAAG,WAAW;AAC7B,QAAAA,MAAK,SAAS,UAAU,UAAU,SAAS,CAAC,EAAE;AAC9C,cAAM,SAAS,CAACA,KAAI;AACpB,eAAO;AAAA,UACL,GAAGA;AAAA,UACH;AAAA,UACA,iBAAiB,MAAM,gBAAgB;AAAA,YACrC,CAAC,UAAU,OAAO,OAAO,SAAS,CAAC,EAAE,QAAQ,MAAM;AAAA,UACrD;AAAA,QACF;AAAA,MACF;AAAA,IAEJ;AAIJ,WAAO;AAAA,EACT,GAGO;AACT;",
-  "names": ["options", "next"]
+  "mappings": ";;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,oBAAqD;AAE9C,MAAM,oBAAoB,CAAC,YAAgC;AAChE,QAAM,aAAS,2BAAY,OAAO,GAE5B,KAAK,OAAO,kBAAkB,KAAK,MAAM;AAC/C,gBAAO,oBAAoB,CAAC,OAAO,QAAQA,aAAY;AACrD,UAAM,OAAO,GAAG,OAAO,QAAQA,QAAO;AASpC,QAAI,OAAO,SAAS,cACd,MAAM,QAAQ;AAChB,YAAM,YAAY,KAAK,QAEjB,aAAa,UAAU,CAAC;AAC9B,MAAI,WAAW,KAAK,SAAS,MAAM,KAC7B,UAAU,MAAM,CAAC,MAAM,EAAE,SAAS,WAAW,IAAI;AAAA,IAwCzD;AAIJ,WAAO;AAAA,EACT,GAGO;AACT;",
+  "names": ["options"]
 }

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

@@ -22,12 +22,8 @@ var import_native = require("@react-navigation/native"), CustomStackRouter = fun
   var router = (0, import_native.StackRouter)(options), og = router.getStateForAction.bind(router);
   return router.getStateForAction = function(state, action, options2) {
     var next = og(state, action, options2);
-    if (0 && action.type === "NAVIGATE" && next != null && next.routes) {
+    if (0 && action.type === "NAVIGATE" && next != null && next.routes)
       var outRoutes, firstRoute;
-      if (firstRoute.name.includes("[...") && outRoutes.every(function(x) {
-      }))
-        var next1, routes;
-    }
     return next;
   }, router;
 };

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

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Users/n8/one/packages/one/src/views/OneStackRouter.tsx"],
-  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAGA,oBAAqD,qCAExCA,oBAAoB,SAACC,SAAAA;AAChC,MAAMC,aAASC,2BAAYF,OAAAA,GAErBG,KAAKF,OAAOG,kBAAkBC,KAAKJ,MAAAA;AAEzCA,gBAAOG,oBAAoB,SAACE,OAAOC,QAAQP,UAAAA;AACzC,QAAMQ,OAAOL,GAAGG,OAAOC,QAAQP,QAAAA;AAQ/B,QAAIS,KACEF,OAAOG,SAAS,cACdF,QAAAA,QAAAA,KAAMG,QAAQ;AAChB,UAAMC,WAEAC;AACN,UAAIA,WAAWC,KAAKC,SAAS,MAAA,KACvBH,UAAUI,MAAM,SAACC,GAAAA;;AAEnB,YAAMT,OAEAG;IAUZ;AAIJ,WAAOH;EACT,GAGOP;AACT;",
-  "names": ["CustomStackRouter", "options", "router", "StackRouter", "og", "getStateForAction", "bind", "state", "action", "next", "process", "type", "routes", "outRoutes", "firstRoute", "name", "includes", "every", "x"]
+  "mappings": ";;;;;;;;;;;;;;;AAAA;;;;;AAGA,oBAAqD,qCAExCA,oBAAoB,SAACC,SAAAA;AAChC,MAAMC,aAASC,2BAAYF,OAAAA,GAErBG,KAAKF,OAAOG,kBAAkBC,KAAKJ,MAAAA;AACzCA,gBAAOG,oBAAoB,SAACE,OAAOC,QAAQP,UAAAA;AACzC,QAAMQ,OAAOL,GAAGG,OAAOC,QAAQP,QAAAA;AAQ/B,QAAIS,KACEF,OAAOG,SAAS,cACdF,QAAAA,QAAAA,KAAMG;AACR,UAAMC,WAEAC;AA8CZ,WAAOL;EACT,GAGOP;AACT;",
+  "names": ["CustomStackRouter", "options", "router", "StackRouter", "og", "getStateForAction", "bind", "state", "action", "next", "process", "type", "routes", "outRoutes", "firstRoute"]
 }

package/dist/esm/views/Navigator.js

@@ -1,11 +1,10 @@
-import { useNavigationBuilder } from "@react-navigation/native";
+import { StackRouter, useNavigationBuilder } from "@react-navigation/native";
 import * as React from "react";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { useFilterScreenChildren } from "../layouts/withLayoutContext";
 import { useContextKey } from "../router/Route";
 import { useSortedScreens } from "../router/useScreens";
 import { Screen } from "./Screen";
-import { CustomStackRouter } from "./OneStackRouter";
 import { jsx } from "react/jsx-runtime";
 const NavigatorContext = React.createContext(null);
 process.env.NODE_ENV !== "production" && (NavigatorContext.displayName = "NavigatorContext");
@@ -32,7 +31,7 @@ function QualifiedNavigator({
   children,
   screens,
   contextKey,
-  router = CustomStackRouter
+  router = StackRouter
 }) {
   const { state, navigation, descriptors, NavigationContent } = useNavigationBuilder(router, {
     // Used for getting the parent with navigation.getParent('/normalized/path')

package/dist/esm/views/Navigator.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/Navigator.tsx"],
-  "mappings": "AACA,SAAS,4BAAgD;AACzD,YAAY,WAAW;AACvB,SAAS,oBAAoB;AAC7B,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAC9B,SAAS,wBAAwB;AACjC,SAAS,cAAc;AACvB,SAAS,yBAAyB;AA0C9B;AArCG,MAAM,mBAAmB,MAAM,cAM5B,IAAI;AAEV,QAAQ,IAAI,aAAa,iBAC3B,iBAAiB,cAAc;AAW1B,SAAS,UAAU,EAAE,kBAAkB,eAAe,UAAU,OAAO,GAAmB;AAC/F,QAAM,aAAa,cAAc,GAG3B,EAAE,SAAS,UAAU,UAAU,IAAI,wBAAwB,UAAU;AAAA,IACzE,mBAAmB;AAAA,IACnB;AAAA,EACF,CAAC,GAEK,SAAS,iBAAiB,WAAW,CAAC,CAAC;AAE7C,SAAK,OAAO,SAMV;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT;AAAA,MACA;AAAA,MAEC;AAAA;AAAA,EACH,KAbA,QAAQ,KAAK,iBAAiB,UAAU,oBAAoB,GACrD;AAcX;AAEA,SAAS,mBAAmB;AAAA,EAC1B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS;AACX,GAAwE;AACtE,QAAM,EAAE,OAAO,YAAY,aAAa,kBAAkB,IAAI,qBAAqB,QAAQ;AAAA;AAAA,IAEzF,IAAI;AAAA,IACJ,UAAU;AAAA,IACV;AAAA,IACA;AAAA,EACF,CAAC,GAEK,QAAQ,MAAM,QAAQ,OACnB;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACC,CAAC,YAAY,OAAO,YAAY,aAAa,MAAM,CAAC;AAEvD,SACE,oBAAC,iBAAiB,UAAjB,EAA0B,OACzB,8BAAC,qBAAmB,UAAS,GAC/B;AAEJ;AAEO,SAAS,sBAAsB;AACpC,QAAM,UAAU,MAAM,WAAW,gBAAgB;AACjD,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,yDAAyD;AAE3E,SAAO;AACT;AAEO,SAAS,UAAU;AACxB,QAAM,UAAU,oBAAoB,GAE9B,EAAE,OAAO,YAAY,IAAI,SAEzB,UAAU,MAAM,OAAO,KAAK,CAAC,OAAO,MACjC,MAAM,UAAU,CACxB;AAED,SAAK,UAIE,YAAY,QAAQ,GAAG,GAAG,OAAO,KAAK,OAHpC;AAIX;AAGO,MAAM,OAAO,MAAM,KAAK,SAAc,OAAyC;AACpF,QAAM,aAAa,cAAc;AAIjC,SAHgB,MAAM,WAAW,gBAAgB,GAGpC,eAAe,aAGxB,oBAAC,aAAW,GAAG,OACb,8BAAC,iBAAc,GACjB,IAIG,oBAAC,iBAAc;AACxB,CAAC;AAEM,SAAS,gBAAgB;AAC9B,SAAO,QAAQ;AACjB;AAEO,SAAS,mBAAmB;AACjC,SACE,oBAAC,gBAAa,OAAO,EAAE,MAAM,EAAE,GAC7B,8BAAC,aACC,8BAAC,iBAAc,GACjB,GACF;AAEJ;AAEA,UAAU,OAAO;AACjB,UAAU,aAAa;AAGvB,UAAU,SAAS;",
+  "mappings": "AACA,SAAS,aAAa,4BAAgD;AACtE,YAAY,WAAW;AACvB,SAAS,oBAAoB;AAC7B,SAAS,+BAA+B;AACxC,SAAS,qBAAqB;AAC9B,SAAS,wBAAwB;AACjC,SAAS,cAAc;AA0CnB;AArCG,MAAM,mBAAmB,MAAM,cAM5B,IAAI;AAEV,QAAQ,IAAI,aAAa,iBAC3B,iBAAiB,cAAc;AAW1B,SAAS,UAAU,EAAE,kBAAkB,eAAe,UAAU,OAAO,GAAmB;AAC/F,QAAM,aAAa,cAAc,GAG3B,EAAE,SAAS,UAAU,UAAU,IAAI,wBAAwB,UAAU;AAAA,IACzE,mBAAmB;AAAA,IACnB;AAAA,EACF,CAAC,GAEK,SAAS,iBAAiB,WAAW,CAAC,CAAC;AAE7C,SAAK,OAAO,SAMV;AAAA,IAAC;AAAA;AAAA,MACC;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT;AAAA,MACA;AAAA,MAEC;AAAA;AAAA,EACH,KAbA,QAAQ,KAAK,iBAAiB,UAAU,oBAAoB,GACrD;AAcX;AAEA,SAAS,mBAAmB;AAAA,EAC1B;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,SAAS;AACX,GAAwE;AACtE,QAAM,EAAE,OAAO,YAAY,aAAa,kBAAkB,IAAI,qBAAqB,QAAQ;AAAA;AAAA,IAEzF,IAAI;AAAA,IACJ,UAAU;AAAA,IACV;AAAA,IACA;AAAA,EACF,CAAC,GAEK,QAAQ,MAAM,QAAQ,OACnB;AAAA,IACL;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,IACC,CAAC,YAAY,OAAO,YAAY,aAAa,MAAM,CAAC;AAEvD,SACE,oBAAC,iBAAiB,UAAjB,EAA0B,OACzB,8BAAC,qBAAmB,UAAS,GAC/B;AAEJ;AAEO,SAAS,sBAAsB;AACpC,QAAM,UAAU,MAAM,WAAW,gBAAgB;AACjD,MAAI,CAAC;AACH,UAAM,IAAI,MAAM,yDAAyD;AAE3E,SAAO;AACT;AAEO,SAAS,UAAU;AACxB,QAAM,UAAU,oBAAoB,GAE9B,EAAE,OAAO,YAAY,IAAI,SAEzB,UAAU,MAAM,OAAO,KAAK,CAAC,OAAO,MACjC,MAAM,UAAU,CACxB;AAED,SAAK,UAIE,YAAY,QAAQ,GAAG,GAAG,OAAO,KAAK,OAHpC;AAIX;AAGO,MAAM,OAAO,MAAM,KAAK,SAAc,OAAyC;AACpF,QAAM,aAAa,cAAc;AAIjC,SAHgB,MAAM,WAAW,gBAAgB,GAGpC,eAAe,aAGxB,oBAAC,aAAW,GAAG,OACb,8BAAC,iBAAc,GACjB,IAIG,oBAAC,iBAAc;AACxB,CAAC;AAEM,SAAS,gBAAgB;AAC9B,SAAO,QAAQ;AACjB;AAEO,SAAS,mBAAmB;AACjC,SACE,oBAAC,gBAAa,OAAO,EAAE,MAAM,EAAE,GAC7B,8BAAC,aACC,8BAAC,iBAAc,GACjB,GACF;AAEJ;AAEA,UAAU,OAAO;AACjB,UAAU,aAAa;AAGvB,UAAU,SAAS;",
   "names": []
 }

package/dist/esm/views/Navigator.mjs

@@ -1,11 +1,10 @@
-import { useNavigationBuilder } from "@react-navigation/native";
+import { StackRouter, useNavigationBuilder } from "@react-navigation/native";
 import * as React from "react";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { useFilterScreenChildren } from "../layouts/withLayoutContext.mjs";
 import { useContextKey } from "../router/Route.mjs";
 import { useSortedScreens } from "../router/useScreens.mjs";
 import { Screen } from "./Screen.mjs";
-import { CustomStackRouter } from "./OneStackRouter.mjs";
 import { jsx } from "react/jsx-runtime";
 const NavigatorContext = React.createContext(null);
 process.env.NODE_ENV !== "production" && (NavigatorContext.displayName = "NavigatorContext");
@@ -39,7 +38,7 @@ function QualifiedNavigator({
   children,
   screens,
   contextKey,
-  router = CustomStackRouter
+  router = StackRouter
 }) {
   const {
       state,

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

@@ -1 +1 @@
-{"version":3,"names":["useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","useContextKey","useSortedScreens","Screen","CustomStackRouter","jsx","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","initialRouteName","screenOptions","children","router","contextKey","screens","otherSlot","isCustomNavigator","sorted","length","QualifiedNavigator","console","warn","state","navigation","descriptors","NavigationContent","id","value","useMemo","Provider","useNavigatorContext","context","useContext","Error","useSlot","current","routes","find","route","i","index","key","render","Slot","memo","props","QualifiedSlot","DefaultNavigator","style","flex"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["StackRouter","useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","useContextKey","useSortedScreens","Screen","jsx","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","initialRouteName","screenOptions","children","router","contextKey","screens","otherSlot","isCustomNavigator","sorted","length","QualifiedNavigator","console","warn","state","navigation","descriptors","NavigationContent","id","value","useMemo","Provider","useNavigatorContext","context","useContext","Error","useSlot","current","routes","find","route","i","index","key","render","Slot","memo","props","QualifiedSlot","DefaultNavigator","style","flex"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -1,12 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useNavigationBuilder } from "@react-navigation/native";
+import { StackRouter, useNavigationBuilder } from "@react-navigation/native";
 import * as React from "react";
 import { SafeAreaView } from "react-native-safe-area-context";
 import { useFilterScreenChildren } from "../layouts/withLayoutContext.native.js";
 import { useContextKey } from "../router/Route.native.js";
 import { useSortedScreens } from "../router/useScreens.native.js";
 import { Screen } from "./Screen.native.js";
-import { CustomStackRouter } from "./OneStackRouter.native.js";
 var NavigatorContext = /* @__PURE__ */React.createContext(null);
 process.env.NODE_ENV !== "production" && (NavigatorContext.displayName = "NavigatorContext");
 function Navigator(param) {
@@ -41,7 +40,7 @@ function QualifiedNavigator(param) {
       children,
       screens,
       contextKey,
-      router = CustomStackRouter
+      router = StackRouter
     } = param,
     {
       state,

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

@@ -1 +1 @@
-{"version":3,"names":["jsx","_jsx","useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","useContextKey","useSortedScreens","Screen","CustomStackRouter","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","param","initialRouteName","screenOptions","children","router","contextKey","screens","otherSlot","isCustomNavigator","sorted","length","QualifiedNavigator","console","warn","state","navigation","descriptors","NavigationContent","id","value","useMemo","Provider","useNavigatorContext","context","useContext","Error","useSlot","_descriptors_current_key","current","routes","find","route","i","index","_descriptors_current_key_render","key","render","Slot","memo","props","QualifiedSlot"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["jsx","_jsx","StackRouter","useNavigationBuilder","React","SafeAreaView","useFilterScreenChildren","useContextKey","useSortedScreens","Screen","NavigatorContext","createContext","process","env","NODE_ENV","displayName","Navigator","param","initialRouteName","screenOptions","children","router","contextKey","screens","otherSlot","isCustomNavigator","sorted","length","QualifiedNavigator","console","warn","state","navigation","descriptors","NavigationContent","id","value","useMemo","Provider","useNavigatorContext","context","useContext","Error","useSlot","_descriptors_current_key","current","routes","find","route","i","index","_descriptors_current_key_render","key","render","Slot","memo","props","QualifiedSlot"],"sources":["../../../src/views/Navigator.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/esm/views/OneStackRouter.js

@@ -5,18 +5,7 @@ const CustomStackRouter = (options) => {
     const next = og(state, action, options2);
     if (action.type === "NAVIGATE" && next?.routes) {
       const outRoutes = next.routes, firstRoute = outRoutes[0];
-      if (firstRoute.name.includes("[...") && outRoutes.every((x) => x.name === firstRoute.name)) {
-        const next2 = { ...firstRoute };
-        next2.params = outRoutes[outRoutes.length - 1].params;
-        const routes = [next2];
-        return {
-          ...next2,
-          routes,
-          preloadedRoutes: state.preloadedRoutes.filter(
-            (route) => routes[routes.length - 1].key !== route.key
-          )
-        };
-      }
+      firstRoute.name.includes("[...") && outRoutes.every((x) => x.name === firstRoute.name);
     }
     return next;
   }, router;

package/dist/esm/views/OneStackRouter.js.map

@@ -1,6 +1,6 @@
 {
   "version": 3,
   "sources": ["../../../src/views/OneStackRouter.tsx"],
-  "mappings": "AAGA,SAAS,mBAA4C;AAE9C,MAAM,oBAAoB,CAAC,YAAgC;AAChE,QAAM,SAAS,YAAY,OAAO,GAE5B,KAAK,OAAO,kBAAkB,KAAK,MAAM;AAE/C,gBAAO,oBAAoB,CAAC,OAAO,QAAQA,aAAY;AACrD,UAAM,OAAO,GAAG,OAAO,QAAQA,QAAO;AASpC,QAAI,OAAO,SAAS,cACd,MAAM,QAAQ;AAChB,YAAM,YAAY,KAAK,QAEjB,aAAa,UAAU,CAAC;AAC9B,UAAI,WAAW,KAAK,SAAS,MAAM,KAC7B,UAAU,MAAM,CAAC,MAAM,EAAE,SAAS,WAAW,IAAI,GAAG;AAEtD,cAAMC,QAAO,EAAE,GAAG,WAAW;AAC7B,QAAAA,MAAK,SAAS,UAAU,UAAU,SAAS,CAAC,EAAE;AAC9C,cAAM,SAAS,CAACA,KAAI;AACpB,eAAO;AAAA,UACL,GAAGA;AAAA,UACH;AAAA,UACA,iBAAiB,MAAM,gBAAgB;AAAA,YACrC,CAAC,UAAU,OAAO,OAAO,SAAS,CAAC,EAAE,QAAQ,MAAM;AAAA,UACrD;AAAA,QACF;AAAA,MACF;AAAA,IAEJ;AAIJ,WAAO;AAAA,EACT,GAGO;AACT;",
-  "names": ["options", "next"]
+  "mappings": "AAGA,SAAS,mBAA4C;AAE9C,MAAM,oBAAoB,CAAC,YAAgC;AAChE,QAAM,SAAS,YAAY,OAAO,GAE5B,KAAK,OAAO,kBAAkB,KAAK,MAAM;AAC/C,gBAAO,oBAAoB,CAAC,OAAO,QAAQA,aAAY;AACrD,UAAM,OAAO,GAAG,OAAO,QAAQA,QAAO;AASpC,QAAI,OAAO,SAAS,cACd,MAAM,QAAQ;AAChB,YAAM,YAAY,KAAK,QAEjB,aAAa,UAAU,CAAC;AAC9B,MAAI,WAAW,KAAK,SAAS,MAAM,KAC7B,UAAU,MAAM,CAAC,MAAM,EAAE,SAAS,WAAW,IAAI;AAAA,IAwCzD;AAIJ,WAAO;AAAA,EACT,GAGO;AACT;",
+  "names": ["options"]
 }

package/dist/esm/views/OneStackRouter.mjs

@@ -7,18 +7,7 @@ const CustomStackRouter = options => {
     if (action.type === "NAVIGATE" && next?.routes) {
       const outRoutes = next.routes,
         firstRoute = outRoutes[0];
-      if (firstRoute.name.includes("[...") && outRoutes.every(x => x.name === firstRoute.name)) {
-        const next2 = {
-          ...firstRoute
-        };
-        next2.params = outRoutes[outRoutes.length - 1].params;
-        const routes = [next2];
-        return {
-          ...next2,
-          routes,
-          preloadedRoutes: state.preloadedRoutes.filter(route => routes[routes.length - 1].key !== route.key)
-        };
-      }
+      firstRoute.name.includes("[...") && outRoutes.every(x => x.name === firstRoute.name);
     }
     return next;
   }, router;

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

@@ -1 +1 @@
-{"version":3,"names":["StackRouter","CustomStackRouter","options","router","og","getStateForAction","bind","state","action","options2","next","type","routes","outRoutes","firstRoute","name","includes","every","x","next2","params","length","preloadedRoutes","filter","route","key"],"sources":["../../../src/views/OneStackRouter.tsx"],"sourcesContent":[null],"mappings":"AAGA,SAASA,WAAA,QAA4C;AAE9C,MAAMC,iBAAA,GAAqBC,OAAA,IAAgC;EAChE,MAAMC,MAAA,GAASH,WAAA,CAAYE,OAAO;IAE5BE,EAAA,GAAKD,MAAA,CAAOE,iBAAA,CAAkBC,IAAA,CAAKH,MAAM;EAE/C,OAAAA,MAAA,CAAOE,iBAAA,GAAoB,CAACE,KAAA,EAAOC,MAAA,EAAQC,QAAA,KAAY;IACrD,MAAMC,IAAA,GAAON,EAAA,CAAGG,KAAA,EAAOC,MAAA,EAAQC,QAAO;IASpC,IAAID,MAAA,CAAOG,IAAA,KAAS,cACdD,IAAA,EAAME,MAAA,EAAQ;MAChB,MAAMC,SAAA,GAAYH,IAAA,CAAKE,MAAA;QAEjBE,UAAA,GAAaD,SAAA,CAAU,CAAC;MAC9B,IAAIC,UAAA,CAAWC,IAAA,CAAKC,QAAA,CAAS,MAAM,KAC7BH,SAAA,CAAUI,KAAA,CAAOC,CAAA,IAAMA,CAAA,CAAEH,IAAA,KAASD,UAAA,CAAWC,IAAI,GAAG;QAEtD,MAAMI,KAAA,GAAO;UAAE,GAAGL;QAAW;QAC7BK,KAAA,CAAKC,MAAA,GAASP,SAAA,CAAUA,SAAA,CAAUQ,MAAA,GAAS,CAAC,EAAED,MAAA;QAC9C,MAAMR,MAAA,GAAS,CAACO,KAAI;QACpB,OAAO;UACL,GAAGA,KAAA;UACHP,MAAA;UACAU,eAAA,EAAiBf,KAAA,CAAMe,eAAA,CAAgBC,MAAA,CACpCC,KAAA,IAAUZ,MAAA,CAAOA,MAAA,CAAOS,MAAA,GAAS,CAAC,EAAEI,GAAA,KAAQD,KAAA,CAAMC,GACrD;QACF;MACF;IAEJ;IAIJ,OAAOf,IAAA;EACT,GAGOP,MAAA;AACT","ignoreList":[]}
+{"version":3,"names":["StackRouter","CustomStackRouter","options","router","og","getStateForAction","bind","state","action","options2","next","type","routes","outRoutes","firstRoute","name","includes","every","x"],"sources":["../../../src/views/OneStackRouter.tsx"],"sourcesContent":[null],"mappings":"AAGA,SAASA,WAAA,QAA4C;AAE9C,MAAMC,iBAAA,GAAqBC,OAAA,IAAgC;EAChE,MAAMC,MAAA,GAASH,WAAA,CAAYE,OAAO;IAE5BE,EAAA,GAAKD,MAAA,CAAOE,iBAAA,CAAkBC,IAAA,CAAKH,MAAM;EAC/C,OAAAA,MAAA,CAAOE,iBAAA,GAAoB,CAACE,KAAA,EAAOC,MAAA,EAAQC,QAAA,KAAY;IACrD,MAAMC,IAAA,GAAON,EAAA,CAAGG,KAAA,EAAOC,MAAA,EAAQC,QAAO;IASpC,IAAID,MAAA,CAAOG,IAAA,KAAS,cACdD,IAAA,EAAME,MAAA,EAAQ;MAChB,MAAMC,SAAA,GAAYH,IAAA,CAAKE,MAAA;QAEjBE,UAAA,GAAaD,SAAA,CAAU,CAAC;MAC1BC,UAAA,CAAWC,IAAA,CAAKC,QAAA,CAAS,MAAM,KAC7BH,SAAA,CAAUI,KAAA,CAAOC,CAAA,IAAMA,CAAA,CAAEH,IAAA,KAASD,UAAA,CAAWC,IAAI;IAwCzD;IAIJ,OAAOL,IAAA;EACT,GAGOP,MAAA;AACT","ignoreList":[]}

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

@@ -4,10 +4,7 @@ var CustomStackRouter = function (options) {
     og = router.getStateForAction.bind(router);
   return router.getStateForAction = function (state, action, options2) {
     var next = og(state, action, options2);
-    if (0 && action.type === "NAVIGATE" && next?.routes) {
-      var outRoutes, firstRoute;
-      if (firstRoute.name.includes("[...") && outRoutes.every(function (x) {})) var next1, routes;
-    }
+    if (0 && action.type === "NAVIGATE" && next?.routes) var outRoutes, firstRoute;
     return next;
   }, router;
 };

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

@@ -1 +1 @@
-{"version":3,"names":["StackRouter","CustomStackRouter","options","router","og","getStateForAction","bind","state","action","options2","next","type","routes","outRoutes","firstRoute","name","includes","every","x","next1"],"sources":["../../../src/views/OneStackRouter.tsx"],"sourcesContent":[null],"mappings":"AAGA,SAASA,WAAA,QAA4C;AAE9C,IAAAC,iBAAM,YAAAA,CAAqBC,OAAgC;EAChE,IAAAC,MAAM,GAAAH,WAAS,CAAAE,OAAY;IAAOE,EAE5B,GAAAD,MAAK,CAAAE,iBAAO,CAAAC,IAAkB,CAAAH,MAAK;EAEzC,OAAAA,MAAA,CAAOE,iBAAA,GAAoB,UAAQE,KAAA,EAAQC,MAAA,EAAAC,QAAY;IACrD,IAAAC,IAAM,GAAAN,EAAO,CAAAG,KAAG,EAAAC,MAAO,EAAAC,QAAQ;IAS7B,IAAI,KAAAD,MAAO,CAAAG,IAAS,eACd,IAAAD,IAAM,EAAAE,MAAQ;MAChB,IAAAC,SAAM,EAAAC,UAAiB;MAGvB,IAAIA,UAAA,CAAWC,IAAA,CAAKC,QAAA,CAAS,MAAM,KAC7BH,SAAA,CAAUI,KAAA,CAAM,UAASC,CAAA,GAE3B,IACA,IAAAC,KAAK,EAAAP,MAAS;IACd;IACA,OAAAF,IAAO;EAAA,GAAAP,MACL;AAAG;AACH,SACuCF,iBACpC","ignoreList":[]}
+{"version":3,"names":["StackRouter","CustomStackRouter","options","router","og","getStateForAction","bind","state","action","options2","next","type","routes","outRoutes","firstRoute"],"sources":["../../../src/views/OneStackRouter.tsx"],"sourcesContent":[null],"mappings":"AAGA,SAASA,WAAA,QAA4C;AAE9C,IAAAC,iBAAM,YAAAA,CAAqBC,OAAgC;EAChE,IAAAC,MAAM,GAAAH,WAAS,CAAAE,OAAY;IAAOE,EAE5B,GAAAD,MAAK,CAAAE,iBAAO,CAAAC,IAAkB,CAAAH,MAAK;EACzC,OAAAA,MAAA,CAAOE,iBAAA,GAAoB,UAAQE,KAAA,EAAQC,MAAA,EAAAC,QAAY;IACrD,IAAAC,IAAM,GAAAN,EAAO,CAAAG,KAAG,EAAAC,MAAO,EAAAC,QAAQ;IAS7B,IAAI,KAAAD,MAAO,CAAAG,IAAS,eACd,IAAAD,IAAM,EAAAE,MAAQ,EAChB,IAAAC,SAAM,EAAAC,UAAiB;IAGvB,OAAIJ,IAAA;EACmD,GAwCzDP,MAAA;AAIJ;AAAO,SAKXF,iBAAA","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "one",
-  "version": "1.1.449",
+  "version": "1.1.450",
   "license": "BSD-3-Clause",
   "sideEffects": [
     "setup.mjs",
@@ -94,15 +94,15 @@
     "@react-navigation/routers": "~7",
     "@swc/core": "^1.10.4",
     "@ungap/structured-clone": "^1.2.0",
-    "@vxrn/compiler": "1.1.449",
-    "@vxrn/resolve": "1.1.449",
-    "@vxrn/tslib-lite": "1.1.449",
-    "@vxrn/universal-color-scheme": "1.1.449",
-    "@vxrn/use-isomorphic-layout-effect": "1.1.449",
+    "@vxrn/compiler": "1.1.450",
+    "@vxrn/resolve": "1.1.450",
+    "@vxrn/tslib-lite": "1.1.450",
+    "@vxrn/universal-color-scheme": "1.1.450",
+    "@vxrn/use-isomorphic-layout-effect": "1.1.450",
     "babel-dead-code-elimination": "^1.0.9",
     "citty": "^0.1.6",
     "core-js": "^3.38.1",
-    "create-vxrn": "1.1.449",
+    "create-vxrn": "1.1.450",
     "escape-string-regexp": "^5.0.0",
     "expo-linking": "~6.3.1",
     "expo-modules-core": "2.1.2",
@@ -128,7 +128,7 @@
     "vite": "^6.1.0",
     "vite-plugin-barrel": "^0.4.1",
     "vite-tsconfig-paths": "^5.0.1",
-    "vxrn": "1.1.449",
+    "vxrn": "1.1.450",
     "ws": "^8.18.0",
     "xxhashjs": "^0.2.2"
   },

package/src/views/Navigator.tsx

@@ -1,12 +1,11 @@
 // Copyright © 2024 650 Industries.
-import { useNavigationBuilder, type RouterFactory } from '@react-navigation/native'
+import { StackRouter, useNavigationBuilder, type RouterFactory } from '@react-navigation/native'
 import * as React from 'react'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import { useFilterScreenChildren } from '../layouts/withLayoutContext'
 import { useContextKey } from '../router/Route'
 import { useSortedScreens } from '../router/useScreens'
 import { Screen } from './Screen'
-import { CustomStackRouter } from './OneStackRouter'
 
 type NavigatorTypes = ReturnType<typeof useNavigationBuilder>
 
@@ -66,7 +65,7 @@ function QualifiedNavigator({
   children,
   screens,
   contextKey,
-  router = CustomStackRouter,
+  router = StackRouter,
 }: NavigatorProps & { contextKey: string; screens: React.ReactNode[] }) {
   const { state, navigation, descriptors, NavigationContent } = useNavigationBuilder(router, {
     // Used for getting the parent with navigation.getParent('/normalized/path')

package/src/views/OneStackRouter.tsx

@@ -7,7 +7,6 @@ export const CustomStackRouter = (options: StackRouterOptions) => {
   const router = StackRouter(options)
 
   const og = router.getStateForAction.bind(router)
-
   router.getStateForAction = (state, action, options) => {
     const next = og(state, action, options)
 
@@ -25,17 +24,43 @@ export const CustomStackRouter = (options: StackRouterOptions) => {
           const firstRoute = outRoutes[0]
           if (firstRoute.name.includes('[...')) {
             if (outRoutes.every((x) => x.name === firstRoute.name)) {
+              // this isn't working, we need a deeper solution
+              // change keys to be stable
+              // return [
+              //   ...outRoutes,
+              //   {
+              //     ...outRoutes[outRoutes.length - 1],
+              //     key: outRoutes[0].key,
+              //   },
+              // ] as any
+              // console.warn(
+              //   'outRoutes',
+              //   outRoutes.map((x) => x.key)
+              // )
+              // const next = outRoutes.map((route, i) => {
+              //   const inverse = outRoutes.length - i
+              //   const isLast = i === outRoutes.length - 1
+              //   const key = isLast ? route.key : `${route.name}-${inverse}`
+              //   return {
+              //     ...route,
+              //     key,
+              //   }
+              // })
+              // console.warn(next)
+              // return next
               // instead of stacking, just update the original one with the new params
-              const next = { ...firstRoute }
-              next.params = outRoutes[outRoutes.length - 1].params
-              const routes = [next]
-              return {
-                ...next,
-                routes,
-                preloadedRoutes: state.preloadedRoutes.filter(
-                  (route) => routes[routes.length - 1].key !== route.key
-                ),
-              } as any
+              // const next = { ...firstRoute }
+              // next.params = outRoutes[outRoutes.length - 1].params
+              // const otherRoutes = outRoutes.filter((x) => x !== firstRoute)
+              // console.warn('otherRoutes', otherRoutes)
+              // const routes = [next]
+              // return {
+              //   ...next,
+              //   routes,
+              //   preloadedRoutes: state.preloadedRoutes.filter(
+              //     (route) => routes[routes.length - 1].key !== route.key
+              //   ),
+              // } as any
             }
           }
         }

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

@@ -1 +1 @@
-{"version":3,"file":"Navigator.d.ts","sourceRoot":"","sources":["../../src/views/Navigator.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACnF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAQ9B,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAG7D,eAAO,MAAM,gBAAgB;gBACf,MAAM;WACX,cAAc,CAAC,OAAO,CAAC;gBAClB,cAAc,CAAC,YAAY,CAAC;iBAC3B,cAAc,CAAC,aAAa,CAAC;YAClC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;SACvB,CAAA;AAMf,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAA;IACjF,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAA;IAC3E,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACjE,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAA;CACpD,CAAA;AAED,+DAA+D;AAC/D,wBAAgB,SAAS,CAAC,EAAE,gBAAgB,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,cAAc,kDA2B9F;yBA3Be,SAAS;;;;;AA8DzB,wBAAgB,mBAAmB;gBAjFrB,MAAM;WACX,cAAc,CAAC,OAAO,CAAC;gBAClB,cAAc,CAAC,YAAY,CAAC;iBAC3B,cAAc,CAAC,aAAa,CAAC;YAClC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;EAmFrC;AAED,wBAAgB,OAAO,uBActB;AAED,8CAA8C;AAC9C,eAAO,MAAM,IAAI,8DAef,CAAA;AAEF,wBAAgB,aAAa,uBAE5B;AAED,wBAAgB,gBAAgB,4CAQ/B"}
+{"version":3,"file":"Navigator.d.ts","sourceRoot":"","sources":["../../src/views/Navigator.tsx"],"names":[],"mappings":"AACA,OAAO,EAAe,oBAAoB,EAAE,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAChG,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAO9B,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAG7D,eAAO,MAAM,gBAAgB;gBACf,MAAM;WACX,cAAc,CAAC,OAAO,CAAC;gBAClB,cAAc,CAAC,YAAY,CAAC;iBAC3B,cAAc,CAAC,aAAa,CAAC;YAClC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;SACvB,CAAA;AAMf,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAA;IACjF,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAA;IAC3E,QAAQ,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;IACjE,MAAM,CAAC,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAA;CACpD,CAAA;AAED,+DAA+D;AAC/D,wBAAgB,SAAS,CAAC,EAAE,gBAAgB,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,cAAc,kDA2B9F;yBA3Be,SAAS;;;;;AA8DzB,wBAAgB,mBAAmB;gBAjFrB,MAAM;WACX,cAAc,CAAC,OAAO,CAAC;gBAClB,cAAc,CAAC,YAAY,CAAC;iBAC3B,cAAc,CAAC,aAAa,CAAC;YAClC,aAAa,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC;EAmFrC;AAED,wBAAgB,OAAO,uBActB;AAED,8CAA8C;AAC9C,eAAO,MAAM,IAAI,8DAef,CAAA;AAEF,wBAAgB,aAAa,uBAE5B;AAED,wBAAgB,gBAAgB,4CAQ/B"}

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

@@ -1 +1 @@
-{"version":3,"file":"OneStackRouter.d.ts","sourceRoot":"","sources":["../../src/views/OneStackRouter.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAE/E,eAAO,MAAM,iBAAiB,YAAa,kBAAkB,KA2C1C,GAClB,CAAA"}
+{"version":3,"file":"OneStackRouter.d.ts","sourceRoot":"","sources":["../../src/views/OneStackRouter.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAE/E,eAAO,MAAM,iBAAiB,YAAa,kBAAkB,KAoE1C,GAClB,CAAA"}