@etsoo/materialui 1.2.85 → 1.2.87

package/lib/SearchBar.js

@@ -14,11 +14,12 @@ const resetForm = (form) => {
             continue;
         // All non hidden inputs
         if (input instanceof HTMLInputElement) {
-            // Ignore hidden input
-            if (input.type === "hidden")
+            // Ignore hidden and data-reset=false input
+            var reset = input.dataset.reset;
+            if (input.type === "hidden" || reset === "false")
                 continue;
             // Ignore readOnly without data-reset=true inputs
-            if (!input.readOnly || input.dataset.reset === "true") {
+            if (!input.readOnly || reset === "true") {
                 ReactUtils.triggerChange(input, "", true);
             }
             continue;

package/lib/app/ReactApp.d.ts

@@ -216,8 +216,9 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken?: boolean): void;
+    userLogout(clearToken?: boolean, noTrigger?: boolean): void;
     /**
      * User unauthorized
      */

package/lib/app/ReactApp.js

@@ -271,12 +271,13 @@ export class ReactApp extends CoreApp {
     /**
      * User logout
      * @param clearToken Clear refresh token or not
+     * @param noTrigger No trigger for state change
      */
-    userLogout(clearToken = true) {
+    userLogout(clearToken = true, noTrigger = false) {
         // Super call
         super.userLogout(clearToken);
         // Dispatch action
-        if (this.userStateDispatch != null)
+        if (!noTrigger && this.userStateDispatch != null)
             this.userStateDispatch({
                 type: UserActionType.Logout
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.2.85",
+  "version": "1.2.87",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,20 +50,20 @@
     "@emotion/css": "^11.11.2",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@etsoo/appscript": "^1.4.31",
+    "@etsoo/appscript": "^1.4.32",
     "@etsoo/notificationbase": "^1.1.26",
-    "@etsoo/react": "^1.7.2",
+    "@etsoo/react": "^1.7.3",
     "@etsoo/shared": "^1.2.8",
-    "@mui/icons-material": "^5.14.3",
-    "@mui/material": "^5.14.5",
+    "@mui/icons-material": "^5.14.6",
+    "@mui/material": "^5.14.6",
     "@mui/x-data-grid": "^6.11.2",
     "@types/pica": "^9.0.1",
     "@types/pulltorefreshjs": "^0.1.5",
-    "@types/react": "^18.2.20",
+    "@types/react": "^18.2.21",
     "@types/react-avatar-editor": "^13.0.0",
     "@types/react-dom": "^18.2.7",
     "@types/react-input-mask": "^3.0.2",
-    "chart.js": "^4.3.3",
+    "chart.js": "^4.4.0",
     "chartjs-plugin-datalabels": "^2.2.0",
     "pica": "^9.0.1",
     "pulltorefreshjs": "^0.1.22",
@@ -76,19 +76,19 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.10",
-    "@babel/core": "^7.22.10",
+    "@babel/core": "^7.22.11",
     "@babel/plugin-transform-runtime": "^7.22.10",
     "@babel/preset-env": "^7.22.10",
     "@babel/preset-react": "^7.22.5",
-    "@babel/preset-typescript": "^7.22.5",
-    "@babel/runtime-corejs3": "^7.22.10",
-    "@testing-library/jest-dom": "^6.0.1",
+    "@babel/preset-typescript": "^7.22.11",
+    "@babel/runtime-corejs3": "^7.22.11",
+    "@testing-library/jest-dom": "^6.1.2",
     "@testing-library/react": "^14.0.0",
-    "@types/jest": "^29.5.3",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "@typescript-eslint/parser": "^6.4.0",
-    "jest": "^29.6.2",
-    "jest-environment-jsdom": "^29.6.2",
-    "typescript": "^5.1.6"
+    "@types/jest": "^29.5.4",
+    "@typescript-eslint/eslint-plugin": "^6.4.1",
+    "@typescript-eslint/parser": "^6.4.1",
+    "jest": "^29.6.4",
+    "jest-environment-jsdom": "^29.6.4",
+    "typescript": "^5.2.2"
   }
 }

package/src/SearchBar.tsx

@@ -41,11 +41,12 @@ const resetForm = (form: HTMLFormElement) => {
 
     // All non hidden inputs
     if (input instanceof HTMLInputElement) {
-      // Ignore hidden input
-      if (input.type === "hidden") continue;
+      // Ignore hidden and data-reset=false input
+      var reset = input.dataset.reset;
+      if (input.type === "hidden" || reset === "false") continue;
 
       // Ignore readOnly without data-reset=true inputs
-      if (!input.readOnly || input.dataset.reset === "true") {
+      if (!input.readOnly || reset === "true") {
         ReactUtils.triggerChange(input, "", true);
       }
       continue;

package/src/app/ReactApp.ts

@@ -512,13 +512,17 @@ export class ReactApp<
   /**
    * User logout
    * @param clearToken Clear refresh token or not
+   * @param noTrigger No trigger for state change
    */
-  override userLogout(clearToken: boolean = true): void {
+  override userLogout(
+    clearToken: boolean = true,
+    noTrigger: boolean = false
+  ): void {
     // Super call
     super.userLogout(clearToken);
 
     // Dispatch action
-    if (this.userStateDispatch != null)
+    if (!noTrigger && this.userStateDispatch != null)
       this.userStateDispatch({
         type: UserActionType.Logout
       });