diff --git a/package.json b/package.json index c9e4ffd..1f91ce7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@brightsoftware/table", - "version": "0.1.0", + "version": "0.1.1", "description": "A React table library by bright office system.", "license": "MIT", "author": { diff --git a/src/utils/useTableDimension.ts b/src/utils/useTableDimension.ts index ae6fb6b..0f5ffb6 100644 --- a/src/utils/useTableDimension.ts +++ b/src/utils/useTableDimension.ts @@ -159,7 +159,8 @@ const useTableDimension = (props: TableDimensionPr getRowHeight, data, onTableScroll, - onTableResizeChange + onTableResizeChange, + tableHeight.current ]); const setOffsetByAffix = useCallback(() => { @@ -254,7 +255,7 @@ const useTableDimension = (props: TableDimensionPr if (tableOffset !== undefined) { const maxTableHeight = innerHeight - tableOffset - bottomPadding; - tableHeight.current = Math.min(maxTableHeight, contentHeight.current - bottomPadding - tableOffset); + tableHeight.current = Math.min(maxTableHeight, contentHeight.current+ headerHeight); } } @@ -321,6 +322,7 @@ const useTableDimension = (props: TableDimensionPr calculateTableWidth(); calculateTableHeight(); calculateTableContentWidth(); + calculateTableContextHeight(); } }, [isVisible]); @@ -332,7 +334,7 @@ const useTableDimension = (props: TableDimensionPr scrollX.current = value; }, []); - const getTableHeight = () => { + const getTableHeight = useCallback(() => { if (data?.length === 0) { return props.height; } @@ -350,7 +352,7 @@ const useTableDimension = (props: TableDimensionPr } return height; - }; + }, [tableHeight.current]); return { contentHeight, diff --git a/vite.config.js b/vite.config.js index 8bb0e20..a2ca460 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,13 +15,13 @@ const prependUseClient = () => { }; }; -/* // Read package.json to get all dependencies +// Read package.json to get all dependencies const packageJson = JSON.parse(readFileSync('./package.json', 'utf8')); const external = [ ...Object.keys(packageJson.dependencies || {}), ...Object.keys(packageJson.peerDependencies || {}), ]; -*/ + // NOTE: due to some reason vite is not adding the import statement for transpiled css file // that is why this function(plugin) exists. // This is not a good way, but it works and it's fine for now. @@ -80,7 +80,7 @@ export default defineConfig({ }, rollupOptions: { - external: ['react', 'react-dom'], + external: external, output: { preserveModules: true, entryFileNames: '[name].js',