fix memory leak

Libraries/Components/AppleTV/TVViewPropTypes.js

@@ -74,4 +74,14 @@ var TVViewPropTypes = {
 
 };
 
+export type TVViewProps = {
+  isTVSelectable?: bool,
+  hasTVPreferredFocus?: bool,
+  tvParallaxProperties?: Object,
+  tvParallaxShiftDistanceX?: number,
+  tvParallaxShiftDistanceY?: number,
+  tvParallaxTiltAngle?: number,
+  tvParallaxMagnification?: number,
+};
+
 module.exports = TVViewPropTypes;

Libraries/Components/View/View.js

@@ -14,26 +14,29 @@
 const NativeMethodsMixin = require('NativeMethodsMixin');
 const NativeModules = require('NativeModules');
 const Platform = require('Platform');
-const React = require('React');
 const PropTypes = require('prop-types');
+const React = require('React');
 const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');
 const ReactNativeStyleAttributes = require('ReactNativeStyleAttributes');
 const ReactNativeViewAttributes = require('ReactNativeViewAttributes');
 const ViewPropTypes = require('ViewPropTypes');
 
 const invariant = require('fbjs/lib/invariant');
+const requireNativeComponent = require('requireNativeComponent');
 const warning = require('fbjs/lib/warning');
 
 const {
   AccessibilityComponentTypes,
   AccessibilityTraits,
 } = require('ViewAccessibility');
 
-const requireNativeComponent = require('requireNativeComponent');
-
 const forceTouchAvailable = (NativeModules.PlatformConstants &&
   NativeModules.PlatformConstants.forceTouchAvailable) || false;
 
+import type {ViewProps} from 'ViewPropTypes';
+
+export type Props = ViewProps;
+
 /**
  * The most fundamental component for building a UI, `View` is a container that supports layout with
  * [flexbox](docs/flexbox.html), [style](docs/style.html),

Libraries/Components/View/ViewPropTypes.js

@@ -27,8 +27,49 @@ if (Platform.isTVOS) {
   TVViewPropTypes = require('TVViewPropTypes');
 }
 
+import type {
+  AccessibilityComponentType,
+  AccessibilityTrait,
+} from 'ViewAccessibility';
+import type {EdgeInsetsProp} from 'EdgeInsetsPropType';
+import type {TVViewProps} from 'TVViewPropTypes';
+
 const stylePropType = StyleSheetPropType(ViewStylePropTypes);
 
+// There's no easy way to create a different type if(Platform.isTVOS):
+// so we must include TVViewProps
+export type ViewProps = {
+  accessible?: bool,
+  accessibilityLabel?: React$PropType$Primitive<any>,
+  accessibilityComponentType?: AccessibilityComponentType,
+  accessibilityLiveRegion?: 'none' | 'polite' | 'assertive',
+  importantForAccessibility?: 'auto'| 'yes'| 'no'| 'no-hide-descendants',
+  accessibilityTraits?: AccessibilityTrait | Array<AccessibilityTrait>,
+  accessibilityViewIsModal?: bool,
+  onAccessibilityTap?: Function,
+  onMagicTap?: Function,
+  testID?: string,
+  nativeID?: string,
+  onResponderGrant?: Function,
+  onResponderMove?: Function,
+  onResponderReject?: Function,
+  onResponderRelease?: Function,
+  onResponderTerminate?: Function,
+  onResponderTerminationRequest?: Function,
+  onStartShouldSetResponder?: Function,
+  onStartShouldSetResponderCapture?: Function,
+  onMoveShouldSetResponder?: Function,
+  onMoveShouldSetResponderCapture?: Function,
+  hitSlop?: EdgeInsetsProp,
+  pointerEvents?: 'box-none'| 'none'| 'box-only'| 'auto',
+  style?: stylePropType,
+  removeClippedSubviews?: bool,
+  renderToHardwareTextureAndroid?: bool,
+  shouldRasterizeIOS?: bool,
+  collapsable?: bool,
+  needsOffscreenAlphaCompositing?: bool,
+} & TVViewProps;
+
 module.exports = {
   ...TVViewPropTypes,
 

Libraries/StyleSheet/EdgeInsetsPropType.js

@@ -11,15 +11,22 @@
  */
 'use strict';
 
