{"commit":{"authoredAt":"2015-06-22T16:58:01-07:00","shortRevision":"c5fb3ff987","subject":"Merge pull request #4139 from spicyj\/dom-refs","revision":"c5fb3ff9870cc09a6ec82672e854ab54a412cef1","authorEmail":"ben@benalpert.com","authorName":"Ben Alpert"},"files":[{"path":"src\/isomorphic\/classic\/element\/ReactElementValidator.js","status":"M"},{"path":"src\/renderers\/dom\/client\/ReactMount.js","status":"M"},{"path":"src\/renderers\/dom\/client\/findDOMNode.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/ReactDOMComponent.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/ReactDefaultInjection.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/ReactNativeComponent.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/ReactUpdateQueue.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/instantiateReactComponent.js","status":"M"},{"path":"src\/test\/ReactTestUtils.js","status":"M"},{"path":"src\/test\/reactComponentExpect.js","status":"M"}],"patch":"diff --git a\/src\/isomorphic\/classic\/element\/ReactElementValidator.js b\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\nindex d4c2df2a07..2eb888ed08 100644\n--- a\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\n+++ b\/src\/isomorphic\/classic\/element\/ReactElementValidator.js\n@@ -23,7 +23,6 @@ var ReactFragment = require('ReactFragment');\n var ReactPropTypeLocations = require('ReactPropTypeLocations');\n var ReactPropTypeLocationNames = require('ReactPropTypeLocationNames');\n var ReactCurrentOwner = require('ReactCurrentOwner');\n-var ReactNativeComponent = require('ReactNativeComponent');\n \n var getIteratorFn = require('getIteratorFn');\n var invariant = require('invariant');\n@@ -293,18 +292,10 @@ function checkPropTypes(componentName, propTypes, props, location) {\n * @param {ReactElement} element\n *\/\n function validatePropTypes(element) {\n- if (!(typeof element.type === 'string' ||\n- typeof element.type === 'function')) {\n- \/\/ This has already warned. Don't throw.\n+ var componentClass = element.type;\n+ if (typeof componentClass !== 'function') {\n return;\n }\n- \/\/ Extract the component class from the element. Converts string types\n- \/\/ to a composite class which may have propTypes.\n- \/\/ TODO: Validating a string's propTypes is not decoupled from the\n- \/\/ rendering target which is problematic.\n- var componentClass = ReactNativeComponent.getComponentClassForElement(\n- element\n- );\n var name = componentClass.displayName || componentClass.name;\n if (componentClass.propTypes) {\n checkPropTypes(\ndiff --git a\/src\/renderers\/dom\/client\/ReactMount.js b\/src\/renderers\/dom\/client\/ReactMount.js\nindex 724feae8c6..2b00a1580e 100644\n--- a\/src\/renderers\/dom\/client\/ReactMount.js\n+++ b\/src\/renderers\/dom\/client\/ReactMount.js\n@@ -274,7 +274,7 @@ function mountComponentIntoNode(\n var markup = ReactReconciler.mountComponent(\n componentInstance, rootID, transaction, context\n );\n- componentInstance._isTopLevel = true;\n+ componentInstance._renderedComponent._topLevelWrapper = componentInstance;\n ReactMount._mountImageIntoNode(markup, container, shouldReuseMarkup);\n }\n \n@@ -328,6 +328,17 @@ function unmountComponentFromNode(instance, container) {\n }\n }\n \n+\/**\n+ * Temporary (?) hack so that we can store all top-level pending updates on\n+ * composites instead of having to worry about different types of components\n+ * here.\n+ *\/\n+var TopLevelWrapper = function() {};\n+TopLevelWrapper.prototype.render = function() {\n+ \/\/ this.props is actually a ReactElement\n+ return this.props;\n+};\n+\n \/**\n * Mounting is the process of initializing a React component by creating its\n * representative DOM elements and inserting them into a supplied `container`.\n@@ -522,17 +533,26 @@ var ReactMount = {\n 'for your app.'\n );\n \n+ var nextWrappedElement = new ReactElement(\n+ TopLevelWrapper,\n+ null,\n+ null,\n+ null,\n+ nextElement\n+ );\n+\n var prevComponent = instancesByReactRootID[getReactRootID(container)];\n \n if (prevComponent) {\n- var prevElement = prevComponent._currentElement;\n+ var prevWrappedElement = prevComponent._currentElement;\n+ var prevElement = prevWrappedElement.props;\n if (shouldUpdateReactComponent(prevElement, nextElement)) {\n return ReactMount._updateRootComponent(\n prevComponent,\n- nextElement,\n+ nextWrappedElement,\n container,\n callback\n- ).getPublicInstance();\n+ )._renderedComponent.getPublicInstance();\n } else {\n ReactMount.unmountComponentAtNode(container);\n }\n@@ -563,7 +583,7 @@ var ReactMount = {\n \n var shouldReuseMarkup = containerHasReactMarkup && !prevComponent;\n var component = ReactMount._renderNewRootComponent(\n- nextElement,\n+ nextWrappedElement,\n container,\n shouldReuseMarkup,\n parentComponent != null ?\n@@ -571,7 +591,7 @@ var ReactMount = {\n parentComponent._reactInternalInstance._context\n ) :\n emptyObject\n- ).getPublicInstance();\n+ )._renderedComponent.getPublicInstance();\n if (callback) {\n callback.call(component);\n }\ndiff --git a\/src\/renderers\/dom\/client\/findDOMNode.js b\/src\/renderers\/dom\/client\/findDOMNode.js\nindex c8e3651047..64f6d5b2d1 100644\n--- a\/src\/renderers\/dom\/client\/findDOMNode.js\n+++ b\/src\/renderers\/dom\/client\/findDOMNode.js\n@@ -17,7 +17,6 @@ var ReactInstanceMap = require('ReactInstanceMap');\n var ReactMount = require('ReactMount');\n \n var invariant = require('invariant');\n-var isNode = require('isNode');\n var warning = require('warning');\n \n \/**\n@@ -45,7 +44,7 @@ function findDOMNode(componentOrElement) {\n if (componentOrElement == null) {\n return null;\n }\n- if (isNode(componentOrElement)) {\n+ if (componentOrElement.nodeType === 1) {\n return componentOrElement;\n }\n if (ReactInstanceMap.has(componentOrElement)) {\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\nindex b960e05b0f..e4d7fe6bf1 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n@@ -30,6 +30,7 @@ var ReactDOMTextarea = require('ReactDOMTextarea');\n var ReactMount = require('ReactMount');\n var ReactMultiChild = require('ReactMultiChild');\n var ReactPerf = require('ReactPerf');\n+var ReactUpdateQueue = require('ReactUpdateQueue');\n \n var assign = require('Object.assign');\n var escapeTextContentForBrowser = require('escapeTextContentForBrowser');\n@@ -51,6 +52,122 @@ var STYLE = keyOf({style: null});\n \n var ELEMENT_NODE_TYPE = 1;\n \n+var canDefineProperty = false;\n+try {\n+ Object.defineProperty({}, 'test', {get: function() {}});\n+ canDefineProperty = true;\n+} catch (e) {\n+}\n+\n+function getDeclarationErrorAddendum(internalInstance) {\n+ if (internalInstance) {\n+ var owner = internalInstance._currentElement._owner || null;\n+ if (owner) {\n+ var name = owner.getName();\n+ if (name) {\n+ return ' This DOM node was rendered by `' + name + '`.';\n+ }\n+ }\n+ }\n+ return '';\n+}\n+\n+var legacyPropsDescriptor;\n+if (__DEV__) {\n+ legacyPropsDescriptor = {\n+ props: {\n+ enumerable: false,\n+ get: function() {\n+ var component = this._reactInternalComponent;\n+ warning(\n+ false,\n+ 'ReactDOMComponent: Do not access .props of a DOM node; instead, ' +\n+ 'recreate the props as `render` did originally or read the DOM ' +\n+ 'properties\/attributes directly from this node (e.g., ' +\n+ 'this.refs.box.className).%s',\n+ getDeclarationErrorAddendum(component)\n+ );\n+ return component._currentElement.props;\n+ },\n+ },\n+ };\n+}\n+\n+function legacyGetDOMNode() {\n+ if (__DEV__) {\n+ var component = this._reactInternalComponent;\n+ warning(\n+ false,\n+ 'ReactDOMComponent: Do not access .getDOMNode() of a DOM node; ' +\n+ 'instead, use the node directly.%s',\n+ getDeclarationErrorAddendum(component)\n+ );\n+ }\n+ return this;\n+}\n+\n+function legacyIsMounted() {\n+ var component = this._reactInternalComponent;\n+ if (__DEV__) {\n+ warning(\n+ false,\n+ 'ReactDOMComponent: Do not access .isMounted() of a DOM node.%s',\n+ getDeclarationErrorAddendum(component)\n+ );\n+ }\n+ return !!component;\n+}\n+\n+function legacySetStateEtc() {\n+ if (__DEV__) {\n+ var component = this._reactInternalComponent;\n+ warning(\n+ false,\n+ 'ReactDOMComponent: Do not access .setState(), .replaceState(), or ' +\n+ '.forceUpdate() of a DOM node. This is a no-op.%s',\n+ getDeclarationErrorAddendum(component)\n+ );\n+ }\n+}\n+\n+function legacySetProps(partialProps, callback) {\n+ var component = this._reactInternalComponent;\n+ if (__DEV__) {\n+ warning(\n+ false,\n+ 'ReactDOMComponent: Do not access .setProps() of a DOM node. ' +\n+ 'Instead, call React.render again at the top level.%s',\n+ getDeclarationErrorAddendum(component)\n+ );\n+ }\n+ if (!component) {\n+ return;\n+ }\n+ ReactUpdateQueue.enqueueSetPropsInternal(component, partialProps);\n+ if (callback) {\n+ ReactUpdateQueue.enqueueCallbackInternal(component, callback);\n+ }\n+}\n+\n+function legacyReplaceProps(partialProps, callback) {\n+ var component = this._reactInternalComponent;\n+ if (__DEV__) {\n+ warning(\n+ false,\n+ 'ReactDOMComponent: Do not access .replaceProps() of a DOM node. ' +\n+ 'Instead, call React.render again at the top level.%s',\n+ getDeclarationErrorAddendum(component)\n+ );\n+ }\n+ if (!component) {\n+ return;\n+ }\n+ ReactUpdateQueue.enqueueReplacePropsInternal(component, partialProps);\n+ if (callback) {\n+ ReactUpdateQueue.enqueueCallbackInternal(component, callback);\n+ }\n+}\n+\n var styleMutationWarning = {};\n \n function checkAndWarnForMutatedStyle(style1, style2, component) {\n@@ -327,6 +444,8 @@ function ReactDOMComponent(tag) {\n this._previousStyleCopy = null;\n this._rootNodeID = null;\n this._wrapperState = null;\n+ this._topLevelWrapper = null;\n+ this._nodeWithLegacyProperties = null;\n }\n \n ReactDOMComponent.displayName = 'ReactDOMComponent';\n@@ -589,6 +708,10 @@ ReactDOMComponent.Mixin = {\n processChildContext(context, this)\n );\n \n+ if (!canDefineProperty && this._nodeWithLegacyProperties) {\n+ this._nodeWithLegacyProperties.props = nextProps;\n+ }\n+\n if (this._tag === 'select') {\n \/\/

dillon1000/react

Files changed