@firecms/core 3.0.0-canary.85 → 3.0.0-canary.86

package/dist/types/datasource.d.ts

@@ -175,6 +175,10 @@ export interface DataSourceDelegate {
      * Key that identifies this data source delegate
      */
     key: string;
+    /**
+     * If the data source has been initialised
+     */
+    initialised?: boolean;
     /**
      * Fetch data from a collection
      * @param path

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@firecms/core",
     "type": "module",
-    "version": "3.0.0-canary.85",
+    "version": "3.0.0-canary.86",
     "description": "Awesome Firebase/Firestore-based headless open-source CMS",
     "funding": {
         "url": "https://github.com/sponsors/firecmsco"
@@ -46,8 +46,8 @@
         "./package.json": "./package.json"
     },
     "dependencies": {
-        "@firecms/formex": "^3.0.0-canary.85",
-        "@firecms/ui": "^3.0.0-canary.85",
+        "@firecms/formex": "^3.0.0-canary.86",
+        "@firecms/ui": "^3.0.0-canary.86",
         "@fontsource/jetbrains-mono": "^5.0.20",
         "@hello-pangea/dnd": "^16.6.0",
         "@radix-ui/react-portal": "^1.1.1",
@@ -72,8 +72,8 @@
         "firebase": "^10.5.2",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "react-router": "^6.22.0",
-        "react-router-dom": "^6.22.0"
+        "react-router": "^6.25.1",
+        "react-router-dom": "^6.25.1"
     },
     "devDependencies": {
         "@jest/globals": "^29.7.0",
@@ -102,7 +102,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "e7ba408552dfc57dbbdb5a49ad7415f1f1381256",
+    "gitHead": "33cba1151b6e92dd0dd3b8ac36d428fed4f1f155",
     "publishConfig": {
         "access": "public"
     },

package/src/components/SelectableTable/SelectableTable.tsx

@@ -221,7 +221,6 @@ export const SelectableTable = React.memo<SelectableTableProps<any>>(
                         onEndReached={loadNextPage}
                         onResetPagination={resetPagination}
                         error={dataLoadingError}
-                        paginationEnabled={paginationEnabled}
                         onColumnResize={onColumnResize}
                         rowHeight={getRowHeight(size)}
                         loading={dataLoading}

package/src/components/VirtualTable/VirtualTable.tsx

@@ -91,6 +91,7 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
                                                              data,
                                                              onResetPagination,
                                                              onEndReached,
+                                                             endOffset = 600,
                                                              rowHeight = 54,
                                                              columns: columnsProp,
                                                              onRowClick,
@@ -110,7 +111,8 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
                                                              style,
                                                              className,
                                                              endAdornment,
-                                                             AddColumnComponent
+                                                             AddColumnComponent,
+                                                             debug
                                                          }: VirtualTableProps<T>) {
 
         const sortByProperty: string | undefined = sortBy ? sortBy[0] : undefined;
@@ -128,10 +130,14 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         const [measureRef, bounds] = useMeasure();
 
         const onColumnResizeInternal = useCallback((params: OnVirtualTableColumnResizeParams) => {
+            if (debug)
+                console.log("onColumnResizeInternal", params);
             setColumns(columns.map((column) => column.key === params.column.key ? params.column : column));
         }, [columns]);
 
         const onColumnResizeEndInternal = useCallback((params: OnVirtualTableColumnResizeParams) => {
+            if (debug)
+                console.log("onColumnResizeEndInternal", params);
             setColumns(columns.map((column) => column.key === params.column.key ? params.column : column));
             if (onColumnResize) {
                 onColumnResize(params);
@@ -142,10 +148,14 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
         const filterRef = useRef<VirtualTableFilterValues<any> | undefined>();
 
         useEffect(() => {
+            if (debug)
+                console.log("Filter updated", filterInput);
             filterRef.current = filterInput;
         }, [filterInput]);
 
         const scrollToTop = useCallback(() => {
+            if (debug)
+                console.log("scrollToTop");
             endReachCallbackThreshold.current = 0;
             if (tableRef.current) {
                 // scrollRef.current = [scrollRef.current[0], 0];
@@ -155,6 +165,9 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
 
         const onColumnSort = useCallback((key: string) => {
 
+            if (debug)
+                console.log("onColumnSort", key);
+
             const isDesc = sortByProperty === key && currentSort === "desc";
             const isAsc = sortByProperty === key && currentSort === "asc";
             const newSort = isAsc ? "desc" : (isDesc ? undefined : "asc");
@@ -181,21 +194,21 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
             scrollToTop();
         }, [checkFilterCombination, currentSort, onFilterUpdate, onResetPagination, onSortByUpdate, scrollToTop, sortByProperty]);
 
-        const resetSort = useCallback(() => {
-            endReachCallbackThreshold.current = 0;
-            if (onSortByUpdate)
-                onSortByUpdate(undefined);
-        }, [onSortByUpdate]);
-
         const maxScroll = Math.max((data?.length ?? 0) * rowHeight - bounds.height, 0);
+        if (debug)
+            console.log("maxScroll", maxScroll);
+
         const onEndReachedInternal = useCallback((scrollOffset: number) => {
-            if (onEndReached && (data?.length ?? 0) > 0 && scrollOffset > endReachCallbackThreshold.current + 600) {
+            if (debug)
+                console.log("onEndReachedInternal", scrollOffset, endReachCallbackThreshold.current + endOffset);
+            if (onEndReached && (data?.length ?? 0) > 0 && scrollOffset > endReachCallbackThreshold.current + endOffset) {
                 endReachCallbackThreshold.current = scrollOffset;
                 onEndReached();
             }
         }, [data?.length, onEndReached]);
 
         const onScroll = useCallback(({
+                                          scrollDirection,
                                           scrollOffset,
                                           scrollUpdateWasRequested
                                       }: {
@@ -203,11 +216,19 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
             scrollOffset: number,
             scrollUpdateWasRequested: boolean;
         }) => {
-            if (!scrollUpdateWasRequested && (scrollOffset >= maxScroll - 600))
+            if(debug)
+                console.log("onScroll", {
+                    scrollDirection,
+                    scrollOffset,
+                    scrollUpdateWasRequested
+                });
+            if (!scrollUpdateWasRequested && (scrollOffset >= maxScroll - endOffset))
                 onEndReachedInternal(scrollOffset);
         }, [maxScroll, onEndReachedInternal]);
 
         const onFilterUpdateInternal = useCallback((column: VirtualTableColumn, filterForProperty?: [VirtualTableWhereFilterOp, any]) => {
+            if(debug)
+                console.log("onFilterUpdateInternal", column, filterForProperty);
 
             endReachCallbackThreshold.current = 0;
             const filter = filterRef.current;
@@ -272,6 +293,9 @@ export const VirtualTable = React.memo<VirtualTableProps<any>>(
             AddColumnComponent
         };
 
+        if(debug)
+            console.log("VirtualTable render", virtualListController);
+
         // useTraceUpdate(virtualListController);
         return (
             <div

package/src/components/VirtualTable/VirtualTableProps.tsx

@@ -31,11 +31,6 @@ export interface VirtualTableProps<T extends Record<string, any>> {
      */
     cellRenderer: React.ComponentType<CellRendererParams<T>>;
 
-    /**
-     * If enabled, content is loaded in batch
-     */
-    paginationEnabled?: boolean;
-
     /**
      * Set this callback if you want to support some combinations
      * of filter combinations only.
@@ -50,6 +45,11 @@ export interface VirtualTableProps<T extends Record<string, any>> {
      */
     onEndReached?: () => void;
 
+    /**
+     * Offset in pixels where the onEndReached callback is triggered
+     */
+    endOffset?: number;
+
     /**
      * When the pagination should be reset. E.g. the filters or sorting
      * has been reset.
@@ -147,9 +147,14 @@ export interface VirtualTableProps<T extends Record<string, any>> {
      */
     AddColumnComponent?: React.ComponentType;
 
+    /**
+     * Debug mode
+     */
+    debug?: boolean;
+
 }
 
-export type CellRendererParams<T extends any = any> = {
+export type CellRendererParams<T = any> = {
     column: VirtualTableColumn;
     columns: VirtualTableColumn[];
     columnIndex: number;
@@ -163,7 +168,7 @@ export type CellRendererParams<T extends any = any> = {
  * @see Table
  * @group Components
  */
-export interface VirtualTableColumn<CustomProps extends any = any> {
+export interface VirtualTableColumn<CustomProps = any> {
 
     /**
      * Data key for the cell value, could be "a.b.c"
@@ -237,7 +242,6 @@ export type OnVirtualTableColumnResizeParams = {
     column: VirtualTableColumn
 };
 
-
 /**
  * @see Table
  * @group Components

package/src/types/datasource.ts

@@ -259,6 +259,11 @@ export interface DataSourceDelegate {
      */
     key: string;
 
+    /**
+     * If the data source has been initialised
+     */
+    initialised?: boolean;
+
     /**
      * Fetch data from a collection
      * @param path