@livequery/react 1.0.97 → 1.0.100

package/build/useCollectionData.js

@@ -1,53 +1,37 @@
 "use client";
-import { useEffect, useMemo } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useLiveQueryContext } from "./LiveQueryContext.js";
-import { useObservable } from "./useObservable.js";
 import { CollectionObservable } from "@livequery/client";
 import { Subject } from 'rxjs';
 function assert(fn, thiss) {
     return (fn || (() => { })).bind(thiss);
 }
 export const useCollectionData = (ref, collection_options = {}) => {
-    if (typeof window == 'undefined') {
-        return {
-            $changes: new Subject(),
-            add: (() => { }),
-            empty: false,
-            filter: (() => { }),
-            fetch_more: (() => { }),
-            filters: {},
-            has_more: false,
-            items: [],
-            reload: (() => { }),
-            reset: (() => { }),
-            trigger: (() => { }),
-            update: (() => { }),
-            loading: false
-        };
-    }
     const { transporter } = useLiveQueryContext();
-    const client = useMemo(() => new CollectionObservable(ref, { transporter, ...collection_options }), [ref]);
-    const stream = useObservable(client, {
+    const [stream, ss] = useState({
         filters: {},
         items: [],
         has_more: false,
         loading: collection_options.lazy ? false : true,
         error: undefined
     });
-    const { loading, has_more, items, error } = stream;
+    const collection_ref = useRef();
     useEffect(() => {
-        try {
-            ref && !collection_options?.lazy && client?.fetch_more();
-        }
-        catch (e) {
-        }
+        if (!ref || typeof window == 'undefined')
+            return;
+        const collection = collection_ref.current = new CollectionObservable(ref, { transporter, ...collection_options });
+        const subscription = collection.subscribe(data => {
+            collection_options.load_all && data.loading == false && data.has_more && collection?.fetch_more();
+            ss(data);
+        });
+        !collection_options?.lazy && collection?.fetch_more();
+        return () => subscription.unsubscribe();
     }, [ref]);
-    useEffect(() => {
-        collection_options.load_all && !loading && has_more && items.length > 0 && client?.fetch_more();
-    }, [loading]);
-    const empty = !!(ref && !error && items.length == 0 && !loading);
+    const client = collection_ref.current;
+    const empty = !!(stream.loading && stream.items.length == 0);
     const result = {
         ...stream,
+        error: stream.error,
         loading: !!stream.loading,
         empty,
         add: assert(client?.add, client),
@@ -57,7 +41,7 @@ export const useCollectionData = (ref, collection_options = {}) => {
         reset: assert(client?.reset, client),
         trigger: assert(client?.trigger, client),
         update: assert(client?.update, client),
-        $changes: client?.$changes
+        $changes: client?.$changes || new Subject()
     };
     return result;
 };

package/package.json

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

package/build/useObservable.d.ts

@@ -1,2 +0,0 @@
-import { Observable } from 'rxjs';
-export declare const useObservable: <T>(o: Observable<T> | null, default_value: T) => T;

package/build/useObservable.js

@@ -1,17 +0,0 @@
-"use client";
-import { useEffect, useState } from 'react';
-export const useObservable = (o, default_value) => {
-    const [s, ss] = useState();
-    useEffect(() => {
-        if (o) {
-            const subcription = o.subscribe(d => ss({ ...d }));
-            return () => {
-                subcription.unsubscribe();
-            };
-        }
-        else {
-            ss(undefined);
-        }
-    }, [o]);
-    return s || default_value;
-};