@etsoo/materialui 1.0.17 → 1.0.19

package/lib/MUGlobal.js

@@ -1,5 +1,5 @@
 import { NumberUtils } from '@etsoo/shared';
-import { RLink } from './RLink';
+import { Link } from 'react-router-dom';
 /**
  * MUGlobal for global configurations
  */
@@ -24,9 +24,9 @@ export class MUGlobal {
             selected = path.startsWith(href.slice(0, -3));
         }
         return {
-            component: RLink,
+            component: Link,
             selected,
-            href,
+            to: href,
             sx: {
                 ...(selected && {
                     '.MuiListItemIcon-root': {

package/lib/app/ReactApp.d.ts

@@ -3,7 +3,7 @@ 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';
+import { NavigateFunction, NavigateOptions } from 'react-router-dom';
 /**
  * Global application
  */
@@ -28,10 +28,6 @@ export interface IReactAppBase {
      * User state
      */
     readonly userState: UserState<any>;
-    /**
-     * Router history
-     */
-    readonly history: History;
     /**
      * Set page data
      * @param data Page data
@@ -77,10 +73,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
      */
@@ -97,6 +89,10 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * Is screen size up 'md'
      */
     mdUp?: boolean;
+    /**
+     * Navigate function
+     */
+    navigateFunction?: NavigateFunction;
     /**
      * Page state dispatch
      */
@@ -150,11 +146,6 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param callback Callback
      */
     freshCountdownUI(callback?: () => PromiseLike<unknown>): void;
-    /**
-     * Redirect to the Url
-     * @param url Url
-     */
-    redirectTo(url: string): void;
     /**
      * Set page data
      * @param data Page data
@@ -165,6 +156,12 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param title Page title
      */
     setPageTitle(title: string): void;
+    /**
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
+     */
+    navigate<T extends number | string | URL>(to: T, options?: T extends number ? never : NavigateOptions): void;
     /**
      * Set page title and data
      * @param key Page title resource key

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;
@@ -201,13 +193,6 @@ export class ReactApp extends CoreApp {
             inputs: progress
         });
     }
-    /**
-     * Redirect to the Url
-     * @param url Url
-     */
-    redirectTo(url) {
-        this.history.push(url);
-    }
     /**
      * Set page data
      * @param data Page data
@@ -236,6 +221,19 @@ export class ReactApp extends CoreApp {
             });
         }
     }
+    /**
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
+     */
+    navigate(to, options) {
+        if (this.navigateFunction == null)
+            super.navigate(to, options);
+        else if (typeof to === 'number')
+            this.navigateFunction(to);
+        else
+            this.navigateFunction(to, options);
+    }
     /**
      * Set page title and data
      * @param key Page title resource key

package/lib/index.d.ts

@@ -55,7 +55,6 @@ export * from './PList';
 export * from './ProgressCount';
 export * from './PullToRefreshUI';
 export * from './ResponsibleContainer';
-export * from './RLink';
 export * from './ScrollerListEx';
 export * from './ScrollTopFab';
 export * from './SearchBar';

package/lib/index.js

@@ -55,7 +55,6 @@ export * from './PList';
 export * from './ProgressCount';
 export * from './PullToRefreshUI';
 export * from './ResponsibleContainer';
-export * from './RLink';
 export * from './ScrollerListEx';
 export * from './ScrollTopFab';
 export * from './SearchBar';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/materialui",
-    "version": "1.0.17",
+    "version": "1.0.19",
     "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/MUGlobal.ts

@@ -1,6 +1,6 @@
 import { NumberUtils } from '@etsoo/shared';
 import { Breakpoint, ListItemButtonProps, Theme } from '@mui/material';
-import { RLink } from './RLink';
+import { Link } from 'react-router-dom';
 
 /**
  * Mouse event handler with data
@@ -74,9 +74,9 @@ export class MUGlobal {
         }
 
         return {
-            component: RLink,
+            component: Link,
             selected,
-            href,
+            to: href,
             sx: {
                 ...(selected && {
                     '.MuiListItemIcon-root': {

package/src/app/ReactApp.ts

@@ -34,11 +34,7 @@ import {
     UserCalls,
     UserState
 } from '@etsoo/react';
-import {
-    History,
-    createBrowserHistory,
-    createMemoryHistory
-} from '@remix-run/router';
+import { NavigateFunction, NavigateOptions } from 'react-router-dom';
 
 /**
  * Global application
@@ -96,11 +92,6 @@ export interface IReactAppBase {
      */
     readonly userState: UserState<any>;
 
-    /**
-     * Router history
-     */
-    readonly history: History;
-
     /**
      * Set page data
      * @param data Page data
@@ -181,11 +172,6 @@ export class ReactApp<
      */
     readonly cultureState: CultureState;
 
-    /**
-     * Router history
-     */
-    readonly history: History;
-
     /**
      * Page state
      */
@@ -206,6 +192,11 @@ export class ReactApp<
      */
     mdUp?: boolean;
 
+    /**
+     * Navigate function
+     */
+    navigateFunction?: NavigateFunction;
+
     /**
      * Page state dispatch
      */
@@ -231,11 +222,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 +229,6 @@ export class ReactApp<
                     this.get('updateReady')
                 );
             });
-        } else {
-            this.history = createBrowserHistory();
         }
 
         this.cultureState = new CultureState(settings.currentCulture);
@@ -388,14 +372,6 @@ export class ReactApp<
         );
     }
 
