@etsoo/react 1.5.1 → 1.5.2

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';
@@ -8,6 +7,7 @@ import { CultureState } from '../states/CultureState';
 import { PageActionType, PageState } from '../states/PageState';
 import { UserActionType, UserState } from '../states/UserState';
 import { Labels } from './Labels';
+import { Utils } from './Utils';
 /**
  * Global application
  */
@@ -194,7 +194,7 @@ export class ReactApp extends CoreApp {
      * @param url Url
      */
     redirectTo(url) {
-        navigate(url);
+        Utils.getMemoryHistory().navigate(url);
     }
     /**
      * Set page data

package/lib/app/Utils.d.ts

@@ -1,3 +1,4 @@
+import { History } from '@reach/router';
 import React from 'react';
 /**
  * React utils
@@ -9,6 +10,11 @@ export declare namespace Utils {
      * @returns Formatted value
      */
     function formatInputValue(value: unknown): string | number | any[] | undefined;
+    /**
+     * Get memory history
+     * @returns History
+     */
+    function getMemoryHistory(): History;
     /**
      * Is safe click
      * @param event Mouse event

package/lib/app/Utils.js

@@ -1,8 +1,12 @@
+import { createHistory, createMemorySource } from '@reach/router';
 /**
  * React utils
  */
 export var Utils;
 (function (Utils) {
+    // Memory history
+    // https://github.com/reach/router/issues/225
+    let memoryHistory;
     /**
      * Format input value
      * @param value Input value
@@ -20,6 +24,17 @@ export var Utils;
         return String(value);
     }
     Utils.formatInputValue = formatInputValue;
+    /**
+     * Get memory history
+     * @returns History
+     */
+    function getMemoryHistory() {
+        if (memoryHistory == null) {
+            memoryHistory = createHistory(createMemorySource('/'));
+        }
+        return memoryHistory;
+    }
+    Utils.getMemoryHistory = getMemoryHistory;
     /**
      * Is safe click
      * @param event Mouse event

package/package.json

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

package/src/app/ReactApp.ts

@@ -14,7 +14,6 @@ import {
     NotificationReturn
 } from '@etsoo/notificationbase';
 import { DataTypes, WindowStorage } from '@etsoo/shared';
-import { navigate } from '@reach/router';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -35,6 +34,7 @@ import {
 } from '../states/UserState';
 import { InputDialogProps } from './InputDialogProps';
 import { Labels } from './Labels';
+import { Utils } from './Utils';
 
 /**
  * Global application
@@ -355,7 +355,7 @@ export class ReactApp<
      * @param url Url
      */
     override redirectTo(url: string) {
-        navigate(url);
+        Utils.getMemoryHistory().navigate(url);
     }
 
     /**

package/src/app/Utils.ts

@@ -1,9 +1,14 @@
+import { createHistory, createMemorySource, History } from '@reach/router';
 import React from 'react';
 
 /**
  * React utils
  */
 export namespace Utils {
+    // Memory history
+    // https://github.com/reach/router/issues/225
+    let memoryHistory: History | null;
+
     /**
      * Format input value
      * @param value Input value
@@ -21,6 +26,17 @@ export namespace Utils {
         return String(value);
     }
 
+    /**
+     * Get memory history
+     * @returns History
+     */
+    export function getMemoryHistory() {
+        if (memoryHistory == null) {
+            memoryHistory = createHistory(createMemorySource('/'));
+        }
+        return memoryHistory;
+    }
+
     /**
      * Is safe click
      * @param event Mouse event