@etsoo/react 1.5.11 → 1.5.15

package/lib/app/Labels.d.ts

@@ -8,6 +8,7 @@ export declare namespace Labels {
      */
     const CommonPage: {
         add: string;
+        back: string;
         delete: string;
         more: string;
         pullToRefresh: string;

package/lib/app/Labels.js

@@ -9,6 +9,7 @@ export var Labels;
      */
     Labels.CommonPage = {
         add: 'Add',
+        back: 'Back',
         delete: 'Delete',
         more: 'More',
         pullToRefresh: 'Pull down to refresh',

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

@@ -26,8 +26,8 @@ export function ReactAppStateDetector(props) {
     // Destruct
     const { targetFields, update } = props;
     // Context
-    const { state } = globalApp == null
-        ? { state: {} }
+    const { state = {} } = globalApp == null
+        ? {}
         : React.useContext(globalApp.userState.context);
     // Ready
     React.useEffect(() => {
@@ -66,9 +66,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
+                : Utils.getMemoryHistory(BridgeUtils.host.getStartUrl());
         this.cultureState = new CultureState(settings.currentCulture);
         this.pageState = new PageState();
         globalApp = this;
@@ -91,29 +91,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);
-    }
     /**
      * Override alert action result
      * @param result Action result

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/app/Utils.d.ts

@@ -15,7 +15,7 @@ export declare namespace Utils {
      * @param initialPath Initial path
      * @returns History
      */
-    function getMemoryHistory(initialPath?: string): History;
+    function getMemoryHistory(initialPath?: string | null): History;
     /**
      * Is safe click
      * @param event Mouse event

package/lib/app/Utils.js

@@ -29,9 +29,9 @@ export var Utils;
      * @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;
     }

package/lib/index.d.ts

@@ -31,6 +31,7 @@ export * from './mu/texts/DateText';
 export * from './mu/texts/MoneyText';
 export * from './mu/texts/NumberText';
 export * from './mu/AuditDisplay';
+export * from './mu/BackButton';
 export * from './mu/BridgeCloseButton';
 export * from './mu/ButtonLink';
 export * from './mu/ComboBox';

package/lib/index.js

@@ -34,6 +34,7 @@ export * from './mu/texts/DateText';
 export * from './mu/texts/MoneyText';
 export * from './mu/texts/NumberText';
 export * from './mu/AuditDisplay';
+export * from './mu/BackButton';
 export * from './mu/BridgeCloseButton';
 export * from './mu/ButtonLink';
 export * from './mu/ComboBox';

package/lib/mu/BackButton.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import { IconButtonProps } from '@mui/material';
+/**
+ * BackButton props
+ */
+export interface BackButtonProps extends IconButtonProps {
+}
+/**
+ * BackButton
+ * @param props Props
+ * @returns Component
+ */
+export declare function BackButton(props: BackButtonProps): JSX.Element;

package/lib/mu/BackButton.js

@@ -0,0 +1,32 @@
+import { IconButton, useTheme } from '@mui/material';
+import ArrowBackIcon from '@mui/icons-material/ArrowBack';
+import React from 'react';
+import { useNavigate } from '@reach/router';
+/**
+ * BackButton
+ * @param props Props
+ * @returns Component
+ */
+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) => {
+        if (onClick)
+            onClick(event);
+        navigate(-1);
+    };
+    return (React.createElement(IconButton, { "aria-label": "Back", color: color, size: size, onClick: onClickLocal, sx: {
+            backgroundColor: pColor.contrastText,
+            border: `1px solid ${pColor.light}`
+        }, ...rest },
+        React.createElement(ArrowBackIcon, null)));
+}

package/lib/mu/BridgeCloseButton.d.ts

@@ -1,10 +1,14 @@
 /// <reference types="react" />
 import { IBridgeHost } from '@etsoo/appscript';
-import { IconButtonProps } from '@mui/material';
+import { BoxProps, IconButtonProps } from '@mui/material';
 /**
  * Bridge close button props
  */
 export interface BridgeCloseButtonProps extends IconButtonProps {
+    /**
+     * Box props
+     */
+    boxProps?: BoxProps;
     /**
      * Validate the host
      * @param host Host

package/lib/mu/BridgeCloseButton.js

@@ -1,6 +1,6 @@
 import { BridgeUtils } from '@etsoo/appscript';
 import CloseIcon from '@mui/icons-material/Close';
-import { IconButton } from '@mui/material';
+import { Box, IconButton } from '@mui/material';
 import React from 'react';
 import { globalApp } from '../app/ReactApp';
 /**
@@ -10,7 +10,7 @@ import { globalApp } from '../app/ReactApp';
  */
 export function BridgeCloseButton(props) {
     // Destruct
-    const { onClick, title = typeof globalApp === 'undefined'
+    const { boxProps, onClick, title = typeof globalApp === 'undefined'
         ? 'Close'
         : globalApp.get('close'), validate, ...rest } = props;
     // Host
@@ -24,11 +24,7 @@ export function BridgeCloseButton(props) {
             onClick(event);
         host.exit();
     };
-    return (React.createElement(IconButton, { "aria-label": "close", color: "secondary", onClick: onClickLocal, title: title, sx: {
-            position: 'absolute',
-            zIndex: (theme) => theme.zIndex.appBar + 1,
-            top: (theme) => theme.spacing(0.5),
-            right: (theme) => theme.spacing(0.5)
-        }, ...rest },
-        React.createElement(CloseIcon, null)));
+    return (React.createElement(Box, { ...boxProps },
+        React.createElement(IconButton, { "aria-label": "close", onClick: onClickLocal, title: title, ...rest },
+            React.createElement(CloseIcon, null))));
 }

package/lib/mu/pages/CommonPage.js

@@ -7,6 +7,7 @@ import { MoreFab } from '../MoreFab';
 import { ReactAppStateDetector } from '../../app/ReactApp';
 import { Container, Fab } from '@mui/material';
 import RefreshIcon from '@mui/icons-material/Refresh';
+import { BackButton } from '../BackButton';
 /**
  * Default scroll container
  */
@@ -17,7 +18,7 @@ export const CommonPageScrollContainer = global;
  */
 export function CommonPage(props) {
     // Destruct
-    const { children, disableGutters = true, fabButtons, fabColumnDirection, fabPaddingAdjust = 1.5, fabSize = 'small', maxWidth = false, moreActions, onRefresh, onUpdate, onUpdateAll, paddings = MUGlobal.pagePaddings, scrollContainer, targetFields, sx = {}, ...rest } = props;
+    const { children, disableGutters = true, fabButtons, fabColumnDirection, fabPaddingAdjust = 1.5, fabSize = 'small', maxWidth = false, moreActions, onRefresh, onUpdate, onUpdateAll, paddings = MUGlobal.pagePaddings, scrollContainer, supportBack = false, targetFields, sx = {}, ...rest } = props;
     // Merge style
     Object.assign(sx, {
         padding: paddings
@@ -53,6 +54,7 @@ export function CommonPage(props) {
                 fabButtons,
                 onRefresh != null && (React.createElement(Fab, { title: labels.refresh, size: fabSize, onClick: onRefresh, sx: { display: { xs: 'none', md: 'inherit' } } },
                     React.createElement(RefreshIcon, null))),
-                React.createElement(MoreFab, { size: fabSize, title: labels.more, actions: moreActions })),
+                React.createElement(MoreFab, { size: fabSize, title: labels.more, actions: moreActions }),
+                supportBack && (React.createElement(BackButton, { title: labels.back, size: fabSize }))),
             children)));
 }

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

@@ -18,7 +18,7 @@ export interface CommonPageProps extends Omit<ContainerProps, 'id'> {
      */
     fabSize?: CustomFabSize;
     /**
-     * Fab flex column direction?
+     * Fab flex column direction, undefined to hide it
      */
     fabColumnDirection?: boolean;
     /**
@@ -49,6 +49,10 @@ export interface CommonPageProps extends Omit<ContainerProps, 'id'> {
      * Scroll container
      */
     scrollContainer?: HTMLElement | object;
+    /**
+     * Support back click
+     */
+    supportBack?: boolean;
     /**
      * State last changed fields
      */

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

@@ -16,6 +16,11 @@ export interface EditPageProps extends Omit<CommonPageProps, 'onSubmit'> {
      * On delete callback
      */
     onDelete?: () => Promise<void> | void;
+    /**
+     * Support back click
+     * @default true
+     */
+    supportBack?: boolean;
 }
 /**
  * Add / Edit page

package/lib/mu/pages/EditPage.js

@@ -5,13 +5,14 @@ import { MUGlobal } from '../MUGlobal';
 import { CommonPage, CommonPageScrollContainer } from './CommonPage';
 import SaveIcon from '@mui/icons-material/Save';
 import DeleteIcon from '@mui/icons-material/Delete';
+import { BackButton } from '../BackButton';
 /**
  * Add / Edit page
  * @param props Props
  */
 export function EditPage(props) {
     // Destruct
-    const { children, isEditing, onDelete, onSubmit, paddings = MUGlobal.pagePaddings, scrollContainer = CommonPageScrollContainer, ...rest } = props;
+    const { children, isEditing, onDelete, onSubmit, paddings = MUGlobal.pagePaddings, scrollContainer = CommonPageScrollContainer, supportBack = true, ...rest } = props;
     // Labels
     const labels = Labels.CommonPage;
     return (React.createElement(CommonPage, { paddings: paddings, scrollContainer: scrollContainer, ...rest },
@@ -23,5 +24,6 @@ export function EditPage(props) {
                     paddingTop: paddings
                 } },
                 isEditing && onDelete && (React.createElement(Button, { color: "primary", variant: "outlined", onClick: () => onDelete(), startIcon: React.createElement(DeleteIcon, { color: "warning" }) }, labels.delete)),
-                React.createElement(Button, { variant: "contained", type: "submit", startIcon: React.createElement(SaveIcon, null), sx: { flexGrow: 1 } }, labels.save)))));
+                React.createElement(Button, { variant: "contained", type: "submit", startIcon: React.createElement(SaveIcon, null), sx: { flexGrow: 1 } }, labels.save),
+                supportBack && React.createElement(BackButton, { title: labels.back })))));
 }

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, ...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();
@@ -72,7 +78,7 @@ export function ViewPage(props) {
             return;
         setData(result);
     };
