RCTSurface: Fixed problem in stage propagation

shergin · facebook-github-bot · commit 081f7d14aded · 2017-12-03T20:16:35.000-08:00
Summary: We previously incorrectly communicated to the delegate changed fragment instead of compound value.

Reviewed By: rsnara

Differential Revision: D6367070

fbshipit-source-id: 373a7c14a79a4727a7e8f61178dea3ca16ea1f40
diff --git a/React/Base/Surface/RCTSurface.mm b/React/Base/Surface/RCTSurface.mm
@@ -211,17 +211,19 @@ - (RCTSurfaceStage)stage
 
 - (void)_setStage:(RCTSurfaceStage)stage
 {
+  RCTSurfaceStage updatedStage;
   {
     std::lock_guard<std::mutex> lock(_mutex);
 
     if (_stage & stage) {
       return;
     }
 
-    _stage = (RCTSurfaceStage)(_stage | stage);
+    updatedStage = (RCTSurfaceStage)(_stage | stage);
+    _stage = updatedStage;
   }
 
-  [self _propagateStageChange:stage];
+  [self _propagateStageChange:updatedStage];
 }
 
 - (void)_propagateStageChange:(RCTSurfaceStage)stage

Original file line number	Diff line number	Diff line change
`@@ -211,17 +211,19 @@ - (RCTSurfaceStage)stage`
`211`	`211`
`212`	`212`	`- (void)_setStage:(RCTSurfaceStage)stage`
`213`	`213`	`{`
	`214`	`+ RCTSurfaceStage updatedStage;`
`214`	`215`	`{`
`215`	`216`	`std::lock_guard<std::mutex> lock(_mutex);`
`216`	`217`
`217`	`218`	`if (_stage & stage) {`
`218`	`219`	`return;`
`219`	`220`	`}`
`220`	`221`
`221`		`- _stage = (RCTSurfaceStage)(_stage \| stage);`
	`222`	`+ updatedStage = (RCTSurfaceStage)(_stage \| stage);`
	`223`	`+ _stage = updatedStage;`
`222`	`224`	`}`
`223`	`225`
`224`		`- [self _propagateStageChange:stage];`
	`226`	`+ [self _propagateStageChange:updatedStage];`
`225`	`227`	`}`
`226`	`228`
`227`	`229`	`- (void)_propagateStageChange:(RCTSurfaceStage)stage`