fix(ReactInstance): Set bridge instance before calling LoadScript (microsoft#745)

rozele · web-flow · commit 7d7dd3abf25e · 2016-10-06T12:11:19.000-04:00
JavaScript may call native behaviors prior to the `_bridge` variable being set in `ReactInstance`, which would be invoked in the initial call to `FlushedQueue` following the call to run the bundle. This change set ensures the `_bridge` is set before the bundle is loaded. Fixes microsoft#744
diff --git a/ReactWindows/ReactNative/Bridge/ReactInstance.cs b/ReactWindows/ReactNative/Bridge/ReactInstance.cs
@@ -109,14 +109,19 @@ public async Task InitializeBridgeAsync()
                             QueueConfiguration.NativeModulesQueueThread);
                     }
 
+                    return bridge;
+                }).ConfigureAwait(false);
+
+                await QueueConfiguration.JavaScriptQueueThread.CallOnQueue(() =>
+                {
                     using (Tracer.Trace(Tracer.TRACE_TAG_REACT_BRIDGE, "setBatchedBridgeConfig").Start())
                     {
-                        bridge.SetGlobalVariable("__fbBatchedBridgeConfig", BuildModulesConfig());
+                        _bridge.SetGlobalVariable("__fbBatchedBridgeConfig", BuildModulesConfig());
                     }
 
-                    _bundleLoader.LoadScript(bridge);
+                    _bundleLoader.LoadScript(_bridge);
 
-                    return bridge;
+                    return default(object);
                 }).ConfigureAwait(false);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -109,14 +109,19 @@ public async Task InitializeBridgeAsync()`
`109`	`109`	`QueueConfiguration.NativeModulesQueueThread);`
`110`	`110`	`}`
`111`	`111`
	`112`	`+ return bridge;`
	`113`	`+ }).ConfigureAwait(false);`
	`114`	`+`
	`115`	`+ await QueueConfiguration.JavaScriptQueueThread.CallOnQueue(() =>`
	`116`	`+ {`
`112`	`117`	`using (Tracer.Trace(Tracer.TRACE_TAG_REACT_BRIDGE, "setBatchedBridgeConfig").Start())`
`113`	`118`	`{`
`114`		`- bridge.SetGlobalVariable("__fbBatchedBridgeConfig", BuildModulesConfig());`
	`119`	`+ _bridge.SetGlobalVariable("__fbBatchedBridgeConfig", BuildModulesConfig());`
`115`	`120`	`}`
`116`	`121`
`117`		`- _bundleLoader.LoadScript(bridge);`
	`122`	`+ _bundleLoader.LoadScript(_bridge);`
`118`	`123`
`119`		`- return bridge;`
	`124`	`+ return default(object);`
`120`	`125`	`}).ConfigureAwait(false);`
`121`	`126`	`}`
`122`	`127`	`}`