@etsoo/react 1.5.13 → 1.5.17

package/lib/app/ReactApp.d.ts

@@ -108,19 +108,6 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param name Application name
      */
     constructor(settings: S, name: string);
-    /**
-     * Get parsed Url under bridge host
-     * @param url Url
-     * @returns Parsed Url
-     */
-    protected getHostUrl(url: string): string;
-    /**
-     * Get parsed Url under bridge host
-     * @param url Url
-     * @param name App name in the host environment
-     * @returns Parsed Url
-     */
-    protected getHostUrlBase(url: string, name: string): string;
     /**
      * Override alert action result
      * @param result Action result

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,7 +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';
+import { ReactUtils } from './ReactUtils';
 /**
  * Global application
  */
@@ -66,9 +65,9 @@ export class ReactApp extends CoreApp {
          */
         this.userState = new UserState();
         this.history =
-            window.location.hostname === ''
-                ? Utils.getMemoryHistory(this.getHostUrl(window.location.href))
-                : undefined;
+            BridgeUtils.host == null
+                ? undefined
+                : ReactUtils.getMemoryHistory(BridgeUtils.host.getStartUrl());
         this.cultureState = new CultureState(settings.currentCulture);
         this.pageState = new PageState();
         globalApp = this;
@@ -91,31 +90,6 @@ export class ReactApp extends CoreApp {
         ReactApp._notifierProvider = NotifierMU.setup();
         return NotifierMU.instance;
     }
-    /**
-     * Get parsed Url under bridge host
-     * @param url Url
-     * @returns Parsed Url
-     */
-    getHostUrl(url) {
-        return this.getHostUrlBase(url, 'core');
-    }
-    /**
-     * Get parsed Url under bridge host
-     * @param url Url
-     * @param name App name in the host environment
-     * @returns Parsed Url
-     */
-    getHostUrlBase(url, name) {
-        if (url.startsWith('/'))
-            return url;
-        const identifier = `/${name}/`;
-        const pos = url.indexOf(identifier);
-        if (pos === -1)
-            return '/';
-        return url
-            .substring(pos + identifier.length - 1)
-            .replace('/index.html', '/'); // Router take / as start
-    }
     /**
      * Override alert action result
      * @param result Action result
@@ -224,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/app/{Utils.d.ts → ReactUtils.d.ts}

@@ -3,7 +3,7 @@ import React from 'react';
 /**
  * React utils
  */
-export declare namespace Utils {
+export declare namespace ReactUtils {
     /**
      * Format input value
      * @param value Input value
@@ -15,7 +15,12 @@ export declare namespace Utils {
      * @param initialPath Initial path
      * @returns History
      */
-    function getMemoryHistory(initialPath?: string): History;
+    function getMemoryHistory(initialPath?: string | null): History;
+    /**
+     * Get navigate function, works with memory history
+     * @returns NavigateFn
+     */
+    function getNavigateFn(): import("@reach/router").NavigateFn;
     /**
      * Is safe click
      * @param event Mouse event

package/lib/app/{Utils.js → ReactUtils.js}

@@ -1,9 +1,9 @@
-import { createHistory, createMemorySource } from '@reach/router';
+import { createHistory, createMemorySource, navigate } from '@reach/router';
 /**
  * React utils
  */
-export var Utils;
-(function (Utils) {
+export var ReactUtils;
+(function (ReactUtils) {
     // Memory history
     // https://github.com/reach/router/issues/225
     let memoryHistory;
@@ -23,19 +23,29 @@ export var Utils;
             return value;
         return String(value);
     }
-    Utils.formatInputValue = formatInputValue;
+    ReactUtils.formatInputValue = formatInputValue;
     /**
      * Get memory history
      * @param initialPath Initial path
      * @returns History
      */
-    function getMemoryHistory(initialPath = '/') {
+    function getMemoryHistory(initialPath) {
         if (memoryHistory == null) {
-            memoryHistory = createHistory(createMemorySource(initialPath));
+            memoryHistory = createHistory(createMemorySource(initialPath !== null && initialPath !== void 0 ? initialPath : '/'));
         }
         return memoryHistory;
     }
-    Utils.getMemoryHistory = getMemoryHistory;
+    ReactUtils.getMemoryHistory = getMemoryHistory;
+    /**
+     * Get navigate function, works with memory history
+     * @returns NavigateFn
+     */
+    function getNavigateFn() {
+        if (memoryHistory == null)
+            return navigate;
+        return memoryHistory.navigate;
+    }
+    ReactUtils.getNavigateFn = getNavigateFn;
     /**
      * Is safe click
      * @param event Mouse event
@@ -61,7 +71,7 @@ export var Utils;
         }
         return true;
     }
-    Utils.isSafeClick = isSafeClick;
+    ReactUtils.isSafeClick = isSafeClick;
     /**
      * Trigger input change event
      * @param input Form input
@@ -99,5 +109,5 @@ export var Utils;
             input.dispatchEvent(inputEvent);
         }
     }
-    Utils.triggerChange = triggerChange;
-})(Utils || (Utils = {}));
+    ReactUtils.triggerChange = triggerChange;
+})(ReactUtils || (ReactUtils = {}));

package/lib/app/ServiceApp.d.ts

@@ -33,11 +33,9 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      */
     constructor(settings: S, name: string);
     /**
-     * Get parsed Url under bridge host
-     * @param url Url
-     * @returns Parsed Url
+     * Load SmartERP core
      */
-    protected getHostUrl(url: string): string;
+    loadSmartERP(): void;
     /**
      * Go to the login page
      * @param tryLogin Try to login again
@@ -66,8 +64,11 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
     serviceEncrypt(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Try login
+     * @param data Additional data
+     * @param showLoading Show loading bar or not
+     * @returns Result
      */
-    tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
+    tryLogin<D extends {} = {}>(data?: D, showLoading?: boolean): Promise<boolean>;
     /**
      * User login extended
      * @param user Core system user

package/lib/app/ServiceApp.js

@@ -40,12 +40,15 @@ export class ServiceApp extends ReactApp {
         this._serviceUser = value;
     }
     /**
-     * Get parsed Url under bridge host
-     * @param url Url
-     * @returns Parsed Url
+     * Load SmartERP core
      */
-    getHostUrl(url) {
-        return this.getHostUrlBase(url, 's' + this.settings.serviceId);
+    loadSmartERP() {
+        if (BridgeUtils.host == null) {
+            window.location.href = this.settings.webUrl;
+        }
+        else {
+            BridgeUtils.host.loadApp('core');
+        }
     }
     /**
      * Go to the login page
@@ -206,10 +209,13 @@ export class ServiceApp extends ReactApp {
     }
     /**
      * Try login
+     * @param data Additional data
+     * @param showLoading Show loading bar or not
+     * @returns Result
      */
-    async tryLogin(data) {
+    async tryLogin(data, showLoading) {
         // Reset user state
-        const result = await super.tryLogin(data);
+        const result = await super.tryLogin(data, showLoading);
         if (!result)
             return false;
         // Refresh token
@@ -228,6 +234,7 @@ export class ServiceApp extends ReactApp {
                 });
             },
             data,
+            showLoading,
             relogin: true
         });
     }

package/lib/index.d.ts

@@ -6,9 +6,9 @@ export * from './app/IServiceUser';
 export * from './app/ISmartERPUser';
 export * from './app/Labels';
 export * from './app/ReactApp';
+export * from './app/ReactUtils';
 export * from './app/RefreshTokenRQ';
 export * from './app/ServiceApp';
-export * from './app/Utils';
 export * from './components/GridColumn';
 export * from './components/GridLoader';
 export * from './components/ListItemReact';

package/lib/index.js

@@ -7,9 +7,9 @@ export * from './app/IServiceUser';
 export * from './app/ISmartERPUser';
 export * from './app/Labels';
 export * from './app/ReactApp';
+export * from './app/ReactUtils';
 export * from './app/RefreshTokenRQ';
 export * from './app/ServiceApp';
-export * from './app/Utils';
 // components
 export * from './components/GridColumn';
 export * from './components/GridLoader';

package/lib/mu/BackButton.js

@@ -1,7 +1,7 @@
-import { IconButton } from '@mui/material';
+import { IconButton, useTheme } from '@mui/material';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import React from 'react';
-import { useNavigate } from '@reach/router';
+import { ReactUtils } from '../app/ReactUtils';
 /**
  * BackButton
  * @param props Props
@@ -10,20 +10,27 @@ import { useNavigate } from '@reach/router';
 export function BackButton(props) {
     // Destruct
     const { color = 'primary', size = 'small', onClick, ...rest } = props;
-    // Navigate
-    const navigate = useNavigate();
+    // Theme
+    const theme = useTheme();
+    // Color
+    const pColor = color != 'inherit' && color != 'default' && color in theme.palette
+        ? 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: {
-            border: (theme) => `1px solid ${(() => color != 'inherit' &&
-                color != 'default' &&
-                color in theme.palette
-                ? theme.palette[color]
-                : theme.palette.primary)().light}`
+            backgroundColor: pColor.contrastText,
+            border: `1px solid ${pColor.light}`
         }, ...rest },
         React.createElement(ArrowBackIcon, null)));
 }

package/lib/mu/ButtonLink.js

@@ -1,6 +1,6 @@
 import { Button } from '@mui/material';
-import { useNavigate } from '@reach/router';
 import React from 'react';
+import { ReactUtils } from '../app/ReactUtils';
 /**
  * ButtonLink
  * @param props Props
@@ -10,7 +10,7 @@ export function ButtonLink(props) {
     // Destruct
     const { href, ...rest } = props;
     // Navigate
-    const navigate = useNavigate();
+    const navigate = ReactUtils.getNavigateFn();
     const onClick = href.includes('://')
         ? () => window.open(href, '_blank')
         : () => navigate(href);

package/lib/mu/ComboBox.js

@@ -1,10 +1,10 @@
 import { Keyboard } from '@etsoo/shared';
 import { Autocomplete } from '@mui/material';
 import React from 'react';
-import { Utils } from '../app/Utils';
 import { Utils as SharedUtils } from '@etsoo/shared';
 import { InputField } from './InputField';
 import { SearchField } from './SearchField';
+import { ReactUtils } from '../app/ReactUtils';
 /**
  * ComboBox
  * @param props Props
@@ -71,7 +71,7 @@ export function ComboBox(props) {
             const newValue = value != null ? `${Reflect.get(value, idField)}` : '';
             if (newValue !== input.value) {
                 // Different value, trigger change event
-                Utils.triggerChange(input, newValue, false);
+                ReactUtils.triggerChange(input, newValue, false);
             }
         }
     };

package/lib/mu/IconButtonLink.js

@@ -1,6 +1,6 @@
 import { IconButton } from '@mui/material';
-import { useNavigate } from '@reach/router';
 import React from 'react';
+import { ReactUtils } from '../app/ReactUtils';
 /**
  * IconButtonLink
  * @param props Props
@@ -10,7 +10,7 @@ export function IconButtonLink(props) {
     // Destruct
     const { href, ...rest } = props;
     // Navigate
-    const navigate = useNavigate();
+    const navigate = ReactUtils.getNavigateFn();
     // Layout
     return React.createElement(IconButton, { ...rest, onClick: () => navigate(href) });
 }

package/lib/mu/ResponsibleContainer.js

@@ -1,7 +1,7 @@
 import { Box, Stack } from '@mui/material';
 import React from 'react';
 import { Labels } from '../app/Labels';
-import { Utils } from '../app/Utils';
+import { ReactUtils } from '../app/ReactUtils';
 import { GridDataGet } from '../components/GridLoader';
 import useCombinedRefs from '../uses/useCombinedRefs';
 import { useDimensions } from '../uses/useDimensions';
@@ -126,7 +126,7 @@ export function ResponsibleContainer(props) {
         return [
             React.createElement(Box, { className: "ListBox", sx: { height: heightLocal } },
                 React.createElement(ScrollerListEx, { autoLoad: !hasFields, height: heightLocal, loadData: localLoadData, mRef: mRefs, onClick: (event, data) => quickAction &&
-                        Utils.isSafeClick(event) &&
+                        ReactUtils.isSafeClick(event) &&
                         quickAction(data), oRef: (element) => {
                         if (element != null && elementReady)
                             elementReady(element, false);

package/lib/mu/SearchBar.js

@@ -2,9 +2,9 @@ import { Button, Drawer, IconButton, Stack, useTheme } from '@mui/material';
 import React from 'react';
 import MoreHorizIcon from '@mui/icons-material/MoreHoriz';
 import { useDimensions } from '../uses/useDimensions';
-import { Utils as AppUtils } from '../app/Utils';
 import { DomUtils } from '@etsoo/shared';
 import { Labels } from '../app/Labels';
+import { ReactUtils } from '../app/ReactUtils';
 // Cached width attribute name
 const cachedWidthName = 'data-cached-width';
 // Reset form
@@ -20,7 +20,7 @@ const resetForm = (form) => {
                 continue;
             // Ignore readOnly without data-reset=true inputs
             if (!input.readOnly || input.dataset.reset === 'true') {
-                AppUtils.triggerChange(input, '', true);
+                ReactUtils.triggerChange(input, '', true);
             }
             continue;
         }

package/lib/mu/SelectEx.js

@@ -1,9 +1,9 @@
-import { Utils as AppUtils } from '../app/Utils';
 import { Checkbox, FormControl, InputLabel, ListItemText, MenuItem, OutlinedInput, Select } from '@mui/material';
 import React from 'react';
 import { MUGlobal } from './MUGlobal';
 import { ListItemRightIcon } from './ListItemRightIcon';
 import { Utils } from '@etsoo/shared';
+import { ReactUtils } from '../app/ReactUtils';
 /**
  * Extended select component
  * @param props Props
@@ -65,7 +65,7 @@ export function SelectEx(props) {
             const input = (_a = divRef.current) === null || _a === void 0 ? void 0 : _a.querySelector('input');
             if (input) {
                 // Different value, trigger change event
-                AppUtils.triggerChange(input, id, false);
+                ReactUtils.triggerChange(input, id, false);
             }
         }
     };

package/lib/mu/Tiplist.js

@@ -1,7 +1,7 @@
 import { DataTypes } from '@etsoo/shared';
 import { Autocomplete } from '@mui/material';
 import React from 'react';
-import { Utils } from '../app/Utils';
+import { ReactUtils } from '../app/ReactUtils';
 import { InputField } from './InputField';
 import { SearchField } from './SearchField';
 /**
@@ -75,7 +75,7 @@ export function Tiplist(props) {
             const input = inputRef.current;
             if (input && input.value !== '') {
                 // Different value, trigger change event
-                Utils.triggerChange(input, '', false);
+                ReactUtils.triggerChange(input, '', false);
             }
             if (states.options.length > 0) {
                 // Reset options
@@ -106,7 +106,7 @@ export function Tiplist(props) {
             const newValue = (_a = DataTypes.getStringValue(value, idField)) !== null && _a !== void 0 ? _a : '';
             if (newValue !== input.value) {
                 // Different value, trigger change event
-                Utils.triggerChange(input, newValue, false);
+                ReactUtils.triggerChange(input, newValue, false);
             }
         }
     };

package/lib/mu/pages/ViewPage.d.ts

@@ -48,6 +48,10 @@ export interface ViewPageProps<T extends {}> extends Exclude<CommonPageProps, 'c
      * Load data
      */
     loadData: () => PromiseLike<T | undefined>;
+    /**
+     * Pull to refresh data
+     */
+    pullToRefresh?: boolean;
     /**
      * Support refresh
      */

package/lib/mu/pages/ViewPage.js

@@ -1,9 +1,11 @@
 import { Utils } from '@etsoo/shared';
 import { Grid, LinearProgress, Stack, Typography } from '@mui/material';
 import React from 'react';
+import { Labels } from '../../app/Labels';
 import { globalApp } from '../../app/ReactApp';
 import { GridDataFormat } from '../GridDataFormat';
 import { MUGlobal } from '../MUGlobal';
+import { PullToRefreshUI } from '../PullToRefreshUI';
 import { CommonPage } from './CommonPage';
 function formatItemData(fieldData) {
     if (fieldData == null)
@@ -62,9 +64,13 @@ function getItemField(field, data) {
  */
 export function ViewPage(props) {
     // Destruct
-    const { actions, children, fields, loadData, paddings = MUGlobal.pagePaddings, supportRefresh = true, fabColumnDirection = true, supportBack = true, ...rest } = props;
+    const { actions, children, fields, loadData, paddings = MUGlobal.pagePaddings, supportRefresh = true, fabColumnDirection = true, supportBack = true, pullToRefresh = true, ...rest } = props;
     // Data
     const [data, setData] = React.useState();
+    // Labels
+    const labels = Labels.CommonPage;
+    // Container
+    const pullContainer = '#page-container';
     // Load data
     const refresh = async () => {
         const result = await loadData();
@@ -91,5 +97,9 @@ export function ViewPage(props) {
                 React.createElement(Typography, { variant: "subtitle2" }, itemData)));
         })),
         actions != null && (React.createElement(Stack, { className: "ET-ViewPage-Actions", direction: "row", width: "100%", flexWrap: "wrap", justifyContent: "flex-end", paddingTop: paddings, paddingBottom: paddings, gap: paddings }, Utils.getResult(actions, data, refresh))),
-        Utils.getResult(children, data, refresh)))));
+        Utils.getResult(children, data, refresh),
+        pullToRefresh && (React.createElement(PullToRefreshUI, { mainElement: pullContainer, triggerElement: pullContainer, instructionsPullToRefresh: labels.pullToRefresh, instructionsReleaseToRefresh: labels.releaseToRefresh, instructionsRefreshing: labels.refreshing, onRefresh: refresh, shouldPullToRefresh: () => {
+                const container = document.querySelector(pullContainer);
+                return !(container === null || container === void 0 ? void 0 : container.scrollTop);
+            } }))))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.5.13",
+    "version": "1.5.17",
     "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.48",
