@argon-router/react 0.8.0 → 0.8.1

package/dist/index.cjs

@@ -28,4 +28,4 @@ React keys must be passed directly to JSX without using spread:
 
 Check the render method of \``+t+"`."),r||(e=a(e))&&(r=`
 
-Check the top-level render call using <`+e+">."),r}var he=y,Y=Symbol.for("react.transitional.element"),Te=Symbol.for("react.portal"),M=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"),$=Symbol.for("react.forward_ref"),V=Symbol.for("react.suspense"),W=Symbol.for("react.suspense_list"),U=Symbol.for("react.memo"),q=Symbol.for("react.lazy"),ke=Symbol.for("react.offscreen"),D=Symbol.iterator,pe=Symbol.for("react.client.reference"),_=he.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,ee=Object.prototype.hasOwnProperty,h=Object.assign,Ce=Symbol.for("react.client.reference"),z=Array.isArray,p=0,re,te,oe,ne,ae,ue,se;b.__reactDisabledLog=!0;var J,le,L=!1,G=new(typeof WeakMap=="function"?WeakMap:Map),Se=Symbol.for("react.client.reference"),ie,ce={},fe={},de={};O.Fragment=M,O.jsx=function(e,r,t,n,c){return H(e,r,t,!1,n,c)},O.jsxs=function(e,r,t,n,c){return H(e,r,t,!0,n,c)}}()),O}var be;function Ne(){return be||(be=1,process.env.NODE_ENV==="production"?N.exports=Oe():N.exports=Ae()),N.exports}var d=Ne();const me=y.createContext(null),Pe=a=>d.jsx(me.Provider,{value:a.router,children:a.children});function F(){const a=y.useContext(me);if(!a)throw new Error("[useRouter] Router not found. Add RouterProvider in app root");return a}function Re(){return ge.useUnit(F())}const Ye=y.forwardRef((a,v)=>{const{to:s,params:b,onClick:l,...i}=a,{mappedRoutes:E}=F(),m=E.find(({route:g})=>g===s),{onOpen:j}=ge.useUnit(s);if(!m)throw new Error(`[Link] Route with path "${s.path}" not found. Maybe it is not passed into createRouter?`);return d.jsx("a",{...i,ref:v,href:m.build(b??void 0),onClick:g=>{l==null||l(g),!g.defaultPrevented&&(i.target&&i.target!=="_self"||g.metaKey||g.altKey||g.ctrlKey||g.shiftKey||(g.preventDefault(),j({params:b||{}})))}})}),Me=a=>({route:a.route,view:()=>{const{view:v,layout:s}=a;return s?d.jsx(s,{children:d.jsx(v,{})}):d.jsx(v,{})}}),$e=a=>{const{routes:v,otherwise:s}=a;return()=>{const{activeRoutes:b}=Re(),l=b.reduce((E,m)=>E.filter(j=>j!==m.parent),b),i=v.find(E=>E.route===l.at(-1));return i?y.createElement(i.view):s?d.jsx(s,{}):null}},Ve=a=>{a.route.internal.setAsyncImport(a.view);const v=y.lazy(a.view);return{route:a.route,view:()=>{const{layout:s,fallback:b=()=>d.jsx(d.Fragment,{})}=a;return s?d.jsx(s,{children:d.jsx(y.Suspense,{fallback:d.jsx(b,{}),children:d.jsx(v,{})})}):d.jsx(y.Suspense,{fallback:d.jsx(b,{}),children:d.jsx(v,{})})}}};exports.Link=Ye;exports.RouterProvider=Pe;exports.createLazyRouteView=Ve;exports.createRouteView=Me;exports.createRoutesView=$e;exports.useRouter=Re;exports.useRouterContext=F;
+Check the top-level render call using <`+e+">."),r}var he=y,Y=Symbol.for("react.transitional.element"),Te=Symbol.for("react.portal"),M=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"),$=Symbol.for("react.forward_ref"),V=Symbol.for("react.suspense"),W=Symbol.for("react.suspense_list"),U=Symbol.for("react.memo"),q=Symbol.for("react.lazy"),ke=Symbol.for("react.offscreen"),D=Symbol.iterator,pe=Symbol.for("react.client.reference"),_=he.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE,ee=Object.prototype.hasOwnProperty,h=Object.assign,Ce=Symbol.for("react.client.reference"),z=Array.isArray,p=0,re,te,oe,ne,ae,ue,se;b.__reactDisabledLog=!0;var J,le,L=!1,G=new(typeof WeakMap=="function"?WeakMap:Map),Se=Symbol.for("react.client.reference"),ie,ce={},fe={},de={};O.Fragment=M,O.jsx=function(e,r,t,n,c){return H(e,r,t,!1,n,c)},O.jsxs=function(e,r,t,n,c){return H(e,r,t,!0,n,c)}}()),O}var be;function Ne(){return be||(be=1,process.env.NODE_ENV==="production"?N.exports=Oe():N.exports=Ae()),N.exports}var d=Ne();const me=y.createContext(null),Pe=a=>d.jsx(me.Provider,{value:a.router,children:a.children});function F(){const a=y.useContext(me);if(!a)throw new Error("[useRouter] Router not found. Add RouterProvider in app root");return a}function Re(){return ge.useUnit(F())}const Ye=y.forwardRef((a,v)=>{const{to:s,params:b,onClick:l,...i}=a,{mappedRoutes:E}=F(),m=E.find(({route:g})=>g===s),{onOpen:j}=ge.useUnit(s);if(!m)throw new Error(`[Link] Route with path "${s.path}" not found. Maybe it is not passed into createRouter?`);return d.jsx("a",{...i,ref:v,href:m.build(b??void 0),onClick:g=>{l==null||l(g),!g.defaultPrevented&&(i.target&&i.target!=="_self"||g.metaKey||g.altKey||g.ctrlKey||g.shiftKey||(g.preventDefault(),j({params:b||{}})))}})});function Me(a){return{route:a.route,view:()=>{const{view:v,layout:s}=a;return s?d.jsx(s,{children:d.jsx(v,{})}):d.jsx(v,{})}}}const $e=a=>{const{routes:v,otherwise:s}=a;return()=>{const{activeRoutes:b}=Re(),l=b.reduce((E,m)=>E.filter(j=>j!==m.parent),b),i=v.find(E=>E.route===l.at(-1));return i?y.createElement(i.view):s?d.jsx(s,{}):null}};function Ve(a){a.route.internal.setAsyncImport(a.view);const v=y.lazy(a.view);return{route:a.route,view:()=>{const{layout:s,fallback:b=()=>d.jsx(d.Fragment,{})}=a;return s?d.jsx(s,{children:d.jsx(y.Suspense,{fallback:d.jsx(b,{}),children:d.jsx(v,{})})}):d.jsx(y.Suspense,{fallback:d.jsx(b,{}),children:d.jsx(v,{})})}}}exports.Link=Ye;exports.RouterProvider=Pe;exports.createLazyRouteView=Ve;exports.createRouteView=Me;exports.createRoutesView=$e;exports.useRouter=Re;exports.useRouterContext=F;

package/dist/index.d.ts

@@ -16,8 +16,8 @@ declare type BaseLinkProps<Params> = {
     children?: ReactNode;
 } & AnchorProps;
 
-declare interface CreateBaseRouteViewProps {
-    route: Route<any>;
+declare interface CreateBaseRouteViewProps<T> {
+    route: Route<T>;
     layout?: ComponentType<{
         children: ReactNode;
     }>;
@@ -47,9 +47,9 @@ declare interface CreateBaseRouteViewProps {
  * });
  * ```
  */
