diff --git a/.flowconfig b/.flowconfig
index 94ffcb54a2..d15db1c9ab 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -34,4 +34,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(2[0-4]\\|1[0-9]\\|[0-9
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
[version]
-^0.26.0
+^0.27.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45acb43a89..046b5da040 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,40 @@
+## 15.2.1 (July 8, 2016)
+
+### React
+- Fix errant warning related to `shouldHaveDebugID`. ([@gaearon](https://github.com/gaearon) in [#7193](https://github.com/facebook/react/pull/7193))
+- Better removal of dev-only code, leading to a small reduction in the minified production bundle size. ([@gaearon](https://github.com/gaearon) in [#7188](https://github.com/facebook/react/pull/7188), [#7189](https://github.com/facebook/react/pull/7189))
+
+### React DOM
+- Add stack trace to unknown property warning. ([@jimfb](https://github.com/jimfb) in [#7040](https://github.com/facebook/react/pull/7040))
+- Fix webcomponents example. ([@jalexanderfox](https://github.com/jalexanderfox) in [#7057](https://github.com/facebook/react/pull/7057))
+- Fix `unstable_renderSubtreeIntoContainer` so that context properly updates when linked to state. ([@gaearon](https://github.com/gaearon) in [#7125](https://github.com/facebook/react/pull/7125))
+- Improve invariant wording for void elements. ([@starkch](https://github.com/starkch) in [#7066](https://github.com/facebook/react/pull/7066))
+- Ensure no errors are thrown due to event handlers in server rendering. ([@rricard](https://github.com/rricard) in [#7127](https://github.com/facebook/react/pull/7127))
+- Fix regression resulting in `value`-less submit and reset inputs removing the browser-default text. ([@zpao](https://github.com/zpao) in [#7197](https://github.com/facebook/react/pull/7197))
+- Fix regression resulting in empty `name` attribute being added to inputs when not provided. ([@okonet](https://github.com/okonet) in [#7199](https://github.com/facebook/react/pull/7199))
+
+### React Perf Add-on
+- Make `ReactPerf.start()` work properly during lifecycle methods. ([@gaearon](https://github.com/gaearon) in [#7208](https://github.com/facebook/react/pull/7208)).
+
+### React CSSTransitionGroup Add-on
+- Fix issue resulting in spurious unknown property warnings. ([@batusai513](https://github.com/batusai513) in [#7165](https://github.com/facebook/react/pull/7165))
+
+### React Native Renderer
+- Improve error handling in cross-platform touch event handling. ([@yungsters](https://github.com/yungsters) in [#7143](https://github.com/facebook/react/pull/7143))
+
+
## 15.2.0 (July 1, 2016)
### React
- Add error codes to production invariants, with links to the view the full error text. ([@keyanzhang](https://github.com/keyanzhang) in [#6948](https://github.com/facebook/react/pull/6948))
-- Include component stack information in PropType validation warnings. ([@spicyj](https://github.com/spicyj) in [#6771](https://github.com/facebook/react/pull/6771))
+- Include component stack information in PropType validation warnings. ([@troydemonbreun](https://github.com/troydemonbreun) in [#6398](https://github.com/facebook/react/pull/6398), [@spicyj](https://github.com/spicyj) in [#6771](https://github.com/facebook/react/pull/6771))
- Include component stack information in key warnings. ([@keyanzhang](https://github.com/keyanzhang) in [#6799](https://github.com/facebook/react/pull/6799))
-- Stop validating props at mount time, only validate at element creation. ([@keyanzhang](https://github.com/keyanzhang) in [#6823](https://github.com/facebook/react/pull/6823))
+- Stop validating props at mount time, only validate at element creation. ([@keyanzhang](https://github.com/keyanzhang) in [#6824](https://github.com/facebook/react/pull/6824))
- New invariant providing actionable error in missing instance case. ([@yungsters](https://github.com/yungsters) in [#6990](https://github.com/facebook/react/pull/6990))
- Add `React.PropTypes.symbol` to support ES2015 Symbols as props. ([@puradox](https://github.com/puradox) in [#6377](https://github.com/facebook/react/pull/6377))
- Fix incorrect coercion of ref or key that are undefined in development ([@gaearon](https://github.com/gaearon) in [#6880](https://github.com/facebook/react/pull/6880))
- Fix a false positive when passing other element’s props to cloneElement ([@ericmatthys](https://github.com/ericmatthys) in [#6268](https://github.com/facebook/react/pull/6268))
+- Warn if you attempt to define `childContextTypes` on a functional component ([@Aweary](https://github.com/Aweary) in [#6933](https://github.com/facebook/react/pull/6933))
### React DOM
- Add warning for unknown properties on DOM elements. ([@jimfb](https://github.com/jimfb) in [#6800](https://github.com/facebook/react/pull/6800), [@gm758](https://github.com/gm758) in [#7152](https://github.com/facebook/react/pull/7152))
diff --git a/Gruntfile.js b/Gruntfile.js
index 9562542441..e2f2faa59c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -52,11 +52,17 @@ module.exports = function(grunt) {
grunt.loadNpmTasks(npmTaskName);
});
- grunt.registerTask('eslint', require('./grunt/tasks/eslint'));
+ grunt.registerTask('eslint', function() {
+ // Use gulp here.
+ spawnGulp(['eslint'], null, this.async());
+ });
grunt.registerTask('lint', ['eslint']);
- grunt.registerTask('flow', require('./grunt/tasks/flow'));
+ grunt.registerTask('flow', function() {
+ // Use gulp here.
+ spawnGulp(['flow'], null, this.async());
+ });
grunt.registerTask('delete-build-modules', function() {
// Use gulp here.
@@ -84,7 +90,10 @@ module.exports = function(grunt) {
grunt.registerTask('npm-react-addons:release', npmReactAddonsTasks.buildReleases);
grunt.registerTask('npm-react-addons:pack', npmReactAddonsTasks.packReleases);
- grunt.registerTask('version-check', require('./grunt/tasks/version-check'));
+ grunt.registerTask('version-check', function() {
+ // Use gulp here.
+ spawnGulp(['version-check'], null, this.async());
+ });
grunt.registerTask('build:basic', [
'build-modules',
diff --git a/README.md b/README.md
index 18003e8a12..f8057a9238 100644
--- a/README.md
+++ b/README.md
@@ -65,6 +65,7 @@ The process to build `react.js` is built entirely on top of node.js, using many
#### Prerequisites
* You have `node` installed at v4.0.0+ and `npm` at v2.0.0+.
+* You have `gcc` installed or are comfortable installing a compiler if needed. Some of our `npm` dependencies may require a compliation step. On OS X, the Xcode Command Line Tools will cover this. On Ubuntu, `apt-get install build-essential` will install the required packages. Similar commands should work on other Linux distros. Windows will require some additional steps, see the [`node-gyp` installation instructions](https://github.com/nodejs/node-gyp#installation) for details.
* You are familiar with `npm` and know whether or not you need to use `sudo` when installing packages globally.
* You are familiar with `git`.
diff --git a/examples/fiber/index.html b/examples/fiber/index.html
new file mode 100644
index 0000000000..c507993794
--- /dev/null
+++ b/examples/fiber/index.html
@@ -0,0 +1,44 @@
+
+
+
+ Fiber Example
+ Fiber Example
+
+
+ To install React, follow the instructions on
+ GitHub .
+
+
+ If you can see this, React is not working right.
+ If you checked out the source from GitHub make sure to run grunt.
+
+
{this.context.foo + '-' + this.context.getFoo()}
;
+ },
+ });
+
+ var Parent = React.createClass({
+ childContextTypes: {
+ foo: React.PropTypes.string.isRequired,
+ getFoo: React.PropTypes.func.isRequired,
+ },
+
+ getChildContext: function() {
+ return {
+ foo: this.state.bar,
+ getFoo: () => this.state.bar,
+ };
+ },
+
+ getInitialState: function() {
+ return {
+ bar: 'initial',
+ };
+ },
+
+ render: function() {
+ return null;
+ },
+
+ componentDidMount: function() {
+ renderSubtreeIntoContainer(this, {this.context.foo + '-' + this.context.getFoo()}
;
+ },
+ });
+
+ var Parent = React.createClass({
+ childContextTypes: {
+ foo: React.PropTypes.string.isRequired,
+ getFoo: React.PropTypes.func.isRequired,
+ },
+
+ getChildContext: function() {
+ return {
+ foo: this.props.bar,
+ getFoo: () => this.props.bar,
+ };
+ },
+
+ render: function() {
+ return null;
+ },
+
+ componentDidMount: function() {
+ renderSubtreeIntoContainer(this, console.error).calls.count()).toBe(2);
expect((console.error).calls.argsFor(0)[0]).toContain(
'replaceState(...) is deprecated in plain JavaScript React classes'
diff --git a/src/renderers/dom/client/ReactMount.js b/src/renderers/dom/client/ReactMount.js
index 5e1827b746..9a0d15ba27 100644
--- a/src/renderers/dom/client/ReactMount.js
+++ b/src/renderers/dom/client/ReactMount.js
@@ -20,6 +20,7 @@ var ReactDOMContainerInfo = require('ReactDOMContainerInfo');
var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
var ReactElement = require('ReactElement');
var ReactFeatureFlags = require('ReactFeatureFlags');
+var ReactInstanceMap = require('ReactInstanceMap');
var ReactInstrumentation = require('ReactInstrumentation');
var ReactMarkupChecksum = require('ReactMarkupChecksum');
var ReactReconciler = require('ReactReconciler');
@@ -287,10 +288,11 @@ var ReactMount = {
_updateRootComponent: function(
prevComponent,
nextElement,
+ nextContext,
container,
callback) {
ReactMount.scrollMonitor(container, function() {
- ReactUpdateQueue.enqueueElementInternal(prevComponent, nextElement);
+ ReactUpdateQueue.enqueueElementInternal(prevComponent, nextElement, nextContext);
if (callback) {
ReactUpdateQueue.enqueueCallbackInternal(prevComponent, callback);
}
@@ -313,10 +315,6 @@ var ReactMount = {
shouldReuseMarkup,
context
) {
- if (__DEV__) {
- ReactInstrumentation.debugTool.onBeginFlush();
- }
-
// Various parts of our code (such as ReactCompositeComponent's
// _renderValidatedComponent) assume that calls to render aren't nested;
// verify that that's the case.
@@ -340,13 +338,7 @@ var ReactMount = {
);
ReactBrowserEventEmitter.ensureScrollValueMonitoring();
- var componentInstance = instantiateReactComponent(nextElement);
-
- if (__DEV__) {
- // Mute future events from the top level wrapper.
- // It is an implementation detail that devtools should not know about.
- componentInstance._debugID = 0;
- }
+ var componentInstance = instantiateReactComponent(nextElement, false);
// The initial render is synchronous but any updates that happen during
// rendering, in componentWillMount or componentDidMount, will be batched
@@ -368,7 +360,6 @@ var ReactMount = {
ReactInstrumentation.debugTool.onMountRootComponent(
componentInstance._renderedComponent._debugID
);
- ReactInstrumentation.debugTool.onEndFlush();
}
return componentInstance;
@@ -389,7 +380,7 @@ var ReactMount = {
*/
renderSubtreeIntoContainer: function(parentComponent, nextElement, container, callback) {
invariant(
- parentComponent != null && parentComponent._reactInternalInstance != null,
+ parentComponent != null && ReactInstanceMap.has(parentComponent),
'parentComponent must be a valid React Component'
);
return ReactMount._renderSubtreeIntoContainer(
@@ -440,6 +431,14 @@ var ReactMount = {
nextElement
);
+ var nextContext;
+ if (parentComponent) {
+ var parentInst = ReactInstanceMap.get(parentComponent);
+ nextContext = parentInst._processChildContext(parentInst._context);
+ } else {
+ nextContext = emptyObject;
+ }
+
var prevComponent = getTopLevelWrapperInContainer(container);
if (prevComponent) {
@@ -453,6 +452,7 @@ var ReactMount = {
ReactMount._updateRootComponent(
prevComponent,
nextWrappedElement,
+ nextContext,
container,
updatedCallback
);
@@ -501,11 +501,7 @@ var ReactMount = {
nextWrappedElement,
container,
shouldReuseMarkup,
- parentComponent != null ?
- parentComponent._reactInternalInstance._processChildContext(
- parentComponent._reactInternalInstance._context
- ) :
- emptyObject
+ nextContext
)._renderedComponent.getPublicInstance();
if (callback) {
callback.call(component);
diff --git a/src/renderers/dom/client/ReactReconcileTransaction.js b/src/renderers/dom/client/ReactReconcileTransaction.js
index 403aa7f2ce..3a4c25170e 100644
--- a/src/renderers/dom/client/ReactReconcileTransaction.js
+++ b/src/renderers/dom/client/ReactReconcileTransaction.js
@@ -15,7 +15,9 @@ var CallbackQueue = require('CallbackQueue');
var PooledClass = require('PooledClass');
var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
var ReactInputSelection = require('ReactInputSelection');
+var ReactInstrumentation = require('ReactInstrumentation');
var Transaction = require('Transaction');
+var ReactUpdateQueue = require('ReactUpdateQueue');
/**
@@ -90,6 +92,13 @@ var TRANSACTION_WRAPPERS = [
ON_DOM_READY_QUEUEING,
];
+if (__DEV__) {
+ TRANSACTION_WRAPPERS.push({
+ initialize: ReactInstrumentation.debugTool.onBeginFlush,
+ close: ReactInstrumentation.debugTool.onEndFlush,
+ });
+}
+
/**
* Currently:
* - The order that these are listed in the transaction is critical:
@@ -104,7 +113,7 @@ var TRANSACTION_WRAPPERS = [
*
* @class ReactReconcileTransaction
*/
-function ReactReconcileTransaction(useCreateElement) {
+function ReactReconcileTransaction(useCreateElement: boolean) {
this.reinitializeTransaction();
// Only server-side rendering really needs this option (see
// `ReactServerRendering`), but server-side uses
@@ -135,6 +144,13 @@ var Mixin = {
return this.reactMountReady;
},
+ /**
+ * @return {object} The queue to collect React async events.
+ */
+ getUpdateQueue: function() {
+ return ReactUpdateQueue;
+ },
+
/**
* Save current transaction state -- if the return value from this method is
* passed to `rollback`, the transaction will be reset to that state.
diff --git a/src/renderers/dom/client/wrappers/ReactDOMInput.js b/src/renderers/dom/client/wrappers/ReactDOMInput.js
index c4bcca0c8e..d8730c2a21 100644
--- a/src/renderers/dom/client/wrappers/ReactDOMInput.js
+++ b/src/renderers/dom/client/wrappers/ReactDOMInput.js
@@ -22,7 +22,6 @@ var warning = require('warning');
var didWarnValueLink = false;
var didWarnCheckedLink = false;
-var didWarnValueNull = false;
var didWarnValueDefaultValue = false;
var didWarnCheckedDefaultChecked = false;
var didWarnControlledToUncontrolled = false;
@@ -35,19 +34,6 @@ function forceUpdateIfMounted() {
}
}
-function warnIfValueIsNull(props) {
- if (props != null && props.value === null && !didWarnValueNull) {
- warning(
- false,
- '`value` prop on `input` should not be null. ' +
- 'Consider using the empty string to clear the component or `undefined` ' +
- 'for uncontrolled components.'
- );
-
- didWarnValueNull = true;
- }
-}
-
function isControlled(props) {
var usesChecked = props.type === 'checkbox' || props.type === 'radio';
return usesChecked ? props.checked !== undefined : props.value !== undefined;
@@ -149,7 +135,6 @@ var ReactDOMInput = {
);
didWarnValueDefaultValue = true;
}
- warnIfValueIsNull(props);
}
var defaultValue = props.defaultValue;
@@ -169,8 +154,6 @@ var ReactDOMInput = {
var props = inst._currentElement.props;
if (__DEV__) {
- warnIfValueIsNull(props);
-
var controlled = isControlled(props);
var owner = inst._currentElement._owner;
@@ -233,10 +216,20 @@ var ReactDOMInput = {
},
postMountWrapper: function(inst) {
+ var props = inst._currentElement.props;
+
// This is in postMount because we need access to the DOM node, which is not
// available until after the component has mounted.
var node = ReactDOMComponentTree.getNodeFromInstance(inst);
- node.value = node.value; // Detach value from defaultValue
+
+ // Detach value from defaultValue. We won't do anything if we're working on
+ // submit or reset inputs as those values & defaultValues are linked. They
+ // are not resetable nodes so this operation doesn't matter and actually
+ // removes browser-default values (eg "Submit Query") when no value is
+ // provided.
+ if (props.type !== 'submit' && props.type !== 'reset') {
+ node.value = node.value;
+ }
// Normally, we'd just do `node.checked = node.checked` upon initial mount, less this bug
// this is needed to work around a chrome bug where setting defaultChecked
@@ -244,10 +237,14 @@ var ReactDOMInput = {
// Reference: https://bugs.chromium.org/p/chromium/issues/detail?id=608416
// We need to temporarily unset name to avoid disrupting radio button groups.
var name = node.name;
- node.name = undefined;
+ if (name !== '') {
+ node.name = '';
+ }
node.defaultChecked = !node.defaultChecked;
node.defaultChecked = !node.defaultChecked;
- node.name = name;
+ if (name !== '') {
+ node.name = name;
+ }
},
};
diff --git a/src/renderers/dom/client/wrappers/ReactDOMSelect.js b/src/renderers/dom/client/wrappers/ReactDOMSelect.js
index 5fc85ef3db..c693fb7036 100644
--- a/src/renderers/dom/client/wrappers/ReactDOMSelect.js
+++ b/src/renderers/dom/client/wrappers/ReactDOMSelect.js
@@ -19,7 +19,6 @@ var ReactUpdates = require('ReactUpdates');
var warning = require('warning');
var didWarnValueLink = false;
-var didWarnValueNull = false;
var didWarnValueDefaultValue = false;
function updateOptionsIfPendingUpdateAndMounted() {
@@ -45,19 +44,6 @@ function getDeclarationErrorAddendum(owner) {
return '';
}
-function warnIfValueIsNull(props) {
- if (props != null && props.value === null && !didWarnValueNull) {
- warning(
- false,
- '`value` prop on `select` should not be null. ' +
- 'Consider using the empty string to clear the component or `undefined` ' +
- 'for uncontrolled components.'
- );
-
- didWarnValueNull = true;
- }
-}
-
var valuePropNames = ['value', 'defaultValue'];
/**
@@ -168,7 +154,6 @@ var ReactDOMSelect = {
mountWrapper: function(inst, props) {
if (__DEV__) {
checkSelectPropTypes(inst, props);
- warnIfValueIsNull(props);
}
var value = LinkedValueUtils.getValue(props);
@@ -205,9 +190,6 @@ var ReactDOMSelect = {
postUpdateWrapper: function(inst) {
var props = inst._currentElement.props;
- if (__DEV__) {
- warnIfValueIsNull(props);
- }
// After the initial mount, we control selected-ness manually so don't pass
// this value down
diff --git a/src/renderers/dom/client/wrappers/ReactDOMTextarea.js b/src/renderers/dom/client/wrappers/ReactDOMTextarea.js
index 3c06222f7a..52f2ae8426 100644
--- a/src/renderers/dom/client/wrappers/ReactDOMTextarea.js
+++ b/src/renderers/dom/client/wrappers/ReactDOMTextarea.js
@@ -20,7 +20,6 @@ var invariant = require('invariant');
var warning = require('warning');
var didWarnValueLink = false;
-var didWarnValueNull = false;
var didWarnValDefaultVal = false;
function forceUpdateIfMounted() {
@@ -30,19 +29,6 @@ function forceUpdateIfMounted() {
}
}
-function warnIfValueIsNull(props) {
- if (props != null && props.value === null && !didWarnValueNull) {
- warning(
- false,
- '`value` prop on `textarea` should not be null. ' +
- 'Consider using the empty string to clear the component or `undefined` ' +
- 'for uncontrolled components.'
- );
-
- didWarnValueNull = true;
- }
-}
-
/**
* Implements a