@raystack/apsara 0.20.3 → 0.20.4

package/dist/index.cjs

@@ -32249,7 +32249,7 @@ function DataTableRoot({ columns, data, emptyState, children, parentStyle, isLoa
         }, { threshold: 0.1 });
         observerRef.current = observer;
         return () => observer.disconnect();
-    }, [onLoadMore]);
+    }, [onLoadMore, isLoading]);
     React.useEffect(() => {
         const observer = observerRef.current;
         const lastRow = lastRowRef.current;
@@ -32264,19 +32264,26 @@ function DataTableRoot({ columns, data, emptyState, children, parentStyle, isLoa
         };
     }, [isLoading]);
     const getLoader = (loaderRow, columns) => ([...new Array(loaderRow)].map((_, rowIndex) => (jsxRuntimeExports.jsx(Table.Row, { children: columns.map((_, colIndex) => (jsxRuntimeExports.jsx(Table.Cell, { children: jsxRuntimeExports.jsx(Skeleton, { containerClassName: styles$4.flex1, highlightColor: "var(--background-base)", baseColor: "var(--background-base-hover)" }) }, `col_${colIndex}`))) }, `row_${rowIndex}`))));
+    const tableData = onLoadMore ? data : (isLoading
+        ? [...new Array(loaderRow)].map((_, i) => ({ id: i }))
+        : data);
     const { filteredColumns, addFilterColumn, removeFilterColumn, resetColumns } = useTableColumn();
     const columnWithCustomFilter = React.useMemo(() => columns.map((col) => {
         const colId = col.id || col?.accessorKey;
         const filterFn = colId && tableCustomFilter.hasOwnProperty(colId)
             ? tableCustomFilter[colId]
             : undefined;
-        const { cell } = col;
+        const cell = onLoadMore
+            ? col.cell
+            : (isLoading
+                ? () => (jsxRuntimeExports.jsx(Skeleton, { containerClassName: styles$4.flex1, highlightColor: "var(--background-base)", baseColor: "var(--background-base-hover)" }))
+                : col.cell);
         return {
             ...col,
             cell,
             filterFn,
         };
-    }), [isLoading, columns, tableCustomFilter]);
+    }), [isLoading, columns, tableCustomFilter, onLoadMore]);
     React.useEffect(() => {
         if (onStateChange) {
             onStateChange(tableState);
@@ -32286,7 +32293,7 @@ function DataTableRoot({ columns, data, emptyState, children, parentStyle, isLoa
         setTableCustomFilter((old) => ({ ...old, [id]: filterFn }));
     };
     const table = useReactTable({
-        data,
+        data: tableData,
         columns: columnWithCustomFilter,
         globalFilterFn: "auto",
         enableRowSelection: true,
@@ -32336,12 +32343,12 @@ function DataTableRoot({ columns, data, emptyState, children, parentStyle, isLoa
                                                     }) }, headerGroup.id)))
                                                 : null }), jsxRuntimeExports.jsxs(Table.Body, { children: [table.getRowModel().rows?.length ? (table.getRowModel().rows.map((row, rowIndex) => (jsxRuntimeExports.jsx(Table.Row, { "data-state": row.getIsSelected() && "selected", onClick: () => onRowClick?.(row.original), className: isLoading
                                                         ? ""
-                                                        : `${styles$4.tRow} ${onRowClick ? styles$4.tRowClick : ""}`, ref: rowIndex === table.getRowModel().rows.length - 1
+                                                        : `${styles$4.tRow} ${onRowClick ? styles$4.tRowClick : ""}`, ref: onLoadMore && rowIndex === table.getRowModel().rows.length - 1
                                                         ? lastRowRef
                                                         : null, children: row.getVisibleCells().map((cell, index) => (jsxRuntimeExports.jsx(Table.Cell, { style: {
                                                             ...(cell.column.columnDef?.meta?.style ?? {}),
                                                         }, children: flexRender(cell.column.columnDef.cell, cell.getContext()) }, `${cell.id}_${index}`))) }, row.id)))) : (!isLoading ?
-                                                    jsxRuntimeExports.jsx(Table.Row, { children: jsxRuntimeExports.jsx(Table.Cell, { colSpan: columns.length, children: emptyState || "No results." }) }) : jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, {})), isLoading && getLoader(loaderRow, columns)] })] }), detail] })] }), footer] }) }));
+                                                    jsxRuntimeExports.jsx(Table.Row, { children: jsxRuntimeExports.jsx(Table.Cell, { colSpan: columns.length, children: emptyState || "No results." }) }) : jsxRuntimeExports.jsx(jsxRuntimeExports.Fragment, {})), isLoading && onLoadMore && getLoader(loaderRow, columns)] })] }), detail] })] }), footer] }) }));
 }
 const DataTable = Object.assign(DataTableRoot, {
     Toolbar: DataTableToolbar,