@argon-router/react 0.8.3 → 0.10.0

package/dist/index.cjs

@@ -1,31 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("react"),P=require("effector-react");var N={exports:{}},S={};/**
- * @license React
- * react-jsx-runtime.production.js
- *
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */var be;function Se(){if(be)return S;be=1;var n=Symbol.for("react.transitional.element"),s=Symbol.for("react.fragment");function i(m,l,E){var g=null;if(E!==void 0&&(g=""+E),l.key!==void 0&&(g=""+l.key),"key"in l){E={};for(var b in l)b!=="key"&&(E[b]=l[b])}else E=l;return l=E.ref,{$$typeof:n,type:m,key:g,ref:l!==void 0?l:null,props:E}}return S.Fragment=s,S.jsx=i,S.jsxs=i,S}var O={};/**
- * @license React
- * react-jsx-runtime.development.js
- *
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */var ge;function Oe(){return ge||(ge=1,process.env.NODE_ENV!=="production"&&function(){function n(e){if(e==null)return null;if(typeof e=="function")return e.$$typeof===pe?null:e.displayName||e.name||null;if(typeof e=="string")return e;switch(e){case V:return"Fragment";case he:return"Portal";case Q:return"Profiler";case Z:return"StrictMode";case W:return"Suspense";case q:return"SuspenseList"}if(typeof e=="object")switch(typeof e.tag=="number"&&console.error("Received an unexpected object in getComponentNameFromType(). This is likely a bug in React. Please file an issue."),e.$$typeof){case ee:return(e.displayName||"Context")+".Provider";case D:return(e._context.displayName||"Context")+".Consumer";case U:var r=e.render;return e=e.displayName,e||(e=r.displayName||r.name||"",e=e!==""?"ForwardRef("+e+")":"ForwardRef"),e;case z:return r=e.displayName||null,r!==null?r:n(e.type)||"Memo";case J:r=e._payload,e=e._init;try{return n(e(r))}catch{}}return null}function s(e){return""+e}function i(e){try{s(e);var r=!1}catch{r=!0}if(r){r=console;var t=r.error,a=typeof Symbol=="function"&&Symbol.toStringTag&&e[Symbol.toStringTag]||e.constructor.name||"Object";return t.call(r,"The provided key is an unsupported type %s. This value must be coerced to a string before using it here.",a),s(e)}}function m(){}function l(){if(k===0){oe=console.log,ne=console.info,ae=console.warn,ue=console.error,se=console.group,ie=console.groupCollapsed,le=console.groupEnd;var e={configurable:!0,enumerable:!0,value:m,writable:!0};Object.defineProperties(console,{info:e,log:e,warn:e,error:e,group:e,groupCollapsed:e,groupEnd:e})}k++}function E(){if(k--,k===0){var e={configurable:!0,enumerable:!0,writable:!0};Object.defineProperties(console,{log:h({},e,{value:oe}),info:h({},e,{value:ne}),warn:h({},e,{value:ae}),error:h({},e,{value:ue}),group:h({},e,{value:se}),groupCollapsed:h({},e,{value:ie}),groupEnd:h({},e,{value:le})})}0>k&&console.error("disabledDepth fell below zero. This is a bug in React. Please file an issue.")}function g(e){if(G===void 0)try{throw Error()}catch(t){var r=t.stack.trim().match(/\n( *(at )?)/);G=r&&r[1]||"",ce=-1<t.stack.indexOf(`
-    at`)?" (<anonymous>)":-1<t.stack.indexOf("@")?"@unknown:0:0":""}return`
-`+G+e+ce}function b(e,r){if(!e||B)return"";var t=F.get(e);if(t!==void 0)return t;B=!0,t=Error.prepareStackTrace,Error.prepareStackTrace=void 0;var a=null;a=_.H,_.H=null,l();try{var c={DetermineComponentFrameRoot:function(){try{if(r){var j=function(){throw Error()};if(Object.defineProperty(j.prototype,"props",{set:function(){throw Error()}}),typeof Reflect=="object"&&Reflect.construct){try{Reflect.construct(j,[])}catch(x){var A=x}Reflect.construct(e,[],j)}else{try{j.call()}catch(x){A=x}e.call(j.prototype)}}else{try{throw Error()}catch(x){A=x}(j=e())&&typeof j.catch=="function"&&j.catch(function(){})}}catch(x){if(x&&A&&typeof x.stack=="string")return[x.stack,A.stack]}return[null,null]}};c.DetermineComponentFrameRoot.displayName="DetermineComponentFrameRoot";var u=Object.getOwnPropertyDescriptor(c.DetermineComponentFrameRoot,"name");u&&u.configurable&&Object.defineProperty(c.DetermineComponentFrameRoot,"name",{value:"DetermineComponentFrameRoot"});var o=c.DetermineComponentFrameRoot(),w=o[0],p=o[1];if(w&&p){var d=w.split(`
-`),T=p.split(`
-`);for(o=u=0;u<d.length&&!d[u].includes("DetermineComponentFrameRoot");)u++;for(;o<T.length&&!T[o].includes("DetermineComponentFrameRoot");)o++;if(u===d.length||o===T.length)for(u=d.length-1,o=T.length-1;1<=u&&0<=o&&d[u]!==T[o];)o--;for(;1<=u&&0<=o;u--,o--)if(d[u]!==T[o]){if(u!==1||o!==1)do if(u--,o--,0>o||d[u]!==T[o]){var C=`
-`+d[u].replace(" at new "," at ");return e.displayName&&C.includes("<anonymous>")&&(C=C.replace("<anonymous>",e.displayName)),typeof e=="function"&&F.set(e,C),C}while(1<=u&&0<=o);break}}}finally{B=!1,_.H=a,E(),Error.prepareStackTrace=t}return d=(d=e?e.displayName||e.name:"")?g(d):"",typeof e=="function"&&F.set(e,d),d}function R(e){if(e==null)return"";if(typeof e=="function"){var r=e.prototype;return b(e,!(!r||!r.isReactComponent))}if(typeof e=="string")return g(e);switch(e){case W:return g("Suspense");case q:return g("SuspenseList")}if(typeof e=="object")switch(e.$$typeof){case U:return e=b(e.render,!1),e;case z:return R(e.type);case J:r=e._payload,e=e._init;try{return R(e(r))}catch{}}return""}function f(){var e=_.A;return e===null?null:e.getOwner()}function Y(e){if(te.call(e,"key")){var r=Object.getOwnPropertyDescriptor(e,"key").get;if(r&&r.isReactWarning)return!1}return e.key!==void 0}function we(e,r){function t(){fe||(fe=!0,console.error("%s: `key` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://react.dev/link/special-props)",r))}t.isReactWarning=!0,Object.defineProperty(e,"key",{get:t,configurable:!0})}function xe(){var e=n(this.type);return de[e]||(de[e]=!0,console.error("Accessing element.ref was removed in React 19. ref is now a regular prop. It will be removed from the JSX Element type in a future release.")),e=this.props.ref,e!==void 0?e:null}function ye(e,r,t,a,c,u){return t=u.ref,e={$$typeof:$,type:e,key:r,props:u,_owner:c},(t!==void 0?t:null)!==null?Object.defineProperty(e,"ref",{enumerable:!1,get:xe}):Object.defineProperty(e,"ref",{enumerable:!1,value:null}),e._store={},Object.defineProperty(e._store,"validated",{configurable:!1,enumerable:!1,writable:!0,value:0}),Object.defineProperty(e,"_debugInfo",{configurable:!1,enumerable:!1,writable:!0,value:null}),Object.freeze&&(Object.freeze(e.props),Object.freeze(e)),e}function X(e,r,t,a,c,u){if(typeof e=="string"||typeof e=="function"||e===V||e===Q||e===Z||e===W||e===q||e===Te||typeof e=="object"&&e!==null&&(e.$$typeof===J||e.$$typeof===z||e.$$typeof===ee||e.$$typeof===D||e.$$typeof===U||e.$$typeof===ke||e.getModuleId!==void 0)){var o=r.children;if(o!==void 0)if(a)if(L(o)){for(a=0;a<o.length;a++)K(o[a],e);Object.freeze&&Object.freeze(o)}else console.error("React.jsx: Static children should always be an array. You are likely explicitly calling React.jsxs or React.jsxDEV. Use the Babel transform instead.");else K(o,e)}else o="",(e===void 0||typeof e=="object"&&e!==null&&Object.keys(e).length===0)&&(o+=" You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports."),e===null?a="null":L(e)?a="array":e!==void 0&&e.$$typeof===$?(a="<"+(n(e.type)||"Unknown")+" />",o=" Did you accidentally export a JSX literal instead of a component?"):a=typeof e,console.error("React.jsx: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",a,o);if(te.call(r,"key")){o=n(e);var w=Object.keys(r).filter(function(d){return d!=="key"});a=0<w.length?"{key: someKey, "+w.join(": ..., ")+": ...}":"{key: someKey}",ve[o+a]||(w=0<w.length?"{"+w.join(": ..., ")+": ...}":"{}",console.error(`A props object containing a "key" prop is being spread into JSX:
-  let props = %s;
-  <%s {...props} />
-React keys must be passed directly to JSX without using spread:
-  let props = %s;
-  <%s key={someKey} {...props} />`,a,o,w,o),ve[o+a]=!0)}if(o=null,t!==void 0&&(i(t),o=""+t),Y(r)&&(i(r.key),o=""+r.key),"key"in r){t={};for(var p in r)p!=="key"&&(t[p]=r[p])}else t=r;return o&&we(t,typeof e=="function"?e.displayName||e.name||"Unknown":e),ye(e,o,u,c,f(),t)}function K(e,r){if(typeof e=="object"&&e&&e.$$typeof!==Ce){if(L(e))for(var t=0;t<e.length;t++){var a=e[t];M(a)&&I(a,r)}else if(M(e))e._store&&(e._store.validated=1);else if(e===null||typeof e!="object"?t=null:(t=re&&e[re]||e["@@iterator"],t=typeof t=="function"?t:null),typeof t=="function"&&t!==e.entries&&(t=t.call(e),t!==e))for(;!(e=t.next()).done;)M(e.value)&&I(e.value,r)}}function M(e){return typeof e=="object"&&e!==null&&e.$$typeof===$}function I(e,r){if(e._store&&!e._store.validated&&e.key==null&&(e._store.validated=1,r=je(r),!Ee[r])){Ee[r]=!0;var t="";e&&e._owner!=null&&e._owner!==f()&&(t=null,typeof e._owner.tag=="number"?t=n(e._owner.type):typeof e._owner.name=="string"&&(t=e._owner.name),t=" It was passed a child from "+t+".");var a=_.getCurrentStack;_.getCurrentStack=function(){var c=R(e.type);return a&&(c+=a()||""),c},console.error('Each child in a list should have a unique "key" prop.%s%s See https://react.dev/link/warning-keys for more information.',r,t),_.getCurrentStack=a}}function je(e){var r="",t=f();return t&&(t=n(t.type))&&(r=`
-
-Check the render method of \``+t+"`."),r||(e=n(e))&&(r=`
-
-Check the top-level render call using <`+e+">."),r}var _e=y,$=Symbol.for("react.transitional.element"),he=Symbol.for("react.portal"),V=Symbol.for("react.fragment"),Z=Symbol.for("react.strict_mode"),Q=Symbol.for("react.profiler"),D=Symbol.for("react.consumer"),ee=Symbol.for("react.context"),U=Symbol.for("react.forward_ref"),W=Symbol.for("react.suspense"),q=Symbol.for("react.suspense_list"),z=Symbol.for("react.memo"),J=Symbol.for("react.lazy"),Te=Symbol.for("react.offscreen"),re=Symbol.iterator,pe=Symbol.for("react.client.reference"),_=_e.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,te=Object.prototype.hasOwnProperty,h=Object.assign,ke=Symbol.for("react.client.reference"),L=Array.isArray,k=0,oe,ne,ae,ue,se,ie,le;m.__reactDisabledLog=!0;var G,ce,B=!1,F=new(typeof WeakMap=="function"?WeakMap:Map),Ce=Symbol.for("react.client.reference"),fe,de={},ve={},Ee={};O.Fragment=V,O.jsx=function(e,r,t,a,c){return X(e,r,t,!1,a,c)},O.jsxs=function(e,r,t,a,c){return X(e,r,t,!0,a,c)}}()),O}var me;function Ae(){return me||(me=1,process.env.NODE_ENV==="production"?N.exports=Se():N.exports=Oe()),N.exports}var v=Ae();const Re=y.createContext(null),Ne=n=>v.jsx(Re.Provider,{value:n.router,children:n.children});function H(){const n=y.useContext(Re);if(!n)throw new Error("[useRouter] Router not found. Add RouterProvider in app root");return n}function Pe(){return P.useUnit(H())}const Ye=y.forwardRef((n,s)=>{const{to:i,params:m,onClick:l,...E}=n,{mappedRoutes:g}=H(),b=g.find(({route:f})=>f===i),{onOpen:R}=P.useUnit(i);if(!b)throw new Error(`[Link] Route with path "${i.path}" not found. Maybe it is not passed into createRouter?`);return v.jsx("a",{...E,ref:s,href:b.build(m??void 0),onClick:f=>{l==null||l(f),!f.defaultPrevented&&(E.target&&E.target!=="_self"||f.metaKey||f.altKey||f.ctrlKey||f.shiftKey||(f.preventDefault(),R({params:m||{}})))}})});function Me(n){return{route:n.route,view:()=>{const{view:s,layout:i}=n;return i?v.jsx(i,{children:v.jsx(s,{})}):v.jsx(s,{})}}}function $e(n,s){return s?s.getState(n):n.getState()}const Ve=n=>{const{routes:s,otherwise:i}=n;return()=>{const m=P.useProvidedScope(),l=P.useUnit(s.map(b=>b.route.$isOpened)),g=y.useMemo(()=>{const b=s.filter(R=>!!$e(R.route.$isOpened,m));return b.reduce((R,f)=>R.filter(Y=>Y.route!==f.route.parent),b)},[l]).at(-1);return g?y.createElement(g.view):i?v.jsx(i,{}):null}};function Ue(n){n.route.internal.setAsyncImport(n.view);const s=y.lazy(n.view);return{route:n.route,view:()=>{const{layout:i,fallback:m=()=>v.jsx(v.Fragment,{})}=n;return i?v.jsx(i,{children:v.jsx(y.Suspense,{fallback:v.jsx(m,{}),children:v.jsx(s,{})})}):v.jsx(y.Suspense,{fallback:v.jsx(m,{}),children:v.jsx(s,{})})}}}exports.Link=Ye;exports.RouterProvider=Ne;exports.createLazyRouteView=Ue;exports.createRouteView=Me;exports.createRoutesView=Ve;exports.useRouter=Pe;exports.useRouterContext=H;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("react/jsx-runtime"),t=require("react"),r=require("effector-react"),o=t.createContext(null);function n(){const e=t.useContext(o);if(!e)throw new Error("[useRouter] Router not found. Add RouterProvider in app root");return e}const u=t.forwardRef((t,o)=>{const{to:u,params:s,onClick:i,...a}=t,{mappedRoutes:c}=n(),l=c.find(({route:e})=>e===u),{onOpen:p}=r.useUnit(u);if(!l)throw new Error(`[Link] Route with path "${u.path}" not found. Maybe it is not passed into createRouter?`);return e.jsx("a",{...a,ref:o,href:l.build(s??void 0),onClick:e=>{null==i||i(e),e.defaultPrevented||a.target&&"_self"!==a.target||e.metaKey||e.altKey||e.ctrlKey||e.shiftKey||(e.preventDefault(),p({params:s||{}}))}})});exports.Link=u,exports.RouterProvider=t=>e.jsx(o.Provider,{value:t.router,children:t.children}),exports.createLazyRouteView=function(r){r.route.internal.setAsyncImport(r.view);const o=t.lazy(r.view),{layout:n,fallback:u=()=>e.jsx(e.Fragment,{})}=r,s=n?()=>e.jsx(n,{children:e.jsx(t.Suspense,{fallback:e.jsx(u,{}),children:e.jsx(o,{})})}):()=>e.jsx(t.Suspense,{fallback:e.jsx(u,{}),children:e.jsx(o,{})});return{route:r.route,view:s}},exports.createRouteView=function(t){const{layout:r,view:o}=t,n=r?()=>e.jsx(r,{children:e.jsx(o,{})}):()=>e.jsx(o,{});return{route:t.route,view:n}},exports.createRoutesView=o=>{const{routes:n,otherwise:u}=o;return()=>{const o=r.useProvidedScope(),s=r.useUnit(n.map(e=>e.route.$isOpened)),i=t.useMemo(()=>{const e=n.filter(e=>Boolean(function(e,t){return t?t.getState(e):e.getState()}(e.route.$isOpened,o)));return e.reduce((e,t)=>e.filter(e=>e.route!==t.route.parent),e)},[s]),a=i.at(-1);return a?t.createElement(a.view):u?e.jsx(u,{}):null}},exports.useRouter=function(){return r.useUnit(n())},exports.useRouterContext=n,exports.withLayout=function(r,o){const n=r;return o.map(({route:r,view:o})=>({route:r,view:()=>e.jsx(n,{children:t.createElement(o)})}))};

