applesauce-react 0.0.0-next-20250212160639 → 0.0.0-next-20250213173056

package/dist/hooks/use-observable.d.ts

@@ -1,6 +1,4 @@
 import { type BehaviorSubject, type Observable } from "rxjs";
-export declare function getCurrentValue<T extends unknown>(observable: BehaviorSubject<T>): T;
-export declare function getCurrentValue<T extends unknown>(observable: Observable<T>): T | undefined;
 /** Subscribe to the value of an observable */
 export declare function useObservable<T extends unknown>(observable?: BehaviorSubject<T>): T;
 export declare function useObservable<T extends unknown>(observable?: Observable<T>): T | undefined;

package/dist/hooks/use-observable.js

@@ -1,21 +1,5 @@
-import { useState, useEffect } from "react";
-export function getCurrentValue(observable) {
-    if (Reflect.has(observable, "value"))
-        return Reflect.get(observable, "value");
-    return undefined;
-}
+import { useObservableState } from "observable-hooks";
+import { EMPTY } from "rxjs";
 export function useObservable(observable) {
-    const current = observable && getCurrentValue(observable);
-    const [_count, setCount] = useState(0);
-    const [value, setValue] = useState(current);
-    useEffect(() => {
-        // Reset the state, the method passed to subscribe will NOT always be called
-        setValue(observable && getCurrentValue(observable));
-        const sub = observable?.subscribe((v) => {
-            setValue(v);
-            setCount((c) => c + 1);
-        });
-        return () => sub?.unsubscribe();
-    }, [observable, setValue, setCount]);
-    return current || value;
+    return useObservableState(observable ?? EMPTY);
 }

package/dist/hooks/use-store-query.js

@@ -1,4 +1,5 @@
 import { useMemo } from "react";
+import { EMPTY } from "rxjs";
 import { useObservable } from "./use-observable.js";
 import { useQueryStore } from "./use-query-store.js";
 /**
@@ -12,7 +13,7 @@ export function useStoreQuery(queryConstructor, args) {
         if (args)
             return store.createQuery(queryConstructor, ...args);
         else
-            return undefined;
+            return EMPTY;
     }, [args, store]);
     return useObservable(observable);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-react",
-  "version": "0.0.0-next-20250212160639",
+  "version": "0.0.0-next-20250213173056",
   "description": "React hooks for applesauce",
   "type": "module",
   "main": "dist/index.js",
@@ -48,11 +48,12 @@
     }
   },
   "dependencies": {
-    "applesauce-accounts": "0.0.0-next-20250212160639",
-    "applesauce-content": "0.0.0-next-20250212160639",
-    "applesauce-core": "0.0.0-next-20250212160639",
-    "applesauce-factory": "0.0.0-next-20250212160639",
+    "applesauce-accounts": "0.0.0-next-20250213173056",
+    "applesauce-content": "0.0.0-next-20250213173056",
+    "applesauce-core": "0.0.0-next-20250213173056",
+    "applesauce-factory": "0.0.0-next-20250213173056",
     "nostr-tools": "^2.10.4",
+    "observable-hooks": "^4.2.4",
     "react": "^18.3.1",
     "rxjs": "^7.8.1"
   },