-    /**
-     * Redirect to the Url
-     * @param url Url
-     */
-    override redirectTo(url: string) {
-        this.history.push(url);
-    }
-
     /**
      * Set page data
      * @param data Page data
@@ -427,6 +403,20 @@ export class ReactApp<
         }
     }
 
+    /**
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
+     */
+    override navigate<T extends number | string | URL>(
+        to: T,
+        options?: T extends number ? never : NavigateOptions
+    ) {
+        if (this.navigateFunction == null) super.navigate(to, options);
+        else if (typeof to === 'number') this.navigateFunction(to);
+        else this.navigateFunction(to, options);
+    }
+
     /**
      * Set page title and data
      * @param key Page title resource key

package/src/index.ts

@@ -58,7 +58,6 @@ export * from './PList';
 export * from './ProgressCount';
 export * from './PullToRefreshUI';
 export * from './ResponsibleContainer';
-export * from './RLink';
 export * from './ScrollerListEx';
 export * from './ScrollTopFab';
 export * from './SearchBar';

package/lib/RLink.d.ts

@@ -1,14 +0,0 @@
-import { LinkProps } from '@mui/material';
-import React from 'react';
-/**
- * Router Link properties
- */
-export declare type RLinkProps = LinkProps & {
-    delay?: number;
-};
-/**
- * Router Link
- * @param props Props
- * @returns Component
- */
-export declare const RLink: React.ForwardRefExoticComponent<Pick<RLinkProps, keyof import("@mui/material/OverridableComponent").CommonProps | "children" | "sx" | "variant" | "p" | "slot" | "title" | "key" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "dir" | "draggable" | "hidden" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "translate" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "prefix" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "color" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "position" | "type" | "border" | "boxShadow" | "fontWeight" | "zIndex" | "alignContent" | "alignItems" | "alignSelf" | "bottom" | "boxSizing" | "columnGap" | "display" | "flexBasis" | "flexDirection" | "flexGrow" | "flexShrink" | "flexWrap" | "fontFamily" | "fontSize" | "fontStyle" | "gridAutoColumns" | "gridAutoFlow" | "gridAutoRows" | "gridTemplateAreas" | "gridTemplateColumns" | "gridTemplateRows" | "height" | "justifyContent" | "justifyItems" | "justifySelf" | "left" | "letterSpacing" | "lineHeight" | "marginBottom" | "marginLeft" | "marginRight" | "marginTop" | "maxHeight" | "maxWidth" | "minHeight" | "minWidth" | "order" | "paddingBottom" | "paddingLeft" | "paddingRight" | "paddingTop" | "right" | "rowGap" | "textAlign" | "textOverflow" | "textTransform" | "top" | "visibility" | "whiteSpace" | "width" | "borderBottom" | "borderColor" | "borderLeft" | "borderRadius" | "borderRight" | "borderTop" | "flex" | "gap" | "gridArea" | "gridColumn" | "gridRow" | "margin" | "overflow" | "padding" | "bgcolor" | "m" | "mt" | "mr" | "mb" | "ml" | "mx" | "marginX" | "my" | "marginY" | "pt" | "pr" | "pb" | "pl" | "px" | "paddingX" | "py" | "paddingY" | "typography" | "displayPrint" | "underline" | "media" | "target" | "href" | "download" | "hrefLang" | "ping" | "rel" | "referrerPolicy" | "align" | "gutterBottom" | "noWrap" | "paragraph" | "variantMapping" | "TypographyClasses" | "delay"> & React.RefAttributes<HTMLAnchorElement>>;