-var {PropTypes} = require('React');
-
 var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
 
+var {PropTypes} = require('React');
+
 var EdgeInsetsPropType = createStrictShapeTypeChecker({
   top: PropTypes.number,
   left: PropTypes.number,
   bottom: PropTypes.number,
   right: PropTypes.number,
 });
 
+export type EdgeInsetsProp = {
+  top: number,
+  left: number,
+  bottom: number,
+  right: number,
+};
+
 module.exports = EdgeInsetsPropType;

README.md

@@ -64,7 +64,7 @@ Note that you'll need the Android NDK installed, see [prerequisites](https://git
 ```bash
 ./gradlew :Examples:Movies:android:app:installDebug
 # Start the packager in a separate shell (make sure you ran npm install):
-./packager/packager.sh
+./scripts/packager.sh
 # Open the Movies app in your emulator
 ```
 

RNTester/README.md

@@ -27,7 +27,7 @@ Start an Android emulator ([Genymotion](https://www.genymotion.com) is recommend
 
     cd react-native
     ./gradlew :RNTester:android:app:installDebug
-    ./packager/packager.sh
+    ./scripts/packager.sh
 
 _Note: Building for the first time can take a while._
 
@@ -46,7 +46,7 @@ Run the following commands from the react-native folder:
     ./gradlew :ReactAndroid:packageReactNdkLibsForBuck
     buck fetch rntester
     buck install -r rntester
-    ./packager/packager.sh
+    ./scripts/packager.sh
 
 _Note: The native libs are still built using gradle. Full build with buck is coming soon(tm)._
 

RNTester/RNTester.xcodeproj/project.pbxproj

@@ -1439,7 +1439,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n$SRCROOT/../packager/react-native-xcode.sh RNTester/js/RNTesterApp.ios.js";
+			shellScript = "export NODE_BINARY=node\n$SRCROOT/../scripts/react-native-xcode.sh RNTester/js/RNTesterApp.ios.js";
 		};
 		68CD48B71D2BCB2C007E06A9 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1453,7 +1453,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n$SRCROOT/../packager/react-native-xcode.sh RNTester/js/RNTesterApp.ios.js";
+			shellScript = "export NODE_BINARY=node\n$SRCROOT/../scripts/react-native-xcode.sh RNTester/js/RNTesterApp.ios.js";
 		};
 /* End PBXShellScriptBuildPhase section */
 

RNTester/RNTesterLegacy.xcodeproj/project.pbxproj

@@ -1432,7 +1432,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n$SRCROOT/../packager/react-native-xcode.sh RNTester/js/RNTesterApp.ios.js";
+			shellScript = "export NODE_BINARY=node\n$SRCROOT/../scripts/react-native-xcode.sh RNTester/js/RNTesterApp.ios.js";
 		};
 		68CD48B71D2BCB2C007E06A9 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -1446,7 +1446,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n$SRCROOT/../packager/react-native-xcode.sh RNTester/js/RNTesterApp.ios.js";
+			shellScript = "export NODE_BINARY=node\n$SRCROOT/../scripts/react-native-xcode.sh RNTester/js/RNTesterApp.ios.js";
 		};
 /* End PBXShellScriptBuildPhase section */
 

React/React.xcodeproj/project.pbxproj

