map context instances using createContext as key

Author: phryneas

src/components/Context.ts

@@ -1,4 +1,4 @@
-import { createContext, version as ReactVersion } from 'react'
+import { createContext } from 'react'
 import type { Context } from 'react'
 import type { Action, AnyAction, Store } from 'redux'
 import type { Subscription } from '../utils/Subscription'
@@ -15,17 +15,20 @@ export interface ReactReduxContextValue<
   noopCheck: CheckFrequency
 }
 
-const ContextKey = Symbol.for(`react-redux-context-${ReactVersion}`)
-const gT = globalThis as { [ContextKey]?: Context<ReactReduxContextValue> }
+const ContextKey = Symbol.for(`react-redux-context`)
+const gT = globalThis as {
+  [ContextKey]?: Map<typeof createContext, Context<ReactReduxContextValue>>
+}
 
 function getContext() {
-  let realContext = gT[ContextKey]
+  const contextMap = (gT[ContextKey] ??= new Map())
+  let realContext = contextMap.get(createContext)
   if (!realContext) {
     realContext = createContext<ReactReduxContextValue>(null as any)
     if (process.env.NODE_ENV !== 'production') {
       realContext.displayName = 'ReactRedux'
     }
-    gT[ContextKey] = realContext
+    contextMap.set(createContext, realContext)
   }
   return realContext
 }