Move lib/DOMPropertyConfig.js to lib/property-config.js

Tidy and refactor code.

Author: remarkablemark

lib/DOMPropertyConfig.js

@@ -3,9 +3,10 @@
 /**
  * Module dependencies.
  */
-var HTMLDOMPropertyConfig = require('./DOMPropertyConfig').HTMLDOMPropertyConfig;
 var utilities = require('./utilities');
 var propertyConfig = require('./property-config');
+var config = propertyConfig.config;
+var isCustomAttribute = propertyConfig.HTMLDOMPropertyConfig.isCustomAttribute;
 
 /**
  * Make attributes compatible with React props.
@@ -24,20 +25,20 @@ function attributesToProps(attributes) {
         propertyValue = attributes[propertyName];
 
         // custom attributes (`data-` and `aria-`)
-        if (HTMLDOMPropertyConfig.isCustomAttribute(propertyName)) {
+        if (isCustomAttribute(propertyName)) {
             props[propertyName] = propertyValue;
             continue;
         }
 
         // make HTML DOM attribute/property consistent with React attribute/property
-        reactProperty = propertyConfig.html[propertyName.toLowerCase()];
+        reactProperty = config.html[propertyName.toLowerCase()];
         if (reactProperty) {
             props[reactProperty] = propertyValue;
             continue;
         }
 
         // make SVG DOM attribute/property consistent with React attribute/property
-        reactProperty = propertyConfig.svg[propertyName];
+        reactProperty = config.svg[propertyName];
         if (reactProperty) {
             props[reactProperty] = propertyValue;
         }

lib/attributes-to-props.js

@@ -4,9 +4,19 @@
  * Module dependencies.
  */
 var utilities = require('./utilities');
-var DOMPropertyConfig = require('./DOMPropertyConfig');
-var HTMLDOMPropertyConfig = DOMPropertyConfig.HTMLDOMPropertyConfig;
-var SVGDOMPropertyConfig = DOMPropertyConfig.SVGDOMPropertyConfig;
+
+// HTML and SVG DOM Property Configs
+// originally in `react/lib/` but moved to `react-dom/lib/` in 15.4
+var HTMLDOMPropertyConfig;
+var SVGDOMPropertyConfig;
+
+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');
+}
 
 var config = {
     html: {},
@@ -54,6 +64,10 @@ for (propertyName in SVGDOMPropertyConfig.Properties) {
 }
 
 /**
- * Export React property config.
+ * Export React property configs.
  */
-module.exports = config;
+module.exports = {
+    config: config,
+    HTMLDOMPropertyConfig: HTMLDOMPropertyConfig,
+    SVGDOMPropertyConfig: SVGDOMPropertyConfig
+};