@etsoo/react 1.1.85 → 1.1.86

package/lib/app/ReactApp.d.ts

@@ -8,6 +8,9 @@ import { UserAction, UserState } from '../states/UserState';
 import { InputDialogProps } from './InputDialogProps';
 /**
  * React app state detector
+ * Case 1: undefined, when refresh the whole page
+ * Case 2: false, unauthorized
+ * Case 3: true, authorized or considered as authorized (maynot, like token expiry)
  * @param props Props
  * @returns Component
  */

package/lib/app/ReactApp.js

@@ -5,6 +5,9 @@ import { UserActionType, UserState } from '../states/UserState';
 let app;
 /**
  * React app state detector
+ * Case 1: undefined, when refresh the whole page
+ * Case 2: false, unauthorized
+ * Case 3: true, authorized or considered as authorized (maynot, like token expiry)
  * @param props Props
  * @returns Component
  */

package/lib/mu/pages/CommonPage.js

@@ -22,7 +22,7 @@ export const CommonPageScrollContainer = global;
  */
 export function CommonPage(props) {
     // Destruct
-    const { children, disableGutters = true, fabButtons, fabSize = 'medium', maxWidth = false, moreActions, onRefresh, onUpdate, paddings = MUGlobal.pagePaddings, scrollContainer, pullContainer, sx = {}, ...rest } = props;
+    const { children, disableGutters = true, fabButtons, fabSize = 'medium', maxWidth = false, moreActions, onRefresh, onUpdate, onUpdateAll, paddings = MUGlobal.pagePaddings, scrollContainer, pullContainer, sx = {}, ...rest } = props;
     // Merge style
     Object.assign(sx, {
         padding: paddings
@@ -30,14 +30,19 @@ export function CommonPage(props) {
     // Labels
     const labels = Labels.CommonPage;
     // Update
-    const update = onUpdate
-        ? onUpdate
-        : onRefresh
+    const update = onUpdateAll
+        ? onUpdateAll
+        : onUpdate
             ? (authorized) => {
-                if (authorized)
-                    onRefresh();
+                if (authorized == null || authorized)
+                    onUpdate();
             }
-            : undefined;
+            : onRefresh
+                ? (authorized) => {
+                    if (authorized)
+                        onRefresh();
+                }
+                : undefined;
     // Return the UI
     return (React.createElement(React.Fragment, null,
         update && React.createElement(ReactAppStateDetector, { update: update }),

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

@@ -21,13 +21,17 @@ export interface CommonPageProps extends Omit<ContainerProps, 'id'> {
      */
     moreActions?: MoreAction[];
     /**
-     * On refresh callback
+     * On refresh callback, only when authorized = true
      */
     onRefresh?: () => void | PromiseLike<void>;
     /**
-     * On page update, may uses onRefresh
+     * On page update, when authorized = null or true case, may uses onRefresh
      */
-    onUpdate?: IStateUpdate;
+    onUpdate?: () => void | PromiseLike<void>;
+    /**
+     * On page update, all cases with authorized
+     */
+    onUpdateAll?: IStateUpdate;
     /**
      * Paddings
      */

package/package.json

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

package/src/app/ReactApp.ts

@@ -23,6 +23,9 @@ let app: IReactApp<IAppSettings, any>;
 
 /**
  * React app state detector
+ * Case 1: undefined, when refresh the whole page
+ * Case 2: false, unauthorized
+ * Case 3: true, authorized or considered as authorized (maynot, like token expiry)
  * @param props Props
  * @returns Component
  */

package/src/mu/pages/CommonPage.tsx

@@ -35,6 +35,7 @@ export function CommonPage(props: CommonPageProps) {
         moreActions,
         onRefresh,
         onUpdate,
+        onUpdateAll,
         paddings = MUGlobal.pagePaddings,
         scrollContainer,
         pullContainer,
@@ -51,8 +52,12 @@ export function CommonPage(props: CommonPageProps) {
     const labels = Labels.CommonPage;
 
     // Update
-    const update = onUpdate
-        ? onUpdate
+    const update = onUpdateAll
+        ? onUpdateAll
+        : onUpdate
+        ? (authorized?: boolean) => {
+              if (authorized == null || authorized) onUpdate();
+          }
         : onRefresh
         ? (authorized?: boolean) => {
               if (authorized) onRefresh();

package/src/mu/pages/CommonPageProps.ts

@@ -24,14 +24,19 @@ export interface CommonPageProps extends Omit<ContainerProps, 'id'> {
     moreActions?: MoreAction[];
 
     /**
-     * On refresh callback
+     * On refresh callback, only when authorized = true
      */
     onRefresh?: () => void | PromiseLike<void>;
 
     /**
-     * On page update, may uses onRefresh
+     * On page update, when authorized = null or true case, may uses onRefresh
      */
-    onUpdate?: IStateUpdate;
+    onUpdate?: () => void | PromiseLike<void>;
+
+    /**
+     * On page update, all cases with authorized
+     */
+    onUpdateAll?: IStateUpdate;
 
     /**
      * Paddings