fix: remove subscription provider

Author: load28

packages/react/src/context.ts

@@ -3,12 +3,7 @@ import { createContext } from "react";
 
 export const createContextQuery = <TState extends TStateImpl>() => {
   const StoreContext = createContext<ContextQueryStore<TState> | null>(null);
-  const ContextQuerySubscriptionContext = createContext<{
-    subscribe: ContextQueryStore<TState>["subscribe"] | null;
-  } | null>(null);
-
   return {
     StoreContext,
-    ContextQuerySubscriptionContext,
   };
 };

packages/react/src/hooks.ts

@@ -5,25 +5,18 @@ import { createContextQuery } from "./context";
 export function createUseContextQuery<TState extends TStateImpl>(
   contexts: ReturnType<typeof createContextQuery<TState>>
 ) {
-  const { StoreContext, ContextQuerySubscriptionContext } = contexts;
+  const { StoreContext } = contexts;
 
   const useLocalContexts = () => {
     const store = useContext(StoreContext);
-    const subscription = useContext(ContextQuerySubscriptionContext);
 
     if (!store) {
       throw new Error(
         "useContextQuery must be used within a ContextQueryProvider"
       );
     }
 
-    if (!subscription || !subscription.subscribe) {
-      throw new Error(
-        "ContextQuerySubscriptionContext not properly initialized"
-      );
-    }
-
-    return { store, subscription };
+    return { store };
   };
 
   const useContextBatchQuery = () => {
@@ -49,7 +42,7 @@ export function createUseContextQuery<TState extends TStateImpl>(
     TState[TKey],
     (value: TState[TKey] | ((prev: TState[TKey]) => TState[TKey])) => boolean,
   ] => {
-    const { store, subscription } = useLocalContexts();
+    const { store } = useLocalContexts();
     const [state, setLocalState] = useState<TState[TKey]>(() =>
       store.getStateByKey(key)
     );
@@ -59,14 +52,12 @@ export function createUseContextQuery<TState extends TStateImpl>(
         setLocalState(newValue);
       };
 
-      if (!subscription.subscribe) return;
-
-      const sub = subscription.subscribe(key, handleChange);
+      const sub = store.subscribe(key, handleChange);
 
       return () => {
         sub.unsubscribe();
       };
-    }, [key, subscription.subscribe, store]);
+    }, [key, store]);
 
     const setState = useCallback(
       (value: TState[TKey] | ((prev: TState[TKey]) => TState[TKey])) => {

packages/react/src/provider.tsx

@@ -1,5 +1,5 @@
 import { ContextQueryStore, TStateImpl } from "@context-query/core";
-import { FC, PropsWithChildren, useEffect, useMemo, useRef } from "react";
+import { FC, PropsWithChildren, useEffect, useRef } from "react";
 import { createContextQuery } from "./context";
 
 export interface ProviderProps<TState extends TStateImpl>
@@ -10,7 +10,7 @@ export interface ProviderProps<TState extends TStateImpl>
 export const createContextQueryProvider = <TState extends TStateImpl>(
   contexts: ReturnType<typeof createContextQuery<TState>>
 ): FC<ProviderProps<TState>> => {
-  const { StoreContext, ContextQuerySubscriptionContext } = contexts;
+  const { StoreContext } = contexts;
 
   return function ContextQueryProvider({
     children,
@@ -34,22 +34,9 @@ export const createContextQueryProvider = <TState extends TStateImpl>(
       }
     }, [initialState]);
 
-    const contextQuerySubscriptionContextValue = useMemo(
-      () => ({
-        subscribe: storeRef.current
-          ? storeRef.current.subscribe.bind(storeRef.current)
-          : null,
-      }),
-      [storeRef.current]
-    );
-
     return (
       <StoreContext.Provider value={storeRef.current}>
-        <ContextQuerySubscriptionContext.Provider
-          value={contextQuerySubscriptionContextValue}
-        >
-          {children}
-        </ContextQuerySubscriptionContext.Provider>
+        {children}
       </StoreContext.Provider>
     );
   };