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
35 changes: 21 additions & 14 deletions packages/store/src/create-store-context/create-store-context.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,31 +32,37 @@ export function createStoreContext<TCreator extends StoreApi<any, any> | AnyFn>(

const Context = React.createContext<StoreInstance | null>(null);

const Provider = (
props: {
children: React.ReactNode;
} & StoreParams
) => {
const { children, ...restProps } = props;
const storeInstance = React.useRef<StoreInstance>(
createInstance(restProps as StoreParams)
const useProvideStore = (props: StoreParams) => {
const storeInstanceRef = React.useRef<StoreInstance>(
createInstance(props)
);

React.useEffect(() => {
const instance = storeInstance.current;
const instance = storeInstanceRef.current;
if (!instance) return;

const effectMethods = createEffectMethods(instance as any);

effectMethods.subscribeToEffects();

return () => {
effectMethods.unsubscribeFromEffects();
};
}, []);

return storeInstanceRef.current;
};

const Provider = (
props: {
children: React.ReactNode;
} & StoreParams
) => {
const { children, ...restProps } = props;
const storeInstance = useProvideStore(restProps as StoreParams);

return (
<Context.Provider value={storeInstance.current as StoreInstance}>
<Context.Provider value={storeInstance}>
{children}
</Context.Provider>
);
Expand Down Expand Up @@ -91,6 +97,7 @@ export function createStoreContext<TCreator extends StoreApi<any, any> | AnyFn>(

return {
Provider,
useProvideStore,
useStore,
withProvider,
Context,
Expand Down