package/lib/RLink.js

@@ -1,37 +0,0 @@
-import { useDelayedExecutor } from '@etsoo/react';
-import { Link } from '@mui/material';
-import React from 'react';
-import { globalApp } from './app/ReactApp';
-/**
- * Router Link
- * @param props Props
- * @returns Component
- */
-export const RLink = React.forwardRef((props, ref) => {
-    // Destruct
-    const { delay = 0, href, target, onClick, ...rest } = props;
-    const delayed = useDelayedExecutor((href) => {
-        // Router push
-        globalApp.history.push(href);
-    }, delay);
-    // Click handler
-    const onClickLocl = (event) => {
-        if (onClick)
-            onClick(event);
-        if (!event.isDefaultPrevented() &&
-            href &&
-            (!target || target === '_self') && // Let browser handle "target=_blank" etc
-            globalApp) {
-            // Prevent href action
-            event.preventDefault();
-            // Delayed excution
-            delayed.call(undefined, href);
-        }
-    };
-    // Clear when exit
-    React.useEffect(() => {
-        return () => delayed.clear();
-    }, [delayed]);
-    // Component
-    return (React.createElement(Link, { ...rest, onClick: onClickLocl, href: href, target: target, ref: ref }));
-});

package/src/RLink.tsx

@@ -1,64 +0,0 @@
-import { useDelayedExecutor } from '@etsoo/react';
-import { Link, LinkProps } from '@mui/material';
-import React from 'react';
-import { globalApp } from './app/ReactApp';
-
-/**
- * Router Link properties
- */
-export type RLinkProps = LinkProps & {
-    delay?: number;
-};
-
-/**
- * Router Link
- * @param props Props
- * @returns Component
- */
-export const RLink = React.forwardRef<HTMLAnchorElement, RLinkProps>(
-    (props, ref) => {
-        // Destruct
-        const { delay = 0, href, target, onClick, ...rest } = props;
-
-        const delayed = useDelayedExecutor((href: string) => {
-            // Router push
-            globalApp.history.push(href);
-        }, delay);
-
-        // Click handler
-        const onClickLocl = (
-            event: React.MouseEvent<HTMLAnchorElement, MouseEvent>
-        ) => {
-            if (onClick) onClick(event);
-
-            if (
-                !event.isDefaultPrevented() &&
-                href &&
-                (!target || target === '_self') && // Let browser handle "target=_blank" etc
-                globalApp
-            ) {
-                // Prevent href action
-                event.preventDefault();
-
-                // Delayed excution
-                delayed.call(undefined, href);
-            }
-        };
-
-        // Clear when exit
-        React.useEffect(() => {
-            return () => delayed.clear();
-        }, [delayed]);
-
-        // Component
-        return (
-            <Link
-                {...rest}
-                onClick={onClickLocl}
-                href={href}
-                target={target}
-                ref={ref}
-            />
-        );
-    }
-);