Revert D6641403: [RN] Refined -[RCTUIManager createView:]

Differential Revision: D6641403

fbshipit-source-id: f478810413aa49b44c060db898e7e8698bddb8e1

React/Modules/RCTUIManager.m

@@ -967,19 +967,21 @@ RCT_EXPORT_METHOD(createView:(nonnull NSNumber *)reactTag
 
   // Dispatch view creation directly to the main thread instead of adding to
   // UIBlocks array. This way, it doesn't get deferred until after layout.
-  __block UIView *preliminaryCreatedView;
+  __weak RCTUIManager *weakManager = self;
-
   RCTExecuteOnMainQueue(^{
-    preliminaryCreatedView = [componentData createViewWithTag:reactTag];
+    RCTUIManager *uiManager = weakManager;
-  });
+    if (!uiManager) {
-
-  [self addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    if (!preliminaryCreatedView) {
       return;
     }
+    UIView *view = [componentData createViewWithTag:reactTag];
+    if (view) {
+      uiManager->_viewRegistry[reactTag] = view;
+    }
+  });
 
-    uiManager->_viewRegistry[reactTag] = preliminaryCreatedView;
+  [self addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
-    [componentData setProps:props forView:preliminaryCreatedView];
+    UIView *view = viewRegistry[reactTag];
+    [componentData setProps:props forView:view];
   }];
 
   [self _shadowView:shadowView didReceiveUpdatedProps:[props allKeys]];