Merge pull request #16 from gisce/fix-conditional-render-hook

Fix conditional rendering hook issue
gisce · Sep 10, 2023 · 2d93ed7 · 2d93ed7
2 parents bf9bede + 4b2686a
commit 2d93ed7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-formiga-table",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "scripts": {
     "build": "tsc && vite build",
     "prepublishOnly": "npm run build",

diff --git a/src/Table.tsx b/src/Table.tsx
@@ -27,20 +27,19 @@ export const Table = (props: TableProps) => {
     selectionRowKeys: selectionRowKeysProps,
   } = props;
 
-  if (loading) {
-    return loadingComponent;
-  }
-
   const {
     selectedRowKeys,
     toggleAllRowsSelected,
     isRowSelected,
     changeSelected,
   } = useSelectable({
-    selectionRowKeysProps
+    selectionRowKeysProps,
   });
-
-  const onChange = useShiftSelected(dataSource.map(el => el.id), changeSelected);
+
+  const onChange = useShiftSelected(
+    dataSource.map((el) => el.id),
+    changeSelected
+  );
   const { localSorter, getColumnSorter, handleColumnClick } =
     useSortable(sorter);
 
@@ -80,8 +79,16 @@ export const Table = (props: TableProps) => {
     toggleAllRowsSelected(getAllVisibleKeys());
   }, [toggleAllRowsSelected, getAllVisibleKeys]);
 
+  if (loading) {
+    return loadingComponent;
+  }
+
   return (
-    <Container height={height} canClick={onRowDoubleClick !== undefined} readonly={readonly}>
+    <Container
+      height={height}
+      canClick={onRowDoubleClick !== undefined}
+      readonly={readonly}
+    >
       <table>
         <thead>
           <tr>