Merge pull request #12 from TechniqueSoftware/allow_multiple_instances_with_different_component_maps

Moving _componentMap property inside the ReactJsonSchema class

Author: Nick Laffey

dist/react-json-schema.js

@@ -12,7 +12,7 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var _componentMap = null;
+var _componentMap = new WeakMap();
 
 var ReactJsonSchema = function () {
   function ReactJsonSchema() {
@@ -34,7 +34,7 @@ var ReactJsonSchema = function () {
   }, {
     key: 'parseSubSchemas',
     value: function parseSubSchemas() {
-      var subSchemas = arguments.length <= 0 || arguments[0] === undefined ? [] : arguments[0];
+      var subSchemas = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
 
       var Components = [];
       var index = 0;
@@ -70,11 +70,10 @@ var ReactJsonSchema = function () {
   }, {
     key: 'createComponent',
     value: function createComponent(schema) {
-      var component = schema.component;
-      var children = schema.children;
-      var text = schema.text;
-
-      var rest = _objectWithoutProperties(schema, ['component', 'children', 'text']);
+      var component = schema.component,
+          children = schema.children,
+          text = schema.text,
+          rest = _objectWithoutProperties(schema, ['component', 'children', 'text']);
 
       var Component = this.resolveComponent(schema);
       var Children = typeof text !== 'undefined' ? text : this.resolveComponentChildren(schema);
@@ -83,6 +82,7 @@ var ReactJsonSchema = function () {
   }, {
     key: 'resolveComponent',
     value: function resolveComponent(schema) {
+      var _componentMap = this.getComponentMap();
       var Component = null;
       if (schema.hasOwnProperty('component')) {
         if (schema.component === Object(schema.component)) {
@@ -105,12 +105,12 @@ var ReactJsonSchema = function () {
   }, {
     key: 'getComponentMap',
     value: function getComponentMap() {
-      return _componentMap;
+      return _componentMap.get(this);
     }
   }, {
     key: 'setComponentMap',
     value: function setComponentMap(componentMap) {
-      _componentMap = componentMap;
+      _componentMap.set(this, componentMap);
     }
   }]);
 

dist/react-json-schema.min.js

@@ -1,6 +1,6 @@
 import { DOM, createElement } from 'react';
 
-let _componentMap = null;
+const _componentMap = new WeakMap();
 
 export default class ReactJsonSchema {
 
@@ -27,19 +27,20 @@ export default class ReactJsonSchema {
   }
 
   createComponent(schema) {
-    const { component, children, text, ...rest} = schema;
+    const { component, children, text, ...rest } = schema;
     const Component = this.resolveComponent(schema);
     const Children = typeof text !== 'undefined' ? text : this.resolveComponentChildren(schema);
     return createElement(Component, rest, Children);
   }
 
   resolveComponent(schema) {
+    const componentMap = this.getComponentMap();
     let Component = null;
     if (schema.hasOwnProperty('component')) {
       if (schema.component === Object(schema.component)) {
         Component = schema.component;
-      } else if (_componentMap && _componentMap[schema.component]) {
-        Component = _componentMap[schema.component];
+      } else if (componentMap && componentMap[schema.component]) {
+        Component = componentMap[schema.component];
       } else if (DOM.hasOwnProperty(schema.component)) {
         Component = schema.component;
       }
@@ -55,10 +56,10 @@ export default class ReactJsonSchema {
   }
 
   getComponentMap() {
-    return _componentMap;
+    return _componentMap.get(this);
   }
 
   setComponentMap(componentMap) {
-    _componentMap = componentMap;
+    _componentMap.set(this, componentMap);
   }
 }

lib/ReactJsonSchema.js

@@ -131,4 +131,16 @@ export default describe('ReactJsonSchema', () => {
       expect(!!actual.length).toBe(true);
     });
   });
+  describe('when multiple instances of ReactJsonSchema are created with different componentMaps', () => {
+    it('getComponentMap() should return the appropriate value for each instance', () => {
+      const reactJsonSchema1 = new ReactJsonSchema();
+      const componentMap1 = { component1: Tester };
+      reactJsonSchema1.setComponentMap(componentMap1);
+      const reactJsonSchema2 = new ReactJsonSchema();
+      const componentMap2 = { component2: Tester };
+      reactJsonSchema2.setComponentMap(componentMap2);
+      expect(reactJsonSchema1.getComponentMap()).toEqual(componentMap1);
+      expect(reactJsonSchema2.getComponentMap()).toEqual(componentMap2);
+    });
+  });
 });