mobx-route 0.0.87 → 0.0.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-route",
-  "version": "0.0.87",
+  "version": "0.0.88",
   "keywords": [
     "mobx",
     "react",

package/react/components/link.d.ts

@@ -1,20 +1,23 @@
 import { AnchorHTMLAttributes, ReactNode } from 'react';
 import { AllPropertiesOptional } from 'yummies/utils/types';
-import { AbstractPathRouteEntity, AnyRoute, ExtractPathParams, RouteNavigateParams } from '../../core/index.js';
-export type LinkProps<TRoute extends AbstractPathRouteEntity> = Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'href'> & {
+import { AbstractPathRouteEntity, ExtractPathParams, RouteNavigateParams } from '../../core/index.js';
+interface LinkAnchorProps extends Omit<AnchorHTMLAttributes<HTMLAnchorElement>, 'href'> {
     asChild?: boolean;
-} & RouteNavigateParams & (({
+}
+type LinkPathRouteProps<TRoute extends AbstractPathRouteEntity> = {
     to: TRoute;
 } & (AllPropertiesOptional<ExtractPathParams<TRoute['path']>> extends true ? {
     params?: ExtractPathParams<TRoute['path']> | null | undefined;
 } : {
     params: ExtractPathParams<TRoute['path']>;
-})) | {
+});
+type LinkSimpleRouteProps = {
     to: string;
 } | {
     href: string;
-});
-type LinkComponentType = <TRoute extends AnyRoute>(props: LinkProps<TRoute>) => ReactNode;
+};
+export type LinkProps<TRoute extends AbstractPathRouteEntity> = LinkAnchorProps & RouteNavigateParams & (LinkPathRouteProps<TRoute> | LinkSimpleRouteProps);
+type LinkComponentType = <TRoute extends AbstractPathRouteEntity>(props: LinkProps<TRoute>) => ReactNode;
 export declare const Link: LinkComponentType;
 export {};
 //# sourceMappingURL=link.d.ts.map

package/react/components/link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/react/components/link.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,EAKpB,SAAS,EACV,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,qBAAqB,EAAa,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EACL,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,SAAS,CAAC,MAAM,SAAS,uBAAuB,IAAI,IAAI,CAClE,oBAAoB,CAAC,iBAAiB,CAAC,EACvC,MAAM,CACP,GAAG;IACF,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,mBAAmB,GACrB,CACI,CAAC;IACC,EAAE,EAAE,MAAM,CAAC;CACZ,GAAG,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,GACtE;IAEE,MAAM,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,GACD;IAAE,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CAAC,CAAC,GACnD;IACE,EAAE,EAAE,MAAM,CAAC;CACZ,GACD;IACE,IAAI,EAAE,MAAM,CAAC;CACd,CACJ,CAAC;AAEJ,KAAK,iBAAiB,GAAG,CAAC,MAAM,SAAS,QAAQ,EAC/C,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,KACrB,SAAS,CAAC;AAEf,eAAO,MAAM,IAAI,EA0DD,iBAAiB,CAAC"}
+{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../../src/react/components/link.tsx"],"names":[],"mappings":"AAEA,OAAO,EACL,oBAAoB,EAKpB,SAAS,EACV,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,qBAAqB,EAAa,MAAM,qBAAqB,CAAC;AAEvE,OAAO,EACL,uBAAuB,EAEvB,iBAAiB,EACjB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAE7B,UAAU,eACR,SAAQ,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC7D,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,KAAK,kBAAkB,CAAC,MAAM,SAAS,uBAAuB,IAAI;IAChE,EAAE,EAAE,MAAM,CAAC;CACZ,GAAG,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,IAAI,GACtE;IAEE,MAAM,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,GACD;IAAE,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;CAAE,CAAC,CAAC;AAEnD,KAAK,oBAAoB,GACrB;IACE,EAAE,EAAE,MAAM,CAAC;CACZ,GACD;IACE,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEN,MAAM,MAAM,SAAS,CAAC,MAAM,SAAS,uBAAuB,IAC1D,eAAe,GACb,mBAAmB,GACnB,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG,oBAAoB,CAAC,CAAC;AAExD,KAAK,iBAAiB,GAAG,CAAC,MAAM,SAAS,uBAAuB,EAC9D,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,KACrB,SAAS,CAAC;AAEf,eAAO,MAAM,IAAI,EA6DD,iBAAiB,CAAC"}

package/react/components/link.js

@@ -2,7 +2,9 @@ import { jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 import { observer } from 'mobx-react-lite';
 import { cloneElement, forwardRef, isValidElement, } from 'react';
-export const Link = observer(forwardRef(({ to, href: outerHref, asChild, query, replace, children, params, ...anchorProps }, ref) => {
+export const Link = observer(forwardRef(({ to, href: outerHref, asChild, children, params, 
+// route navigate params
+query, replace, state, ...outerAnchorProps }, ref) => {
     const href = outerHref ??
         (typeof to === 'string'
             ? to
@@ -14,15 +16,21 @@ export const Link = observer(forwardRef(({ to, href: outerHref, asChild, query,
             event.shiftKey ||
             event.button !== 0)
             return;
-        anchorProps.onClick?.(event);
+        outerAnchorProps.onClick?.(event);
         if (!event.defaultPrevented && typeof to !== 'string') {
             event.preventDefault();
-            to.open(href, { replace, query });
+            to.open(href, { replace, query, state });
         }
     };
+    const anchorProps = {
+        ...outerAnchorProps,
+        href,
+        onClick: handleClick,
+        rel: outerAnchorProps.target === '_blank' && !outerAnchorProps.rel
+            ? 'noopener noreferrer'
+            : outerAnchorProps.rel,
+    };
     return asChild && isValidElement(children) ? (
     // @ts-ignore
-    cloneElement(children, { onClick: handleClick, href })) : (_jsx("a", { ref: ref, href: href, onClick: handleClick, rel: anchorProps.target === '_blank' && !anchorProps.rel
-            ? 'noopener noreferrer'
-            : anchorProps.rel, children: children }));
+    cloneElement(children, anchorProps)) : (_jsx("a", { ...anchorProps, ref: ref, children: children }));
 }));