@argon-router/react 0.11.0 → 0.11.2

package/dist/index.cjs

@@ -1 +1 @@
-"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)})}))};
+"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,replace:a,query:c,...l}=t,{mappedRoutes:p}=n(),x=p.find(({route:e})=>e===u),{onOpen:d}=r.useUnit(u);if(!x)throw new Error(`[Link] Route with path "${u.path}" not found. Maybe it is not passed into createRouter?`);return e.jsx("a",{...l,ref:o,href:x.build(s??void 0),onClick:e=>{null==i||i(e),e.defaultPrevented||l.target&&"_self"!==l.target||e.metaKey||e.altKey||e.ctrlKey||e.shiftKey||(e.preventDefault(),d({params:s||{},replace:a,query:c}))}})});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.useUnit(n.map(e=>e.route.$isOpened)),s=t.useMemo(()=>{const e=n.filter((e,t)=>o[t]);return e.reduce((e,t)=>e.filter(e=>e.route!==t.route.parent),e)},[o]).at(-1);return s?t.createElement(s.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

@@ -4,6 +4,7 @@ import { FC } from 'react';
 import { ForwardedRef } from 'react';
 import { JSX } from 'react/jsx-runtime';
 import { NavigatePayload } from '@argon-router/core';
+import { OpenPayloadBase } from '@argon-router/core';
 import { Query } from '@argon-router/core';
 import { ReactNode } from 'react';
 import { Route } from '@argon-router/core';
@@ -14,7 +15,7 @@ declare type AnchorProps = Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'href'>
 declare type BaseLinkProps<Params> = {
     to: Route<Params>;
     children?: ReactNode;
-} & AnchorProps;
+} & AnchorProps & OpenPayloadBase;
 
 declare interface CreateBaseRouteViewProps<T> {
     route: Route<T>;

package/dist/index.js

@@ -1,6 +1,6 @@
 import { jsx, Fragment } from "react/jsx-runtime";
 import { createContext, useContext, forwardRef, useMemo, createElement, lazy, Suspense } from "react";
-import { useUnit, useProvidedScope } from "effector-react";
+import { useUnit } from "effector-react";
 const RouterProviderContext = createContext(null);
 const RouterProvider = (props) => {
   return /* @__PURE__ */ jsx(RouterProviderContext.Provider, { value: props.router, children: props.children });
@@ -18,7 +18,7 @@ function useRouter() {
   return useUnit(useRouterContext());
 }
 const Link = forwardRef((props, ref) => {
-  const { to, params, onClick, ...anchorProps } = props;
+  const { to, params, onClick, replace, query, ...anchorProps } = props;
   const { mappedRoutes } = useRouterContext();
   const target = mappedRoutes.find(({ route }) => route === to);
   const { onOpen } = useUnit(to);
@@ -45,7 +45,7 @@ const Link = forwardRef((props, ref) => {
           return;
         }
         e.preventDefault();
-        onOpen({ params: params || {} });
+        onOpen({ params: params || {}, replace, query });
       }
     }
   );
@@ -58,18 +58,12 @@ function createRouteView(props) {
     view
   };
 }
-function getStoreValue(store, scope) {
-  return scope ? scope.getState(store) : store.getState();
-}
 const createRoutesView = (props) => {
   const { routes, otherwise: NotFound } = props;
   return () => {
-    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))
-      );
+      const filtered = routes.filter((_, i) => visibilities[i]);
       return filtered.reduce(
         (filtered2, view) => filtered2.filter(
           (r) => r.route !== view.route.parent

package/package.json

@@ -5,7 +5,7 @@
     "registry": "https://registry.npmjs.org/"
   },
   "private": false,
-  "version": "0.11.0",
+  "version": "0.11.2",
   "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.11.0"
+    "@argon-router/core": "^0.11.1"
   },
   "devDependencies": {
     "@babel/preset-react": "^7.26.3",
@@ -59,5 +59,5 @@
     "effector-react": ">=23",
     "react": "18 || 19"
   },
-  "gitHead": "0180f75dbbc73a123e706ff48961f8e57d57ce65"
+  "gitHead": "f63bf945db57a29b96028a96aaef81cc79bc4320"
 }