@@ -3335,7 +3335,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost 8081 ; then\n    if ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port 8081 already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../packager/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi";
+			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost 8081 ; then\n    if ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port 8081 already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi";
 			showEnvVarsInLog = 0;
 		};
 		142C4F7F1B582EA6001F0B58 /* Include RCTJSCProfiler */ = {
@@ -3394,7 +3394,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\nif nc -w 5 -z localhost 8081 ; then\nif ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\necho \"Port 8081 already in use, packager is either not running or not running correctly\"\nexit 2\nfi\nelse\nopen \"$SRCROOT/../packager/launchPackager.command\" || echo \"Can't start packager automatically\"\nfi\nfi";
+			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\nif nc -w 5 -z localhost 8081 ; then\nif ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\necho \"Port 8081 already in use, packager is either not running or not running correctly\"\nexit 2\nfi\nelse\nopen \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\nfi\nfi";
 			showEnvVarsInLog = 0;
 		};
 		3D383D3E1EBD27B9005632C8 /* Install Third Party */ = {

React/ReactLegacy.xcodeproj/project.pbxproj

@@ -2398,7 +2398,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost 8081 ; then\n    if ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port 8081 already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../packager/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi";
+			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\n  if nc -w 5 -z localhost 8081 ; then\n    if ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\n      echo \"Port 8081 already in use, packager is either not running or not running correctly\"\n      exit 2\n    fi\n  else\n    open \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\n  fi\nfi";
 			showEnvVarsInLog = 0;
 		};
 		142C4F7F1B582EA6001F0B58 /* Include RCTJSCProfiler */ = {
@@ -2443,7 +2443,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\nif nc -w 5 -z localhost 8081 ; then\nif ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\necho \"Port 8081 already in use, packager is either not running or not running correctly\"\nexit 2\nfi\nelse\nopen \"$SRCROOT/../packager/launchPackager.command\" || echo \"Can't start packager automatically\"\nfi\nfi";
+			shellScript = "if [ -z \"${RCT_NO_LAUNCH_PACKAGER+xxx}\" ] ; then\nif nc -w 5 -z localhost 8081 ; then\nif ! curl -s \"http://localhost:8081/status\" | grep -q \"packager-status:running\" ; then\necho \"Port 8081 already in use, packager is either not running or not running correctly\"\nexit 2\nfi\nelse\nopen \"$SRCROOT/../scripts/launchPackager.command\" || echo \"Can't start packager automatically\"\nfi\nfi";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java

@@ -24,12 +24,14 @@
 import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.queue.MessageQueueThread;
+import com.facebook.react.bridge.queue.MessageQueueThreadRegistry;
 import com.facebook.react.bridge.queue.QueueThreadExceptionHandler;
 import com.facebook.react.bridge.queue.ReactQueueConfiguration;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationImpl;
 import com.facebook.react.bridge.queue.ReactQueueConfigurationSpec;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.annotations.VisibleForTesting;
+import com.facebook.react.uimanager.ViewManagerPropertyUpdater;
 import com.facebook.soloader.SoLoader;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.TraceListener;
@@ -297,6 +299,9 @@ public void run() {
       }
     });
 
+    MessageQueueThreadRegistry.clear();
+    ViewManagerPropertyUpdater.clear();
+
     // This is a noop if the listener was not yet registered.
     Systrace.unregisterListener(mTraceListener);
   }

ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadRegistry.java

@@ -35,5 +35,9 @@ public static MessageQueueThread myMessageQueueThread() {
         sMyMessageQueueThread.get(),
         "This thread doesn't have a MessageQueueThread registered to it!");
   }
+
+  public static void clear() {
+    sMyMessageQueueThread.remove();
+  }
 }
 

ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactShadowNode.java

@@ -452,6 +452,23 @@ public final int getTotalNativeChildren() {
     return mTotalNativeChildren;
   }
 
+  public boolean isDescendantOf(ReactShadowNode ancestorNode) {
+    ReactShadowNode parentNode = getParent();
+
+    boolean isDescendant = false;
+
+    while (parentNode != null) {
+      if (parentNode == ancestorNode) {
+        isDescendant = true;
+        break;
+      } else {
+        parentNode = parentNode.getParent();
+      }
+    }
+
+    return isDescendant;
+  }
+
   /**
    * Returns the offset within the native children owned by all layout-only nodes in the subtree
    * rooted at this node for the given child. Put another way, this returns the number of native

ReactAndroid/src/main/java/com/facebook/react/uimanager/UIImplementation.java

@@ -469,6 +469,22 @@ public void findSubviewIn(int reactTag, float targetX, float targetY, Callback c
     mOperationsQueue.enqueueFindTargetForTouch(reactTag, targetX, targetY, callback);
   }
 
+  /**
+   *  Check if the first shadow node is the descendant of the second shadow node
+   */
+  public void viewIsDescendantOf(
+      final int reactTag,
+      final int ancestorReactTag,
+      final Callback callback) {
+    ReactShadowNode node = mShadowNodeRegistry.getNode(reactTag);
+    ReactShadowNode ancestorNode = mShadowNodeRegistry.getNode(ancestorReactTag);
+    if (node == null || ancestorNode == null) {
+      callback.invoke(false);
+      return;
+    }
+    callback.invoke(node.isDescendantOf(ancestorNode));
+  }
+
   /**
    * Determines the location on screen, width, and height of the given view relative to the root
    * view and returns the values via an async callback.

ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModule.java

@@ -412,6 +412,17 @@ public void findSubviewIn(
       callback);
   }
 
+  /**
+   *  Check if the first shadow node is the descendant of the second shadow node
+   */
+  @ReactMethod
+  public void viewIsDescendantOf(
+      final int reactTag,
+      final int ancestorReactTag,
+      final Callback callback) {
+    mUIImplementation.viewIsDescendantOf(reactTag, ancestorReactTag, callback);
+  }
+
   /**
    * Registers a new Animation that can then be added to a View using {@link #addAnimation}.
    */

ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerPropertyUpdater.java