-export declare const createLazyRouteView: (props: CreateLazyRouteViewProps) => RouteView;
+export declare function createLazyRouteView<T>(props: CreateLazyRouteViewProps<T>): RouteView;
 
-export declare interface CreateLazyRouteViewProps extends CreateBaseRouteViewProps {
+export declare interface CreateLazyRouteViewProps<T> extends CreateBaseRouteViewProps<T> {
     view: () => Promise<{
         default: ComponentType;
     }>;
@@ -107,9 +107,9 @@ declare interface CreateRoutesViewProps {
  * });
  * ```
  */
-export declare const createRouteView: (props: CreateRouteViewProps) => RouteView;
+export declare function createRouteView<T>(props: CreateRouteViewProps<T>): RouteView;
 
-export declare interface CreateRouteViewProps extends CreateBaseRouteViewProps {
+export declare interface CreateRouteViewProps<T> extends CreateBaseRouteViewProps<T> {
     view: ComponentType;
 }
 

package/dist/index.js

@@ -15,22 +15,22 @@ function Me() {
   if (de) return C;
   de = 1;
   var a = Symbol.for("react.transitional.element"), v = Symbol.for("react.fragment");
-  function s(b, l, i) {
+  function l(b, s, i) {
     var E = null;
-    if (i !== void 0 && (E = "" + i), l.key !== void 0 && (E = "" + l.key), "key" in l) {
+    if (i !== void 0 && (E = "" + i), s.key !== void 0 && (E = "" + s.key), "key" in s) {
       i = {};
-      for (var g in l)
-        g !== "key" && (i[g] = l[g]);
-    } else i = l;
-    return l = i.ref, {
+      for (var g in s)
+        g !== "key" && (i[g] = s[g]);
+    } else i = s;
+    return s = i.ref, {
       $$typeof: a,
       type: b,
       key: E,
-      ref: l !== void 0 ? l : null,
+      ref: s !== void 0 ? s : null,
       props: i
     };
   }
-  return C.Fragment = v, C.jsx = s, C.jsxs = s, C;
+  return C.Fragment = v, C.jsx = l, C.jsxs = l, C;
 }
 var A = {};
 /**
@@ -89,7 +89,7 @@ function $e() {
     function v(e) {
       return "" + e;
     }
-    function s(e) {
+    function l(e) {
       try {
         v(e);
         var r = !1;
@@ -108,7 +108,7 @@ function $e() {
     }
     function b() {
     }
-    function l() {
+    function s() {
       if (p === 0) {
         D = console.log, ee = console.info, re = console.warn, te = console.error, oe = console.group, ne = console.groupCollapsed, ae = console.groupEnd;
         var e = {
@@ -164,7 +164,7 @@ function $e() {
       if (t !== void 0) return t;
       J = !0, t = Error.prepareStackTrace, Error.prepareStackTrace = void 0;
       var n = null;
-      n = j.H, j.H = null, l();
+      n = j.H, j.H = null, s();
       try {
         var c = {
           DetermineComponentFrameRoot: function() {
@@ -299,7 +299,7 @@ function $e() {
     }
     function we(e, r) {
       function t() {
-        se || (se = !0, console.error(
+        le || (le = !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
         ));
@@ -311,7 +311,7 @@ function $e() {
     }
     function Re() {
       var e = a(this.type);
-      return le[e] || (le[e] = !0, console.error(
+      return se[e] || (se[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;
     }
@@ -375,7 +375,7 @@ React keys must be passed directly to JSX without using spread:
           o
         ), ie[o + n] = !0);
       }
-      if (o = null, t !== void 0 && (s(t), o = "" + t), xe(r) && (s(r.key), o = "" + r.key), "key" in r) {
+      if (o = null, t !== void 0 && (l(t), o = "" + t), xe(r) && (l(r.key), o = "" + r.key), "key" in r) {
         t = {};
         for (var T in r)
           T !== "key" && (t[T] = r[T]);
@@ -428,7 +428,7 @@ Check the top-level render call using <` + e + ">."), r;
     }
     var _e = Ae, P = Symbol.for("react.transitional.element"), he = Symbol.for("react.portal"), Y = Symbol.for("react.fragment"), X = Symbol.for("react.strict_mode"), B = Symbol.for("react.profiler"), K = Symbol.for("react.consumer"), I = Symbol.for("react.context"), M = Symbol.for("react.forward_ref"), $ = Symbol.for("react.suspense"), W = Symbol.for("react.suspense_list"), U = Symbol.for("react.memo"), V = Symbol.for("react.lazy"), Te = Symbol.for("react.offscreen"), Z = Symbol.iterator, pe = Symbol.for("react.client.reference"), j = _e.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE, Q = Object.prototype.hasOwnProperty, _ = Object.assign, ke = Symbol.for("react.client.reference"), z = Array.isArray, p = 0, D, ee, re, te, oe, ne, ae;
     b.__reactDisabledLog = !0;
