@etsoo/react 1.4.31 → 1.4.35

package/lib/components/ScrollerGrid.js

@@ -36,7 +36,7 @@ export const ScrollerGrid = (props) => {
         // Update state
         state.isNextPageLoading = true;
         // Parameters
-        const { currentPage, batchSize, orderBy, orderByAsc, data, isMounted } = state;
+        const { currentPage, batchSize, orderBy, orderByAsc, data } = state;
         const loadProps = {
             currentPage,
             batchSize,
@@ -45,10 +45,10 @@ export const ScrollerGrid = (props) => {
             data
         };
         loadData(loadProps).then((result) => {
-            state.isMounted = true;
-            if (result == null || isMounted === false) {
+            if (result == null || state.isMounted === false) {
                 return;
             }
+            state.isMounted = true;
             const newItems = result.length;
             state.lastLoadedItems = newItems;
             state.isNextPageLoading = false;
@@ -109,7 +109,8 @@ export const ScrollerGrid = (props) => {
         };
         Object.assign(state, resetState);
         // Reset items
-        setRows([]);
+        if (state.isMounted !== false)
+            setRows([]);
     };
     React.useImperativeHandle(mRef, () => ({
         scrollTo(params) {
@@ -184,13 +185,12 @@ export const ScrollerGrid = (props) => {
             shouldForceUpdate: true
         });
     }, [width]);
-    // Destruct state
-    const { autoLoad: stateAutoLoad, hasNextPage, currentPage } = state;
+    // Rows
     const rowLength = rows.length;
     // Row count
-    const rowCount = hasNextPage ? rowLength + 1 : rowLength;
+    const rowCount = state.hasNextPage ? rowLength + 1 : rowLength;
     // Auto load data when current page is 0
-    if (currentPage === 0 && stateAutoLoad)
+    if (state.currentPage === 0 && state.autoLoad)
         loadDataLocal();
     // Layout
     return (React.createElement(React.Fragment, null,

package/lib/components/ScrollerList.js

@@ -53,7 +53,7 @@ export const ScrollerList = (props) => {
         // Update state
         state.isNextPageLoading = true;
         // Parameters
-        const { currentPage, batchSize, orderBy, orderByAsc, data, isMounted } = state;
+        const { currentPage, batchSize, orderBy, orderByAsc, data } = state;
         const loadProps = {
             currentPage,
             batchSize,
@@ -62,10 +62,10 @@ export const ScrollerList = (props) => {
             data
         };
         loadData(loadProps).then((result) => {
-            state.isMounted = true;
-            if (result == null || isMounted === false) {
+            if (result == null || state.isMounted === false) {
                 return;
             }
+            state.isMounted = true;
             const newItems = result.length;
             state.lastLoadedItems = newItems;
             state.hasNextPage = newItems >= loadBatchSize;
@@ -121,7 +121,8 @@ export const ScrollerList = (props) => {
                 };
                 Object.assign(state, resetState);
                 // Reset
-                setRows([]);
+                if (state.isMounted !== false)
+                    setRows([]);
             },
             scrollTo(scrollOffset) {
                 refMethods.scrollTo(scrollOffset);
@@ -160,8 +161,7 @@ export const ScrollerList = (props) => {
             state.isMounted = false;
         };
     }, []);
-    // Destruct state
-    const { autoLoad: stateAutoLoad, hasNextPage, currentPage } = state;
+    // Row count
     const rowCount = rows.length;
     // Local items renderer callback
     const onItemsRenderedLocal = (props) => {
@@ -175,9 +175,9 @@ export const ScrollerList = (props) => {
             onItemsRendered(props);
     };
     // Item count
-    const itemCount = hasNextPage ? rowCount + 1 : rowCount;
+    const itemCount = state.hasNextPage ? rowCount + 1 : rowCount;
     // Auto load data when current page is 0
-    if (currentPage === 0 && stateAutoLoad)
+    if (state.currentPage === 0 && state.autoLoad)
         loadDataLocal();
     // Layout
     return typeof itemSize === 'function' ? (React.createElement(VariableSizeList, { height: height, width: width, itemCount: itemCount, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest }, itemRendererLocal)) : (React.createElement(FixedSizeList, { height: height, width: width, itemCount: itemCount, itemSize: itemSize, outerRef: refs, ref: listRef, style: style, onItemsRendered: onItemsRenderedLocal, ...rest }, itemRendererLocal));

package/lib/mu/DataGridRenderers.js

@@ -67,7 +67,7 @@ export var DataGridRenderers;
             if (value)
                 return React.createElement(CheckIcon, { fontSize: "small" });
             else
-                return React.createElement(ClearIcon, { fontSize: "small" });
+                return React.createElement(ClearIcon, { fontSize: "small", color: "error" });
         }
         // To string
         return new String(value);

package/lib/mu/ResponsibleContainer.d.ts

@@ -23,7 +23,7 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
     /**
      * Container box SX (dataGrid determines the case)
      */
-    containerBoxSx?: (dataGrid?: boolean) => SxProps<Theme>;
+    containerBoxSx?: (paddings: {}, dataGrid?: boolean) => SxProps<Theme>;
     /**
      * Min width to show Datagrid
      */

package/lib/mu/ResponsibleContainer.js

@@ -9,13 +9,12 @@ import { MUGlobal } from './MUGlobal';
 import { PullToRefreshUI } from './PullToRefreshUI';
 import { ScrollerListEx } from './ScrollerListEx';
 import { SearchBar } from './SearchBar';
-function getDefaultSearchBoxSx(paddings) {
+function defaultContainerBoxSx(paddings, _dataGrid) {
     const half = MUGlobal.half(paddings);
     return {
-        paddingLeft: (theme) => theme.spacing(1),
-        paddingRight: (theme) => theme.spacing(1),
-        paddingTop: half,
-        marginBottom: half
+        '& .SearchBox': {
+            marginBottom: half
+        }
     };
 }
 /**
@@ -25,7 +24,7 @@ function getDefaultSearchBoxSx(paddings) {
  */
 export function ResponsibleContainer(props) {
     // Destruct
-    const { adjustHeight, columns, containerBoxSx, dataGridMinWidth = Math.max(576, DataGridExCalColumns(columns).total), elementReady, fields, fieldTemplate, height, loadData, mRef, paddings = MUGlobal.pagePaddings, pullToRefresh = true, sizeReadyMiliseconds = 0, ...rest } = props;
+    const { adjustHeight, columns, containerBoxSx = defaultContainerBoxSx, dataGridMinWidth = Math.max(576, DataGridExCalColumns(columns).total), elementReady, fields, fieldTemplate, height, loadData, mRef, paddings = MUGlobal.pagePaddings, pullToRefresh = true, sizeReadyMiliseconds = 0, ...rest } = props;
     // Labels
     const labels = Labels.CommonPage;
     // Refs
@@ -146,7 +145,7 @@ export function ResponsibleContainer(props) {
     // Layout
     return (React.createElement(Box, { sx: containerBoxSx == null
             ? undefined
-            : containerBoxSx(showDataGrid) },
+            : containerBoxSx(paddings, showDataGrid) },
         React.createElement(Stack, null,
             React.createElement(Box, { ref: dimensions[0][0], className: "SearchBox" }, searchBar),
             list),

package/lib/mu/TabBox.d.ts

@@ -21,6 +21,14 @@ export interface TabBoxPros extends BoxProps {
      * Container props
      */
     container?: Omit<TabsProps, 'value'>;
+    /**
+     * Default selected index
+     */
+    defaultIndex?: number;
+    /**
+     * Current index
+     */
+    index?: number;
     /**
      * Add a hidden input and its name
      */

package/lib/mu/TabBox.js

@@ -8,10 +8,15 @@ import React from 'react';
  */
 export function TabBox(props) {
     // Destruct
-    const { inputName, root, container = {}, tabs } = props;
+    const { index, inputName, root, container = {}, defaultIndex = 0, tabs } = props;
     const { onChange, ...rest } = container;
     // State
-    const [value, setValue] = React.useState(0);
+    const [value, setValue] = React.useState(defaultIndex);
+    React.useEffect(() => {
+        if (index == null)
+            return;
+        setValue(index);
+    }, [index]);
     // Layout
     return (React.createElement(React.Fragment, null,
         inputName && (React.createElement("input", { type: "hidden", name: inputName, value: value })),

package/lib/mu/pages/ResponsivePage.js

@@ -13,13 +13,14 @@ export function ResponsivePage(props) {
     const { pageProps = {}, ...rest } = props;
     (_a = pageProps.paddings) !== null && _a !== void 0 ? _a : (pageProps.paddings = MUGlobal.pagePaddings);
     const { paddings, fabColumnDirection, ...pageRest } = pageProps;
-    const half = MUGlobal.half(paddings);
     // State
     const [scrollContainer, setScrollContainer] = React.useState();
     const [direction, setDirection] = React.useState(fabColumnDirection);
     // Layout
     return (React.createElement(CommonPage, { ...pageRest, paddings: {}, scrollContainer: scrollContainer, fabColumnDirection: direction },
-        React.createElement(ResponsibleContainer, { paddings: paddings, containerBoxSx: (dataGrid) => {
+        React.createElement(ResponsibleContainer, { paddings: paddings, containerBoxSx: (paddings, _dataGrid) => {
+                // Half
+                const half = MUGlobal.half(paddings);
                 // .SearchBox keep the same to avoid flick when switching between DataGrid and List
                 return {
                     '& .SearchBox': {

package/package.json

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

package/src/components/ScrollerGrid.tsx

@@ -198,8 +198,7 @@ export const ScrollerGrid = <T extends Record<string, unknown>>(
         state.isNextPageLoading = true;
 
         // Parameters
-        const { currentPage, batchSize, orderBy, orderByAsc, data, isMounted } =
-            state;
+        const { currentPage, batchSize, orderBy, orderByAsc, data } = state;
 
         const loadProps: GridLoadDataProps = {
             currentPage,
@@ -210,11 +209,10 @@ export const ScrollerGrid = <T extends Record<string, unknown>>(
         };
 
         loadData(loadProps).then((result) => {
-            state.isMounted = true;
-
-            if (result == null || isMounted === false) {
+            if (result == null || state.isMounted === false) {
                 return;
             }
+            state.isMounted = true;
 
             const newItems = result.length;
             state.lastLoadedItems = newItems;
@@ -291,7 +289,7 @@ export const ScrollerGrid = <T extends Record<string, unknown>>(
         Object.assign(state, resetState);
 
         // Reset items
-        setRows([]);
+        if (state.isMounted !== false) setRows([]);
     };
 
     React.useImperativeHandle(
@@ -378,15 +376,14 @@ export const ScrollerGrid = <T extends Record<string, unknown>>(
         });
     }, [width]);
 
-    // Destruct state
-    const { autoLoad: stateAutoLoad, hasNextPage, currentPage } = state;
+    // Rows
     const rowLength = rows.length;
 
     // Row count
-    const rowCount = hasNextPage ? rowLength + 1 : rowLength;
+    const rowCount = state.hasNextPage ? rowLength + 1 : rowLength;
 
     // Auto load data when current page is 0
-    if (currentPage === 0 && stateAutoLoad) loadDataLocal();
+    if (state.currentPage === 0 && state.autoLoad) loadDataLocal();
 
     // Layout
     return (

package/src/components/ScrollerList.tsx

@@ -163,8 +163,7 @@ export const ScrollerList = <T extends Record<string, any>>(
         state.isNextPageLoading = true;
 
         // Parameters
-        const { currentPage, batchSize, orderBy, orderByAsc, data, isMounted } =
-            state;
+        const { currentPage, batchSize, orderBy, orderByAsc, data } = state;
 
         const loadProps: GridLoadDataProps = {
             currentPage,
@@ -175,11 +174,10 @@ export const ScrollerList = <T extends Record<string, any>>(
         };
 
         loadData(loadProps).then((result) => {
-            state.isMounted = true;
-
-            if (result == null || isMounted === false) {
+            if (result == null || state.isMounted === false) {
                 return;
             }
+            state.isMounted = true;
 
             const newItems = result.length;
             state.lastLoadedItems = newItems;
@@ -250,7 +248,7 @@ export const ScrollerList = <T extends Record<string, any>>(
                     Object.assign(state, resetState);
 
                     // Reset
-                    setRows([]);
+                    if (state.isMounted !== false) setRows([]);
                 },
 
                 scrollTo(scrollOffset: number): void {
@@ -301,8 +299,7 @@ export const ScrollerList = <T extends Record<string, any>>(
         };
     }, []);
 
-    // Destruct state
-    const { autoLoad: stateAutoLoad, hasNextPage, currentPage } = state;
+    // Row count
     const rowCount = rows.length;
 
     // Local items renderer callback
@@ -319,10 +316,10 @@ export const ScrollerList = <T extends Record<string, any>>(
     };
 
     // Item count
-    const itemCount = hasNextPage ? rowCount + 1 : rowCount;
+    const itemCount = state.hasNextPage ? rowCount + 1 : rowCount;
 
     // Auto load data when current page is 0
-    if (currentPage === 0 && stateAutoLoad) loadDataLocal();
+    if (state.currentPage === 0 && state.autoLoad) loadDataLocal();
 
     // Layout
     return typeof itemSize === 'function' ? (

package/src/mu/DataGridRenderers.tsx

@@ -103,7 +103,7 @@ export namespace DataGridRenderers {
             }
 
             if (value) return <CheckIcon fontSize="small" />;
-            else return <ClearIcon fontSize="small" />;
+            else return <ClearIcon fontSize="small" color="error" />;
         }
 
         // To string

package/src/mu/ResponsibleContainer.tsx

@@ -54,7 +54,7 @@ export interface ResponsibleContainerProps<
     /**
      * Container box SX (dataGrid determines the case)
      */
-    containerBoxSx?: (dataGrid?: boolean) => SxProps<Theme>;
+    containerBoxSx?: (paddings: {}, dataGrid?: boolean) => SxProps<Theme>;
 
     /**
      * Min width to show Datagrid
@@ -132,13 +132,15 @@ interface LocalRefs {
     mounted?: boolean;
 }
 
-function getDefaultSearchBoxSx(paddings: {}): SxProps<Theme> {
+function defaultContainerBoxSx(
+    paddings: {},
+    _dataGrid?: boolean
+): SxProps<Theme> {
     const half = MUGlobal.half(paddings);
     return {
-        paddingLeft: (theme) => theme.spacing(1),
-        paddingRight: (theme) => theme.spacing(1),
-        paddingTop: half,
-        marginBottom: half
+        '& .SearchBox': {
+            marginBottom: half
+        }
     };
 }
 
@@ -155,7 +157,7 @@ export function ResponsibleContainer<
     const {
         adjustHeight,
         columns,
-        containerBoxSx,
+        containerBoxSx = defaultContainerBoxSx,
         dataGridMinWidth = Math.max(576, DataGridExCalColumns(columns).total),
         elementReady,
         fields,
@@ -342,7 +344,7 @@ export function ResponsibleContainer<
             sx={
                 containerBoxSx == null
                     ? undefined
-                    : containerBoxSx(showDataGrid)
+                    : containerBoxSx(paddings, showDataGrid)
             }
         >
             <Stack>

package/src/mu/TabBox.tsx

@@ -26,6 +26,16 @@ export interface TabBoxPros extends BoxProps {
      */
     container?: Omit<TabsProps, 'value'>;
 
+    /**
+     * Default selected index
+     */
+    defaultIndex?: number;
+
+    /**
+     * Current index
+     */
+    index?: number;
+
     /**
      * Add a hidden input and its name
      */
@@ -49,11 +59,23 @@ export interface TabBoxPros extends BoxProps {
  */
 export function TabBox(props: TabBoxPros) {
     // Destruct
-    const { inputName, root, container = {}, tabs } = props;
+    const {
+        index,
+        inputName,
+        root,
+        container = {},
+        defaultIndex = 0,
+        tabs
+    } = props;
     const { onChange, ...rest } = container;
 
     // State
-    const [value, setValue] = React.useState(0);
+    const [value, setValue] = React.useState(defaultIndex);
+
+    React.useEffect(() => {
+        if (index == null) return;
+        setValue(index);
+    }, [index]);
 
     // Layout
     return (

package/src/mu/pages/ResponsivePage.tsx

@@ -20,8 +20,6 @@ export function ResponsivePage<
     pageProps.paddings ??= MUGlobal.pagePaddings;
     const { paddings, fabColumnDirection, ...pageRest } = pageProps;
 
-    const half = MUGlobal.half(paddings);
-
     // State
     const [scrollContainer, setScrollContainer] = React.useState<HTMLElement>();
     const [direction, setDirection] = React.useState(fabColumnDirection);
@@ -36,7 +34,10 @@ export function ResponsivePage<
         >
             <ResponsibleContainer<T, F>
                 paddings={paddings}
-                containerBoxSx={(dataGrid) => {
+                containerBoxSx={(paddings, _dataGrid) => {
+                    // Half
+                    const half = MUGlobal.half(paddings);
+
                     // .SearchBox keep the same to avoid flick when switching between DataGrid and List
                     return {
                         '& .SearchBox': {