Dan Abramov 8e598ea5c6 Don't count the time inside flushes towards lifecycle hooks (#6860) ...

* Don't count the time inside flushes towards lifecycle hooks

Fixes #6842.

We keep the existing behavior of testing for matching `onBeginLifeCycleTimer`/`onEndLifeCycleTimer` calls, but we push the current timer onto the stack if we enter a flush.
This solves an issue with portals which cause updates while a lifecycle timer is already running.

I chose to subtract the time spent in the flush from the time counted towards the lifecycle method because it would artificially inflate the “total” time of the component due to all the components inside the portal, so it would skew the exclusive table.

* Fix up the comment

(cherry picked from commit 8d7161e004)

2016-06-14 15:48:53 -07:00

..

addons

Add warning for unknown properties. (#6800)

2016-06-14 15:48:53 -07:00

core/__tests__

Merge pull request #6620 from cpojer/master

2016-05-09 22:05:09 -07:00

isomorphic

Avoid directly calling hasOwnProperty (#6855)

2016-06-14 15:34:28 -07:00

renderers

Don't count the time inside flushes towards lifecycle hooks (#6860)

2016-06-14 15:48:53 -07:00

shared

Add component stack info to key validation warnings (#6799)

2016-06-14 15:34:27 -07:00

test

Merge pull request #6789 from gaearon/tree-devtool-fixes

2016-06-14 15:34:27 -07:00

umd

Use Object.assign directly and inject object-assign at compile

2016-04-04 09:53:25 -07:00

package.json

15.0.1

2016-04-08 11:12:25 -07:00

ReactVersion.js

15.1.0

2016-05-20 15:54:35 -07:00