[iOS] Fix isBatchActive of RCTCxxBridge

React/CxxBridge/RCTCxxBridge.mm

@@ -170,7 +170,6 @@ void onBatchComplete() override {
 
 @implementation RCTCxxBridge
 {
-  BOOL _wasBatchActive;
   BOOL _didInvalidate;
   BOOL _moduleRegistryCreated;
 
@@ -1360,7 +1359,7 @@ - (void)stopProfiling:(void (^)(NSData *))callback
 
 - (BOOL)isBatchActive
 {
-  return _wasBatchActive;
+  return _reactInstance ? _reactInstance->isBatchActive() : NO;
 }
 
 - (void *)runtime

ReactCommon/cxxreact/Instance.cpp

@@ -149,6 +149,10 @@ void *Instance::getJavaScriptContext() {
 bool Instance::isInspectable() {
   return nativeToJsBridge_ ? nativeToJsBridge_->isInspectable() : false;
 }
+
+bool Instance::isBatchActive() {
+  return nativeToJsBridge_ ? nativeToJsBridge_->isBatchActive() : false;
+}
 
 void Instance::callJSFunction(std::string &&module, std::string &&method,
                               folly::dynamic &&params) {

ReactCommon/cxxreact/Instance.h

@@ -58,6 +58,7 @@ class RN_EXPORT Instance {
                          std::unique_ptr<const JSBigString> jsonValue);
   void *getJavaScriptContext();
   bool isInspectable();
+  bool isBatchActive();
   void callJSFunction(std::string &&module, std::string &&method,
                       folly::dynamic &&params);
   void callJSCallback(uint64_t callbackId, folly::dynamic &&params);

ReactCommon/cxxreact/NativeToJsBridge.cpp

@@ -37,6 +37,10 @@ class JsToNativeBridge : public react::ExecutorDelegate {
   std::shared_ptr<ModuleRegistry> getModuleRegistry() override {
     return m_registry;
   }
+
+  bool isBatchActive() {
+    return m_batchHadNativeModuleCalls;
+  }
 
   void callNativeModules(
       JSExecutor& executor, folly::dynamic&& calls, bool isEndOfBatch) override {
@@ -222,6 +226,10 @@ void* NativeToJsBridge::getJavaScriptContext() {
 bool NativeToJsBridge::isInspectable() {
   return m_executor->isInspectable();
 }
+
+bool NativeToJsBridge::isBatchActive() {
+  return m_delegate->isBatchActive();
+}
 
 void NativeToJsBridge::handleMemoryPressure(int pressureLevel) {
   runOnExecutorQueue([=] (JSExecutor* executor) {

ReactCommon/cxxreact/NativeToJsBridge.h

@@ -75,6 +75,7 @@ class NativeToJsBridge {
   void setGlobalVariable(std::string propName, std::unique_ptr<const JSBigString> jsonValue);
   void* getJavaScriptContext();
   bool isInspectable();
+  bool isBatchActive();
 
   void handleMemoryPressure(int pressureLevel);