package/dist/index.d.ts

@@ -179,4 +179,38 @@ export declare function useRouter(): {
 
 export declare function useRouterContext(): Router;
 
+/**
+ * @description Group routes by layout, so you don't need to pass `layout` property manually in all routes. Works for `createRouteView` and `createLazyRouteView`.
+ * @link https://movpushmov.dev/argon-router/react/with-layout.html
+ * @example ```tsx
+ * import {
+ *   createRoutesView,
+ *   createRouteView,
+ *   withLayout,
+ * } from '@argon-router/react';
+ *
+ * import { ProfileScreen } from './profile';
+ * import { SignInScreen } from './sign-in';
+ * import { SignUpScreen } from './sign-up';
+ *
+ * import { routes } from '@shared/routing';
+ *
+ * import { AuthLayout } from '@layouts/auth';
+ *
+ * export const RoutesView = createRoutesView([
+ *   ...withLayout(AuthLayout, [
+ *     createRouteView({ route: routes.signIn, view: SignInScreen }),
+ *     createRouteView({ route: routes.signUp, view: SignUpScreen }),
+ *   ]),
+ *   createRouteView({ route: routes.profile, view: ProfileScreen }),
+ * ]);
+ * ```
+ */
+export declare function withLayout(layout: ComponentType<{
+    children: ReactNode;
+}>, views: RouteView[]): {
+    route: Route<any>;
+    view: () => JSX.Element;
+}[];
+
 export { }

package/dist/index.js

@@ -1,522 +1,113 @@
-import Se, { createContext as Oe, useContext as Ae, forwardRef as Ne, useMemo as Pe, createElement as Ye, lazy as $e, Suspense as ve } from "react";
-import { useUnit as B, useProvidedScope as Me } from "effector-react";
-var A = { exports: {} }, C = {};
-/**
- * @license React
- * react-jsx-runtime.production.js
- *
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var Ee;
-function Ve() {
-  if (Ee) return C;
-  Ee = 1;
-  var n = Symbol.for("react.transitional.element"), s = Symbol.for("react.fragment");
-  function l(g, i, E) {
-    var m = null;
-    if (E !== void 0 && (m = "" + E), i.key !== void 0 && (m = "" + i.key), "key" in i) {
-      E = {};
-      for (var b in i)
-        b !== "key" && (E[b] = i[b]);
-    } else E = i;
-    return i = E.ref, {
-      $$typeof: n,
-      type: g,
-      key: m,
-      ref: i !== void 0 ? i : null,
-      props: E
-    };
-  }
-  return C.Fragment = s, C.jsx = l, C.jsxs = l, C;
-}
-var S = {};
-/**
- * @license React
- * react-jsx-runtime.development.js
- *
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var be;
-function We() {
-  return be || (be = 1, process.env.NODE_ENV !== "production" && function() {
-    function n(e) {
-      if (e == null) return null;
-      if (typeof e == "function")
-        return e.$$typeof === Te ? null : e.displayName || e.name || null;
-      if (typeof e == "string") return e;
-      switch (e) {
-        case $:
-          return "Fragment";
-        case he:
-          return "Portal";
-        case I:
-          return "Profiler";
-        case K:
-          return "StrictMode";
-        case V:
-          return "Suspense";
-        case W:
-          return "SuspenseList";
-      }
-      if (typeof e == "object")
-        switch (typeof e.tag == "number" && console.error(
-          "Received an unexpected object in getComponentNameFromType(). This is likely a bug in React. Please file an issue."
-        ), e.$$typeof) {
-          case Q:
-            return (e.displayName || "Context") + ".Provider";
-          case Z:
-            return (e._context.displayName || "Context") + ".Consumer";
-          case M:
-            var r = e.render;
-            return e = e.displayName, e || (e = r.displayName || r.name || "", e = e !== "" ? "ForwardRef(" + e + ")" : "ForwardRef"), e;
-          case U:
-            return r = e.displayName || null, r !== null ? r : n(e.type) || "Memo";
-          case z:
-            r = e._payload, e = e._init;
-            try {
-              return n(e(r));
-            } catch {
-            }
-        }
-      return null;
-    }
-    function s(e) {
-      return "" + e;
-    }
-    function l(e) {
-      try {
-        s(e);
-        var r = !1;
-      } catch {
-        r = !0;
-      }
-      if (r) {
-        r = console;
-        var t = r.error, a = typeof Symbol == "function" && Symbol.toStringTag && e[Symbol.toStringTag] || e.constructor.name || "Object";
-        return t.call(
-          r,
-          "The provided key is an unsupported type %s. This value must be coerced to a string before using it here.",
-          a
-        ), s(e);
-      }
-    }
-    function g() {
-    }
-    function i() {
-      if (T === 0) {
-        re = console.log, te = console.info, oe = console.warn, ne = console.error, ae = console.group, ue = console.groupCollapsed, se = console.groupEnd;
-        var e = {
-          configurable: !0,
-          enumerable: !0,
-          value: g,
-          writable: !0
-        };
-        Object.defineProperties(console, {
-          info: e,
-          log: e,
-          warn: e,
-          error: e,
-          group: e,
-          groupCollapsed: e,
-          groupEnd: e
-        });
-      }
-      T++;
-    }
-    function E() {
-      if (T--, T === 0) {
-        var e = { configurable: !0, enumerable: !0, writable: !0 };
-        Object.defineProperties(console, {
-          log: _({}, e, { value: re }),
-          info: _({}, e, { value: te }),
-          warn: _({}, e, { value: oe }),
-          error: _({}, e, { value: ne }),
-          group: _({}, e, { value: ae }),
-          groupCollapsed: _({}, e, { value: ue }),
-          groupEnd: _({}, e, { value: se })
-        });
-      }
-      0 > T && console.error(
-        "disabledDepth fell below zero. This is a bug in React. Please file an issue."
-      );
-    }
-    function m(e) {
-      if (J === void 0)
-        try {
-          throw Error();
-        } catch (t) {
-          var r = t.stack.trim().match(/\n( *(at )?)/);
-          J = r && r[1] || "", le = -1 < t.stack.indexOf(`
-    at`) ? " (<anonymous>)" : -1 < t.stack.indexOf("@") ? "@unknown:0:0" : "";
-        }
-      return `
-` + J + e + le;
-    }
-    function b(e, r) {
-      if (!e || G) return "";
-      var t = L.get(e);
-      if (t !== void 0) return t;
-      G = !0, t = Error.prepareStackTrace, Error.prepareStackTrace = void 0;
-      var a = null;
-      a = j.H, j.H = null, i();
-      try {
-        var c = {
-          DetermineComponentFrameRoot: function() {
-            try {
-              if (r) {
-                var y = function() {
-                  throw Error();
-                };
-                if (Object.defineProperty(y.prototype, "props", {
-                  set: function() {
-                    throw Error();
-                  }
-                }), typeof Reflect == "object" && Reflect.construct) {
-                  try {
-                    Reflect.construct(y, []);
-                  } catch (R) {
-                    var O = R;
-                  }
-                  Reflect.construct(e, [], y);
-                } else {
-                  try {
-                    y.call();
-                  } catch (R) {
-                    O = R;
-                  }
-                  e.call(y.prototype);
-                }
-              } else {
-                try {
-                  throw Error();
-                } catch (R) {
-                  O = R;
-                }
-                (y = e()) && typeof y.catch == "function" && y.catch(function() {
-                });
-              }
-            } catch (R) {
-              if (R && O && typeof R.stack == "string")
-                return [R.stack, O.stack];
-            }
-            return [null, null];
-          }
-        };
-        c.DetermineComponentFrameRoot.displayName = "DetermineComponentFrameRoot";
-        var u = Object.getOwnPropertyDescriptor(
-          c.DetermineComponentFrameRoot,
-          "name"
-        );
-        u && u.configurable && Object.defineProperty(
-          c.DetermineComponentFrameRoot,
-          "name",
-          { value: "DetermineComponentFrameRoot" }
-        );
-        var o = c.DetermineComponentFrameRoot(), w = o[0], p = o[1];
-        if (w && p) {
-          var d = w.split(`
-`), h = p.split(`
-`);
-          for (o = u = 0; u < d.length && !d[u].includes(
-            "DetermineComponentFrameRoot"
-          ); )
-            u++;
-          for (; o < h.length && !h[o].includes(
-            "DetermineComponentFrameRoot"
-          ); )
-            o++;
-          if (u === d.length || o === h.length)
-            for (u = d.length - 1, o = h.length - 1; 1 <= u && 0 <= o && d[u] !== h[o]; )
-              o--;
-          for (; 1 <= u && 0 <= o; u--, o--)
-            if (d[u] !== h[o]) {
-              if (u !== 1 || o !== 1)
-                do
-                  if (u--, o--, 0 > o || d[u] !== h[o]) {
-                    var k = `
-` + d[u].replace(
-                      " at new ",
-                      " at "
-                    );
-                    return e.displayName && k.includes("<anonymous>") && (k = k.replace("<anonymous>", e.displayName)), typeof e == "function" && L.set(e, k), k;
-                  }
-                while (1 <= u && 0 <= o);
-              break;
-            }
-        }
-      } finally {
-        G = !1, j.H = a, E(), Error.prepareStackTrace = t;
-      }
-      return d = (d = e ? e.displayName || e.name : "") ? m(d) : "", typeof e == "function" && L.set(e, d), d;
-    }
-    function x(e) {
-      if (e == null) return "";
-      if (typeof e == "function") {
-        var r = e.prototype;
-        return b(
-          e,
-          !(!r || !r.isReactComponent)
-        );
-      }
-      if (typeof e == "string") return m(e);
-      switch (e) {
-        case V:
-          return m("Suspense");
-        case W:
-          return m("SuspenseList");
-      }
-      if (typeof e == "object")
-        switch (e.$$typeof) {
-          case M:
-            return e = b(e.render, !1), e;
-          case U:
-            return x(e.type);
-          case z:
-            r = e._payload, e = e._init;
-            try {
-              return x(e(r));
-            } catch {
-            }
-        }
-      return "";
-    }
-    function f() {
-      var e = j.A;
-      return e === null ? null : e.getOwner();
-    }
-    function N(e) {
-      if (ee.call(e, "key")) {
-        var r = Object.getOwnPropertyDescriptor(e, "key").get;
-        if (r && r.isReactWarning) return !1;
-      }
-      return e.key !== void 0;
-    }
-    function we(e, r) {
-      function t() {
-        ie || (ie = !0, console.error(
-          "%s: `key` is not a prop. Trying to access it will result in `undefined` being returned. If you need to access the same value within the child component, you should pass it as a different prop. (https://react.dev/link/special-props)",
-          r
-        ));
-      }
-      t.isReactWarning = !0, Object.defineProperty(e, "key", {
-        get: t,
-        configurable: !0
-      });
-    }
-    function Re() {
-      var e = n(this.type);
-      return ce[e] || (ce[e] = !0, console.error(
-        "Accessing element.ref was removed in React 19. ref is now a regular prop. It will be removed from the JSX Element type in a future release."
-      )), e = this.props.ref, e !== void 0 ? e : null;
-    }
-    function ye(e, r, t, a, c, u) {
-      return t = u.ref, e = {
-        $$typeof: Y,
-        type: e,
-        key: r,
-        props: u,
-        _owner: c
-      }, (t !== void 0 ? t : null) !== null ? Object.defineProperty(e, "ref", {
-        enumerable: !1,
-        get: Re
-      }) : Object.defineProperty(e, "ref", { enumerable: !1, value: null }), e._store = {}, Object.defineProperty(e._store, "validated", {
-        configurable: !1,
-        enumerable: !1,
-        writable: !0,
-        value: 0
-      }), Object.defineProperty(e, "_debugInfo", {
-        configurable: !1,
-        enumerable: !1,
-        writable: !0,
-        value: null
-      }), Object.freeze && (Object.freeze(e.props), Object.freeze(e)), e;
-    }
-    function F(e, r, t, a, c, u) {
-      if (typeof e == "string" || typeof e == "function" || e === $ || e === I || e === K || e === V || e === W || e === pe || typeof e == "object" && e !== null && (e.$$typeof === z || e.$$typeof === U || e.$$typeof === Q || e.$$typeof === Z || e.$$typeof === M || e.$$typeof === ke || e.getModuleId !== void 0)) {
-        var o = r.children;
-        if (o !== void 0)
-          if (a)
-            if (q(o)) {
-              for (a = 0; a < o.length; a++)
-                H(o[a], e);
-              Object.freeze && Object.freeze(o);
-            } else
-              console.error(
-                "React.jsx: Static children should always be an array. You are likely explicitly calling React.jsxs or React.jsxDEV. Use the Babel transform instead."
-              );
-          else H(o, e);
-      } else
-        o = "", (e === void 0 || typeof e == "object" && e !== null && Object.keys(e).length === 0) && (o += " You likely forgot to export your component from the file it's defined in, or you might have mixed up default and named imports."), e === null ? a = "null" : q(e) ? a = "array" : e !== void 0 && e.$$typeof === Y ? (a = "<" + (n(e.type) || "Unknown") + " />", o = " Did you accidentally export a JSX literal instead of a component?") : a = typeof e, console.error(
-          "React.jsx: type is invalid -- expected a string (for built-in components) or a class/function (for composite components) but got: %s.%s",
-          a,
-          o
-        );
-      if (ee.call(r, "key")) {
-        o = n(e);
-        var w = Object.keys(r).filter(function(d) {
-          return d !== "key";
-        });
-        a = 0 < w.length ? "{key: someKey, " + w.join(": ..., ") + ": ...}" : "{key: someKey}", fe[o + a] || (w = 0 < w.length ? "{" + w.join(": ..., ") + ": ...}" : "{}", console.error(
-          `A props object containing a "key" prop is being spread into JSX:
-  let props = %s;
-  <%s {...props} />
-React keys must be passed directly to JSX without using spread:
-  let props = %s;
-  <%s key={someKey} {...props} />`,
-          a,
-          o,
-          w,
-          o
-        ), fe[o + a] = !0);
-      }
-      if (o = null, t !== void 0 && (l(t), o = "" + t), N(r) && (l(r.key), o = "" + r.key), "key" in r) {
-        t = {};
-        for (var p in r)
-          p !== "key" && (t[p] = r[p]);
-      } else t = r;
-      return o && we(
-        t,
-        typeof e == "function" ? e.displayName || e.name || "Unknown" : e
-      ), ye(e, o, u, c, f(), t);
-    }
-    function H(e, r) {
-      if (typeof e == "object" && e && e.$$typeof !== Ce) {
-        if (q(e))
-          for (var t = 0; t < e.length; t++) {
-            var a = e[t];
-            P(a) && X(a, r);
-          }
-        else if (P(e))
-          e._store && (e._store.validated = 1);
-        else if (e === null || typeof e != "object" ? t = null : (t = D && e[D] || e["@@iterator"], t = typeof t == "function" ? t : null), typeof t == "function" && t !== e.entries && (t = t.call(e), t !== e))
-          for (; !(e = t.next()).done; )
-            P(e.value) && X(e.value, r);
-      }
-    }
-    function P(e) {
-      return typeof e == "object" && e !== null && e.$$typeof === Y;
-    }
-    function X(e, r) {
-      if (e._store && !e._store.validated && e.key == null && (e._store.validated = 1, r = je(r), !de[r])) {
-        de[r] = !0;
-        var t = "";
-        e && e._owner != null && e._owner !== f() && (t = null, typeof e._owner.tag == "number" ? t = n(e._owner.type) : typeof e._owner.name == "string" && (t = e._owner.name), t = " It was passed a child from " + t + ".");
-        var a = j.getCurrentStack;
-        j.getCurrentStack = function() {
-          var c = x(e.type);
-          return a && (c += a() || ""), c;
-        }, console.error(
-          'Each child in a list should have a unique "key" prop.%s%s See https://react.dev/link/warning-keys for more information.',
-          r,
-          t
-        ), j.getCurrentStack = a;
-      }
-    }
-    function je(e) {
-      var r = "", t = f();
-      return t && (t = n(t.type)) && (r = `
-
-Check the render method of \`` + t + "`."), r || (e = n(e)) && (r = `
-
-Check the top-level render call using <` + e + ">."), r;
-    }
-    var _e = Se, Y = Symbol.for("react.transitional.element"), he = Symbol.for("react.portal"), $ = Symbol.for("react.fragment"), K = Symbol.for("react.strict_mode"), I = Symbol.for("react.profiler"), Z = Symbol.for("react.consumer"), Q = Symbol.for("react.context"), M = Symbol.for("react.forward_ref"), V = Symbol.for("react.suspense"), W = Symbol.for("react.suspense_list"), U = Symbol.for("react.memo"), z = Symbol.for("react.lazy"), pe = Symbol.for("react.offscreen"), D = Symbol.iterator, Te = Symbol.for("react.client.reference"), j = _e.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, ee = Object.prototype.hasOwnProperty, _ = Object.assign, ke = Symbol.for("react.client.reference"), q = Array.isArray, T = 0, re, te, oe, ne, ae, ue, se;
-    g.__reactDisabledLog = !0;
-    var J, le, G = !1, L = new (typeof WeakMap == "function" ? WeakMap : Map)(), Ce = Symbol.for("react.client.reference"), ie, ce = {}, fe = {}, de = {};
-    S.Fragment = $, S.jsx = function(e, r, t, a, c) {
-      return F(e, r, t, !1, a, c);
-    }, S.jsxs = function(e, r, t, a, c) {
-      return F(e, r, t, !0, a, c);
-    };
-  }()), S;
-}
-var me;
-function Ue() {
-  return me || (me = 1, process.env.NODE_ENV === "production" ? A.exports = Ve() : A.exports = We()), A.exports;
-}
-var v = Ue();
-const ge = Oe(null), Ge = (n) => /* @__PURE__ */ v.jsx(ge.Provider, { value: n.router, children: n.children });
-function xe() {
-  const n = Ae(ge);
-  if (!n)
+import { jsx, Fragment } from "react/jsx-runtime";
+import { createContext, useContext, forwardRef, useMemo, createElement, lazy, Suspense } from "react";
+import { useUnit, useProvidedScope } from "effector-react";
+const RouterProviderContext = createContext(null);
+const RouterProvider = (props) => {
+  return /* @__PURE__ */ jsx(RouterProviderContext.Provider, { value: props.router, children: props.children });
+};
+function useRouterContext() {
+  const context = useContext(RouterProviderContext);
+  if (!context) {
     throw new Error(
       "[useRouter] Router not found. Add RouterProvider in app root"
     );
-  return n;
+  }
+  return context;
 }
-function Le() {
-  return B(xe());
+function useRouter() {
+  return useUnit(useRouterContext());
 }
-const Be = Ne((n, s) => {
-  const { to: l, params: g, onClick: i, ...E } = n, { mappedRoutes: m } = xe(), b = m.find(({ route: f }) => f === l), { onOpen: x } = B(l);
-  if (!b)
+const Link = forwardRef((props, ref) => {
+  const { to, params, onClick, ...anchorProps } = props;
+  const { mappedRoutes } = useRouterContext();
+  const target = mappedRoutes.find(({ route }) => route === to);
+  const { onOpen } = useUnit(to);
+  if (!target) {
     throw new Error(
-      `[Link] Route with path "${l.path}" not found. Maybe it is not passed into createRouter?`
+      `[Link] Route with path "${to.path}" not found. Maybe it is not passed into createRouter?`
     );
-  return /* @__PURE__ */ v.jsx(
+  }
+  return /* @__PURE__ */ jsx(
     "a",
     {
-      ...E,
-      ref: s,
-      href: b.build(g ?? void 0),
-      onClick: (f) => {
-        i == null || i(f), !f.defaultPrevented && (E.target && E.target !== "_self" || f.metaKey || f.altKey || f.ctrlKey || f.shiftKey || (f.preventDefault(), x({ params: g || {} })));
+      ...anchorProps,
+      ref,
+      href: target.build(params ?? void 0),
+      onClick: (e) => {
+        onClick == null ? void 0 : onClick(e);
+        if (e.defaultPrevented) {
+          return;
+        }
+        if (anchorProps.target && anchorProps.target !== "_self") {
+          return;
+        }
+        if (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) {
+          return;
+        }
+        e.preventDefault();
+        onOpen({ params: params || {} });
       }
     }
   );
 });
-function Fe(n) {
+function createRouteView(props) {
+  const { layout: Layout, view: View } = props;
+  const view = Layout ? () => /* @__PURE__ */ jsx(Layout, { children: /* @__PURE__ */ jsx(View, {}) }) : () => /* @__PURE__ */ jsx(View, {});
   return {
-    route: n.route,
-    view: () => {
-      const { view: s, layout: l } = n;
-      return l ? /* @__PURE__ */ v.jsx(l, { children: /* @__PURE__ */ v.jsx(s, {}) }) : /* @__PURE__ */ v.jsx(s, {});
-    }
+    route: props.route,
+    view
   };
 }
-function ze(n, s) {
-  return s ? s.getState(n) : n.getState();
+function getStoreValue(store, scope) {
+  return scope ? scope.getState(store) : store.getState();
 }
-const He = (n) => {
-  const { routes: s, otherwise: l } = n;
+const createRoutesView = (props) => {
+  const { routes, otherwise: NotFound } = props;
   return () => {
-    const g = Me(), i = B(s.map((b) => b.route.$isOpened)), m = Pe(() => {
-      const b = s.filter(
-        (x) => !!ze(x.route.$isOpened, g)
+    const scope = useProvidedScope();
+    const visibilities = useUnit(routes.map((view) => view.route.$isOpened));
+    const openedViews = useMemo(() => {
+      const filtered = routes.filter(
+        (view) => Boolean(getStoreValue(view.route.$isOpened, scope))
       );
-      return b.reduce(
-        (x, f) => x.filter(
-          (N) => N.route !== f.route.parent
+      return filtered.reduce(
+        (filtered2, view) => filtered2.filter(
+          (r) => r.route !== view.route.parent
         ),
-        b
+        filtered
       );
-    }, [i]).at(-1);
-    return m ? Ye(m.view) : l ? /* @__PURE__ */ v.jsx(l, {}) : null;
+    }, [visibilities]);
+    const lastRoute = openedViews.at(-1);
+    if (!lastRoute) {
+      return NotFound ? /* @__PURE__ */ jsx(NotFound, {}) : null;
+    }
+    return createElement(lastRoute.view);
   };
 };
-function Xe(n) {
-  n.route.internal.setAsyncImport(n.view);
-  const s = $e(n.view);
+function createLazyRouteView(props) {
+  props.route.internal.setAsyncImport(props.view);
+  const View = lazy(props.view);
+  const { layout: Layout, fallback: Fallback = () => /* @__PURE__ */ jsx(Fragment, {}) } = props;
+  const view = Layout ? () => /* @__PURE__ */ jsx(Layout, { children: /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Fallback, {}), children: /* @__PURE__ */ jsx(View, {}) }) }) : () => /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Fallback, {}), children: /* @__PURE__ */ jsx(View, {}) });
   return {
-    route: n.route,
-    view: () => {
-      const { layout: l, fallback: g = () => /* @__PURE__ */ v.jsx(v.Fragment, {}) } = n;
-      return l ? /* @__PURE__ */ v.jsx(l, { children: /* @__PURE__ */ v.jsx(ve, { fallback: /* @__PURE__ */ v.jsx(g, {}), children: /* @__PURE__ */ v.jsx(s, {}) }) }) : /* @__PURE__ */ v.jsx(ve, { fallback: /* @__PURE__ */ v.jsx(g, {}), children: /* @__PURE__ */ v.jsx(s, {}) });
-    }
+    route: props.route,
+    view
   };
 }
+function withLayout(layout, views) {
+  const Layout = layout;
+  return views.map(({ route, view }) => ({
+    route,
+    view: () => /* @__PURE__ */ jsx(Layout, { children: createElement(view) })
+  }));
+}
 export {
-  Be as Link,
-  Ge as RouterProvider,
-  Xe as createLazyRouteView,
-  Fe as createRouteView,
-  He as createRoutesView,
-  Le as useRouter,
-  xe as useRouterContext
+  Link,
+  RouterProvider,
+  createLazyRouteView,
+  createRouteView,
+  createRoutesView,
+  useRouter,
+  useRouterContext,
+  withLayout
 };

package/package.json

@@ -5,7 +5,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "private": false,
-  "version": "0.8.3",
+  "version": "0.10.0",
   "description": "React bindings for argon router",
   "keywords": [
     "effector",
@@ -44,7 +44,7 @@
     "url": "https://github.com/movpushmov/argon-router/issues"
   },
   "dependencies": {
-    "@argon-router/core": "^0.8.3"
+    "@argon-router/core": "^0.10.0"
   },
   "devDependencies": {
     "@babel/preset-react": "^7.26.3",
@@ -59,5 +59,5 @@
     "effector-react": ">=23",
     "react": "18 || 19"
   },
-  "gitHead": "abb0fa752864d5bfec232035f5f77edea40951db"
+  "gitHead": "7f8d946c9b6d11a4a828bdf2bafcf012970aa4d7"
 }