@etsoo/react 1.3.57 → 1.3.58

package/lib/app/ReactApp.d.ts

@@ -13,6 +13,7 @@ import { InputDialogProps } from './InputDialogProps';
  * Case 1: undefined, when refresh the whole page
  * Case 2: false, unauthorized
  * Case 3: true, authorized or considered as authorized (maynot, like token expiry)
+ * Case 4: property or properties changed
  * @param props Props
  * @returns Component
  */

package/lib/app/ReactApp.js

@@ -13,6 +13,7 @@ let globalApp;
  * Case 1: undefined, when refresh the whole page
  * Case 2: false, unauthorized
  * Case 3: true, authorized or considered as authorized (maynot, like token expiry)
+ * Case 4: property or properties changed
  * @param props Props
  * @returns Component
  */
@@ -23,25 +24,25 @@ export function ReactAppStateDetector(props) {
     const { state } = globalApp == null
         ? { state: {} }
         : React.useContext(globalApp.userState.context);
-    // Match fields
-    const changedFields = state.lastChangedFields;
-    let matchedFields;
-    if (targetFields == null || changedFields == null) {
-        matchedFields = changedFields;
-    }
-    else {
-        matchedFields = [];
-        targetFields.forEach((targetField) => {
-            if (changedFields.includes(targetField))
-                matchedFields === null || matchedFields === void 0 ? void 0 : matchedFields.push(targetField);
-        });
-    }
-    console.log(targetFields, changedFields, matchedFields);
     // Ready
     React.useEffect(() => {
+        // Match fields
+        const changedFields = state.lastChangedFields;
+        let matchedFields;
+        if (targetFields == null || changedFields == null) {
+            matchedFields = changedFields;
+        }
+        else {
+            matchedFields = [];
+            targetFields.forEach((targetField) => {
+                if (changedFields.includes(targetField))
+                    matchedFields === null || matchedFields === void 0 ? void 0 : matchedFields.push(targetField);
+            });
+        }
+        console.log('ReactAppStateDetector', changedFields, targetFields, matchedFields);
         // Callback
         update(state.authorized, matchedFields);
-    }, [state.authorized, matchedFields]);
+    }, [state]);
     // return
     return React.createElement(React.Fragment);
 }

package/lib/states/UserState.js

@@ -68,6 +68,7 @@ export class UserState {
     }
     getChangedFields(input, init) {
         return Utils.objectUpdated(input, init, [
+            'authorized',
             'seconds',
             'lastChangedFields'
         ]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.57",
+    "version": "1.3.58",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/app/ReactApp.ts

@@ -37,6 +37,7 @@ let globalApp: IReactApp<IAppSettings, any, IPageData>;
  * Case 1: undefined, when refresh the whole page
  * Case 2: false, unauthorized
  * Case 3: true, authorized or considered as authorized (maynot, like token expiry)
+ * Case 4: property or properties changed
  * @param props Props
  * @returns Component
  */
@@ -52,26 +53,31 @@ export function ReactAppStateDetector(props: IStateProps) {
                   (globalApp.userState as UserState<IUser>).context
               );
 
-    // Match fields
-    const changedFields = state.lastChangedFields;
-    let matchedFields: string[] | undefined;
-    if (targetFields == null || changedFields == null) {
-        matchedFields = changedFields;
-    } else {
-        matchedFields = [];
-        targetFields.forEach((targetField) => {
-            if (changedFields.includes(targetField))
-                matchedFields?.push(targetField);
-        });
-    }
-
-    console.log(targetFields, changedFields, matchedFields);
-
     // Ready
     React.useEffect(() => {
+        // Match fields
+        const changedFields = state.lastChangedFields;
+        let matchedFields: string[] | undefined;
+        if (targetFields == null || changedFields == null) {
+            matchedFields = changedFields;
+        } else {
+            matchedFields = [];
+            targetFields.forEach((targetField) => {
+                if (changedFields.includes(targetField))
+                    matchedFields?.push(targetField);
+            });
+        }
+
+        console.log(
+            'ReactAppStateDetector',
+            changedFields,
+            targetFields,
+            matchedFields
+        );
+
         // Callback
         update(state.authorized, matchedFields);
-    }, [state.authorized, matchedFields]);
+    }, [state]);
 
     // return
     return React.createElement(React.Fragment);

package/src/states/UserState.ts

@@ -124,6 +124,7 @@ export class UserState<D extends IUser> {
 
     private getChangedFields(input: {}, init: {}) {
         return Utils.objectUpdated(input, init, [
+            'authorized',
             'seconds',
             'lastChangedFields'
         ]);