@etsoo/react 1.4.39 → 1.4.40

package/lib/mu/MUGlobal.d.ts

@@ -63,8 +63,15 @@ export declare class MUGlobal {
      * @returns Updated object
      */
     static adjustWithTheme(size: number, adjust: {}, updateFunc: (value: number) => string): {};
+    /**
+     * Break points defined
+     */
+    static breakpoints: readonly ["xs", "sm", "md", "lg", "xl"];
     /**
      * Get multple medias theme space
+     * Responsive values and Breakpoints as an object
+     * xs = theme.breakpoints.up('xs')
+     * https://mui.com/system/basics/
      * @param spaces Spaces
      * @param theme Theme
      * @returns Result

package/lib/mu/MUGlobal.js

@@ -72,14 +72,19 @@ export class MUGlobal {
     }
     /**
      * Get multple medias theme space
+     * Responsive values and Breakpoints as an object
+     * xs = theme.breakpoints.up('xs')
+     * https://mui.com/system/basics/
      * @param spaces Spaces
      * @param theme Theme
      * @returns Result
      */
     static getSpace(spaces, theme) {
-        for (const [key, value] of Object.entries(spaces)) {
-            if (typeof value === 'number' &&
-                theme.breakpoints.keys.findIndex((bk) => bk === key) != -1) {
+        const start = this.breakpoints.length - 1;
+        for (let i = start; i >= 0; i--) {
+            const key = this.breakpoints[i];
+            const value = Reflect.get(spaces, key);
+            if (typeof value === 'number') {
                 const mediaRaw = theme.breakpoints.up(key);
                 const mediaQuery = mediaRaw.substring(mediaRaw.indexOf('('));
                 if (window.matchMedia(mediaQuery).matches) {
@@ -137,3 +142,7 @@ MUGlobal.textFieldVariant = 'filled';
  * Page default paddings
  */
 MUGlobal.pagePaddings = { xs: 2, sm: 3 };
+/**
+ * Break points defined
+ */
+MUGlobal.breakpoints = ['xs', 'sm', 'md', 'lg', 'xl'];

package/lib/mu/ScrollerListEx.js

@@ -111,18 +111,25 @@ export function ScrollerListEx(props) {
             : false;
         return selected;
     };
+    // Destruct
+    const { alternatingColors = [undefined, undefined], className, idField = 'id', innerItemRenderer, itemSize, itemKey = (index, data) => { var _a; return (_a = DataTypes.getIdValue(data, idField)) !== null && _a !== void 0 ? _a : index; }, itemRenderer = (itemProps) => {
+        const [itemHeight, space, margins] = calculateItemSize(itemProps.index);
+        return defaultItemRenderer({
+            itemHeight,
+            innerItemRenderer,
+            onMouseDown,
+            space,
+            margins,
+            selected: isSelected(itemProps.data),
+            ...itemProps
+        });
+    }, onSelectChange, selectedColor = '#edf4fb', ...rest } = props;
     // Theme
     const theme = useTheme();
-    // Calculate size
-    const calculateItemSize = (index) => {
-        // Callback function
-        if (typeof itemSize === 'function') {
-            const result = itemSize(index);
-            if (result.length == 2)
-                return [...result, defaultMargin(MUGlobal.pagePaddings)];
-            return result;
-        }
-        // Calculation
+    // Cache calculation
+    const itemSizeResult = React.useMemo(() => {
+        if (typeof itemSize === 'function')
+            return undefined;
         const [size, spaces, isNarrow] = itemSize;
         if (typeof spaces === 'number')
             return [
@@ -135,25 +142,24 @@ export function ScrollerListEx(props) {
             MUGlobal.getSpace(spaces, theme),
             defaultMargin(spaces, isNarrow)
         ];
+    }, [itemSize]);
+    // Calculate size
+    const calculateItemSize = (index) => {
+        // Callback function
+        if (typeof itemSize === 'function') {
+            const result = itemSize(index);
+            if (result.length == 2)
+                return [...result, defaultMargin(MUGlobal.pagePaddings)];
+            return result;
+        }
+        // Calculation
+        return itemSizeResult;
     };
     // Local item size
     const itemSizeLocal = (index) => {
         const [size, space] = calculateItemSize(index);
         return size + space;
     };
-    // Destruct
-    const { alternatingColors = [undefined, undefined], className, idField = 'id', innerItemRenderer, itemSize, itemKey = (index, data) => { var _a; return (_a = DataTypes.getIdValue(data, idField)) !== null && _a !== void 0 ? _a : index; }, itemRenderer = (itemProps) => {
-        const [itemHeight, space, margins] = calculateItemSize(itemProps.index);
-        return defaultItemRenderer({
-            itemHeight,
-            innerItemRenderer,
-            onMouseDown,
-            space,
-            margins,
-            selected: isSelected(itemProps.data),
-            ...itemProps
-        });
-    }, onSelectChange, selectedColor = '#edf4fb', ...rest } = props;
     // Layout
     return (React.createElement(ScrollerList, { className: Utils.mergeClasses('ScrollerListEx-Body', className, createGridStyle(alternatingColors, selectedColor)), itemKey: itemKey, itemRenderer: itemRenderer, itemSize: itemSizeLocal, ...rest }));
 }

package/package.json

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

package/src/mu/MUGlobal.ts

@@ -126,18 +126,26 @@ export class MUGlobal {
         return newObj;
     }
 
+    /**
+     * Break points defined
+     */
+    static breakpoints = ['xs', 'sm', 'md', 'lg', 'xl'] as const;
+
     /**
      * Get multple medias theme space
+     * Responsive values and Breakpoints as an object
+     * xs = theme.breakpoints.up('xs')
+     * https://mui.com/system/basics/
      * @param spaces Spaces
      * @param theme Theme
      * @returns Result
      */
     static getSpace(spaces: {}, theme: Theme) {
-        for (const [key, value] of Object.entries(spaces)) {
-            if (
-                typeof value === 'number' &&
-                theme.breakpoints.keys.findIndex((bk) => bk === key) != -1
-            ) {
+        const start = this.breakpoints.length - 1;
+        for (let i = start; i >= 0; i--) {
+            const key = this.breakpoints[i];
+            const value = Reflect.get(spaces, key);
+            if (typeof value === 'number') {
                 const mediaRaw = theme.breakpoints.up(key as Breakpoint);
                 const mediaQuery = mediaRaw.substring(mediaRaw.indexOf('('));
                 if (window.matchMedia(mediaQuery).matches) {
@@ -145,6 +153,7 @@ export class MUGlobal {
                 }
             }
         }
+
         return 0;
     }
 

package/src/mu/ScrollerListEx.tsx

@@ -265,41 +265,6 @@ export function ScrollerListEx<T extends Record<string, unknown>>(
         return selected;
     };
 
-    // Theme
-    const theme = useTheme();
-
-    // Calculate size
-    const calculateItemSize = (index: number): [number, number, {}] => {
-        // Callback function
-        if (typeof itemSize === 'function') {
-            const result = itemSize(index);
-            if (result.length == 2)
-                return [...result, defaultMargin(MUGlobal.pagePaddings)];
-            return result;
-        }
-
-        // Calculation
-        const [size, spaces, isNarrow] = itemSize;
-        if (typeof spaces === 'number')
-            return [
-                size,
-                spaces,
-                defaultMargin(MUGlobal.pagePaddings, undefined)
-            ];
-
-        return [
-            size,
-            MUGlobal.getSpace(spaces, theme),
-            defaultMargin(spaces, isNarrow)
-        ];
-    };
-
-    // Local item size
-    const itemSizeLocal = (index: number) => {
-        const [size, space] = calculateItemSize(index);
-        return size + space;
-    };
-
     // Destruct
     const {
         alternatingColors = [undefined, undefined],
@@ -328,6 +293,49 @@ export function ScrollerListEx<T extends Record<string, unknown>>(
         ...rest
     } = props;
 
+    // Theme
+    const theme = useTheme();
+
+    // Cache calculation
+    const itemSizeResult = React.useMemo(():
+        | [number, number, {}]
+        | undefined => {
+        if (typeof itemSize === 'function') return undefined;
+        const [size, spaces, isNarrow] = itemSize;
+        if (typeof spaces === 'number')
+            return [
+                size,
+                spaces,
+                defaultMargin(MUGlobal.pagePaddings, undefined)
+            ];
+
+        return [
+            size,
+            MUGlobal.getSpace(spaces, theme),
+            defaultMargin(spaces, isNarrow)
+        ];
+    }, [itemSize]);
+
+    // Calculate size
+    const calculateItemSize = (index: number): [number, number, {}] => {
+        // Callback function
+        if (typeof itemSize === 'function') {
+            const result = itemSize(index);
+            if (result.length == 2)
+                return [...result, defaultMargin(MUGlobal.pagePaddings)];
+            return result;
+        }
+
+        // Calculation
+        return itemSizeResult!;
+    };
+
+    // Local item size
+    const itemSizeLocal = (index: number) => {
+        const [size, space] = calculateItemSize(index);
+        return size + space;
+    };
+
     // Layout
     return (
         <ScrollerList<T>