From 4771806c449f0cb9f861055819de8d883cbd845b Mon Sep 17 00:00:00 2001
From: Spencer Ahrens <sahrens@fb.com>
Date: Fri, 15 May 2015 10:54:25 -0700
Subject: [PATCH] [ReactNative] Fix some mount callback issues

---
 Libraries/ReactIOS/NativeMethodsMixin.js | 14 +++++++++++++-
 Libraries/Utilities/mountSafeCallback.js | 23 -----------------------
 2 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 Libraries/Utilities/mountSafeCallback.js

diff --git a/Libraries/ReactIOS/NativeMethodsMixin.js b/Libraries/ReactIOS/NativeMethodsMixin.js
index 4bc99f56b..e31b0e43a 100644
--- 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
deleted file mode 100644
index c065718d1..000000000
--- a/Libraries/Utilities/mountSafeCallback.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2015-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule mountSafeCallback
- * @flow
- */
-'use strict';
-
-var mountSafeCallback = function(context: ReactComponent, callback: ?Function): any {
-  return function() {
-    if (!callback || !context.isMounted()) {
-      return;
-    }
-    return callback.apply(context, arguments);
-  };
-};
-
-module.exports = mountSafeCallback;