Merge pull request #277 from jquense/clone-with-props

Future proof cloneWithProps a little. Remove unused internal utils
react-bootstrap · Nov 18, 2014 · 0cf72c8 · 0cf72c8
2 parents 9751f49 + 726c730
commit 0cf72c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 99 deletions.
diff --git a/src/utils/ReactContext.js b/src/utils/ReactContext.js
diff --git a/src/utils/ReactCurrentOwner.js b/src/utils/ReactCurrentOwner.js
diff --git a/src/utils/cloneWithProps.js b/src/utils/cloneWithProps.js
@@ -127,12 +127,17 @@ function cloneWithProps(child, props) {
     newProps.children = child.props.children;
   }
 
+  if (React.version.substr(0, 4) === '0.12'){
+    var mockLegacyFactory = function(){};
+    mockLegacyFactory.isReactLegacyFactory = true;
+    mockLegacyFactory.type = child.type;
+
+    return React.createElement(mockLegacyFactory, newProps);
+  }
+
   // The current API doesn't retain _owner and _context, which is why this
   // doesn't use ReactElement.cloneAndReplaceProps.
-  var mockLegacyFactory = function(){};
-  mockLegacyFactory.isReactLegacyFactory = true;
-  mockLegacyFactory.type = child.type;
-  return React.createElement(mockLegacyFactory, newProps);
+  return React.createElement(child.type, newProps);
 }
 
 module.exports = cloneWithProps;