Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions src/useRXQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ export const useRXQuery = <DATA>(
const [data, setData] = useState(
getInitQueryResponse<DATA | undefined>(initialState),
);
const [isInitValue, setIsInitValue] = useState(true);
const subscriberRef = useRef<Subscription>();
const queryHandler = useCallback(
(
query: (
Expand All @@ -40,34 +38,22 @@ export const useRXQuery = <DATA>(

const observable$ = query(configs);
subscriberRef.current = observable$.subscribe((subscribedData) => {
if (isInitValue) {
setIsInitValue(false);
}
setData(subscribedData);
});
},
[!!query],
);
const subscriberRef = useRef<Subscription>();

function usnsubscribe() {
subscriberRef.current?.unsubscribe();
}

// Handle query method
useEffect(() => {
if (!query) return usnsubscribe;
queryHandler(query);

if (isInitValue) return usnsubscribe;

return usnsubscribe;
}, [!!query]);

// Handle recal query
useEffect(() => {
if (!keysToRecallQuery || !query) return;
queryHandler(query);
}, [JSON.stringify(keysToRecallQuery)]);
}, [JSON.stringify(keysToRecallQuery), !!query]);

return data;
};