Skip to content

Commit

Permalink
Remove _isReactElement
Browse files Browse the repository at this point in the history
As of this commit, we still support objects as maps so if anyone has an object with keys 'type' and 'props' this will change behavior, but otherwise this should be pretty safe.
  • Loading branch information
sophiebits committed Aug 18, 2015
1 parent b4ee5b5 commit 6663fb3
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
21 changes: 7 additions & 14 deletions src/isomorphic/classic/element/ReactElement.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ var ReactElement = function(type, key, ref, self, source, owner, props) {

// We intentionally don't expose the function on the constructor property.
// ReactElement should be indistinguishable from a plain object.
ReactElement.prototype = {
_isReactElement: true,
};
ReactElement.prototype = {};

ReactElement.createElement = function(type, config, children) {
var propName;
Expand Down Expand Up @@ -251,17 +249,12 @@ ReactElement.cloneElement = function(element, config, children) {
* @final
*/
ReactElement.isValidElement = function(object) {
// ReactTestUtils is often used outside of beforeEach where as React is
// within it. This leads to two different instances of React on the same
// page. To identify a element from a different React instance we use
// a flag instead of an instanceof check.
var isElement = !!(object && object._isReactElement);
// if (isElement && !(object instanceof ReactElement)) {
// This is an indicator that you're using multiple versions of React at the
// same time. This will screw with ownership and stuff. Fix it, please.
// TODO: We could possibly warn here.
// }
return isElement;
return !!(
typeof object === 'object' &&
object != null &&
'type' in object &&
'props' in object
);
};

module.exports = ReactElement;
2 changes: 2 additions & 0 deletions src/renderers/dom/client/ReactMount.js
Original file line number Diff line number Diff line change
Expand Up @@ -976,6 +976,8 @@ var ReactMount = {

getNodeFromInstance: getNodeFromInstance,

isValid: isValid,

purgeID: purgeID,
};

Expand Down

0 comments on commit 6663fb3

Please sign in to comment.