-    var q, ue, J = !1, G = new (typeof WeakMap == "function" ? WeakMap : Map)(), Ce = Symbol.for("react.client.reference"), se, le = {}, ie = {}, ce = {};
+    var q, ue, J = !1, G = new (typeof WeakMap == "function" ? WeakMap : Map)(), Ce = Symbol.for("react.client.reference"), le, se = {}, ie = {}, ce = {};
     A.Fragment = Y, A.jsx = function(e, r, t, n, c) {
       return L(e, r, t, !1, n, c);
     }, A.jsxs = function(e, r, t, n, c) {
@@ -454,10 +454,10 @@ function Ue() {
   return be(ge());
 }
 const Je = Ne((a, v) => {
-  const { to: s, params: b, onClick: l, ...i } = a, { mappedRoutes: E } = ge(), g = E.find(({ route: m }) => m === s), { onOpen: y } = be(s);
+  const { to: l, params: b, onClick: s, ...i } = a, { mappedRoutes: E } = ge(), g = E.find(({ route: m }) => m === l), { onOpen: y } = be(l);
   if (!g)
     throw new Error(
-      `[Link] Route with path "${s.path}" not found. Maybe it is not passed into createRouter?`
+      `[Link] Route with path "${l.path}" not found. Maybe it is not passed into createRouter?`
     );
   return /* @__PURE__ */ d.jsx(
     "a",
@@ -466,35 +466,40 @@ const Je = Ne((a, v) => {
       ref: v,
       href: g.build(b ?? void 0),
       onClick: (m) => {
-        l == null || l(m), !m.defaultPrevented && (i.target && i.target !== "_self" || m.metaKey || m.altKey || m.ctrlKey || m.shiftKey || (m.preventDefault(), y({ params: b || {} })));
+        s == null || s(m), !m.defaultPrevented && (i.target && i.target !== "_self" || m.metaKey || m.altKey || m.ctrlKey || m.shiftKey || (m.preventDefault(), y({ params: b || {} })));
       }
     }
   );
-}), Ge = (a) => ({
-  route: a.route,
-  view: () => {
-    const { view: v, layout: s } = a;
-    return s ? /* @__PURE__ */ d.jsx(s, { children: /* @__PURE__ */ d.jsx(v, {}) }) : /* @__PURE__ */ d.jsx(v, {});
-  }
-}), Le = (a) => {
-  const { routes: v, otherwise: s } = a;
+});
+function Ge(a) {
+  return {
+    route: a.route,
+    view: () => {
+      const { view: v, layout: l } = a;
+      return l ? /* @__PURE__ */ d.jsx(l, { children: /* @__PURE__ */ d.jsx(v, {}) }) : /* @__PURE__ */ d.jsx(v, {});
+    }
+  };
+}
+const Le = (a) => {
+  const { routes: v, otherwise: l } = a;
   return () => {
-    const { activeRoutes: b } = Ue(), l = b.reduce((E, g) => E.filter((y) => y !== g.parent), b), i = v.find(
-      (E) => E.route === l.at(-1)
+    const { activeRoutes: b } = Ue(), s = b.reduce((E, g) => E.filter((y) => y !== g.parent), b), i = v.find(
+      (E) => E.route === s.at(-1)
     );
-    return i ? Pe(i.view) : s ? /* @__PURE__ */ d.jsx(s, {}) : null;
+    return i ? Pe(i.view) : l ? /* @__PURE__ */ d.jsx(l, {}) : null;
   };
-}, Fe = (a) => {
+};
+function Fe(a) {
   a.route.internal.setAsyncImport(a.view);
   const v = Ye(a.view);
   return {
     route: a.route,
     view: () => {
-      const { layout: s, fallback: b = () => /* @__PURE__ */ d.jsx(d.Fragment, {}) } = a;
-      return s ? /* @__PURE__ */ d.jsx(s, { children: /* @__PURE__ */ d.jsx(fe, { fallback: /* @__PURE__ */ d.jsx(b, {}), children: /* @__PURE__ */ d.jsx(v, {}) }) }) : /* @__PURE__ */ d.jsx(fe, { fallback: /* @__PURE__ */ d.jsx(b, {}), children: /* @__PURE__ */ d.jsx(v, {}) });
+      const { layout: l, fallback: b = () => /* @__PURE__ */ d.jsx(d.Fragment, {}) } = a;
+      return l ? /* @__PURE__ */ d.jsx(l, { children: /* @__PURE__ */ d.jsx(fe, { fallback: /* @__PURE__ */ d.jsx(b, {}), children: /* @__PURE__ */ d.jsx(v, {}) }) }) : /* @__PURE__ */ d.jsx(fe, { fallback: /* @__PURE__ */ d.jsx(b, {}), children: /* @__PURE__ */ d.jsx(v, {}) });
     }
   };
-};
+}
 export {
   Je as Link,
   qe as RouterProvider,

package/package.json

@@ -5,7 +5,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "private": false,
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "React bindings for argon router",
   "keywords": [
     "effector",
@@ -59,5 +59,5 @@
     "effector-react": ">=23",
     "react": "18 || 19"
   },
-  "gitHead": "1865adb15d9a326bc13d7b4f4a25ef63d14c63ee"
+  "gitHead": "027a8258dd08c6fe7394b9512f98f833a15b68bf"
 }