Merge pull request #30 from remarkablemark/bug-react

Fix bug due to DOMPropertyConfigs being moved to `react-dom` in v15.4
remarkablemark · Nov 17, 2016 · d99cf97 · d99cf97
2 parents cc9c53e + 3537bbd
commit d99cf97
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/lib/DOMPropertyConfig.js b/lib/DOMPropertyConfig.js
@@ -0,0 +1,25 @@
+'use strict';
+
+/**
+ * Module dependencies.
+ */
+var HTMLDOMPropertyConfig;
+var SVGDOMPropertyConfig;
+
+// HTML and SVG DOM Property Config
+// moved to `react-dom` in v15.4.x
+try {
+    HTMLDOMPropertyConfig = require('react-dom/lib/HTMLDOMPropertyConfig');
+    SVGDOMPropertyConfig = require('react-dom/lib/SVGDOMPropertyConfig');
+} catch (error) {
+    HTMLDOMPropertyConfig = require('react/lib/HTMLDOMPropertyConfig');
+    SVGDOMPropertyConfig = require('react/lib/SVGDOMPropertyConfig');
+}
+
+/**
+ * Export config.
+ */
+module.exports = {
+    HTMLDOMPropertyConfig: HTMLDOMPropertyConfig,
+    SVGDOMPropertyConfig: SVGDOMPropertyConfig
+};
diff --git a/lib/attributes-to-props.js b/lib/attributes-to-props.js
@@ -3,7 +3,7 @@
 /**
  * Module dependencies.
  */
-var HTMLDOMPropertyConfig = require('react/lib/HTMLDOMPropertyConfig');
+var HTMLDOMPropertyConfig = require('./DOMPropertyConfig').HTMLDOMPropertyConfig;
 var utilities = require('./utilities');
 var propertyConfig = require('./property-config');
 

diff --git a/lib/property-config.js b/lib/property-config.js
@@ -4,8 +4,9 @@
  * Module dependencies.
  */
 var utilities = require('./utilities');
-var HTMLDOMPropertyConfig = require('react/lib/HTMLDOMPropertyConfig');
-var SVGDOMPropertyConfig = require('react/lib/SVGDOMPropertyConfig');
+var DOMPropertyConfig = require('./DOMPropertyConfig');
+var HTMLDOMPropertyConfig = DOMPropertyConfig.HTMLDOMPropertyConfig;
+var SVGDOMPropertyConfig = DOMPropertyConfig.SVGDOMPropertyConfig;
 
 var config = {
     html: {},