@livequery/react 1.0.109 → 1.0.111

package/build/hooks/useSyncMemo.js

@@ -1,14 +1,11 @@
-import { useEffect, useRef } from "react";
+import { useRef } from "react";
 export const useSyncMemo = (fn, deps) => {
-    const ref = useRef({ value: undefined, deps: [], n: 0 });
+    const ref = useRef({ value: undefined, deps: [], n: 0, cleaner: () => { } });
     const outdated = ref.current.n == 0 || deps.some((e, i) => e != ref.current.deps[i]);
-    const [value, cleaner] = outdated ? fn() : [
+    const [value, cleaner] = outdated ? (ref.current.cleaner(), fn()) : [
         ref.current.value,
         () => { }
     ];
-    ref.current = { deps, value, n: ref.current.n + 1 };
-    useEffect(() => {
-        return cleaner;
-    }, [ref.current.value]);
+    ref.current = { deps, value, n: ref.current.n + 1, cleaner };
     return value;
 };

package/build/useCollectionData.d.ts

@@ -5,11 +5,12 @@ export type useCollectionDataOptions<T extends LivequeryBaseEntity = LivequeryBa
     filters: Partial<QueryOption<T>>;
     load_all: boolean;
 };
+export type CollectionRef = string | undefined | '' | null | false;
 export type CollectionData<T extends LivequeryBaseEntity> = (CollectionStream<T> & Pick<CollectionObservable<T>, 'add' | 'fetch_more' | 'filter' | 'reload' | 'reset' | 'trigger' | 'update' | '$changes'> & {
     empty: boolean;
     loaded: boolean;
+    ref: CollectionRef;
 });
-export type CollectionRef = string | undefined | '' | null | false;
 export declare const useCollectionData: <T extends LivequeryBaseEntity>(ref: CollectionRef, collection_options?: Partial<useCollectionDataOptions<T>> & {
     vkl?: any;
 }) => CollectionData<T>;

package/build/useCollectionData.js

@@ -11,14 +11,7 @@ export const useCollectionData = (ref, collection_options = {}) => {
     const { transporter } = useLiveQueryContext();
     const n = useRef(0);
     const lazy = collection_options.lazy;
-    const [stream, set_stream] = useState({
-        filters: {},
-        has_more: false,
-        items: [],
-        loaded: false,
-        n: 0,
-        loading: lazy ? false : !!ref
-    });
+    const [version, set_version] = useState(0);
     const client = useSyncMemo(() => {
         const client = new CollectionObservable(ref, { transporter, ...collection_options });
         n.current = 0;
@@ -28,7 +21,7 @@ export const useCollectionData = (ref, collection_options = {}) => {
             }
             else {
                 n.current++;
-                set_stream({ ...data, loaded: true, n: n.current });
+                set_version(Math.random());
             }
         });
         if (!lazy) {
@@ -36,11 +29,11 @@ export const useCollectionData = (ref, collection_options = {}) => {
         }
         return [client, () => subscription.unsubscribe()];
     }, [ref]);
-    const empty = !client.value.loading && client.value.items.length == 0 && stream.loaded;
+    const loaded = n.current > 0;
+    const empty = loaded && !client.value.loading && client.value.items.length == 0;
     const result = {
-        ...stream,
-        error: stream.error,
-        loading: !!stream.loading || (!collection_options?.lazy && !!ref && n.current == 0),
+        ...client.value,
+        loaded,
         empty,
         add: assert(client?.add, client),
         fetch_more: assert(client?.fetch_more, client),
@@ -50,6 +43,7 @@ export const useCollectionData = (ref, collection_options = {}) => {
         trigger: assert(client?.trigger, client),
         update: assert(client?.update, client),
         $changes: client?.$changes || new Subject(),
+        ref
     };
     return result;
 };

package/package.json

@@ -4,7 +4,7 @@
         "url": "https://github.com/livequery/react"
     },
     "type": "module",
-    "version": "1.0.109",
+    "version": "1.0.111",
     "description": "",
     "main": "build/index.js",
     "types": "build/index.d.ts",