Tidied up comments, var-to-const, etc

Author: Brian Vaughn

src/renderers/native/ReactNativeComponentTree.js

@@ -35,8 +35,8 @@ function getRenderedHostOrTextFromComponent(component) {
  * DOM node. The passed `inst` can be a composite.
  */
 function precacheNode(inst, tag) {
-  var hostInst = getRenderedHostOrTextFromComponent(inst);
-  instanceCache[tag] = hostInst;
+  var nativeInst = getRenderedHostOrTextFromComponent(inst);
+  instanceCache[tag] = nativeInst;
 }
 
 function precacheFiberNode(hostInst, tag) {

src/renderers/native/ReactNativeFiber.js

@@ -15,24 +15,24 @@
 import type { Fiber } from 'ReactFiber';
 import type { ReactNodeList } from 'ReactTypes';
 
-var NativeMethodsMixin = require('NativeMethodsMixin');
-var ReactControlledComponent = require('ReactControlledComponent');
-var ReactFiberReconciler = require('ReactFiberReconciler');
-var ReactGenericBatching = require('ReactGenericBatching');
-var ReactInstanceMap = require('ReactInstanceMap');
-var ReactNativeAttributePayload = require('ReactNativeAttributePayload');
-var ReactNativeComponentTree = require('ReactNativeComponentTree');
-var ReactNativeInjection = require('ReactNativeInjection');
-var ReactNativeTagHandles = require('ReactNativeTagHandles');
-var ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');
-var ReactPortal = require('ReactPortal');
-var UIManager = require('UIManager');
-
-var deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');
-var findNodeHandle = require('findNodeHandle');
-var invariant = require('invariant');
-
-var { precacheFiberNode, uncacheFiberNode } = ReactNativeComponentTree;
+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');
+const ReactNativeTagHandles = require('ReactNativeTagHandles');
+const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');
+const ReactPortal = require('ReactPortal');
+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(
@@ -60,7 +60,7 @@ function recursivelyUncacheFiberNode (node) {
   }
 }
 
-var NativeRenderer = ReactFiberReconciler({
+const NativeRenderer = ReactFiberReconciler({
 
   appendChild(
     parentInstance : Instance | Container,
@@ -69,19 +69,19 @@ var NativeRenderer = ReactFiberReconciler({
     if (typeof parentInstance === 'number') {
       // Root container
       UIManager.setChildren(
-        parentInstance,
-        [child._nativeTag]
+        parentInstance, // containerTag
+        [child._nativeTag] // reactTags
       );
     } else {
       parentInstance._children.push(child);
 
       UIManager.manageChildren(
-        parentInstance._nativeTag,
-        [],
-        [],
-        [child._nativeTag],
-        [parentInstance._children.length - 1],
-        [],
+        parentInstance._nativeTag, // containerTag
+        [], // moveFromIndices
+        [], // moveToIndices
+        [child._nativeTag], // addChildReactTags
+        [parentInstance._children.length - 1], // addAtIndices
+        [], // removeAtIndices
       );
     }
   },
@@ -100,9 +100,9 @@ var NativeRenderer = ReactFiberReconciler({
     newText : string
   ) : void {
     UIManager.updateView(
-      textInstance,
-      'RCTRawText',
-      {text: newText},
+      textInstance, // reactTag
+      'RCTRawText', // viewName
+      {text: newText}, // props
     );
   },
 
@@ -115,16 +115,16 @@ var NativeRenderer = ReactFiberReconciler({
   ) : void {
     precacheFiberNode(internalInstanceHandle, instance._nativeTag);
 
-    var updatePayload = ReactNativeAttributePayload.diff(
+    const updatePayload = ReactNativeAttributePayload.diff(
       oldProps,
       newProps,
       instance.viewConfig.validAttributes
     );
 
     UIManager.updateView(
-      instance._nativeTag,
-      instance.viewConfig.uiViewClassName,
-      updatePayload,
+      instance._nativeTag, // reactTag
+      instance.viewConfig.uiViewClassName, // viewName
+      updatePayload, // props
     );
   },
 
@@ -135,27 +135,27 @@ var NativeRenderer = ReactFiberReconciler({
     hostContext : string | null,
     internalInstanceHandle : Object
   ) : Instance {
-    var tag = ReactNativeTagHandles.allocateTag();
-    var viewConfig = ReactNativeViewConfigRegistry.get(type);
+    const tag = ReactNativeTagHandles.allocateTag();
+    const viewConfig = ReactNativeViewConfigRegistry.get(type);
 
     if (__DEV__) {
-      for (var key in viewConfig.validAttributes) {
+      for (let key in viewConfig.validAttributes) {
         if (props.hasOwnProperty(key)) {
           deepFreezeAndThrowOnMutationInDev(props[key]);
         }
       }
     }
 
-    var updatePayload = ReactNativeAttributePayload.create(
+    const updatePayload = ReactNativeAttributePayload.create(
       props,
       viewConfig.validAttributes
     );
 
     UIManager.createView(
-      tag,
-      viewConfig.uiViewClassName,
-      rootContainerInstance,
-      updatePayload
+      tag, // reactTag
+      viewConfig.uiViewClassName, // viewName
+      rootContainerInstance, // rootTag
+      updatePayload // props
     );
 
     const component = new NativeHostComponent(tag);
@@ -171,13 +171,13 @@ var NativeRenderer = ReactFiberReconciler({
     rootContainerInstance : Container,
     internalInstanceHandle : Object,
   ) : TextInstance {
-    var tag = ReactNativeTagHandles.allocateTag();
+    const tag = ReactNativeTagHandles.allocateTag();
 
     UIManager.createView(
-      tag,
-      'RCTRawText',
-      rootContainerInstance,
-      {text: text}
+      tag, // reactTag
+      'RCTRawText', // viewName
+      rootContainerInstance, // rootTag
+      {text: text} // props
     );
 
     precacheFiberNode(internalInstanceHandle, tag);
@@ -191,16 +191,16 @@ var NativeRenderer = ReactFiberReconciler({
     rootContainerInstance : Container,
   ) : void {
     // Map from child objects to native tags.
-    // If we weren't mapping we would still need to pass a copy of the Array to prevent it from being frozen.
+    // Either way we need to pass a copy of the Array to prevent it from being frozen.
     const nativeTags = parentInstance._children.map(
       (child) => typeof child === 'number'
         ? child // Leaf node (eg text)
         : child._nativeTag
     );
 
     UIManager.setChildren(
-      parentInstance._nativeTag,
-      nativeTags
+      parentInstance._nativeTag, // containerTag
+      nativeTags // reactTags
     );
   },
 
@@ -225,23 +225,23 @@ var NativeRenderer = ReactFiberReconciler({
       parentInstance._children.splice(beforeChildIndex,0,child);
 
       UIManager.manageChildren(
-        parentInstance._nativeTag,
-        [index],
-        [beforeChildIndex],
-        [],
-        [],
-        [],
+        parentInstance._nativeTag, // containerID
+        [index], // moveFromIndices
+        [beforeChildIndex], // moveToIndices
+        [], // addChildReactTags
+        [], // addAtIndices
+        [], // removeAtIndices
       );
     } else {
       parentInstance._children.splice(beforeChildIndex,0,child);
 
       UIManager.manageChildren(
-        parentInstance._nativeTag,
-        [],
-        [],
-        [child._nativeTag],
-        [beforeChildIndex],
-        [],
+        parentInstance._nativeTag, // containerID
+        [], // moveFromIndices
+        [], // moveToIndices
+        [child._nativeTag], // addChildReactTags
+        [beforeChildIndex], // addAtIndices
+        [], // removeAtIndices
       );
     }
   },
@@ -263,25 +263,25 @@ var NativeRenderer = ReactFiberReconciler({
 
     if (typeof parentInstance === 'number') {
       UIManager.manageChildren(
-        parentInstance,
-        [],
-        [],
-        [],
-        [],
-        [0],
+        parentInstance, // containerID
+        [], // moveFromIndices
+        [], // moveToIndices
+        [], // addChildReactTags
+        [], // addAtIndices
+        [0], // removeAtIndices
       );
     } else {
       const index = parentInstance._children.indexOf(child);
 
       parentInstance._children.splice(index, 1);
 
       UIManager.manageChildren(
-        parentInstance._nativeTag,
-        [],
-        [],
-        [],
-        [],
-        [index],
+        parentInstance._nativeTag, // containerID
+        [], // moveFromIndices
+        [], // moveToIndices
+        [], // addChildReactTags
+        [], // addAtIndices
+        [index], // removeAtIndices
       );
     }
   },
@@ -321,7 +321,7 @@ findNodeHandle.injection.injectFindRootNodeID(
   (instance) => instance._nativeTag
 );
 
-var ReactNative = {
+const ReactNative = {
   findNodeHandle,
 
   render(element : React.Element<any>, containerTag : number, callback: ?Function) {

src/renderers/native/createReactNativeComponentClass.js

@@ -12,10 +12,10 @@
 
 'use strict';
 
-var React = require('React');
-var ReactNativeBaseComponent = require('ReactNativeBaseComponent');
-var ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');
-var ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
+const React = require('React');
+const ReactNativeBaseComponent = require('ReactNativeBaseComponent');
+const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');
+const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
 
 // See also ReactNativeBaseComponent
 type ReactNativeBaseComponentViewConfig = {
@@ -28,7 +28,7 @@ type ReactNativeBaseComponentViewConfig = {
  * @param {string} config iOS View configuration.
  * @private
  */
-var createReactNativeFiberComponentClass = function(
+const createReactNativeFiberComponentClass = function(
   viewConfig: ReactNativeBaseComponentViewConfig
 ): string {
   return ReactNativeViewConfigRegistry.register(viewConfig);
@@ -38,10 +38,10 @@ var createReactNativeFiberComponentClass = function(
  * @param {string} config iOS View configuration.
  * @private
  */
-var createReactNativeComponentClass = function(
+const createReactNativeComponentClass = function(
   viewConfig: ReactNativeBaseComponentViewConfig
 ): ReactClass<any> {
-  var Constructor = function(element) {
+  const Constructor = function(element) {
     this._currentElement = element;
     this._topLevelWrapper = null;
     this._hostParent = null;