{"body":"We've decided on a new naming convention for ReactDescriptor. It's now\ncalled ReactElement, which is a subset of the ReactNode union type.","commit":{"revision":"8f1657bba618846b7a111a2caee855bf59145c5a","authorName":"Sebastian Markbage","authorEmail":"sema@fb.com","authoredAt":"2014-10-07T13:41:51-07:00","subject":"Renamed Descriptor -> Element","shortRevision":"8f1657bba6"},"files":[{"path":"src\/browser\/ReactDOM.js","status":"M"},{"path":"src\/browser\/ReactTextComponent.js","status":"M"},{"path":"src\/browser\/__tests__\/ReactDOM-test.js","status":"M"},{"path":"src\/browser\/server\/ReactServerRendering.js","status":"M"},{"path":"src\/browser\/ui\/React.js","status":"M"},{"path":"src\/browser\/ui\/ReactDOMComponent.js","status":"M"},{"path":"src\/browser\/ui\/ReactMount.js","status":"M"},{"path":"src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js","status":"M"},{"path":"src\/browser\/ui\/__tests__\/ReactMount-test.js","status":"M"},{"path":"src\/browser\/ui\/dom\/components\/ReactDOMButton.js","status":"M"},{"path":"src\/browser\/ui\/dom\/components\/ReactDOMForm.js","status":"M"},{"path":"src\/browser\/ui\/dom\/components\/ReactDOMImg.js","status":"M"},{"path":"src\/browser\/ui\/dom\/components\/ReactDOMInput.js","status":"M"},{"path":"src\/browser\/ui\/dom\/components\/ReactDOMOption.js","status":"M"},{"path":"src\/browser\/ui\/dom\/components\/ReactDOMSelect.js","status":"M"},{"path":"src\/browser\/ui\/dom\/components\/ReactDOMTextarea.js","status":"M"},{"path":"src\/browser\/ui\/dom\/components\/createFullPageComponent.js","status":"M"},{"path":"src\/core\/ReactComponent.js","status":"M"},{"path":"src\/core\/ReactCompositeComponent.js","status":"M"},{"path":"src\/core\/ReactElement.js","status":"R077","previousPath":"src\/core\/ReactDescriptor.js"},{"path":"src\/core\/ReactElementValidator.js","status":"R090","previousPath":"src\/core\/ReactDescriptorValidator.js"},{"path":"src\/core\/ReactEmptyComponent.js","status":"M"},{"path":"src\/core\/ReactLegacyElement.js","status":"R084","previousPath":"src\/core\/ReactLegacyDescriptor.js"},{"path":"src\/core\/ReactMultiChild.js","status":"M"},{"path":"src\/core\/ReactPropTransferer.js","status":"M"},{"path":"src\/core\/ReactPropTypes.js","status":"M"},{"path":"src\/core\/__tests__\/ReactComponent-test.js","status":"M"},{"path":"src\/core\/__tests__\/ReactComponentLifeCycle-test.js","status":"M"},{"path":"src\/core\/__tests__\/ReactCompositeComponent-test.js","status":"M"},{"path":"src\/core\/__tests__\/ReactDescriptor-test.js","status":"M"},{"path":"src\/core\/instantiateReactComponent.js","status":"M"},{"path":"src\/core\/shouldUpdateReactComponent.js","status":"M"},{"path":"src\/test\/ReactTestUtils.js","status":"M"},{"path":"src\/test\/reactComponentExpect.js","status":"M"},{"path":"src\/utils\/cloneWithProps.js","status":"M"},{"path":"src\/utils\/onlyChild.js","status":"M"},{"path":"src\/utils\/traverseAllChildren.js","status":"M"}],"parents":["7f9b1d18d197d102777f214e782ecc27685cf481"],"patch":"diff --git a\/src\/browser\/ReactDOM.js b\/src\/browser\/ReactDOM.js\nindex 9d88b7eb62..280ad76a75 100644\n--- a\/src\/browser\/ReactDOM.js\n+++ b\/src\/browser\/ReactDOM.js\n@@ -19,26 +19,26 @@\n \n \"use strict\";\n \n-var ReactDescriptor = require('ReactDescriptor');\n-var ReactDescriptorValidator = require('ReactDescriptorValidator');\n-var ReactLegacyDescriptor = require('ReactLegacyDescriptor');\n+var ReactElement = require('ReactElement');\n+var ReactElementValidator = require('ReactElementValidator');\n+var ReactLegacyElement = require('ReactLegacyElement');\n \n var mapObject = require('mapObject');\n \n \/**\n- * Create a factory that creates HTML tag descriptors.\n+ * Create a factory that creates HTML tag elements.\n *\n * @param {string} tag Tag name (e.g. `div`).\n * @private\n *\/\n function createDOMFactory(tag) {\n if (__DEV__) {\n- return ReactLegacyDescriptor.markNonLegacyFactory(\n- ReactDescriptorValidator.createFactory(tag)\n+ return ReactLegacyElement.markNonLegacyFactory(\n+ ReactElementValidator.createFactory(tag)\n );\n }\n- return ReactLegacyDescriptor.markNonLegacyFactory(\n- ReactDescriptor.createFactory(tag)\n+ return ReactLegacyElement.markNonLegacyFactory(\n+ ReactElement.createFactory(tag)\n );\n }\n \ndiff --git a\/src\/browser\/ReactTextComponent.js b\/src\/browser\/ReactTextComponent.js\nindex ce4222c51f..25cdd6e1bf 100644\n--- a\/src\/browser\/ReactTextComponent.js\n+++ b\/src\/browser\/ReactTextComponent.js\n@@ -22,7 +22,7 @@\n var DOMPropertyOperations = require('DOMPropertyOperations');\n var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');\n var ReactComponent = require('ReactComponent');\n-var ReactDescriptor = require('ReactDescriptor');\n+var ReactElement = require('ReactElement');\n \n var escapeTextForBrowser = require('escapeTextForBrowser');\n var mixInto = require('mixInto');\n@@ -105,7 +105,7 @@ mixInto(ReactTextComponent, {\n \n var ReactTextComponentFactory = function(text) {\n \/\/ Bypass validation and configuration\n- return new ReactDescriptor(ReactTextComponent, null, null, null, null, text);\n+ return new ReactElement(ReactTextComponent, null, null, null, null, text);\n };\n \n ReactTextComponentFactory.type = ReactTextComponent;\ndiff --git a\/src\/browser\/__tests__\/ReactDOM-test.js b\/src\/browser\/__tests__\/ReactDOM-test.js\nindex aa3458ef41..b0cc1e9a52 100644\n--- a\/src\/browser\/__tests__\/ReactDOM-test.js\n+++ b\/src\/browser\/__tests__\/ReactDOM-test.js\n@@ -122,8 +122,8 @@ describe('ReactDOM', function() {\n \n it('allow React.DOM factories to be called without warnings', function() {\n spyOn(console, 'warn');\n- var descriptor = React.DOM.div();\n- expect(descriptor.type).toBe('div');\n+ var element = React.DOM.div();\n+ expect(element.type).toBe('div');\n expect(console.warn.argsForCall.length).toBe(0);\n });\n \n@@ -139,8 +139,8 @@ describe('ReactDOM', function() {\n \n it('warns but allow dom factories to be used in createElement', function() {\n spyOn(console, 'warn');\n- var descriptor = React.createElement(React.DOM.div);\n- expect(descriptor.type).toBe('div');\n+ var element = React.createElement(React.DOM.div);\n+ expect(element.type).toBe('div');\n expect(console.warn.argsForCall.length).toBe(1);\n expect(console.warn.argsForCall[0][0]).toContain(\n 'Do not pass React.DOM.div'\ndiff --git a\/src\/browser\/server\/ReactServerRendering.js b\/src\/browser\/server\/ReactServerRendering.js\nindex d0beb51d41..5c07694263 100644\n--- a\/src\/browser\/server\/ReactServerRendering.js\n+++ b\/src\/browser\/server\/ReactServerRendering.js\n@@ -18,7 +18,7 @@\n *\/\n \"use strict\";\n \n-var ReactDescriptor = require('ReactDescriptor');\n+var ReactElement = require('ReactElement');\n var ReactInstanceHandles = require('ReactInstanceHandles');\n var ReactMarkupChecksum = require('ReactMarkupChecksum');\n var ReactServerRenderingTransaction =\n@@ -33,7 +33,7 @@ var invariant = require('invariant');\n *\/\n function renderComponentToString(component) {\n invariant(\n- ReactDescriptor.isValidDescriptor(component),\n+ ReactElement.isValidElement(component),\n 'renderComponentToString(): You must pass a valid ReactComponent.'\n );\n \n@@ -65,7 +65,7 @@ function renderComponentToString(component) {\n *\/\n function renderComponentToStaticMarkup(component) {\n invariant(\n- ReactDescriptor.isValidDescriptor(component),\n+ ReactElement.isValidElement(component),\n 'renderComponentToStaticMarkup(): You must pass a valid ReactComponent.'\n );\n \ndiff --git a\/src\/browser\/ui\/React.js b\/src\/browser\/ui\/React.js\nindex e0d6c9bad4..bcf2b38f27 100644\n--- a\/src\/browser\/ui\/React.js\n+++ b\/src\/browser\/ui\/React.js\n@@ -29,13 +29,13 @@ var ReactComponent = require('ReactComponent');\n var ReactCompositeComponent = require('ReactCompositeComponent');\n var ReactContext = require('ReactContext');\n var ReactCurrentOwner = require('ReactCurrentOwner');\n-var ReactDescriptor = require('ReactDescriptor');\n-var ReactDescriptorValidator = require('ReactDescriptorValidator');\n+var ReactElement = require('ReactElement');\n+var ReactElementValidator = require('ReactElementValidator');\n var ReactDOM = require('ReactDOM');\n var ReactDOMComponent = require('ReactDOMComponent');\n var ReactDefaultInjection = require('ReactDefaultInjection');\n var ReactInstanceHandles = require('ReactInstanceHandles');\n-var ReactLegacyDescriptor = require('ReactLegacyDescriptor');\n+var ReactLegacyElement = require('ReactLegacyElement');\n var ReactMount = require('ReactMount');\n var ReactMultiChild = require('ReactMultiChild');\n var ReactPerf = require('ReactPerf');\n@@ -47,19 +47,19 @@ var onlyChild = require('onlyChild');\n \n ReactDefaultInjection.inject();\n \n-var createDescriptor = ReactDescriptor.createDescriptor;\n-var createFactory = ReactDescriptor.createFactory;\n+var createElement = ReactElement.createElement;\n+var createFactory = ReactElement.createFactory;\n \n if (__DEV__) {\n- createDescriptor = ReactDescriptorValidator.createDescriptor;\n- createFactory = ReactDescriptorValidator.createFactory;\n+ createElement = ReactElementValidator.createElement;\n+ createFactory = ReactElementValidator.createFactory;\n }\n \n-\/\/ TODO: Drop legacy descriptors once classes no longer export these factories\n-createDescriptor = ReactLegacyDescriptor.wrapCreateDescriptor(\n- createDescriptor\n+\/\/ TODO: Drop legacy elements once classes no longer export these factories\n+createElement = ReactLegacyElement.wrapCreateElement(\n+ createElement\n );\n-createFactory = ReactLegacyDescriptor.wrapCreateFactory(\n+createFactory = ReactLegacyElement.wrapCreateFactory(\n createFactory\n );\n \n@@ -76,8 +76,8 @@ var React = {\n EventPluginUtils.useTouchEvents = shouldUseTouch;\n },\n createClass: ReactCompositeComponent.createClass,\n- createDescriptor: createDescriptor, \/\/ deprecated, will be removed next week\n- createElement: createDescriptor,\n+ createDescriptor: createElement, \/\/ deprecated, will be removed next week\n+ createElement: createElement,\n createFactory: createFactory,\n constructAndRenderComponent: ReactMount.constructAndRenderComponent,\n constructAndRenderComponentByID: ReactMount.constructAndRenderComponentByID,\n@@ -90,8 +90,8 @@ var React = {\n renderComponentToStaticMarkup:\n ReactServerRendering.renderComponentToStaticMarkup,\n unmountComponentAtNode: ReactMount.unmountComponentAtNode,\n- isValidClass: ReactLegacyDescriptor.isValidFactory,\n- isValidComponent: ReactDescriptor.isValidDescriptor,\n+ isValidClass: ReactLegacyElement.isValidFactory,\n+ isValidComponent: ReactElement.isValidElement,\n withContext: ReactContext.withContext,\n __internals: {\n Component: ReactComponent,\ndiff --git a\/src\/browser\/ui\/ReactDOMComponent.js b\/src\/browser\/ui\/ReactDOMComponent.js\nindex 3436e4c979..cbbe776d3d 100644\n--- a\/src\/browser\/ui\/ReactDOMComponent.js\n+++ b\/src\/browser\/ui\/ReactDOMComponent.js\n@@ -260,22 +260,22 @@ ReactDOMComponent.Mixin = {\n return '';\n },\n \n- receiveComponent: function(nextDescriptor, transaction) {\n- if (nextDescriptor === this._descriptor &&\n- nextDescriptor._owner != null) {\n- \/\/ Since descriptors are immutable after the owner is rendered,\n+ receiveComponent: function(nextElement, transaction) {\n+ if (nextElement === this._currentElement &&\n+ nextElement._owner != null) {\n+ \/\/ Since elements are immutable after the owner is rendered,\n \/\/ we can do a cheap identity compare here to determine if this is a\n \/\/ superfluous reconcile. It's possible for state to be mutable but such\n \/\/ change should trigger an update of the owner which would recreate\n- \/\/ the descriptor. We explicitly check for the existence of an owner since\n- \/\/ it's possible for a descriptor created outside a composite to be\n+ \/\/ the element. We explicitly check for the existence of an owner since\n+ \/\/ it's possible for a element created outside a composite to be\n \/\/ deeply mutated and reused.\n return;\n }\n \n ReactComponent.Mixin.receiveComponent.call(\n this,\n- nextDescriptor,\n+ nextElement,\n transaction\n );\n },\n@@ -285,22 +285,22 @@ ReactDOMComponent.Mixin = {\n * attached to the DOM. Reconciles the root DOM node, then recurses.\n *\n * @param {ReactReconcileTransaction} transaction\n- * @param {ReactDescriptor} prevDescriptor\n+ * @param {ReactElement} prevElement\n * @internal\n * @overridable\n *\/\n updateComponent: ReactPerf.measure(\n 'ReactDOMComponent',\n 'updateComponent',\n- function(transaction, prevDescriptor) {\n- assertValidProps(this._descriptor.props);\n+ function(transaction, prevElement) {\n+ assertValidProps(this._currentElement.props);\n ReactComponent.Mixin.updateComponent.call(\n this,\n transaction,\n- prevDescriptor\n+ prevElement\n );\n- this._updateDOMProperties(prevDescriptor.props, transaction);\n- this._updateDOMChildren(prevDescriptor.props, transaction);\n+ this._updateDOMProperties(prevElement.props, transaction);\n+ this._updateDOMChildren(prevElement.props, transaction);\n }\n ),\n \ndiff --git a\/src\/browser\/ui\/ReactMount.js b\/src\/browser\/ui\/ReactMount.js\nindex a5acf90134..a0dc478d12 100644\n--- a\/src\/browser\/ui\/ReactMount.js\n+++ b\/src\/browser\/ui\/ReactMount.js\n@@ -21,8 +21,8 @@\n var DOMProperty = require('DOMProperty');\n var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');\n var ReactCurrentOwner = require('ReactCurrentOwner');\n-var ReactDescriptor = require('ReactDescriptor');\n-var ReactLegacyDescriptor = require('ReactLegacyDescriptor');\n+var ReactElement = require('ReactElement');\n+var ReactLegacyElement = require('ReactLegacyElement');\n var ReactInstanceHandles = require('ReactInstanceHandles');\n var ReactPerf = require('ReactPerf');\n \n@@ -33,8 +33,8 @@ var invariant = require('invariant');\n var shouldUpdateReactComponent = require('shouldUpdateReactComponent');\n var warning = require('warning');\n \n-var createDescriptor = ReactLegacyDescriptor.wrapCreateDescriptor(\n- ReactDescriptor.createDescriptor\n+var createElement = ReactLegacyElement.wrapCreateElement(\n+ ReactElement.createElement\n );\n \n var SEPARATOR = ReactInstanceHandles.SEPARATOR;\n@@ -335,24 +335,24 @@ var ReactMount = {\n * perform an update on it and only mutate the DOM as necessary to reflect the\n * latest React component.\n *\n- * @param {ReactDescriptor} nextDescriptor Component descriptor to render.\n+ * @param {ReactElement} nextElement Component element to render.\n * @param {DOMElement} container DOM element to render into.\n * @param {?function} callback function triggered on completion\n * @return {ReactComponent} Component instance rendered in `container`.\n *\/\n- renderComponent: function(nextDescriptor, container, callback) {\n+ renderComponent: function(nextElement, container, callback) {\n invariant(\n- ReactDescriptor.isValidDescriptor(nextDescriptor),\n- 'renderComponent(): Invalid component descriptor.%s',\n+ ReactElement.isValidElement(nextElement),\n+ 'renderComponent(): Invalid component element.%s',\n (\n- typeof nextDescriptor === 'string' ?\n+ typeof nextElement === 'string' ?\n ' Instead of passing an element string, make sure to instantiate ' +\n 'it by passing it to React.createElement.' :\n- ReactLegacyDescriptor.isValidFactory(nextDescriptor) ?\n+ ReactLegacyElement.isValidFactory(nextElement) ?\n ' Instead of passing a component class, make sure to instantiate ' +\n 'it by passing it to React.createElement.' :\n- \/\/ Check if it quacks like a descriptor\n- typeof nextDescriptor.props !== \"undefined\" ?\n+ \/\/ Check if it quacks like a element\n+ typeof nextElement.props !== \"undefined\" ?\n ' This may be caused by unintentionally loading two independent ' +\n 'copies of React.' :\n ''\n@@ -362,11 +362,11 @@ var ReactMount = {\n var prevComponent = instancesByReactRootID[getReactRootID(container)];\n \n if (prevComponent) {\n- var prevDescriptor = prevComponent._descriptor;\n- if (shouldUpdateReactComponent(prevDescriptor, nextDescriptor)) {\n+ var prevElement = prevComponent._currentElement;\n+ if (shouldUpdateReactComponent(prevElement, nextElement)) {\n return ReactMount._updateRootComponent(\n prevComponent,\n- nextDescriptor,\n+ nextElement,\n container,\n callback\n );\n@@ -382,7 +382,7 @@ var ReactMount = {\n var shouldReuseMarkup = containerHasReactMarkup && !prevComponent;\n \n var component = ReactMount._renderNewRootComponent(\n- nextDescriptor,\n+ nextElement,\n container,\n shouldReuseMarkup\n );\n@@ -400,8 +400,8 @@ var ReactMount = {\n * @return {ReactComponent} Component instance rendered in `container`.\n *\/\n constructAndRenderComponent: function(constructor, props, container) {\n- var descriptor = createDescriptor(constructor, props);\n- return ReactMount.renderComponent(descriptor, container);\n+ var element = createElement(constructor, props);\n+ return ReactMount.renderComponent(element, container);\n },\n \n \/**\ndiff --git a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\nindex 8eb0e105a6..3da6798f7a 100644\n--- a\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/browser\/ui\/__tests__\/ReactDOMComponent-test.js\n@@ -318,8 +318,8 @@ describe('ReactDOMComponent', function() {\n var ReactDOMComponent = require('ReactDOMComponent');\n var ReactReconcileTransaction = require('ReactReconcileTransaction');\n \n- var StubNativeComponent = function(descriptor) {\n- ReactComponent.Mixin.construct.call(this, descriptor);\n+ var StubNativeComponent = function(element) {\n+ ReactComponent.Mixin.construct.call(this, element);\n };\n mixInto(StubNativeComponent, ReactComponent.Mixin);\n mixInto(StubNativeComponent, ReactDOMComponent.Mixin);\ndiff --git a\/src\/browser\/ui\/__tests__\/ReactMount-test.js b\/src\/browser\/ui\/__tests__\/ReactMount-test.js\nindex 2b5fa5cd09..473c87672c 100644\n--- a\/src\/browser\/ui\/__tests__\/ReactMount-test.js\n+++ b\/src\/browser\/ui\/__tests__\/ReactMount-test.js\n@@ -42,7 +42,7 @@ describe('ReactMount', function() {\n expect(function() {\n ReactTestUtils.renderIntoDocument('div');\n }).toThrow(\n- 'Invariant Violation: renderComponent(): Invalid component descriptor. ' +\n+ 'Invariant Violation: renderComponent(): Invalid component element. ' +\n 'Instead of passing an element string, make sure to instantiate it ' +\n 'by passing it to React.createElement.'\n );\n@@ -57,7 +57,7 @@ describe('ReactMount', function() {\n expect(function() {\n ReactTestUtils.renderIntoDocument(Component);\n }).toThrow(\n- 'Invariant Violation: renderComponent(): Invalid component descriptor. ' +\n+ 'Invariant Violation: renderComponent(): Invalid component element. ' +\n 'Instead of passing a component class, make sure to instantiate it ' +\n 'by passing it to React.createElement.'\n );\ndiff --git a\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js b\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js\nindex d9c07a78db..bce5ea584b 100644\n--- a\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js\n+++ b\/src\/browser\/ui\/dom\/components\/ReactDOMButton.js\n@@ -21,13 +21,13 @@\n var AutoFocusMixin = require('AutoFocusMixin');\n var ReactBrowserComponentMixin = require('ReactBrowserComponentMixin');\n var ReactCompositeComponent = require('ReactCompositeComponent');\n-var ReactDescriptor = require('ReactDescriptor');\n+var ReactElement = require('ReactElement');\n var ReactDOM = require('ReactDOM');\n \n var keyMirror = require('keyMirror');\n \n \/\/ Store a reference to the

dillon1000/react

Files changed