@etsoo/react 1.4.53 → 1.4.58

package/lib/app/ReactApp.d.ts

@@ -114,9 +114,10 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
     };
     /**
      * Get money format props
+     * @param currency Currency, if undefined, default currency applied
      * @returns Props
      */
-    getMoneyFormatProps(): {
+    getMoneyFormatProps(currency?: string): {
         culture: string;
         currency: string;
     };

package/lib/app/ReactApp.js

@@ -150,10 +150,11 @@ export class ReactApp extends CoreApp {
     }
     /**
      * Get money format props
+     * @param currency Currency, if undefined, default currency applied
      * @returns Props
      */
-    getMoneyFormatProps() {
-        return { culture: this.culture, currency: this.currency };
+    getMoneyFormatProps(currency) {
+        return { culture: this.culture, currency: currency !== null && currency !== void 0 ? currency : this.currency };
     }
     /**
      * Fresh countdown UI

package/lib/app/ServiceApp.js

@@ -234,11 +234,12 @@ export class ServiceApp extends ReactApp {
         // Service user login
         this.servicePassphrase =
             (_a = this.decrypt(serviceUser.serviceDeviceId, this.settings.serviceId.toString())) !== null && _a !== void 0 ? _a : '';
-        // Keep = true, means service could hold the refresh token for long access
-        super.userLogin(user, refreshToken, true);
         // Service user
         this.serviceUser = serviceUser;
         // Service API token
         this.serviceApi.authorize(this.settings.authScheme, 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/mu/MobileListItemRenderer.d.ts

@@ -12,5 +12,6 @@ export declare function MobileListItemRenderer<T>({ data, itemHeight, margins }:
     string,
     string | undefined,
     React.ReactNode | (ListItemReact | boolean)[],
-    React.ReactNode
+    React.ReactNode,
+    React.ReactNode?
 ]): JSX.Element;

package/lib/mu/MobileListItemRenderer.js

@@ -22,8 +22,9 @@ export function MobileListItemRenderer({ data, itemHeight, margins }, renderer)
     // Loading
     if (data == null)
         return React.createElement(LinearProgress, null);
+    console.log('margins', margins);
     // Elements
-    const [title, subheader, actions, children] = renderer(data);
+    const [title, subheader, actions, children, cardActions] = renderer(data);
     return (React.createElement(Card, { sx: {
             height: itemHeight,
             ...margins
@@ -61,6 +62,10 @@ export function MobileListItemRenderer({ data, itemHeight, margins }, renderer)
                     }
                 } })) : (actions), title: title, titleTypographyProps: { variant: 'body2' }, subheader: subheader, subheaderTypographyProps: { variant: 'caption' } }),
         React.createElement(CardContent, { sx: {
-                paddingTop: 0
-            } }, children)));
+                paddingTop: 0,
+                paddingBottom: cardActions == null
+                    ? Reflect.get(margins, 'marginBottom')
+                    : 0
+            } }, children),
+        cardActions));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.53",
+    "version": "1.4.58",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.26",
+        "@etsoo/appscript": "^1.2.27",
         "@etsoo/notificationbase": "^1.1.0",
         "@etsoo/shared": "^1.1.6",
         "@mui/icons-material": "^5.3.0",

package/src/app/ReactApp.ts

@@ -292,10 +292,11 @@ export class ReactApp<
 
     /**
      * Get money format props
+     * @param currency Currency, if undefined, default currency applied
      * @returns Props
      */
-    getMoneyFormatProps() {
-        return { culture: this.culture, currency: this.currency };
+    getMoneyFormatProps(currency?: string) {
+        return { culture: this.culture, currency: currency ?? this.currency };
     }
 
     /**

package/src/app/ServiceApp.ts

@@ -333,13 +333,14 @@ export class ServiceApp<
                 this.settings.serviceId.toString()
             ) ?? '';
 
-        // Keep = true, means service could hold the refresh token for long access
-        super.userLogin(user, refreshToken, true);
-
         // Service user
         this.serviceUser = serviceUser;
 
         // Service API token
         this.serviceApi.authorize(this.settings.authScheme, 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/src/mu/MobileListItemRenderer.tsx

@@ -29,14 +29,17 @@ export function MobileListItemRenderer<T>(
         string,
         string | undefined,
         React.ReactNode | (ListItemReact | boolean)[],
-        React.ReactNode
+        React.ReactNode,
+        React.ReactNode?
     ]
 ) {
     // Loading
     if (data == null) return <LinearProgress />;
 
+    console.log('margins', margins);
+
     // Elements
-    const [title, subheader, actions, children] = renderer(data);
+    const [title, subheader, actions, children, cardActions] = renderer(data);
 
     return (
         <Card
@@ -100,11 +103,16 @@ export function MobileListItemRenderer<T>(
             />
             <CardContent
                 sx={{
-                    paddingTop: 0
+                    paddingTop: 0,
+                    paddingBottom:
+                        cardActions == null
+                            ? Reflect.get(margins, 'marginBottom')
+                            : 0
                 }}
             >
                 {children}
             </CardContent>
+            {cardActions}
         </Card>
     );
 }