@etsoo/materialui 1.3.86 → 1.3.88

package/lib/AddresSelector.d.ts

@@ -1,6 +1,6 @@
 import { AddressApi, AddressCity, AddressDistrict, AddressRegionDb, AddressState } from "@etsoo/appscript";
-import { RegularBreakpoints } from "@mui/material";
 import React from "react";
+import { RegularBreakpoints } from "@mui/material/Grid";
 /**
  * Address field
  */

package/lib/HiSelector.d.ts

@@ -1,6 +1,7 @@
 import { DataTypes, IdDefaultType, LabelDefaultType } from "@etsoo/shared";
-import { RegularBreakpoints, SelectChangeEvent } from "@mui/material";
+import { SelectChangeEvent } from "@mui/material";
 import React from "react";
+import { RegularBreakpoints } from "@mui/material/Grid";
 /**
  * Hierarchy selector props
  */

package/lib/HiSelectorTL.d.ts

@@ -1,6 +1,7 @@
 import { DataTypes, IdDefaultType } from "@etsoo/shared";
-import { AutocompleteChangeReason, RegularBreakpoints } from "@mui/material";
+import { AutocompleteChangeReason } from "@mui/material";
 import React from "react";
+import { RegularBreakpoints } from "@mui/material/Grid";
 /**
  * Hierarchy tiplist selector props
  */

package/lib/NotifierMU.js

