WIP throw from render passing

Author: markerikson

src/hooks/useSelector.ts

@@ -10,6 +10,7 @@ import type { uSESWS } from '../utils/useSyncExternalStore'
 import { notInitialized } from '../utils/useSyncExternalStore'
 import { useIsomorphicLayoutEffect } from '../utils/useIsomorphicLayoutEffect'
 import { createCache } from '../utils/autotracking/autotracking'
+import { CacheWrapper } from '../utils/Subscription'
 
 export type CheckFrequency = 'never' | 'once' | 'always'
 
@@ -150,10 +151,17 @@ export function createSelectorHook(context = ReactReduxContext): UseSelector {
     const cache = useMemo(() => {
       const cache = createCache(() => {
         console.log('Wrapper cache called: ', store.getState())
-        return latestWrappedSelectorRef.current(trackingNode.proxy as TState)
+        //return latestWrappedSelectorRef.current(trackingNode.proxy as TState)
+        return wrappedSelector(trackingNode.proxy as TState)
       })
       return cache
-    }, [trackingNode])
+    }, [trackingNode, wrappedSelector])
+
+    const cacheWrapper = useRef({ cache } as CacheWrapper)
+
+    useIsomorphicLayoutEffect(() => {
+      cacheWrapper.current.cache = cache
+    })
 
     const subscribeToStore = useMemo(() => {
       const subscribeToStore = (onStoreChange: () => void) => {
@@ -164,7 +172,7 @@ export function createSelectorHook(context = ReactReduxContext): UseSelector {
         // console.log('Subscribing to store with tracking')
         return subscription.addNestedSub(wrappedOnStoreChange, {
           trigger: 'tracked',
-          cache,
+          cache: cacheWrapper.current,
         })
       }
       return subscribeToStore

src/utils/Subscription.ts

@@ -15,13 +15,16 @@ import { updateNode } from './autotracking/proxy'
 
 type VoidFunc = () => void
 
+export interface CacheWrapper {
+  cache: TrackingCache
+}
+
 type Listener = {
   callback: VoidFunc
   next: Listener | null
   prev: Listener | null
   trigger: 'always' | 'tracked'
-  selectorCache?: TrackingCache
-  subscriberCache?: TrackingCache
+  selectorCache?: CacheWrapper
 }
 
 function createListenerCollection() {
@@ -42,7 +45,7 @@ function createListenerCollection() {
         while (listener) {
           //console.log('Listener: ', listener)
           if (listener.trigger == 'tracked') {
-            if (listener.selectorCache!.needsRecalculation()) {
+            if (listener.selectorCache!.cache.needsRecalculation()) {
               console.log('Calling subscriber due to recalc need')
               // console.log(
               //   'Calling subscriber due to recalc. Revision before: ',
@@ -128,7 +131,7 @@ type ListenerCollection = ReturnType<typeof createListenerCollection>
 
 interface AddNestedSubOptions {
   trigger: 'always' | 'tracked'
-  cache?: TrackingCache
+  cache?: CacheWrapper
 }
 
 export interface Subscription {

test/hooks/useSelector.spec.tsx

@@ -600,8 +600,8 @@ describe('React', () => {
           expect(() => {
             rtl.act(() => {
               console.log('Dispatching update')
-              //normalStore.dispatch({ type: '' })
-              forceParentRender()
+              normalStore.dispatch({ type: '' })
+              //forceParentRender()
             })
           }).toThrowError()