fix(table): fix that flexGrow and wordWrap cannot be used together (

#247)
rsuite · Sep 17, 2021 · f91aa2b · f91aa2b
1 parent 572b1cd
commit f91aa2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/docs/md/WordWrapTable.md b/docs/md/WordWrapTable.md
@@ -36,7 +36,7 @@ const App = () => {
           <Cell dataKey="id" />
         </Column>
 
-        <Column width={130} fixed>
+        <Column width={130} fixed flexGrow={1}>
           <HeaderCell>First Name</HeaderCell>
           <Cell dataKey="firstName" />
         </Column>
@@ -65,7 +65,6 @@ const App = () => {
           <HeaderCell>Email</HeaderCell>
           <Cell dataKey="email" />
         </Column>
-
       </Table>
     </div>
   );

diff --git a/src/utils/useTableDimension.ts b/src/utils/useTableDimension.ts
@@ -158,14 +158,16 @@ const useTableDimension = (props: TableDimensionProps) => {
   }, [onTableWidthChange, setOffsetByAffix, tableRef]);
 
   useMount(() => {
-    calculateTableWidth();
     calculateTableContextHeight();
     calculateTableContentWidth();
+    calculateTableWidth();
     setOffsetByAffix();
+
     bindElementResize(tableRef.current, debounce(calculateTableWidth, 400));
   });
 
   useUpdateLayoutEffect(() => {
+    calculateTableWidth();
     calculateTableContextHeight();
     calculateTableContentWidth();
   }, [