From f7dab22ac9a3fe6d148ea8fbd6447e7122881885 Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Wed, 27 Jul 2016 13:07:08 -0700 Subject: [PATCH] Ensure that setState update function's context is undefined --- src/renderers/shared/fiber/ReactFiberStateQueue.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/renderers/shared/fiber/ReactFiberStateQueue.js b/src/renderers/shared/fiber/ReactFiberStateQueue.js index beceeb07dd..d410f8d0d6 100644 --- a/src/renderers/shared/fiber/ReactFiberStateQueue.js +++ b/src/renderers/shared/fiber/ReactFiberStateQueue.js @@ -53,9 +53,13 @@ exports.mergeStateQueue = function(queue : ?StateQueue, prevState : any, props : } let state = Object.assign({}, prevState); do { - const partialState = typeof node.partialState === 'function' ? - node.partialState(state, props) : - node.partialState; + let partialState; + if (typeof node.partialState === 'function') { + const updateFn = node.partialState; + partialState = updateFn(state, props); + } else { + partialState = node.partialState; + } state = Object.assign(state, partialState); } while (node = node.next); return state;