@etsoo/materialui 1.0.17 → 1.0.18

package/lib/RLink.js

@@ -12,7 +12,7 @@ export const RLink = React.forwardRef((props, ref) => {
     const { delay = 0, href, target, onClick, ...rest } = props;
     const delayed = useDelayedExecutor((href) => {
         // Router push
-        globalApp.history.push(href);
+        globalApp.redirectTo(href);
     }, delay);
     // Click handler
     const onClickLocl = (event) => {

package/lib/app/ReactApp.d.ts

@@ -3,7 +3,6 @@ import { NotificationRenderProps, NotificationReturn } from '@etsoo/notification
 import { DataTypes } from '@etsoo/shared';
 import React from 'react';
 import { CultureAction, CultureState, INotificationReact, InputDialogProps, IPageData, IStateProps, NotificationReactCallProps, PageAction, PageState, UserAction, UserState } from '@etsoo/react';
-import { History } from '@remix-run/router';
 /**
  * Global application
  */
@@ -28,10 +27,6 @@ export interface IReactAppBase {
      * User state
      */
     readonly userState: UserState<any>;
-    /**
-     * Router history
-     */
-    readonly history: History;
     /**
      * Set page data
      * @param data Page data
@@ -77,10 +72,6 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * Culture state
      */
     readonly cultureState: CultureState;
-    /**
-     * Router history
-     */
-    readonly history: History;
     /**
      * Page state
      */

package/lib/app/ReactApp.js

@@ -6,7 +6,6 @@ import { NotifierMU } from '../NotifierMU';
 import { ProgressCount } from '../ProgressCount';
 import { Labels } from './Labels';
 import { CultureState, PageActionType, PageState, UserActionType, UserState } from '@etsoo/react';
-import { createBrowserHistory, createMemoryHistory } from '@remix-run/router';
 /**
  * Global application
  */
@@ -64,17 +63,10 @@ export class ReactApp extends CoreApp {
          */
         this.userState = new UserState();
         if (BridgeUtils.host) {
-            const startUrl = BridgeUtils.host.getStartUrl();
-            this.history = createMemoryHistory({
-                initialEntries: startUrl == null ? undefined : [startUrl]
-            });
             BridgeUtils.host.onUpdate((app, version) => {
                 this.notifier.message(NotificationMessageType.Success, this.get('updateTip') + `(${[app, version].join(', ')})`, this.get('updateReady'));
             });
         }
-        else {
-            this.history = createBrowserHistory();
-        }
         this.cultureState = new CultureState(settings.currentCulture);
         this.pageState = new PageState();
         globalApp = this;
@@ -206,7 +198,7 @@ export class ReactApp extends CoreApp {
      * @param url Url
      */
     redirectTo(url) {
-        this.history.push(url);
+        location.href = url;
     }
     /**
      * Set page data

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/materialui",
-    "version": "1.0.17",
+    "version": "1.0.18",
     "description": "TypeScript Material-UI Implementation",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -57,7 +57,6 @@
         "@etsoo/shared": "^1.1.57",
         "@mui/icons-material": "^5.10.3",
         "@mui/material": "^5.10.5",
-        "@remix-run/router": "^1.0.0",
         "@types/pica": "^9.0.1",
         "@types/pulltorefreshjs": "^0.1.5",
         "@types/react": "^18.0.20",

package/src/RLink.tsx

@@ -22,7 +22,7 @@ export const RLink = React.forwardRef<HTMLAnchorElement, RLinkProps>(
 
         const delayed = useDelayedExecutor((href: string) => {
             // Router push
-            globalApp.history.push(href);
+            globalApp.redirectTo(href);
         }, delay);
 
         // Click handler

package/src/app/ReactApp.ts

@@ -34,11 +34,6 @@ import {
     UserCalls,
     UserState
 } from '@etsoo/react';
-import {
-    History,
-    createBrowserHistory,
-    createMemoryHistory
-} from '@remix-run/router';
 
 /**
  * Global application
@@ -96,11 +91,6 @@ export interface IReactAppBase {
      */
     readonly userState: UserState<any>;
 
-    /**
-     * Router history
-     */
-    readonly history: History;
-
     /**
      * Set page data
      * @param data Page data
@@ -181,11 +171,6 @@ export class ReactApp<
      */
     readonly cultureState: CultureState;
 
-    /**
-     * Router history
-     */
-    readonly history: History;
-
     /**
      * Page state
      */
@@ -231,11 +216,6 @@ export class ReactApp<
         );
 
         if (BridgeUtils.host) {
-            const startUrl = BridgeUtils.host.getStartUrl();
-            this.history = createMemoryHistory({
-                initialEntries: startUrl == null ? undefined : [startUrl]
-            });
-
             BridgeUtils.host.onUpdate((app, version) => {
                 this.notifier.message(
                     NotificationMessageType.Success,
@@ -243,8 +223,6 @@ export class ReactApp<
                     this.get('updateReady')
                 );
             });
-        } else {
-            this.history = createBrowserHistory();
         }
 
         this.cultureState = new CultureState(settings.currentCulture);
@@ -393,7 +371,7 @@ export class ReactApp<
      * @param url Url
      */
     override redirectTo(url: string) {
-        this.history.push(url);
+        location.href = url;
     }
 
     /**