@etsoo/react 1.4.14 → 1.4.18

package/lib/components/ScrollerList.js

@@ -1,11 +1,12 @@
+import { Utils } from '@etsoo/shared';
 import React from 'react';
 import { FixedSizeList, VariableSizeList } from 'react-window';
 import useCombinedRefs from '../uses/useCombinedRefs';
 import { GridSizeGet } from './GridLoader';
 // Calculate loadBatchSize
 const calculateBatchSize = (height, itemSize) => {
-    return (2 +
-        Math.ceil(height / (typeof itemSize === 'function' ? itemSize(0) : itemSize)));
+    const size = Utils.getResult(itemSize, 0);
+    return 2 + Math.ceil(height / size);
 };
 /**
  * Scroller vertical list

package/lib/mu/ResponsibleContainer.js

@@ -43,6 +43,7 @@ export function ResponsibleContainer(props) {
         return loadData(data);
     };
     const gridHeight = refs.current.height;
+    console.log(rect, gridHeight, showDataGrid);
     const list = React.useMemo(() => {
         if (gridHeight == null)
             return;

package/lib/mu/TabBox.d.ts

@@ -7,7 +7,7 @@ export interface TabBoxPanel extends Omit<TabProps, 'value' | 'children'> {
     /**
      * Children
      */
-    children?: React.ReactNode;
+    children?: ((visible: boolean) => React.ReactNode) | React.ReactNode;
     /**
      * Panel box props
      */

package/lib/mu/TabBox.js

@@ -1,3 +1,4 @@
+import { Utils } from '@etsoo/shared';
 import { Box, Tab, Tabs } from '@mui/material';
 import React from 'react';
 /**
@@ -20,5 +21,5 @@ export function TabBox(props) {
                     if (onChange)
                         onChange(event, newValue);
                 }, ...rest }, tabs.map(({ children, panel, ...tabRest }, index) => (React.createElement(Tab, { key: index, value: index, ...tabRest }))))),
-        tabs.map(({ children, panel }, index) => (React.createElement(Box, { key: index, hidden: value !== index, ...panel }, children)))));
+        tabs.map(({ children, panel }, index) => (React.createElement(Box, { key: index, hidden: value !== index, ...panel }, Utils.getResult(children, value === index))))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.4.14",
+    "version": "1.4.18",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,9 +50,9 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.2.20",
+        "@etsoo/appscript": "^1.2.21",
         "@etsoo/notificationbase": "^1.1.0",
-        "@etsoo/shared": "^1.1.0",
+        "@etsoo/shared": "^1.1.3",
         "@mui/icons-material": "^5.2.5",
         "@mui/material": "^5.2.7",
         "@reach/router": "^1.3.4",

package/src/components/ScrollerList.tsx

@@ -1,3 +1,4 @@
+import { Utils } from '@etsoo/shared';
 import React from 'react';
 import {
     Align,
@@ -88,12 +89,8 @@ const calculateBatchSize = (
     height: number,
     itemSize: ((index: number) => number) | number
 ) => {
-    return (
-        2 +
-        Math.ceil(
-            height / (typeof itemSize === 'function' ? itemSize(0) : itemSize)
-        )
-    );
+    const size = Utils.getResult(itemSize, 0);
+    return 2 + Math.ceil(height / size);
 };
 
 /**

package/src/mu/ResponsibleContainer.tsx

@@ -176,6 +176,7 @@ export function ResponsibleContainer<
     };
 
     const gridHeight = refs.current.height;
+    console.log(rect, gridHeight, showDataGrid);
     const list = React.useMemo(() => {
         if (gridHeight == null) return;
 

package/src/mu/TabBox.tsx

@@ -1,3 +1,4 @@
+import { Utils } from '@etsoo/shared';
 import { Box, BoxProps, Tab, TabProps, Tabs, TabsProps } from '@mui/material';
 import React from 'react';
 
@@ -8,7 +9,7 @@ export interface TabBoxPanel extends Omit<TabProps, 'value' | 'children'> {
     /**
      * Children
      */
-    children?: React.ReactNode;
+    children?: ((visible: boolean) => React.ReactNode) | React.ReactNode;
 
     /**
      * Panel box props
@@ -76,7 +77,7 @@ export function TabBox(props: TabBoxPros) {
             </Box>
             {tabs.map(({ children, panel }, index) => (
                 <Box key={index} hidden={value !== index} {...panel}>
-                    {children}
+                    {Utils.getResult(children, value === index)}
                 </Box>
             ))}
         </React.Fragment>