-    return (React.createElement(CommonPage, { paddings: paddings, onRefresh: supportRefresh ? refresh : undefined, onUpdate: supportRefresh ? undefined : refresh, ...rest, scrollContainer: global }, data == null ? (React.createElement(LinearProgress, null)) : (React.createElement(React.Fragment, null,
+    return (React.createElement(CommonPage, { paddings: paddings, onRefresh: supportRefresh ? refresh : undefined, onUpdate: supportRefresh ? undefined : refresh, ...rest, scrollContainer: globalThis, fabColumnDirection: fabColumnDirection, supportBack: supportBack }, data == null ? (React.createElement(LinearProgress, null)) : (React.createElement(React.Fragment, null,
         React.createElement(Grid, { container: true, justifyContent: "left", spacing: paddings, className: "ET-ViewPage", sx: {
                 '.MuiTypography-subtitle2': {
                     fontWeight: 'bold'
@@ -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.11",
+    "version": "1.5.15",
     "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/Labels.ts

@@ -9,6 +9,7 @@ export namespace Labels {
      */
     export const CommonPage = {
         add: 'Add',
+        back: 'Back',
         delete: 'Delete',
         more: 'More',
         pullToRefresh: 'Pull down to refresh',

package/src/app/ReactApp.ts

@@ -56,12 +56,10 @@ export function ReactAppStateDetector(props: IStateProps) {
     const { targetFields, update } = props;
 
     // Context
-    const { state } =
+    const { state = {} } =
         globalApp == null
-            ? ({ state: {} } as UserCalls<IUser>)
-            : React.useContext(
-                  (globalApp.userState as UserState<IUser>).context
-              );
+            ? ({} as UserCalls<IUser>)
+            : React.useContext(globalApp.userState.context);
 
     // Ready
     React.useEffect(() => {
@@ -221,41 +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
+                : Utils.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);
-    }
-
     /**
      * Override alert action result
      * @param result Action result

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/app/Utils.ts

@@ -31,9 +31,11 @@ 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;
     }

package/src/index.ts

@@ -38,6 +38,7 @@ export * from './mu/texts/MoneyText';
 export * from './mu/texts/NumberText';
 
 export * from './mu/AuditDisplay';
+export * from './mu/BackButton';
 export * from './mu/BridgeCloseButton';
 export * from './mu/ButtonLink';
 export * from './mu/ComboBox';

package/src/mu/BackButton.tsx

@@ -0,0 +1,53 @@
+import { IconButton, IconButtonProps, useTheme } from '@mui/material';
+import ArrowBackIcon from '@mui/icons-material/ArrowBack';
+import React from 'react';
+import { useNavigate } from '@reach/router';
+
+/**
+ * BackButton props
+ */
+export interface BackButtonProps extends IconButtonProps {}
+
+/**
+ * BackButton
+ * @param props Props
+ * @returns Component
+ */
+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>) => {
+        if (onClick) onClick(event);
+        navigate(-1);
+    };
+
+    return (
+        <IconButton
+            aria-label="Back"
+            color={color}
+            size={size}
+            onClick={onClickLocal}
+            sx={{
+                backgroundColor: pColor.contrastText,
+                border: `1px solid ${pColor.light}`
+            }}
+            {...rest}
+        >
+            <ArrowBackIcon />
+        </IconButton>
+    );
+}

package/src/mu/BridgeCloseButton.tsx

@@ -1,6 +1,6 @@
 import { BridgeUtils, IBridgeHost } from '@etsoo/appscript';
 import CloseIcon from '@mui/icons-material/Close';
-import { IconButton, IconButtonProps } from '@mui/material';
+import { Box, BoxProps, IconButton, IconButtonProps } from '@mui/material';
 import React from 'react';
 import { globalApp } from '../app/ReactApp';
 
@@ -8,6 +8,11 @@ import { globalApp } from '../app/ReactApp';
  * Bridge close button props
  */
 export interface BridgeCloseButtonProps extends IconButtonProps {
+    /**
+     * Box props
+     */
+    boxProps?: BoxProps;
+
     /**
      * Validate the host
      * @param host Host
@@ -23,6 +28,7 @@ export interface BridgeCloseButtonProps extends IconButtonProps {
 export function BridgeCloseButton(props: BridgeCloseButtonProps) {
     // Destruct
     const {
+        boxProps,
         onClick,
         title = typeof globalApp === 'undefined'
             ? 'Close'
@@ -45,20 +51,15 @@ export function BridgeCloseButton(props: BridgeCloseButtonProps) {
     };
 
     return (
-        <IconButton
-            aria-label="close"
-            color="secondary"
-            onClick={onClickLocal}
-            title={title}
-            sx={{
-                position: 'absolute',
-                zIndex: (theme) => theme.zIndex.appBar + 1,
-                top: (theme) => theme.spacing(0.5),
-                right: (theme) => theme.spacing(0.5)
-            }}
-            {...rest}
-        >
-            <CloseIcon />
-        </IconButton>
+        <Box {...boxProps}>
+            <IconButton
+                aria-label="close"
+                onClick={onClickLocal}
+                title={title}
+                {...rest}
+            >
+                <CloseIcon />
+            </IconButton>
+        </Box>
     );
 }

package/src/mu/pages/CommonPage.tsx

@@ -8,6 +8,7 @@ import { MoreFab } from '../MoreFab';
 import { ReactAppStateDetector } from '../../app/ReactApp';
 import { Container, Fab } from '@mui/material';
 import RefreshIcon from '@mui/icons-material/Refresh';
+import { BackButton } from '../BackButton';
 
 /**
  * Default scroll container
@@ -34,6 +35,7 @@ export function CommonPage(props: CommonPageProps) {
         onUpdateAll,
         paddings = MUGlobal.pagePaddings,
         scrollContainer,
+        supportBack = false,
         targetFields,
         sx = {},
         ...rest
@@ -115,6 +117,9 @@ export function CommonPage(props: CommonPageProps) {
                         title={labels.more}
                         actions={moreActions}
                     />
+                    {supportBack && (
+                        <BackButton title={labels.back} size={fabSize} />
+                    )}
                 </FabBox>
                 {children}
             </Container>

package/src/mu/pages/CommonPageProps.ts

@@ -20,7 +20,7 @@ export interface CommonPageProps extends Omit<ContainerProps, 'id'> {
     fabSize?: CustomFabSize;
 
     /**
-     * Fab flex column direction?
+     * Fab flex column direction, undefined to hide it
      */
     fabColumnDirection?: boolean;
 
@@ -59,6 +59,11 @@ export interface CommonPageProps extends Omit<ContainerProps, 'id'> {
      */
     scrollContainer?: HTMLElement | object;
 
+    /**
+     * Support back click
+     */
+    supportBack?: boolean;
+
     /**
      * State last changed fields
      */

package/src/mu/pages/EditPage.tsx

@@ -6,6 +6,7 @@ import { CommonPage, CommonPageScrollContainer } from './CommonPage';
 import { CommonPageProps } from './CommonPageProps';
 import SaveIcon from '@mui/icons-material/Save';
 import DeleteIcon from '@mui/icons-material/Delete';
+import { BackButton } from '../BackButton';
 
 /**
  * Add / Edit page props
@@ -25,6 +26,12 @@ export interface EditPageProps extends Omit<CommonPageProps, 'onSubmit'> {
      * On delete callback
      */
     onDelete?: () => Promise<void> | void;
+
+    /**
+     * Support back click
+     * @default true
+     */
+    supportBack?: boolean;
 }
 
 /**
@@ -40,6 +47,7 @@ export function EditPage(props: EditPageProps) {
         onSubmit,
         paddings = MUGlobal.pagePaddings,
         scrollContainer = CommonPageScrollContainer,
+        supportBack = true,
         ...rest
     } = props;
 
@@ -91,6 +99,7 @@ export function EditPage(props: EditPageProps) {
                     >
                         {labels.save}
                     </Button>
+                    {supportBack && <BackButton title={labels.back} />}
                 </Grid>
             </form>
         </CommonPage>

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
      */
@@ -165,12 +172,21 @@ export function ViewPage<T extends {}>(props: ViewPageProps<T>) {
         loadData,
         paddings = MUGlobal.pagePaddings,
         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();
@@ -184,7 +200,9 @@ export function ViewPage<T extends {}>(props: ViewPageProps<T>) {
             onRefresh={supportRefresh ? refresh : undefined}
             onUpdate={supportRefresh ? undefined : refresh}
             {...rest}
-            scrollContainer={global}
+            scrollContainer={globalThis}
+            fabColumnDirection={fabColumnDirection}
+            supportBack={supportBack}
         >
             {data == null ? (
                 <LinearProgress />
@@ -241,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>