@etsoo/react 1.5.39 → 1.5.40

package/lib/mu/RLink.d.ts

@@ -1,13 +1,8 @@
 /// <reference types="react" />
 import { LinkProps } from '@mui/material';
-import { LinkProps as RouterLinkProps } from 'react-router-dom';
-/**
- * Router Link props
- */
-export declare type RLinkProps = LinkProps & RouterLinkProps;
 /**
  * Router Link
  * @param props Props
  * @returns Component
  */
-export declare function RLink(props: RLinkProps): JSX.Element;
+export declare function RLink(props: LinkProps): JSX.Element;

package/lib/mu/RLink.js

@@ -1,11 +1,22 @@
 import { Link } from '@mui/material';
-import { Link as RouterLink } from 'react-router-dom';
 import React from 'react';
+import { globalApp } from '../app/ReactApp';
 /**
  * Router Link
  * @param props Props
  * @returns Component
  */
 export function RLink(props) {
-    return React.createElement(Link, { component: RouterLink, ...props });
+    // Destruct
+    const { href, onClick, ...rest } = props;
+    // Click handler
+    const onClickLocl = (event) => {
+        if (onClick)
+            onClick(event);
+        if (href && globalApp) {
+            globalApp.history.push(href);
+        }
+    };
+    // Component
+    return React.createElement(Link, { ...rest, onClick: onClickLocl });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.39",
+    "version": "1.5.40",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/mu/RLink.tsx

@@ -1,20 +1,27 @@
 import { Link, LinkProps } from '@mui/material';
-import {
-    Link as RouterLink,
-    LinkProps as RouterLinkProps
-} from 'react-router-dom';
 import React from 'react';
-
-/**
- * Router Link props
- */
-export type RLinkProps = LinkProps & RouterLinkProps;
+import { globalApp } from '../app/ReactApp';
 
 /**
  * Router Link
  * @param props Props
  * @returns Component
  */
-export function RLink(props: RLinkProps) {
-    return <Link component={RouterLink} {...props} />;
+export function RLink(props: LinkProps) {
+    // Destruct
+    const { href, onClick, ...rest } = props;
+
+    // Click handler
+    const onClickLocl = (
+        event: React.MouseEvent<HTMLAnchorElement, MouseEvent>
+    ) => {
+        if (onClick) onClick(event);
+
+        if (href && globalApp) {
+            globalApp.history.push(href);
+        }
+    };
+
+    // Component
+    return <Link {...rest} onClick={onClickLocl} />;
 }