fix(react/createConsumer): Use WeakMap (instead of object) to store consumers

m.berezin · m.berezin · commit 5959e2731d24 · 2018-06-27T13:44:08.000+03:00
diff --git a/src/react/createConsumer/createConsumer.spec.tsx b/src/react/createConsumer/createConsumer.spec.tsx
@@ -19,9 +19,9 @@ describe('createContext', () => {
 
   const wait = (n: number) => new Promise((resolve) => setTimeout(resolve, n))
 
-  const getApp = () =>
+  const getApp = (appName = 'test' + uniqueId()) =>
     createApp({
-      name: 'test' + uniqueId(),
+      name: appName,
       modules: [
         {
           name: 'test',
@@ -252,4 +252,21 @@ describe('createContext', () => {
     expect(Consumer1).not.toBe(Consumer2)
     expect(Consumer1).not.toBe(Consumer4)
   })
+
+  it('should create different components for applications with same name', () => {
+    const app1 = getApp('test')
+    const app2 = getApp('test')
+    const app3 = getApp('test')
+
+    const Consumer1 = createConsumer(app1)
+    const Consumer2 = createConsumer(app2)
+    const Consumer3 = createConsumer(app1)
+    const Consumer4 = createConsumer(app3)
+    const Consumer5 = createConsumer(app1)
+
+    expect(Consumer1).toBe(Consumer3)
+    expect(Consumer1).toBe(Consumer5)
+    expect(Consumer1).not.toBe(Consumer2)
+    expect(Consumer1).not.toBe(Consumer4)
+  })
 })
diff --git a/src/react/createConsumer/createConsumer.ts b/src/react/createConsumer/createConsumer.ts
@@ -22,7 +22,11 @@ import { ConsumerProps } from './createConsumer.h'
 /**
  * @private
  */
-const consumers: { [K: string]: ComponentClass<ConsumerProps<any, any, any, any, any>> } = {}
+
+const consumers = new WeakMap<
+  Stapp<any, any>,
+  ComponentClass<ConsumerProps<any, any, any, any, any>>
+>()
 
 /**
  * @private
@@ -41,13 +45,11 @@ const consumerPropTypes = {
 export const createConsumer = <State, Api>(
   app: Stapp<State, Api>
 ): ComponentClass<ConsumerProps<State, Api, any, any, any>> => {
-  if (consumers[app.name]) {
-    return consumers[app.name]
+  if (consumers.has(app)) {
+    return consumers.get(app) as ComponentClass<ConsumerProps<any, any, any, any, any>>
   }
 
-  return (consumers[app.name] = class Consumer extends Component<
-    ConsumerProps<State, Api, any, any, any>
-  > {
+  const consumer = class Consumer extends Component<ConsumerProps<State, Api, any, any, any>> {
     static propTypes = consumerPropTypes
 
     subscription!: Subscription
@@ -112,5 +114,9 @@ export const createConsumer = <State, Api>(
         'Consumer'
       )
     }
-  })
+  }
+
+  consumers.set(app, consumer)
+
+  return consumer
 }