@@ -175,7 +175,7 @@ export class NotificationMU extends NotificationReact {
                     event.preventDefault();
                     event.currentTarget.elements.namedItem("okButton")?.click();
                     return false;
-                }, children: [_jsxs(IconDialogTitle, { className: "draggable-dialog-title", children: [_jsx(Info, { color: "primary" }), _jsx("span", { className: "dialogTitle", children: title }), closable && (_jsx(IconButton, { className: "MuiDialogContent-root-close-button", size: "small", onClick: () => this.returnValue("CLOSE"), children: _jsx(CloseIcon, {}) }))] }), _jsxs(DialogContent, { children: [typeof this.content === "string" ? (_jsx(DialogContentText, { children: this.content })) : (this.content), localInputs, _jsx(Typography, { variant: "caption", display: "block", ref: errorRef, color: (theme) => theme.palette.error.main })] }), _jsx(DialogActions, { children: buttons ? (buttons(this, handleSubmit)) : (_jsxs(React.Fragment, { children: [cancelButton && (_jsx(Button, { color: "secondary", onClick: () => {
+                }, children: [_jsxs(IconDialogTitle, { className: "draggable-dialog-title", children: [_jsx(Info, { color: "primary" }), _jsx("span", { className: "dialogTitle", children: title }), closable && (_jsx(IconButton, { className: "MuiDialogContent-root-close-button", size: "small", onClick: () => this.returnValue("CLOSE"), children: _jsx(CloseIcon, {}) }))] }), _jsxs(DialogContent, { children: [typeof this.content === "string" ? (_jsx(DialogContentText, { children: this.content })) : (this.content), localInputs, _jsx(Typography, { variant: "caption", display: "block", ref: errorRef, color: "error" })] }), _jsx(DialogActions, { children: buttons ? (buttons(this, handleSubmit)) : (_jsxs(React.Fragment, { children: [cancelButton && (_jsx(Button, { color: "secondary", onClick: () => {
                                         if (this.onReturn)
                                             this.onReturn(undefined);
                                         this.dismiss();

package/lib/app/CommonApp.js

@@ -87,6 +87,8 @@ export class CommonApp extends ReactApp {
         if (result == null)
             return false;
         if (!result.ok) {
+            // Remove the wrong token
+            this.clearCacheToken();
             if (result.type === "TokenExpired" && relogin) {
                 // Try login
                 // Dialog to receive password

package/lib/app/IServiceUser.d.ts

@@ -14,11 +14,11 @@ export interface IServiceUser extends IUser {
      */
     readonly organizationName: string;
     /**
-     * Service device id
+     * Service (App) device id
      */
     readonly serviceDeviceId: string;
     /**
-     * Service passphrase encrypted
+     * Service (App) passphrase encrypted
      */
     readonly servicePassphrase: string;
 }

package/lib/app/ServiceApp.js

@@ -263,7 +263,7 @@ export class ServiceApp extends ReactApp {
         // Service user
         this.serviceUser = serviceUser;
         // Service API token
-        this.serviceApi.authorize(this.settings.authScheme, serviceUser.token);
+        this.serviceApi.authorize(serviceUser.tokenScheme ?? "Bearer", serviceUser.token);
         // Keep = true, means service could hold the refresh token for long access
         // Trigger Context change and serviceUser is ready then
         super.userLogin(user, refreshToken, true);

package/lib/texts/DateText.d.ts

@@ -1,5 +1,5 @@
-import { DateUtils } from '@etsoo/shared';
-import { TypographyProps } from '@mui/material';
+import { DateUtils } from "@etsoo/shared";
+import { TypographyProps } from "@mui/material";
 /**
  * Date text props
  */

package/lib/texts/DateText.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { DateUtils } from '@etsoo/shared';
-import { Typography } from '@mui/material';
+import { DateUtils } from "@etsoo/shared";
+import { Typography } from "@mui/material";
 /**
  * Date text
  * @param props Props
@@ -8,7 +8,7 @@ import { Typography } from '@mui/material';
  */
 export function DateText(props) {
     // Destruct
-    const { nearDays, locale = 'lookup', options, timeZone, value, ...rest } = props;
+    const { nearDays, locale = "lookup", options, timeZone, value, ...rest } = props;
     // Format date
     const date = DateUtils.parse(value);
     // Formatted value
@@ -18,7 +18,7 @@ export function DateText(props) {
     if (nearDays != null &&
         date != null &&
         Math.abs(new Date().substract(date).totalDays) <= nearDays) {
-        rest.color = (theme) => theme.palette.error.main;
+        rest.color = "error";
     }
     // Layout
     return (_jsx(Typography, { component: "span", fontSize: "inherit", ...rest, children: localValue }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.3.86",
+  "version": "1.3.88",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -48,16 +48,16 @@
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/sortable": "^8.0.0",
     "@emotion/css": "^11.13.0",
-    "@emotion/react": "^11.13.0",
+    "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.11",
+    "@etsoo/appscript": "^1.5.16",
     "@etsoo/notificationbase": "^1.1.47",
-    "@etsoo/react": "^1.7.63",
+    "@etsoo/react": "^1.7.66",
     "@etsoo/shared": "^1.2.44",
-    "@mui/icons-material": "^5.16.7",
-    "@mui/material": "^5.16.7",
-    "@mui/x-data-grid": "^7.13.0",
-    "chart.js": "^4.4.3",
+    "@mui/icons-material": "^6.1.1",
+    "@mui/material": "^6.1.1",
+    "@mui/x-data-grid": "^7.18.0",
+    "chart.js": "^4.4.4",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eventemitter3": "^5.0.1",
     "pica": "^9.0.1",
@@ -70,27 +70,27 @@
     "react-imask": "7.6.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.24.8",
+    "@babel/cli": "^7.25.6",
     "@babel/core": "^7.25.2",
-    "@babel/plugin-transform-runtime": "^7.24.7",
-    "@babel/preset-env": "^7.25.3",
+    "@babel/plugin-transform-runtime": "^7.25.4",
+    "@babel/preset-env": "^7.25.4",
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
-    "@babel/runtime-corejs3": "^7.25.0",
-    "@testing-library/jest-dom": "^6.4.8",
-    "@testing-library/react": "^16.0.0",
-    "@types/jest": "^29.5.12",
+    "@babel/runtime-corejs3": "^7.25.6",
+    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/react": "^16.0.1",
+    "@types/jest": "^29.5.13",
     "@types/pica": "^9.0.4",
     "@types/pulltorefreshjs": "^0.1.7",
-    "@types/react": "^18.3.3",
-    "@types/react-avatar-editor": "^13.0.2",
+    "@types/react": "^18.3.8",
+    "@types/react-avatar-editor": "^13.0.3",
     "@types/react-dom": "^18.3.0",
     "@types/react-input-mask": "^3.0.5",
     "@types/react-window": "^1.8.8",
-    "@typescript-eslint/eslint-plugin": "^8.1.0",
-    "@typescript-eslint/parser": "^8.1.0",
+    "@typescript-eslint/eslint-plugin": "^8.6.0",
+    "@typescript-eslint/parser": "^8.6.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
-    "typescript": "^5.5.4"
+    "typescript": "^5.6.2"
   }
 }

package/src/AddresSelector.tsx

@@ -5,11 +5,12 @@ import {
   AddressRegionDb,
   AddressState
 } from "@etsoo/appscript";
-import { FormLabel, Grid, RegularBreakpoints } from "@mui/material";
+import { FormLabel, Grid } from "@mui/material";
 import React from "react";
 import { globalApp } from "./app/ReactApp";
 import { ComboBox } from "./ComboBox";
 import { Tiplist } from "./Tiplist";
+import { RegularBreakpoints } from "@mui/material/Grid";
 
 /**
  * Address field

package/src/HiSelector.tsx

@@ -1,12 +1,8 @@
 import { DataTypes, IdDefaultType, LabelDefaultType } from "@etsoo/shared";
-import {
-  FormLabel,
-  Grid,
-  RegularBreakpoints,
-  SelectChangeEvent
-} from "@mui/material";
+import { FormLabel, Grid, SelectChangeEvent } from "@mui/material";
 import React from "react";
 import { SelectEx } from "./SelectEx";
+import { RegularBreakpoints } from "@mui/material/Grid";
 
 /**
  * Hierarchy selector props

package/src/HiSelectorTL.tsx

@@ -3,11 +3,11 @@ import {
   AutocompleteChangeReason,
   AutocompleteValue,
   FormLabel,
-  Grid,
-  RegularBreakpoints
+  Grid
 } from "@mui/material";
 import React from "react";
 import { Tiplist } from "./Tiplist";
+import { RegularBreakpoints } from "@mui/material/Grid";
 
 /**
  * Hierarchy tiplist selector props

package/src/NotifierMU.tsx

@@ -454,7 +454,7 @@ export class NotificationMU extends NotificationReact {
               variant="caption"
               display="block"
               ref={errorRef}
-              color={(theme) => theme.palette.error.main}
+              color="error"
             />
           </DialogContent>
           <DialogActions>

package/src/app/CommonApp.ts

@@ -132,6 +132,9 @@ export abstract class CommonApp<
     if (result == null) return false;
 
     if (!result.ok) {
+      // Remove the wrong token
+      this.clearCacheToken();
+
       if (result.type === "TokenExpired" && relogin) {
         // Try login
         // Dialog to receive password

package/src/app/IServiceUser.ts

@@ -17,12 +17,12 @@ export interface IServiceUser extends IUser {
   readonly organizationName: string;
 
   /**
-   * Service device id
+   * Service (App) device id
    */
   readonly serviceDeviceId: string;
 
   /**
-   * Service passphrase encrypted
+   * Service (App) passphrase encrypted
    */
   readonly servicePassphrase: string;
 }

package/src/app/ServiceApp.ts

@@ -374,7 +374,10 @@ export class ServiceApp<
     this.serviceUser = serviceUser;
 
     // Service API token
-    this.serviceApi.authorize(this.settings.authScheme, serviceUser.token);
+    this.serviceApi.authorize(
+      serviceUser.tokenScheme ?? "Bearer",
+      serviceUser.token
+    );
 
     // Keep = true, means service could hold the refresh token for long access
     // Trigger Context change and serviceUser is ready then

package/src/texts/DateText.tsx

@@ -1,35 +1,35 @@
-import { DateUtils } from '@etsoo/shared';
-import { Typography, TypographyProps } from '@mui/material';
-import React from 'react';
+import { DateUtils } from "@etsoo/shared";
+import { Typography, TypographyProps } from "@mui/material";
+import React from "react";
 
 /**
  * Date text props
  */
 export interface DateTextProps extends TypographyProps {
-    /**
-     * Locale
-     */
-    locale?: string;
+  /**
+   * Locale
+   */
+  locale?: string;
 
-    /**
-     * Near days to show in error color
-     */
-    nearDays?: number;
+  /**
+   * Near days to show in error color
+   */
+  nearDays?: number;
 
-    /**
-     * Options
-     */
-    options?: DateUtils.FormatOptions;
+  /**
+   * Options
+   */
+  options?: DateUtils.FormatOptions;
 
-    /**
-     * Time zone
-     */
-    timeZone?: string;
+  /**
+   * Time zone
+   */
+  timeZone?: string;
 
-    /**
-     * Value to display
-     */
-    value?: Date | string;
+  /**
+   * Value to display
+   */
+  value?: Date | string;
 }
 
 /**
@@ -38,37 +38,37 @@ export interface DateTextProps extends TypographyProps {
  * @returns Component
  */
 export function DateText(props: DateTextProps) {
-    // Destruct
-    const {
-        nearDays,
-        locale = 'lookup',
-        options,
-        timeZone,
-        value,
-        ...rest
-    } = props;
+  // Destruct
+  const {
+    nearDays,
+    locale = "lookup",
+    options,
+    timeZone,
+    value,
+    ...rest
+  } = props;
 
-    // Format date
-    const date = DateUtils.parse(value);
+  // Format date
+  const date = DateUtils.parse(value);
 
-    // Formatted value
-    const localValue =
-        date == null
-            ? undefined
-            : DateUtils.format(value, locale, options, timeZone);
+  // Formatted value
+  const localValue =
+    date == null
+      ? undefined
+      : DateUtils.format(value, locale, options, timeZone);
 
-    if (
-        nearDays != null &&
-        date != null &&
-        Math.abs(new Date().substract(date).totalDays) <= nearDays
-    ) {
-        rest.color = (theme) => theme.palette.error.main;
-    }
+  if (
+    nearDays != null &&
+    date != null &&
+    Math.abs(new Date().substract(date).totalDays) <= nearDays
+  ) {
+    rest.color = "error";
+  }
 
-    // Layout
-    return (
-        <Typography component="span" fontSize="inherit" {...rest}>
-            {localValue}
-        </Typography>
-    );
+  // Layout
+  return (
+    <Typography component="span" fontSize="inherit" {...rest}>
+      {localValue}
+    </Typography>
+  );
 }