@etsoo/react 1.5.2 → 1.5.6

package/lib/app/ReactApp.d.ts

@@ -1,6 +1,7 @@
 import { CoreApp, IActionResult, IAppSettings, ICoreApp, IUser, IUserData } from '@etsoo/appscript';
 import { NotificationRenderProps, NotificationReturn } from '@etsoo/notificationbase';
 import { DataTypes } from '@etsoo/shared';
+import { History } from '@reach/router';
 import React from 'react';
 import { NotificationReactCallProps } from '../notifier/Notifier';
 import { CultureAction, CultureState } from '../states/CultureState';
@@ -30,6 +31,10 @@ export interface IReactApp<S extends IAppSettings, D extends IUser, P extends IP
      * User state
      */
     readonly userState: UserState<D>;
+    /**
+     * Router history
+     */
+    readonly history?: History;
     /**
      * Is screen size down 'sm'
      */
@@ -69,6 +74,10 @@ 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

@@ -1,5 +1,6 @@
 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';
@@ -64,6 +65,10 @@ export class ReactApp extends CoreApp {
          * User state
          */
         this.userState = new UserState();
+        this.history =
+            window.location.hostname === ''
+                ? Utils.getMemoryHistory()
+                : undefined;
         this.cultureState = new CultureState(settings.currentCulture);
         this.pageState = new PageState();
         globalApp = this;
@@ -194,7 +199,7 @@ export class ReactApp extends CoreApp {
      * @param url Url
      */
     redirectTo(url) {
-        Utils.getMemoryHistory().navigate(url);
+        (this.history == null ? navigate : this.history.navigate)(url);
     }
     /**
      * Set page data

package/lib/app/ServiceApp.js

@@ -1,4 +1,4 @@
-import { createClient } from '@etsoo/appscript';
+import { BridgeUtils, createClient } from '@etsoo/appscript';
 import { DomUtils } from '@etsoo/shared';
 import { CoreConstants } from './CoreConstants';
 import { ReactApp } from './ReactApp';
@@ -44,16 +44,14 @@ export class ServiceApp extends ReactApp {
      * @param tryLogin Try to login again
      */
     toLoginPage(tryLogin) {
-        const coreUrl = this.settings.webUrl;
-        window.location.href =
-            coreUrl +
-                '?serviceId=' +
-                this.settings.serviceId +
-                '&' +
-                DomUtils.CultureField +
-                '=' +
-                this.culture +
-                (tryLogin ? '' : '&tryLogin=false');
+        const parameters = `?serviceId=${this.settings.serviceId}&${DomUtils.CultureField}=${this.culture}${tryLogin ? '' : '&tryLogin=false'}`;
+        if (BridgeUtils.host == null) {
+            const coreUrl = this.settings.webUrl;
+            window.location.href = coreUrl + parameters;
+        }
+        else {
+            BridgeUtils.host.loadApp('core', parameters);
+        }
     }
     /**
      * Refresh token

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.2",
+    "version": "1.5.6",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.43",
+        "@etsoo/appscript": "^1.2.45",
         "@etsoo/notificationbase": "^1.1.1",
         "@etsoo/shared": "^1.1.11",
         "@mui/icons-material": "^5.4.1",

package/src/app/ReactApp.ts

@@ -14,6 +14,7 @@ import {
     NotificationReturn
 } from '@etsoo/notificationbase';
 import { DataTypes, WindowStorage } from '@etsoo/shared';
+import { History, navigate } from '@reach/router';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -98,6 +99,11 @@ export interface IReactApp<
      */
     readonly userState: UserState<D>;
 
+    /**
+     * Router history
+     */
+    readonly history?: History;
+
     /**
      * Is screen size down 'sm'
      */
@@ -167,6 +173,11 @@ export class ReactApp<
      */
     readonly cultureState: CultureState;
 
+    /**
+     * Router history
+     */
+    readonly history?: History;
+
     /**
      * Page state
      */
@@ -210,6 +221,10 @@ export class ReactApp<
             new WindowStorage(),
             name
         );
+        this.history =
+            window.location.hostname === ''
+                ? Utils.getMemoryHistory()
+                : undefined;
         this.cultureState = new CultureState(settings.currentCulture);
         this.pageState = new PageState<P>();
 
@@ -355,7 +370,7 @@ export class ReactApp<
      * @param url Url
      */
     override redirectTo(url: string) {
-        Utils.getMemoryHistory().navigate(url);
+        (this.history == null ? navigate : this.history.navigate)(url);
     }
 
     /**

package/src/app/ServiceApp.ts

@@ -1,4 +1,5 @@
 import {
+    BridgeUtils,
     createClient,
     IApi,
     IApiPayload,
@@ -72,16 +73,16 @@ export class ServiceApp<
      * @param tryLogin Try to login again
      */
     override toLoginPage(tryLogin?: boolean) {
-        const coreUrl = this.settings.webUrl;
-        window.location.href =
-            coreUrl +
-            '?serviceId=' +
-            this.settings.serviceId +
-            '&' +
-            DomUtils.CultureField +
-            '=' +
-            this.culture +
-            (tryLogin ? '' : '&tryLogin=false');
+        const parameters = `?serviceId=${this.settings.serviceId}&${
+            DomUtils.CultureField
+        }=${this.culture}${tryLogin ? '' : '&tryLogin=false'}`;
+
+        if (BridgeUtils.host == null) {
+            const coreUrl = this.settings.webUrl;
+            window.location.href = coreUrl + parameters;
+        } else {
+            BridgeUtils.host.loadApp('core', parameters);
+        }
     }
 
     /**