Skip to content
Merged
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
9 changes: 8 additions & 1 deletion lib/src/useContextSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import {
createContext as createContextOrig,
useCallback,
useContext as useContextOrig,
useDebugValue,
useEffect,
Expand Down Expand Up @@ -62,9 +63,15 @@ export function useContextSelector<T, X>(
selector: (value: T) => X,
) {
const store = useContextOrig(context as React.Context<Store<T>>);
const selectorRef = useRef(selector);
selectorRef.current = selector;
const getSnapshot = useCallback(
() => selectorRef.current(store?.value),
[store],
);
const selected = useSyncExternalStore(
store?.subscribe ?? dummySubscribe,
() => selector(store?.value),
getSnapshot,
);
useDebugValue("react-arven");
return selected;
Expand Down
Loading