@etsoo/react 1.5.16 → 1.5.17

package/lib/app/ReactApp.js

@@ -1,6 +1,5 @@
 import { ActionResultError, BridgeUtils, CoreApp, createClient } from '@etsoo/appscript';
 import { WindowStorage } from '@etsoo/shared';
-import { navigate } from '@reach/router';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -199,7 +198,8 @@ export class ReactApp extends CoreApp {
      * @param url Url
      */
     redirectTo(url) {
-        (this.history == null ? navigate : this.history.navigate)(url);
+        const navigate = ReactUtils.getNavigateFn();
+        navigate(url);
     }
     /**
      * Set page data

package/lib/mu/BackButton.js

@@ -10,8 +10,6 @@ import { ReactUtils } from '../app/ReactUtils';
 export function BackButton(props) {
     // Destruct
     const { color = 'primary', size = 'small', onClick, ...rest } = props;
-    // Navigate
-    const navigate = ReactUtils.getNavigateFn();
     // Theme
     const theme = useTheme();
     // Color
@@ -19,10 +17,16 @@ export function BackButton(props) {
         ? theme.palette[color]
         : theme.palette.primary;
     // Click handler
-    const onClickLocal = (event) => {
+    const onClickLocal = async (event) => {
         if (onClick)
             onClick(event);
-        navigate(-1);
+        // Navigate
+        const navigate = ReactUtils.getNavigateFn();
+        await navigate(-1);
+        const history = ReactUtils.getMemoryHistory();
+        if (history) {
+            console.log(history);
+        }
     };
     return (React.createElement(IconButton, { "aria-label": "Back", color: color, size: size, onClick: onClickLocal, sx: {
             backgroundColor: pColor.contrastText,

package/package.json

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

package/src/app/ReactApp.ts

@@ -14,7 +14,7 @@ import {
     NotificationReturn
 } from '@etsoo/notificationbase';
 import { DataTypes, WindowStorage } from '@etsoo/shared';
-import { History, navigate } from '@reach/router';
+import { History } from '@reach/router';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -370,7 +370,8 @@ export class ReactApp<
      * @param url Url
      */
     override redirectTo(url: string) {
-        (this.history == null ? navigate : this.history.navigate)(url);
+        const navigate = ReactUtils.getNavigateFn();
+        navigate(url);
     }
 
     /**

package/src/mu/BackButton.tsx

@@ -2,6 +2,7 @@ import { IconButton, IconButtonProps, useTheme } from '@mui/material';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import React from 'react';
 import { ReactUtils } from '../app/ReactUtils';
+import { BridgeUtils } from '@etsoo/appscript';
 
 /**
  * BackButton props
@@ -17,9 +18,6 @@ export function BackButton(props: BackButtonProps) {
     // Destruct
     const { color = 'primary', size = 'small', onClick, ...rest } = props;
 
-    // Navigate
-    const navigate = ReactUtils.getNavigateFn();
-
     // Theme
     const theme = useTheme();
 
@@ -30,9 +28,17 @@ export function BackButton(props: BackButtonProps) {
             : theme.palette.primary;
 
     // Click handler
-    const onClickLocal = (event: React.MouseEvent<HTMLButtonElement>) => {
+    const onClickLocal = async (event: React.MouseEvent<HTMLButtonElement>) => {
         if (onClick) onClick(event);
-        navigate(-1);
+
+        // Navigate
+        const navigate = ReactUtils.getNavigateFn();
+        await navigate(-1);
+
+        const history = ReactUtils.getMemoryHistory();
+        if (history) {
+            console.log(history);
+        }
     };
 
     return (