[ReactNative] Fix some mount callback issues

facebook · May 15, 2015 · 4771806 · 4771806
1 parent 2497c02
commit 4771806
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 24 deletions.
diff --git a/Libraries/ReactIOS/NativeMethodsMixin.js b/Libraries/ReactIOS/NativeMethodsMixin.js
@@ -20,7 +20,6 @@ var findNodeHandle = require('findNodeHandle');
 var flattenStyle = require('flattenStyle');
 var invariant = require('invariant');
 var mergeFast = require('mergeFast');
-var mountSafeCallback = require('mountSafeCallback');
 var precomputeStyle = require('precomputeStyle');
 
 type MeasureOnSuccessCallback = (
@@ -161,4 +160,17 @@ if (__DEV__) {
   };
 }
 
+/**
+ * In the future, we should cleanup callbacks by cancelling them instead of
+ * using this.
+ */
+var mountSafeCallback = function(context: ReactComponent, callback: ?Function): any {
+  return function() {
+    if (!callback || (context.isMounted && !context.isMounted())) {
+      return;
+    }
+    return callback.apply(context, arguments);
+  };
+};
+
 module.exports = NativeMethodsMixin;
diff --git a/Libraries/Utilities/mountSafeCallback.js b/Libraries/Utilities/mountSafeCallback.js