@@ -30,6 +30,12 @@ public interface ShadowNodeSetter<T extends ReactShadowNode> extends Settable {
       new HashMap<>();
   private static final Map<Class<?>, ShadowNodeSetter<?>> SHADOW_NODE_SETTER_MAP = new HashMap<>();
 
+  public static void clear() {
+    ViewManagersPropertyCache.clear();
+    VIEW_MANAGER_SETTER_MAP.clear();
+    SHADOW_NODE_SETTER_MAP.clear();
+  }
+
   public static <T extends ViewManager, V extends View> void updateProps(
       T manager,
       V v,

ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java

@@ -28,6 +28,11 @@
   private static final Map<Class, Map<String, PropSetter>> CLASS_PROPS_CACHE = new HashMap<>();
   private static final Map<String, PropSetter> EMPTY_PROPS_MAP = new HashMap<>();
 
+  public static void clear() {
+    CLASS_PROPS_CACHE.clear();
+    EMPTY_PROPS_MAP.clear();
+  }
+
   /*package*/ static abstract class PropSetter {
 
     protected final String mPropName;

ReactCommon/yoga/yoga/Yoga.c

@@ -1736,8 +1736,13 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(const YGNodeRef node,
   const float marginAxisRow = YGNodeMarginForAxis(node, YGFlexDirectionRow, availableWidth);
   const float marginAxisColumn = YGNodeMarginForAxis(node, YGFlexDirectionColumn, availableWidth);
 
-  const float innerWidth = availableWidth - marginAxisRow - paddingAndBorderAxisRow;
-  const float innerHeight = availableHeight - marginAxisColumn - paddingAndBorderAxisColumn;
+  // We want to make sure we don't call measure with negative size
+  const float innerWidth = YGFloatIsUndefined(availableWidth)
+                            ? availableWidth
+                            : fmaxf(0, availableWidth - marginAxisRow - paddingAndBorderAxisRow);
+  const float innerHeight = YGFloatIsUndefined(availableHeight)
+                            ? availableHeight
+                            : fmaxf(0, availableHeight - marginAxisColumn - paddingAndBorderAxisColumn);
 
   if (widthMeasureMode == YGMeasureModeExactly && heightMeasureMode == YGMeasureModeExactly) {
     // Don't bother sizing the text if both dimensions are already defined.

docs/Accessibility.md

@@ -173,7 +173,7 @@ In the above example we've created a custom radio button that now behaves like a
 
 ## Testing VoiceOver Support (iOS)
 
-To enable VoiceOver, go to the Settings app on your iOS device. Tap General, then Accessibility. There you will find many tools that people use to use to make their devices more usable, such as bolder text, increased contrast, and VoiceOver.
+To enable VoiceOver, go to the Settings app on your iOS device. Tap General, then Accessibility. There you will find many tools that people use to make their devices more usable, such as bolder text, increased contrast, and VoiceOver.
 
 To enable VoiceOver, tap on VoiceOver under "Vision" and toggle the switch that appears at the top.
 

docs/Colors.md

@@ -8,7 +8,7 @@ next: platform-specific-code
 previous: images
 ---
 
-Components in React Native are [styled using JavaScript](docs/styles.html). Color properties usually match how [CSS works on the web](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value).
+Components in React Native are [styled using JavaScript](docs/style.html). Color properties usually match how [CSS works on the web](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value).
 
 ### Red-green-blue