+        "@etsoo/appscript": "^1.2.50",
         "@etsoo/notificationbase": "^1.1.1",
         "@etsoo/shared": "^1.1.11",
         "@mui/icons-material": "^5.4.1",

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';
@@ -35,7 +35,7 @@ import {
 } from '../states/UserState';
 import { InputDialogProps } from './InputDialogProps';
 import { Labels } from './Labels';
-import { Utils } from './Utils';
+import { ReactUtils } from './ReactUtils';
 
 /**
  * Global application
@@ -219,43 +219,18 @@ export class ReactApp<
             new WindowStorage(),
             name
         );
+
         this.history =
-            window.location.hostname === ''
-                ? Utils.getMemoryHistory(this.getHostUrl(window.location.href))
-                : undefined;
+            BridgeUtils.host == null
+                ? undefined
+                : ReactUtils.getMemoryHistory(BridgeUtils.host.getStartUrl());
+
         this.cultureState = new CultureState(settings.currentCulture);
         this.pageState = new PageState<P>();
 
         globalApp = this;
     }
 
-    /**
-     * Get parsed Url under bridge host
-     * @param url Url
-     * @returns Parsed Url
-     */
-    protected getHostUrl(url: string) {
-        return this.getHostUrlBase(url, 'core');
-    }
-
-    /**
-     * Get parsed Url under bridge host
-     * @param url Url
-     * @param name App name in the host environment
-     * @returns Parsed Url
-     */
-    protected getHostUrlBase(url: string, name: string) {
-        if (url.startsWith('/')) return url;
-
-        const identifier = `/${name}/`;
-        const pos = url.indexOf(identifier);
-        if (pos === -1) return '/';
-
-        return url
-            .substring(pos + identifier.length - 1)
-            .replace('/index.html', '/'); // Router take / as start
-    }
-
     /**
      * Override alert action result
      * @param result Action result
@@ -395,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/app/{Utils.ts → ReactUtils.ts}

@@ -1,10 +1,15 @@
-import { createHistory, createMemorySource, History } from '@reach/router';
+import {
+    createHistory,
+    createMemorySource,
+    History,
+    navigate
+} from '@reach/router';
 import React from 'react';
 
 /**
  * React utils
  */
