@etsoo/react 1.4.27 → 1.4.31

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?: (dataGrid?: boolean) => SxProps<Theme>;
     /**
      * Min width to show Datagrid
      */
@@ -52,10 +52,6 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
      * Item size, a function indicates its a variable size list
      */
     itemSize: ((index: number) => number) | number;
-    /**
-     * Listbox SX (dataGrid determines the case)
-     */
-    listBoxSx?: (dataGrid: boolean, height: number) => SxProps<Theme>;
     /**
      * Load data callback
      */
@@ -76,10 +72,6 @@ export interface ResponsibleContainerProps<T extends {}, F extends DataTypes.Bas
      * Pull to refresh data
      */
     pullToRefresh?: boolean;
-    /**
-     * Searchbox SX
-     */
-    searchBoxSx?: SxProps<Theme>;
     /**
      * Size ready to read miliseconds span
      */

package/lib/mu/ResponsibleContainer.js

@@ -12,8 +12,8 @@ import { SearchBar } from './SearchBar';
 function getDefaultSearchBoxSx(paddings) {
     const half = MUGlobal.half(paddings);
     return {
-        paddingLeft: (theme) => theme.spacing(0.5),
-        paddingRight: (theme) => theme.spacing(0.5),
+        paddingLeft: (theme) => theme.spacing(1),
+        paddingRight: (theme) => theme.spacing(1),
         paddingTop: half,
         marginBottom: half
     };
@@ -25,7 +25,7 @@ function getDefaultSearchBoxSx(paddings) {
  */
 export function ResponsibleContainer(props) {
     // Destruct
-    const { adjustHeight, columns, containerBoxSx, dataGridMinWidth = DataGridExCalColumns(columns).total, elementReady, fields, fieldTemplate, height, listBoxSx, loadData, mRef, paddings = MUGlobal.pagePaddings, pullToRefresh = true, searchBoxSx = getDefaultSearchBoxSx(paddings), sizeReadyMiliseconds = 0, ...rest } = props;
+    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;
     // Labels
     const labels = Labels.CommonPage;
     // Refs
@@ -64,7 +64,6 @@ export function ResponsibleContainer(props) {
         // Last rect
         const lastRect = state.rect;
         // 32 = scroll bar width
-        console.log(lastRect, rect);
         if (lastRect != null &&
             state.mounted !== true &&
             Math.abs(rect.width - lastRect.width) <= 32 &&
@@ -107,9 +106,7 @@ export function ResponsibleContainer(props) {
             // Delete
             delete rest.itemRenderer;
             return [
-                React.createElement(Box, { sx: listBoxSx == null
-                        ? undefined
-                        : listBoxSx(true, heightLocal) },
+                React.createElement(Box, { className: "DataGridBox" },
                     React.createElement(DataGridEx, { autoLoad: !hasFields, height: heightLocal, width: rect.width, loadData: localLoadData, mRef: mRefs, outerRef: (element) => {
                             if (element != null && elementReady)
                                 elementReady(element, true);
@@ -127,9 +124,7 @@ export function ResponsibleContainer(props) {
         delete rest.hoverColor;
         delete rest.selectable;
         return [
-            React.createElement(Box, { sx: listBoxSx == null
-                    ? undefined
-                    : listBoxSx(false, heightLocal) },
+            React.createElement(Box, { className: "ListBox", sx: { height: heightLocal } },
                 React.createElement(ScrollerListEx, { autoLoad: !hasFields, height: heightLocal, loadData: localLoadData, mRef: mRefs, oRef: (element) => {
                         if (element != null && elementReady)
                             elementReady(element, false);
@@ -149,11 +144,11 @@ export function ResponsibleContainer(props) {
             ? '.DataGridEx-Body'
             : '.ScrollerListEx-Body';
     // Layout
-    return (React.createElement(Box, { sx: containerBoxSx == null || showDataGrid == null
+    return (React.createElement(Box, { sx: containerBoxSx == null
             ? undefined
             : containerBoxSx(showDataGrid) },
         React.createElement(Stack, null,
-            React.createElement(Box, { ref: dimensions[0][0], sx: searchBoxSx }, searchBar),
+            React.createElement(Box, { ref: dimensions[0][0], className: "SearchBox" }, searchBar),
             list),
         pullToRefresh && pullContainer && (React.createElement(PullToRefreshUI, { mainElement: pullContainer, triggerElement: pullContainer, instructionsPullToRefresh: labels.pullToRefresh, instructionsReleaseToRefresh: labels.releaseToRefresh, instructionsRefreshing: labels.refreshing, onRefresh: () => { var _a; return (_a = state.ref) === null || _a === void 0 ? void 0 : _a.reset(); }, shouldPullToRefresh: () => {
                 const container = document.querySelector(pullContainer);

package/lib/mu/SearchBar.js

@@ -64,11 +64,12 @@ export function SearchBar(props) {
     // Drawer open / close
     const [open, updateOpen] = React.useState(false);
     // State
-    const state = React.useRef({}).current;
+    const state = React.useRef({ hasMore: true, lastMaxWidth: 9999 }).current;
     // Watch container
     const { dimensions } = useDimensions(1, (target, rect) => {
         // Same logic from resetButtonRef
-        if (rect.width === state.lastMaxWidth)
+        if (rect.width === state.lastMaxWidth ||
+            (!state.hasMore && rect.width > state.lastMaxWidth))
             return false;
         // Len
         const len = target.children.length;
@@ -76,7 +77,7 @@ export function SearchBar(props) {
             var classList = target.children[i].classList;
             classList.remove('showChild');
         }
-    });
+    }, 0);
     // Show or hide element
     const setElementVisible = (element, visible) => {
         element.classList.remove(visible ? 'hiddenChild' : 'showChild');
@@ -96,7 +97,8 @@ export function SearchBar(props) {
             return;
         // Container width
         let maxWidth = containerRect.width;
-        if (maxWidth === state.lastMaxWidth) {
+        if (maxWidth === state.lastMaxWidth ||
+            (!state.hasMore && maxWidth > state.lastMaxWidth)) {
             return;
         }
         state.lastMaxWidth = maxWidth;
@@ -158,6 +160,7 @@ export function SearchBar(props) {
             }
         }
         // Show or hide more button
+        state.hasMore = hasMore;
         setElementVisible(buttonMore, hasMore);
         setElementVisible(resetButton, true);
         // Update menu start index

package/lib/mu/pages/ResponsivePage.js

@@ -13,34 +13,32 @@ 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) => {
-                if (dataGrid) {
-                    return {
-                        padding: paddings
-                    };
-                }
-                else {
-                    return {
-                        paddingTop: paddings,
-                        paddingBottom: paddings
-                    };
-                }
+                // .SearchBox keep the same to avoid flick when switching between DataGrid and List
+                return {
+                    '& .SearchBox': {
+                        marginLeft: paddings,
+                        marginTop: paddings,
+                        marginRight: paddings,
+                        marginBottom: half
+                    },
+                    '& .ListBox': {
+                        marginBottom: paddings
+                    },
+                    '& .DataGridBox': {
+                        marginLeft: paddings,
+                        marginRight: paddings,
+                        marginBottom: paddings
+                    }
+                };
             }, elementReady: (element, isDataGrid) => {
                 setDirection(!isDataGrid);
                 setScrollContainer(element);
-            }, listBoxSx: (dataGrid, height) => {
-                if (dataGrid) {
-                    return {};
-                }
-                else {
-                    return {
-                        height: height
-                    };
-                }
             }, ...rest })));
 }

package/package.json

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

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?: (dataGrid?: boolean) => SxProps<Theme>;
 
     /**
      * Min width to show Datagrid
@@ -93,11 +93,6 @@ export interface ResponsibleContainerProps<
      */
     itemSize: ((index: number) => number) | number;
 
-    /**
-     * Listbox SX (dataGrid determines the case)
-     */
-    listBoxSx?: (dataGrid: boolean, height: number) => SxProps<Theme>;
-
     /**
      * Load data callback
      */
@@ -125,11 +120,6 @@ export interface ResponsibleContainerProps<
      */
     pullToRefresh?: boolean;
 
-    /**
-     * Searchbox SX
-     */
-    searchBoxSx?: SxProps<Theme>;
-
     /**
      * Size ready to read miliseconds span
      */
@@ -145,8 +135,8 @@ interface LocalRefs {
 function getDefaultSearchBoxSx(paddings: {}): SxProps<Theme> {
     const half = MUGlobal.half(paddings);
     return {
-        paddingLeft: (theme) => theme.spacing(0.5),
-        paddingRight: (theme) => theme.spacing(0.5),
+        paddingLeft: (theme) => theme.spacing(1),
+        paddingRight: (theme) => theme.spacing(1),
         paddingTop: half,
         marginBottom: half
     };
@@ -166,17 +156,15 @@ export function ResponsibleContainer<
         adjustHeight,
         columns,
         containerBoxSx,
-        dataGridMinWidth = DataGridExCalColumns(columns).total,
+        dataGridMinWidth = Math.max(576, DataGridExCalColumns(columns).total),
         elementReady,
         fields,
         fieldTemplate,
         height,
-        listBoxSx,
         loadData,
         mRef,
         paddings = MUGlobal.pagePaddings,
         pullToRefresh = true,
-        searchBoxSx = getDefaultSearchBoxSx(paddings),
         sizeReadyMiliseconds = 0,
         ...rest
     } = props;
@@ -229,7 +217,6 @@ export function ResponsibleContainer<
             const lastRect = state.rect;
 
             // 32 = scroll bar width
-            console.log(lastRect, rect);
             if (
                 lastRect != null &&
                 state.mounted !== true &&
@@ -283,13 +270,7 @@ export function ResponsibleContainer<
             delete rest.itemRenderer;
 
             return [
-                <Box
-                    sx={
-                        listBoxSx == null
-                            ? undefined
-                            : listBoxSx(true, heightLocal)
-                    }
-                >
+                <Box className="DataGridBox">
                     <DataGridEx<T>
                         autoLoad={!hasFields}
                         height={heightLocal}
@@ -319,13 +300,7 @@ export function ResponsibleContainer<
         delete rest.selectable;
 
         return [
-            <Box
-                sx={
-                    listBoxSx == null
-                        ? undefined
-                        : listBoxSx(false, heightLocal)
-                }
-            >
+            <Box className="ListBox" sx={{ height: heightLocal }}>
                 <ScrollerListEx<T>
                     autoLoad={!hasFields}
                     height={heightLocal}
@@ -365,13 +340,13 @@ export function ResponsibleContainer<
     return (
         <Box
             sx={
-                containerBoxSx == null || showDataGrid == null
+                containerBoxSx == null
                     ? undefined
                     : containerBoxSx(showDataGrid)
             }
         >
             <Stack>
-                <Box ref={dimensions[0][0]} sx={searchBoxSx}>
+                <Box ref={dimensions[0][0]} className="SearchBox">
                     {searchBar}
                 </Box>
                 {list}

package/src/mu/SearchBar.tsx

@@ -104,21 +104,30 @@ export function SearchBar(props: SearchBarProps) {
         form?: HTMLFormElement;
         moreForm?: HTMLFormElement;
         submitSeed?: number;
-        lastMaxWidth?: number;
-    }>({}).current;
+        lastMaxWidth: number;
+        hasMore: boolean;
+    }>({ hasMore: true, lastMaxWidth: 9999 }).current;
 
     // Watch container
-    const { dimensions } = useDimensions(1, (target, rect) => {
-        // Same logic from resetButtonRef
-        if (rect.width === state.lastMaxWidth) return false;
-
-        // Len
-        const len = target.children.length;
-        for (let i = 0; i < len; i++) {
-            var classList = target.children[i].classList;
-            classList.remove('showChild');
-        }
-    });
+    const { dimensions } = useDimensions(
+        1,
+        (target, rect) => {
+            // Same logic from resetButtonRef
+            if (
+                rect.width === state.lastMaxWidth ||
+                (!state.hasMore && rect.width > state.lastMaxWidth)
+            )
+                return false;
+
+            // Len
+            const len = target.children.length;
+            for (let i = 0; i < len; i++) {
+                var classList = target.children[i].classList;
+                classList.remove('showChild');
+            }
+        },
+        0
+    );
 
     // Show or hide element
     const setElementVisible = (element: Element, visible: boolean) => {
@@ -143,7 +152,10 @@ export function SearchBar(props: SearchBarProps) {
 
         // Container width
         let maxWidth = containerRect.width;
-        if (maxWidth === state.lastMaxWidth) {
+        if (
+            maxWidth === state.lastMaxWidth ||
+            (!state.hasMore && maxWidth > state.lastMaxWidth)
+        ) {
             return;
         }
         state.lastMaxWidth = maxWidth;
@@ -220,6 +232,7 @@ export function SearchBar(props: SearchBarProps) {
         }
 
         // Show or hide more button
+        state.hasMore = hasMore;
         setElementVisible(buttonMore, hasMore);
         setElementVisible(resetButton, true);
 

package/src/mu/pages/ResponsivePage.tsx

@@ -20,6 +20,8 @@ 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);
@@ -35,30 +37,28 @@ export function ResponsivePage<
             <ResponsibleContainer<T, F>
                 paddings={paddings}
                 containerBoxSx={(dataGrid) => {
-                    if (dataGrid) {
-                        return {
-                            padding: paddings
-                        };
-                    } else {
-                        return {
-                            paddingTop: paddings,
-                            paddingBottom: paddings
-                        };
-                    }
+                    // .SearchBox keep the same to avoid flick when switching between DataGrid and List
+                    return {
+                        '& .SearchBox': {
+                            marginLeft: paddings,
+                            marginTop: paddings,
+                            marginRight: paddings,
+                            marginBottom: half
+                        },
+                        '& .ListBox': {
+                            marginBottom: paddings
+                        },
+                        '& .DataGridBox': {
+                            marginLeft: paddings,
+                            marginRight: paddings,
+                            marginBottom: paddings
+                        }
+                    };
                 }}
                 elementReady={(element, isDataGrid) => {
                     setDirection(!isDataGrid);
                     setScrollContainer(element);
                 }}
-                listBoxSx={(dataGrid, height) => {
-                    if (dataGrid) {
-                        return {};
-                    } else {
-                        return {
-                            height: height
-                        };
-                    }
-                }}
                 {...rest}
             />
         </CommonPage>