@etsoo/react 1.4.35 → 1.4.36

package/lib/mu/MUGlobal.d.ts

@@ -40,14 +40,20 @@ export declare class MUGlobal {
      * @returns Updated object
      */
     static half(input: {}): {};
+    /**
+     * Reverse object number properties, like 5 to -5
+     * @param input Input object
+     * @returns Updated object
+     */
+    static reverse(input: {}): {};
     /**
      * Update object number properties with adjustment
      * @param input Input object
-     * @param adjust Adjust value
+     * @param adjust Adjust value or new size object
      * @param field Specific field
      * @returns Updated object
      */
-    static increase(input: {}, adjust: number, field?: string): {};
+    static increase(input: {}, adjust: number | {}, field?: string): {};
     /**
      * Adjust size with theme update
      * @param size Base size

package/lib/mu/MUGlobal.js

@@ -14,10 +14,24 @@ export class MUGlobal {
         });
         return newObj;
     }
+    /**
+     * Reverse object number properties, like 5 to -5
+     * @param input Input object
+     * @returns Updated object
+     */
+    static reverse(input) {
+        const newObj = { ...input };
+        Object.entries(newObj).forEach(([key, value]) => {
+            if (typeof value === 'number') {
+                Reflect.set(newObj, key, -value);
+            }
+        });
+        return newObj;
+    }
     /**
      * Update object number properties with adjustment
      * @param input Input object
-     * @param adjust Adjust value
+     * @param adjust Adjust value or new size object
      * @param field Specific field
      * @returns Updated object
      */
@@ -25,8 +39,14 @@ export class MUGlobal {
         const newObj = { ...input };
         Object.entries(newObj).forEach(([key, value]) => {
             if (typeof value === 'number') {
-                if (field == null || field === key)
-                    Reflect.set(newObj, key, value + adjust);
+                if (field == null || field === key) {
+                    const adjustValue = typeof adjust === 'number'
+                        ? adjust
+                        : Reflect.get(adjust, key);
+                    if (adjustValue == null || typeof adjustValue !== 'number')
+                        return;
+                    Reflect.set(newObj, key, value + adjustValue);
+                }
             }
         });
         return newObj;

package/lib/mu/MobileListItemRenderer.d.ts

@@ -1,3 +1,4 @@
+import { SxProps, Theme } from '@mui/material';
 import React from 'react';
 import { ListItemReact } from '../components/ListItemReact';
 import { ScrollerListExInnerItemRendererProps } from './ScrollerListEx';
@@ -8,7 +9,7 @@ import { ScrollerListExInnerItemRendererProps } from './ScrollerListEx';
  * @param renderer Renderer for card content
  * @returns Component
  */
-export declare function MobileListItemRenderer<T>({ data, itemHeight }: ScrollerListExInnerItemRendererProps<T>, margin: {}, renderer: (data: T) => [
+export declare function MobileListItemRenderer<T>({ data, itemHeight }: ScrollerListExInnerItemRendererProps<T>, margin: {} | [{}, boolean] | (() => SxProps<Theme>), renderer: (data: T) => [
     string,
     string | undefined,
     React.ReactNode | (ListItemReact | boolean)[],

package/lib/mu/MobileListItemRenderer.js

@@ -26,13 +26,45 @@ export function MobileListItemRenderer({ data, itemHeight }, margin, renderer) {
     // Elements
     const [title, subheader, actions, children] = renderer(data);
     // Half
-    const halfMargin = MUGlobal.half(margin);
-    return (React.createElement(Card, { sx: {
-            height: (theme) => MUGlobal.adjustWithTheme(itemHeight, margin, theme.spacing),
+    //const halfMargin = MUGlobal.half(margin);
+    //const nMargin = MUGlobal.reverse(margin);
+    const calculateMargin = () => {
+        if (typeof margin === 'function')
+            return margin();
+        if (Array.isArray(margin)) {
+            const marginValue = margin[0];
+            const isNarrow = margin[1];
+            const nMargin = MUGlobal.reverse(marginValue);
+            const half = MUGlobal.half(marginValue);
+            if (isNarrow) {
+                const nHalf = MUGlobal.reverse(half);
+                return {
+                    marginLeft: nHalf,
+                    marginRight: nHalf,
+                    marginTop: half,
+                    marginBottom: half
+                };
+            }
+            else {
+                return {
+                    marginLeft: nMargin,
+                    marginRight: nMargin,
+                    marginTop: half,
+                    marginBottom: half
+                };
+            }
+        }
+        const half = MUGlobal.half(margin);
+        return {
             marginLeft: margin,
             marginRight: margin,
-            marginTop: halfMargin,
-            marginBottom: halfMargin
+            marginTop: half,
+            marginBottom: half
+        };
+    };
+    return (React.createElement(Card, { sx: {
+            height: (theme) => MUGlobal.adjustWithTheme(itemHeight, margin, theme.spacing),
+            ...calculateMargin()
         } },
         React.createElement(CardHeader, { sx: { paddingBottom: 0.5 }, action: Array.isArray(actions) ? (React.createElement(MoreFab, { iconButton: true, size: "small", anchorOrigin: {
                     vertical: 'bottom',

package/package.json

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

package/src/mu/MUGlobal.ts

@@ -56,19 +56,42 @@ export class MUGlobal {
         return newObj;
     }
 
+    /**
+     * Reverse object number properties, like 5 to -5
+     * @param input Input object
+     * @returns Updated object
+     */
+    static reverse(input: {}) {
+        const newObj = { ...input };
+        Object.entries(newObj).forEach(([key, value]) => {
+            if (typeof value === 'number') {
+                Reflect.set(newObj, key, -value);
+            }
+        });
+        return newObj;
+    }
+
     /**
      * Update object number properties with adjustment
      * @param input Input object
-     * @param adjust Adjust value
+     * @param adjust Adjust value or new size object
      * @param field Specific field
      * @returns Updated object
      */
-    static increase(input: {}, adjust: number, field?: string) {
+    static increase(input: {}, adjust: number | {}, field?: string) {
         const newObj = { ...input };
         Object.entries(newObj).forEach(([key, value]) => {
             if (typeof value === 'number') {
-                if (field == null || field === key)
-                    Reflect.set(newObj, key, value + adjust);
+                if (field == null || field === key) {
+                    const adjustValue =
+                        typeof adjust === 'number'
+                            ? adjust
+                            : Reflect.get(adjust, key);
+                    if (adjustValue == null || typeof adjustValue !== 'number')
+                        return;
+
+                    Reflect.set(newObj, key, value + adjustValue);
+                }
             }
         });
         return newObj;

package/src/mu/MobileListItemRenderer.tsx

@@ -1,4 +1,11 @@
-import { Card, CardContent, CardHeader, LinearProgress } from '@mui/material';
+import {
+    Card,
+    CardContent,
+    CardHeader,
+    LinearProgress,
+    SxProps,
+    Theme
+} from '@mui/material';
 import React from 'react';
 import { ListItemReact } from '../components/ListItemReact';
 import { MoreFab } from './MoreFab';
@@ -24,7 +31,7 @@ function getActions(input: (ListItemReact | boolean)[]): ListItemReact[] {
  */
 export function MobileListItemRenderer<T>(
     { data, itemHeight }: ScrollerListExInnerItemRendererProps<T>,
-    margin: {},
+    margin: {} | [{}, boolean] | (() => SxProps<Theme>),
     renderer: (
         data: T
     ) => [
@@ -41,17 +48,48 @@ export function MobileListItemRenderer<T>(
     const [title, subheader, actions, children] = renderer(data);
 
     // Half
-    const halfMargin = MUGlobal.half(margin);
+    //const halfMargin = MUGlobal.half(margin);
+    //const nMargin = MUGlobal.reverse(margin);
+    const calculateMargin = () => {
+        if (typeof margin === 'function') return margin();
+        if (Array.isArray(margin)) {
+            const marginValue = margin[0];
+            const isNarrow = margin[1];
+            const nMargin = MUGlobal.reverse(marginValue);
+            const half = MUGlobal.half(marginValue);
+            if (isNarrow) {
+                const nHalf = MUGlobal.reverse(half);
+                return {
+                    marginLeft: nHalf,
+                    marginRight: nHalf,
+                    marginTop: half,
+                    marginBottom: half
+                };
+            } else {
+                return {
+                    marginLeft: nMargin,
+                    marginRight: nMargin,
+                    marginTop: half,
+                    marginBottom: half
+                };
+            }
+        }
+
+        const half = MUGlobal.half(margin);
+        return {
+            marginLeft: margin,
+            marginRight: margin,
+            marginTop: half,
+            marginBottom: half
+        };
+    };
 
     return (
         <Card
             sx={{
                 height: (theme) =>
                     MUGlobal.adjustWithTheme(itemHeight, margin, theme.spacing),
-                marginLeft: margin,
-                marginRight: margin,
-                marginTop: halfMargin,
-                marginBottom: halfMargin
+                ...calculateMargin()
             }}
         >
             <CardHeader