-export namespace Utils {
+export namespace ReactUtils {
     // Memory history
     // https://github.com/reach/router/issues/225
     let memoryHistory: History | null;
@@ -31,13 +36,24 @@ export namespace Utils {
      * @param initialPath Initial path
      * @returns History
      */
-    export function getMemoryHistory(initialPath: string = '/') {
+    export function getMemoryHistory(initialPath?: string | null) {
         if (memoryHistory == null) {
-            memoryHistory = createHistory(createMemorySource(initialPath));
+            memoryHistory = createHistory(
+                createMemorySource(initialPath ?? '/')
+            );
         }
         return memoryHistory;
     }
 
+    /**
+     * Get navigate function, works with memory history
+     * @returns NavigateFn
+     */
+    export function getNavigateFn() {
+        if (memoryHistory == null) return navigate;
+        return memoryHistory.navigate;
+    }
+
     /**
      * Is safe click
      * @param event Mouse event

package/src/app/ServiceApp.ts

@@ -69,12 +69,14 @@ export class ServiceApp<
     }
 
     /**
-     * Get parsed Url under bridge host
-     * @param url Url
-     * @returns Parsed Url
+     * Load SmartERP core
      */
-    protected override getHostUrl(url: string) {
-        return this.getHostUrlBase(url, 's' + this.settings.serviceId);
+    loadSmartERP() {
+        if (BridgeUtils.host == null) {
+            window.location.href = this.settings.webUrl;
+        } else {
+            BridgeUtils.host.loadApp('core');
+        }
     }
 
     /**
@@ -300,10 +302,16 @@ export class ServiceApp<
 
     /**
      * Try login
+     * @param data Additional data
+     * @param showLoading Show loading bar or not
+     * @returns Result
      */
-    override async tryLogin<D extends {} = {}>(data?: D) {
+    override async tryLogin<D extends {} = {}>(
+        data?: D,
+        showLoading?: boolean
+    ) {
         // Reset user state
-        const result = await super.tryLogin(data);
+        const result = await super.tryLogin(data, showLoading);
         if (!result) return false;
 
         // Refresh token
@@ -323,6 +331,7 @@ export class ServiceApp<
                 });
             },
             data,
+            showLoading,
             relogin: true
         });
     }

package/src/index.ts

@@ -7,9 +7,9 @@ export * from './app/IServiceUser';
 export * from './app/ISmartERPUser';
 export * from './app/Labels';
 export * from './app/ReactApp';
+export * from './app/ReactUtils';
 export * from './app/RefreshTokenRQ';
 export * from './app/ServiceApp';
-export * from './app/Utils';
 
 // components
 export * from './components/GridColumn';

package/src/mu/BackButton.tsx

@@ -1,7 +1,8 @@
-import { IconButton, IconButtonProps } from '@mui/material';
+import { IconButton, IconButtonProps, useTheme } from '@mui/material';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import React from 'react';
-import { useNavigate } from '@reach/router';
+import { ReactUtils } from '../app/ReactUtils';
+import { BridgeUtils } from '@etsoo/appscript';
 
 /**
  * BackButton props
@@ -17,13 +18,27 @@ export function BackButton(props: BackButtonProps) {
     // Destruct
     const { color = 'primary', size = 'small', onClick, ...rest } = props;
 
-    // Navigate
-    const navigate = useNavigate();
+    // Theme
+    const theme = useTheme();
+
+    // Color
+    const pColor =
+        color != 'inherit' && color != 'default' && color in theme.palette
+            ? theme.palette[color]
+            : 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 (
@@ -33,15 +48,8 @@ export function BackButton(props: BackButtonProps) {
             size={size}
             onClick={onClickLocal}
             sx={{
-                border: (theme) =>
-                    `1px solid ${
-                        (() =>
-                            color != 'inherit' &&
-                            color != 'default' &&
-                            color in theme.palette
-                                ? theme.palette[color]
-                                : theme.palette.primary)().light
-                    }`
+                backgroundColor: pColor.contrastText,
+                border: `1px solid ${pColor.light}`
             }}
             {...rest}
         >

package/src/mu/ButtonLink.tsx

@@ -1,6 +1,6 @@
 import { Button, ButtonProps } from '@mui/material';
-import { useNavigate } from '@reach/router';
 import React from 'react';
+import { ReactUtils } from '../app/ReactUtils';
 
 /**
  * ButtonLink props
@@ -22,7 +22,8 @@ export function ButtonLink(props: ButtonLinkProps) {
     const { href, ...rest } = props;
 
     // Navigate
-    const navigate = useNavigate();
+    const navigate = ReactUtils.getNavigateFn();
+
     const onClick = href.includes('://')
         ? () => window.open(href, '_blank')
         : () => navigate(href);

package/src/mu/ComboBox.tsx

@@ -2,11 +2,11 @@ import { IdLabelDto } from '@etsoo/appscript';
 import { Keyboard } from '@etsoo/shared';
 import { Autocomplete, AutocompleteRenderInputParams } from '@mui/material';
 import React from 'react';
-import { Utils } from '../app/Utils';
 import { Utils as SharedUtils } from '@etsoo/shared';
 import { AutocompleteExtendedProps } from './AutocompleteExtendedProps';
 import { InputField } from './InputField';
 import { SearchField } from './SearchField';
+import { ReactUtils } from '../app/ReactUtils';
 
 /**
  * ComboBox props
@@ -152,7 +152,7 @@ export function ComboBox<T extends {} = IdLabelDto>(props: ComboBoxProps<T>) {
 
             if (newValue !== input.value) {
                 // Different value, trigger change event
-                Utils.triggerChange(input, newValue, false);
+                ReactUtils.triggerChange(input, newValue, false);
             }
         }
     };

package/src/mu/IconButtonLink.tsx

@@ -1,6 +1,6 @@
 import { IconButton, IconButtonProps } from '@mui/material';
-import { useNavigate } from '@reach/router';
 import React from 'react';
+import { ReactUtils } from '../app/ReactUtils';
 
 /**
  * IconButtonLink props
@@ -22,7 +22,7 @@ export function IconButtonLink(props: IconButtonLinkProps) {
     const { href, ...rest } = props;
 
     // Navigate
-    const navigate = useNavigate();
+    const navigate = ReactUtils.getNavigateFn();
 
     // Layout
     return <IconButton {...rest} onClick={() => navigate(href)} />;

package/src/mu/ResponsibleContainer.tsx

@@ -3,7 +3,7 @@ import { Box, Stack, SxProps, Theme } from '@mui/material';
 import React from 'react';
 import { ListChildComponentProps } from 'react-window';
 import { Labels } from '../app/Labels';
-import { Utils } from '../app/Utils';
+import { ReactUtils } from '../app/ReactUtils';
 import { GridColumn } from '../components/GridColumn';
 import {
     GridDataGet,
@@ -326,7 +326,7 @@ export function ResponsibleContainer<
                     mRef={mRefs}
                     onClick={(event, data) =>
                         quickAction &&
-                        Utils.isSafeClick(event) &&
+                        ReactUtils.isSafeClick(event) &&
                         quickAction(data)
                     }
                     oRef={(element) => {

package/src/mu/SearchBar.tsx

@@ -2,9 +2,9 @@ import { Button, Drawer, IconButton, Stack, useTheme } from '@mui/material';
 import React from 'react';
 import MoreHorizIcon from '@mui/icons-material/MoreHoriz';
 import { useDimensions } from '../uses/useDimensions';
-import { Utils as AppUtils } from '../app/Utils';
 import { DomUtils } from '@etsoo/shared';
 import { Labels } from '../app/Labels';
+import { ReactUtils } from '../app/ReactUtils';
 
 /**
  * Search bar props
@@ -48,7 +48,7 @@ const resetForm = (form: HTMLFormElement) => {
 
             // Ignore readOnly without data-reset=true inputs
             if (!input.readOnly || input.dataset.reset === 'true') {
-                AppUtils.triggerChange(input, '', true);
+                ReactUtils.triggerChange(input, '', true);
             }
             continue;
         }

package/src/mu/SelectEx.tsx

@@ -1,4 +1,3 @@
-import { Utils as AppUtils } from '../app/Utils';
 import {
     Checkbox,
     FormControl,
@@ -15,6 +14,7 @@ import { MUGlobal } from './MUGlobal';
 import { IdLabelDto } from '@etsoo/appscript';
 import { ListItemRightIcon } from './ListItemRightIcon';
 import { Utils } from '@etsoo/shared';
+import { ReactUtils } from '../app/ReactUtils';
 
 /**
  * Extended select component props
@@ -145,7 +145,7 @@ export function SelectEx<T extends {} = IdLabelDto>(props: SelectExProps<T>) {
             const input = divRef.current?.querySelector('input');
             if (input) {
                 // Different value, trigger change event
-                AppUtils.triggerChange(input, id as string, false);
+                ReactUtils.triggerChange(input, id as string, false);
             }
         }
     };

package/src/mu/Tiplist.tsx

@@ -2,7 +2,7 @@ import { IdLabelDto } from '@etsoo/appscript';
 import { DataTypes } from '@etsoo/shared';
 import { Autocomplete, AutocompleteRenderInputParams } from '@mui/material';
 import React from 'react';
-import { Utils } from '../app/Utils';
+import { ReactUtils } from '../app/ReactUtils';
 import { AutocompleteExtendedProps } from './AutocompleteExtendedProps';
 import { InputField } from './InputField';
 import { SearchField } from './SearchField';
@@ -152,7 +152,7 @@ export function Tiplist<T extends {} = IdLabelDto>(props: TiplistProps<T>) {
 
             if (input && input.value !== '') {
                 // Different value, trigger change event
-                Utils.triggerChange(input, '', false);
+                ReactUtils.triggerChange(input, '', false);
             }
 
             if (states.options.length > 0) {
@@ -186,7 +186,7 @@ export function Tiplist<T extends {} = IdLabelDto>(props: TiplistProps<T>) {
             const newValue = DataTypes.getStringValue(value, idField) ?? '';
             if (newValue !== input.value) {
                 // Different value, trigger change event
-                Utils.triggerChange(input, newValue, false);
+                ReactUtils.triggerChange(input, newValue, false);
             }
         }
     };

package/src/mu/pages/ViewPage.tsx

@@ -7,6 +7,7 @@ import {
     Typography
 } from '@mui/material';
 import React from 'react';
+import { Labels } from '../../app/Labels';
 import { globalApp } from '../../app/ReactApp';
 import {
     GridColumnRenderProps,
@@ -14,6 +15,7 @@ import {
 } from '../../components/GridColumn';
 import { GridDataFormat } from '../GridDataFormat';
 import { MUGlobal } from '../MUGlobal';
+import { PullToRefreshUI } from '../PullToRefreshUI';
 import { CommonPage } from './CommonPage';
 import { CommonPageProps } from './CommonPageProps';
 
@@ -81,6 +83,11 @@ export interface ViewPageProps<T extends {}>
      */
     loadData: () => PromiseLike<T | undefined>;
 
+    /**
+     * Pull to refresh data
+     */
+    pullToRefresh?: boolean;
+
     /**
      * Support refresh
      */
@@ -167,12 +174,19 @@ export function ViewPage<T extends {}>(props: ViewPageProps<T>) {
         supportRefresh = true,
         fabColumnDirection = true,
         supportBack = true,
+        pullToRefresh = true,
         ...rest
     } = props;
 
     // Data
     const [data, setData] = React.useState<T>();
 
+    // Labels
+    const labels = Labels.CommonPage;
+
+    // Container
+    const pullContainer = '#page-container';
+
     // Load data
     const refresh = async () => {
         const result = await loadData();
@@ -245,6 +259,23 @@ export function ViewPage<T extends {}>(props: ViewPageProps<T>) {
                         </Stack>
                     )}
                     {Utils.getResult(children, data, refresh)}
+                    {pullToRefresh && (
+                        <PullToRefreshUI
+                            mainElement={pullContainer}
+                            triggerElement={pullContainer}
+                            instructionsPullToRefresh={labels.pullToRefresh}
+                            instructionsReleaseToRefresh={
+                                labels.releaseToRefresh
+                            }
+                            instructionsRefreshing={labels.refreshing}
+                            onRefresh={refresh}
+                            shouldPullToRefresh={() => {
+                                const container =
+                                    document.querySelector(pullContainer);
+                                return !container?.scrollTop;
+                            }}
+                        />
+                    )}
                 </React.Fragment>
             )}
         </CommonPage>