Added UIManager flowtype annotations and fixed flow/lint issues

Author: Brian Vaughn

flow/react-native-host-hooks.js

@@ -29,16 +29,35 @@ declare module 'TextInputState' {
 declare module 'UIManager' {
   declare var customBubblingEventTypes : Object;
   declare var customDirectEventTypes : Object;
-  declare function createView() : void;
-  declare function manageChildren() : void;
+  declare function createView(
+    reactTag : number,
+    viewName : string,
+    rootTag : number,
+    props : Object,
+  ) : void;
+  declare function manageChildren(
+    containerTag : number,
+    moveFromIndices : Array<number>,
+    moveToIndices : Array<number>,
+    addChildReactTags : Array<number>,
+    addAtIndices : Array<number>,
+    removeAtIndices : Array<number>
+  ) : void;
   declare function measure() : void;
   declare function measureInWindow() : void;
   declare function measureLayout() : void;
   declare function removeRootView() : void;
   declare function removeSubviewsFromContainerWithID() : void;
   declare function replaceExistingNonRootView() : void;
-  declare function setChildren() : void;
-  declare function updateView() : void;
+  declare function setChildren(
+    containerTag : number,
+    reactTags : Array<number>,
+  ) : void;
+  declare function updateView(
+    reactTag : number,
+    viewName : string,
+    props : Object,
+  ) : void;
 }
 declare module 'View' {
   declare var exports : typeof ReactComponent;

src/renderers/native/NativeMethodsMixin.js

@@ -150,9 +150,9 @@ var NativeMethodsMixin = {
     );
 
     UIManager.updateView(
-      findNodeHandle(this),
+      (findNodeHandle(this) : any),
       this.viewConfig.uiViewClassName,
-      updatePayload
+      (updatePayload : any)
     );
   },
 

src/renderers/native/ReactNativeBaseComponent.js

@@ -112,7 +112,7 @@ ReactNativeBaseComponent.Mixin = {
       UIManager.updateView(
         this._rootNodeID,
         this.viewConfig.uiViewClassName,
-        updatePayload
+        (updatePayload : any)
       );
     }
 
@@ -160,7 +160,7 @@ ReactNativeBaseComponent.Mixin = {
       tag,
       this.viewConfig.uiViewClassName,
       nativeTopRootTag,
-      updatePayload
+      (updatePayload : any)
     );
 
     ReactNativeComponentTree.precacheNode(this, tag);

src/renderers/native/ReactNativeFiber.js

@@ -12,14 +12,13 @@
 
 'use strict';
 
+import type { Element } from 'React';
 import type { Fiber } from 'ReactFiber';
 import type { ReactNodeList } from 'ReactTypes';
 
 const NativeMethodsMixin = require('NativeMethodsMixin');
-const ReactControlledComponent = require('ReactControlledComponent');
 const ReactFiberReconciler = require('ReactFiberReconciler');
 const ReactGenericBatching = require('ReactGenericBatching');
-const ReactInstanceMap = require('ReactInstanceMap');
 const ReactNativeAttributePayload = require('ReactNativeAttributePayload');
 const ReactNativeComponentTree = require('ReactNativeComponentTree');
 const ReactNativeInjection = require('ReactNativeInjection');
@@ -30,38 +29,33 @@ const UIManager = require('UIManager');
 
 const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');
 const findNodeHandle = require('findNodeHandle');
-const invariant = require('invariant');
 
 const { precacheFiberNode, uncacheFiberNode } = ReactNativeComponentTree;
 
 ReactNativeInjection.inject();
-// ReactControlledComponent.injection.injectFiberControlledHostComponent(
-//   ReactNativeFiberComponent
-// );
 
-type Container = mixed;
-type Props = mixed;
-type Instance = mixed;
-type TextInstance = mixed;
+type Container = number;
+type Props = Object;
+type Instance = any;
+type TextInstance = number;
 
 function NativeHostComponent(tag) {
   this._nativeTag = tag;
   this._children = [];
 }
 Object.assign(NativeHostComponent.prototype, NativeMethodsMixin);
 
-function recursivelyUncacheFiberNode (node) {
+function recursivelyUncacheFiberNode(node : Instance | TextInstance) {
   if (typeof node === 'number') { // Leaf node (eg text)
     uncacheFiberNode(node);
   } else {
-    uncacheFiberNode(node._nativeTag);
+    uncacheFiberNode((node : any)._nativeTag);
 
-    node._children.forEach(recursivelyUncacheFiberNode);
+    (node : any)._children.forEach(recursivelyUncacheFiberNode);
   }
 }
 
 const NativeRenderer = ReactFiberReconciler({
-
   appendChild(
     parentInstance : Instance | Container,
     child : Instance | TextInstance
@@ -70,17 +64,19 @@ const NativeRenderer = ReactFiberReconciler({
       // Root container
       UIManager.setChildren(
         parentInstance, // containerTag
-        [child._nativeTag] // reactTags
+        [(child : any)._nativeTag] // reactTags
       );
     } else {
-      parentInstance._children.push(child);
+      const children = parentInstance._children;
+
+      children.push(child);
 
       UIManager.manageChildren(
         parentInstance._nativeTag, // containerTag
         [], // moveFromIndices
         [], // moveToIndices
-        [child._nativeTag], // addChildReactTags
-        [parentInstance._children.length - 1], // addAtIndices
+        [(child : any)._nativeTag], // addChildReactTags
+        [children.length - 1], // addAtIndices
         [], // removeAtIndices
       );
     }
@@ -115,16 +111,18 @@ const NativeRenderer = ReactFiberReconciler({
   ) : void {
     precacheFiberNode(internalInstanceHandle, instance._nativeTag);
 
+    const viewConfig = (instance : any).viewConfig;
+
     const updatePayload = ReactNativeAttributePayload.diff(
       oldProps,
       newProps,
-      instance.viewConfig.validAttributes
+      viewConfig.validAttributes
     );
 
     UIManager.updateView(
-      instance._nativeTag, // reactTag
-      instance.viewConfig.uiViewClassName, // viewName
-      updatePayload, // props
+      (instance : any)._nativeTag, // reactTag
+      viewConfig.uiViewClassName, // viewName
+      (updatePayload : any), // props
     );
   },
 
@@ -155,7 +153,7 @@ const NativeRenderer = ReactFiberReconciler({
       tag, // reactTag
       viewConfig.uiViewClassName, // viewName
       rootContainerInstance, // rootTag
-      updatePayload // props
+      (updatePayload : any), // props
     );
 
     const component = new NativeHostComponent(tag);
@@ -216,30 +214,31 @@ const NativeRenderer = ReactFiberReconciler({
     child : Instance | TextInstance,
     beforeChild : Instance | TextInstance
   ) : void {
-    const beforeChildIndex = parentInstance._children.indexOf(beforeChild);
-    const index = parentInstance._children.indexOf(child);
+    const children = (parentInstance : any)._children;
+    const beforeChildIndex = children.indexOf(beforeChild);
+    const index = children.indexOf(child);
 
     // Move existing child or add new child?
     if (index >= 0) {
-      parentInstance._children.splice(index,1);
-      parentInstance._children.splice(beforeChildIndex,0,child);
+      children.splice(index, 1);
+      children.splice(beforeChildIndex, 0, child);
 
       UIManager.manageChildren(
-        parentInstance._nativeTag, // containerID
+        (parentInstance : any)._nativeTag, // containerID
         [index], // moveFromIndices
         [beforeChildIndex], // moveToIndices
         [], // addChildReactTags
         [], // addAtIndices
         [], // removeAtIndices
       );
     } else {
-      parentInstance._children.splice(beforeChildIndex,0,child);
+      children.splice(beforeChildIndex, 0, child);
 
       UIManager.manageChildren(
-        parentInstance._nativeTag, // containerID
+        (parentInstance : any)._nativeTag, // containerID
         [], // moveFromIndices
         [], // moveToIndices
-        [child._nativeTag], // addChildReactTags
+        [(child : any)._nativeTag], // addChildReactTags
         [beforeChildIndex], // addAtIndices
         [], // removeAtIndices
       );
@@ -271,9 +270,10 @@ const NativeRenderer = ReactFiberReconciler({
         [0], // removeAtIndices
       );
     } else {
-      const index = parentInstance._children.indexOf(child);
+      const children = parentInstance._children
+      const index = children.indexOf(child);
 
-      parentInstance._children.splice(index, 1);
+      children.splice(index, 1);
 
       UIManager.manageChildren(
         parentInstance._nativeTag, // containerID
@@ -324,7 +324,7 @@ findNodeHandle.injection.injectFindRootNodeID(
 const ReactNative = {
   findNodeHandle,
 
-  render(element : React.Element<any>, containerTag : number, callback: ?Function) {
+  render(element : Element<any>, containerTag : any, callback: ?Function) {
     let root = roots.get(containerTag);
 
     if (!root) {

src/renderers/native/ReactNativeViewConfigRegistry.js

@@ -12,6 +12,8 @@
 
 'use strict';
 
+const invariant = require('invariant');
+
 type ReactNativeBaseComponentViewConfig = {
   validAttributes: Object,
   uiViewClassName: string,
@@ -38,7 +40,8 @@ const ReactNativeViewConfigRegistry = {
     const config = viewConfigs.get(secretName);
     invariant(
       config,
-      'View config not found for name %s'
+      'View config not found for name %s',
+      secretName
     );
     return config;
   },

src/renderers/native/createReactNativeComponentClass.js

@@ -12,7 +12,6 @@
 
 'use strict';
 
-const React = require('React');
 const ReactNativeBaseComponent = require('ReactNativeBaseComponent');
 const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');
 const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
@@ -32,7 +31,7 @@ const createReactNativeFiberComponentClass = function(
   viewConfig: ReactNativeBaseComponentViewConfig
 ): string {
   return ReactNativeViewConfigRegistry.register(viewConfig);
-}
+};
 
 /**
  * @param {string} config iOS View configuration.