react-native 0.68.1 → 0.69.0-rc.0

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/CMakeLists.txt

@@ -0,0 +1,34 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB mapbuffer_SRC CONFIGURE_DEPENDS
+        ${CMAKE_CURRENT_SOURCE_DIR}/react/common/mapbuffer/*.cpp)
+
+add_library(mapbufferjni SHARED ${mapbuffer_SRC})
+
+target_include_directories(mapbufferjni
+        PUBLIC
+          ${CMAKE_CURRENT_SOURCE_DIR}
+        PRIVATE
+          ${CMAKE_CURRENT_SOURCE_DIR}/react/common/mapbuffer/
+)
+
+target_link_libraries(mapbufferjni
+        fb
+        fbjni
+        folly_runtime
+        glog
+        glog_init
+        react_debug
+        react_render_mapbuffer
+        react_utils
+        react_config
+        yoga
+)

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/.clang-tidy

@@ -0,0 +1,3 @@
+---
+InheritParentConfig: true
+...

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JReadableMapBuffer.cpp

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "JReadableMapBuffer.h"
+
+namespace facebook {
+namespace react {
+
+void JReadableMapBuffer::registerNatives() {
+  registerHybrid({
+      makeNativeMethod(
+          "importByteBuffer", JReadableMapBuffer::importByteBuffer),
+  });
+}
+
+jni::local_ref<jni::JByteBuffer> JReadableMapBuffer::importByteBuffer() {
+  // TODO T83483191: Reevaluate what's the best approach here (allocateDirect vs
+  // DirectByteBuffer).
+  return jni::JByteBuffer::wrapBytes(
+      serializedData_.data(), serializedData_.size());
+}
+
+std::vector<uint8_t> JReadableMapBuffer::data() const {
+  return serializedData_;
+}
+
+jni::local_ref<JReadableMapBuffer::jhybridobject>
+JReadableMapBuffer::createWithContents(MapBuffer &&map) {
+  return newObjectCxxArgs(std::move(map));
+}
+
+JReadableMapBuffer::JReadableMapBuffer(MapBuffer &&map)
+    : serializedData_(std::move(map.bytes_)) {
+  react_native_assert(
+      (serializedData_.size() != 0) && "Error no content in map");
+}
+
+} // namespace react
+} // namespace facebook

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/{ReadableMapBuffer.h → JReadableMapBuffer.h}

@@ -16,20 +16,22 @@
 namespace facebook {
 namespace react {
 
-class ReadableMapBuffer : public jni::HybridClass<ReadableMapBuffer> {
+class JReadableMapBuffer : public jni::HybridClass<JReadableMapBuffer> {
  public:
   static auto constexpr kJavaDescriptor =
       "Lcom/facebook/react/common/mapbuffer/ReadableMapBuffer;";
 
   static void registerNatives();
 
-  static jni::local_ref<ReadableMapBuffer::jhybridobject> createWithContents(
+  static jni::local_ref<JReadableMapBuffer::jhybridobject> createWithContents(
       MapBuffer &&map);
 
-  explicit ReadableMapBuffer(MapBuffer &&map);
+  explicit JReadableMapBuffer(MapBuffer &&map);
 
   jni::local_ref<jni::JByteBuffer> importByteBuffer();
 
+  std::vector<uint8_t> data() const;
+
  private:
   std::vector<uint8_t> serializedData_;
 };

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.cpp

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "JWritableMapBuffer.h"
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
+
+namespace facebook::react {
+
+MapBuffer JWritableMapBuffer::getMapBuffer() {
+  static const auto getKeys =
+      javaClassStatic()->getMethod<jni::JArrayInt()>("getKeys");
+  static const auto getValues =
+      javaClassStatic()->getMethod<jni::JArrayClass<jni::JObject>()>(
+          "getValues");
+
+  auto keyArray = getKeys(self());
+  auto values = getValues(self());
+
+  auto keys = keyArray->pin();
+
+  MapBufferBuilder builder;
+
+  auto size = keys.size();
+  for (int i = 0; i < size; i++) {
+    auto key = keys[i];
+    jni::local_ref<jni::JObject> value = values->getElement(i);
+
+    static const auto booleanClass = jni::JBoolean::javaClassStatic();
+    static const auto integerClass = jni::JInteger::javaClassStatic();
+    static const auto doubleClass = jni::JDouble::javaClassStatic();
+    static const auto stringClass = jni::JString::javaClassStatic();
+    static const auto readableMapClass = JReadableMapBuffer::javaClassStatic();
+    static const auto writableMapClass = JWritableMapBuffer::javaClassStatic();
+
+    if (value->isInstanceOf(booleanClass)) {
+      auto element = jni::static_ref_cast<jni::JBoolean>(value);
+      builder.putBool(key, element->value());
+    } else if (value->isInstanceOf(integerClass)) {
+      auto element = jni::static_ref_cast<jni::JInteger>(value);
+      builder.putInt(key, element->value());
+    } else if (value->isInstanceOf(doubleClass)) {
+      auto element = jni::static_ref_cast<jni::JDouble>(value);
+      builder.putDouble(key, element->value());
+    } else if (value->isInstanceOf(stringClass)) {
+      auto element = jni::static_ref_cast<jni::JString>(value);
+      builder.putString(key, element->toStdString());
+    } else if (value->isInstanceOf(readableMapClass)) {
+      auto element =
+          jni::static_ref_cast<JReadableMapBuffer::jhybridobject>(value);
+      builder.putMapBuffer(key, MapBuffer(element->cthis()->data()));
+    } else if (value->isInstanceOf(writableMapClass)) {
+      auto element =
+          jni::static_ref_cast<JWritableMapBuffer::javaobject>(value);
+      builder.putMapBuffer(key, element->getMapBuffer());
+    }
+  }
+
+  return builder.build();
+}
+
+} // namespace facebook::react

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/JWritableMapBuffer.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <react/common/mapbuffer/JReadableMapBuffer.h>
+
+namespace facebook::react {
+
+class JWritableMapBuffer : public jni::JavaClass<JWritableMapBuffer> {
+ public:
+  static auto constexpr kJavaDescriptor =
+      "Lcom/facebook/react/common/mapbuffer/WritableMapBuffer;";
+
+  MapBuffer getMapBuffer();
+};
+
+} // namespace facebook::react

package/ReactAndroid/src/main/java/com/facebook/react/common/mapbuffer/jni/react/common/mapbuffer/OnLoad.cpp

@@ -7,9 +7,10 @@
 
 #include <fbjni/fbjni.h>
 
-#include "ReadableMapBuffer.h"
+#include "JReadableMapBuffer.h"
+#include "JWritableMapBuffer.h"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(
-      vm, [] { facebook::react::ReadableMapBuffer::registerNatives(); });
+      vm, [] { facebook::react::JReadableMapBuffer::registerNatives(); });
 }

package/ReactAndroid/src/main/java/com/facebook/react/common/network/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "network",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/config/BUCK

@@ -4,7 +4,10 @@ rn_android_library(
     name = "config",
     srcs = glob(["**/*.java"]),
     autoglob = False,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/config/ReactFeatureFlags.java

@@ -64,9 +64,6 @@ public class ReactFeatureFlags {
   /** This feature flag enables logs for Fabric */
   public static boolean enableFabricLogs = false;
 
-  /** Enables Static ViewConfig in RN Android native code. */
-  public static boolean enableExperimentalStaticViewConfigs = false;
-
   public static boolean enableRuntimeScheduler = false;
 
   public static boolean enableRuntimeSchedulerInTurboModule = false;
@@ -74,6 +71,9 @@ public class ReactFeatureFlags {
   /** Feature flag to configure eager attachment of the root view/initialisation of the JS code */
   public static boolean enableEagerRootViewAttachment = false;
 
+  /** Feature flag to configure synchronized queue access for Animated module */
+  public static boolean enableSynchronizationForAnimated = false;
+
   private static boolean mapBufferSerializationEnabled = false;
 
   /** Enables or disables MapBuffer Serialization */
@@ -102,6 +102,19 @@ public class ReactFeatureFlags {
 
   public static boolean insertZReorderBarriersOnViewGroupChildren = true;
 
-  /** TODO: T107492383 Delete this flag. Enables postprocessor for rounded corners for Image */
-  public static boolean enableRoundedCornerPostprocessing = false;
+  public static boolean enableDelayedViewStateDeletion = false;
+
+  /**
+   * Feature Flag to control the size of the cache used by TextLayoutManager in Fabric. Used from
+   * JNI.
+   */
+  public static boolean enableLargeTextMeasureCache = true;
+
+  /** TODO: T113245006 Delete this flag. Enables caching of spannables for text */
+  public static boolean enableSpannableCache = false;
+
+  public static boolean dispatchPointerEvents = false;
+
+  /** Feature Flag to control RN Android scrollEventThrottle prop. */
+  public static boolean enableScrollEventThrottle = false;
 }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     manifest = "AndroidManifest.xml",
     provided_deps = [
         react_native_dep("third-party/android/androidx:core"),
@@ -49,7 +52,10 @@ rn_android_library(
     srcs = glob(["interfaces/*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgeDevSupportManager.java

@@ -27,6 +27,7 @@ import com.facebook.react.common.futures.SimpleSettableFuture;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevOptionHandler;
 import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler;
 import com.facebook.react.packagerconnection.RequestHandler;
 import java.io.File;
 import java.io.IOException;

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DefaultDevSupportManagerFactory.java

@@ -12,6 +12,7 @@ import androidx.annotation.Nullable;
 import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler;
 import com.facebook.react.packagerconnection.RequestHandler;
 import java.lang.reflect.Constructor;
 import java.util.Map;

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.java

@@ -51,6 +51,7 @@ import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.devsupport.interfaces.ErrorCustomizer;
 import com.facebook.react.devsupport.interfaces.ErrorType;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler;
 import com.facebook.react.devsupport.interfaces.StackFrame;
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
 import com.facebook.react.packagerconnection.RequestHandler;
@@ -96,7 +97,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
   private final DefaultNativeModuleCallExceptionHandler mDefaultNativeModuleCallExceptionHandler;
   private final DevLoadingViewController mDevLoadingViewController;
 
-  private @Nullable RedBoxDialog mRedBoxDialog;
+  private @Nullable SurfaceDelegate mRedBoxSurfaceDelegate;
   private @Nullable AlertDialog mDevOptionsDialog;
   private @Nullable DebugOverlayController mDebugOverlayController;
   private boolean mDevLoadingViewVisible = false;
@@ -197,7 +198,7 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
     final String bundleFile = subclassTag + "ReactNativeDevBundle.js";
     mJSBundleDownloadedFile = new File(applicationContext.getFilesDir(), bundleFile);
 
-    final String splitBundlesDir = subclassTag.toLowerCase() + "_dev_js_split_bundles";
+    final String splitBundlesDir = subclassTag.toLowerCase(Locale.ROOT) + "_dev_js_split_bundles";
     mJSSplitBundlesDir = mApplicationContext.getDir(splitBundlesDir, Context.MODE_PRIVATE);
 
     mDefaultNativeModuleCallExceptionHandler = new DefaultNativeModuleCallExceptionHandler();
@@ -272,7 +273,8 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
     mErrorCustomizers.add(errorCustomizer);
   }
 
-  private Pair<String, StackFrame[]> processErrorCustomizers(Pair<String, StackFrame[]> errorInfo) {
+  @Override
+  public Pair<String, StackFrame[]> processErrorCustomizers(Pair<String, StackFrame[]> errorInfo) {
     if (mErrorCustomizers == null) {
       return errorInfo;
     } else {
@@ -296,33 +298,25 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
             // Since we only show the first JS error in a succession of JS errors, make sure we only
             // update the error message for that error message. This assumes that updateJSError
             // belongs to the most recent showNewJSError
-            if (mRedBoxDialog == null
-                || !mRedBoxDialog.isShowing()
-                || errorCookie != mLastErrorCookie) {
+            if (!mRedBoxSurfaceDelegate.isShowing() || errorCookie != mLastErrorCookie) {
               return;
             }
-            StackFrame[] stack = StackTraceHelper.convertJsStackTrace(details);
-            Pair<String, StackFrame[]> errorInfo =
-                processErrorCustomizers(Pair.create(message, stack));
-            mRedBoxDialog.setExceptionDetails(errorInfo.first, errorInfo.second);
-            updateLastErrorInfo(message, stack, errorCookie, ErrorType.JS);
-            // JS errors are reported here after source mapping.
-            if (mRedBoxHandler != null) {
-              mRedBoxHandler.handleRedbox(message, stack, ErrorType.JS);
-              mRedBoxDialog.resetReporting();
-            }
-            mRedBoxDialog.show();
+
+            // The RedBox surface delegate will always show the latest error
+            updateLastErrorInfo(
+                message, StackTraceHelper.convertJsStackTrace(details), errorCookie, ErrorType.JS);
+            mRedBoxSurfaceDelegate.show();
           }
         });
   }
 
   @Override
   public void hideRedboxDialog() {
-    // dismiss redbox if exists
-    if (mRedBoxDialog != null) {
-      mRedBoxDialog.dismiss();
-      mRedBoxDialog = null;
+    if (mRedBoxSurfaceDelegate == null) {
+      return;
     }
+
+    mRedBoxSurfaceDelegate.hide();
   }
 
   public @Nullable View createRootView(String appKey) {
@@ -349,41 +343,28 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
         new Runnable() {
           @Override
           public void run() {
-            Activity context = mReactInstanceDevHelper.getCurrentActivity();
-            if (context != null && !context.isFinishing() && currentActivity != context) {
-              currentActivity = context;
-              // Create a new RedBox when currentActivity get updated
-              mRedBoxDialog =
-                  new RedBoxDialog(currentActivity, DevSupportManagerBase.this, mRedBoxHandler);
-            }
-            if (currentActivity == null || currentActivity.isFinishing()) {
-              FLog.e(
-                  ReactConstants.TAG,
-                  "Unable to launch redbox because react activity "
-                      + "is not available, here is the error that redbox would've displayed: "
-                      + message);
-              return;
-            }
-            if (mRedBoxDialog == null) {
-              mRedBoxDialog =
-                  new RedBoxDialog(currentActivity, DevSupportManagerBase.this, mRedBoxHandler);
+            // Keep a copy of the latest error to be shown by the RedBoxSurface
+            updateLastErrorInfo(message, stack, errorCookie, errorType);
+
+            if (mRedBoxSurfaceDelegate == null) {
+              @Nullable SurfaceDelegate redBoxSurfaceDelegate = createSurfaceDelegate("RedBox");
+              if (redBoxSurfaceDelegate != null) {
+                mRedBoxSurfaceDelegate = redBoxSurfaceDelegate;
+              } else {
+                mRedBoxSurfaceDelegate =
+                    new RedBoxDialogSurfaceDelegate(DevSupportManagerBase.this);
+              }
+
+              mRedBoxSurfaceDelegate.createContentView("RedBox");
             }
-            if (mRedBoxDialog.isShowing()) {
+
+            if (mRedBoxSurfaceDelegate.isShowing()) {
               // Sometimes errors cause multiple errors to be thrown in JS in quick succession. Only
               // show the first and most actionable one.
               return;
             }
-            Pair<String, StackFrame[]> errorInfo =
-                processErrorCustomizers(Pair.create(message, stack));
-            mRedBoxDialog.setExceptionDetails(errorInfo.first, errorInfo.second);
-            updateLastErrorInfo(message, stack, errorCookie, errorType);
-            // Only report native errors here. JS errors are reported
-            // inside {@link #updateJSError} after source mapping.
-            if (mRedBoxHandler != null && errorType == ErrorType.NATIVE) {
-              mRedBoxHandler.handleRedbox(message, stack, ErrorType.NATIVE);
-            }
-            mRedBoxDialog.resetReporting();
-            mRedBoxDialog.show();
+
+            mRedBoxSurfaceDelegate.show();
           }
         });
   }
@@ -622,6 +603,11 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
     return mDevSettings;
   }
 
+  @Override
+  public RedBoxHandler getRedBoxHandler() {
+    return mRedBoxHandler;
+  }
+
   @Override
   public void onNewReactContextCreated(ReactContext reactContext) {
     resetCurrentContext(reactContext);
@@ -887,6 +873,11 @@ public abstract class DevSupportManagerBase implements DevSupportManager {
     return mLastErrorStack;
   }
 
+  @Override
+  public int getLastErrorCookie() {
+    return mLastErrorCookie;
+  }
+
   @Override
   public @Nullable ErrorType getLastErrorType() {
     return mLastErrorType;

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerFactory.java

@@ -12,6 +12,7 @@ import androidx.annotation.Nullable;
 import com.facebook.react.common.SurfaceDelegateFactory;
 import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler;
 import com.facebook.react.packagerconnection.RequestHandler;
 import java.util.Map;
 

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DisabledDevSupportManager.java

@@ -8,6 +8,7 @@
 package com.facebook.react.devsupport;
 
 import android.app.Activity;
+import android.util.Pair;
 import android.view.View;
 import androidx.annotation.Nullable;
 import com.facebook.react.bridge.DefaultNativeModuleCallExceptionHandler;
@@ -21,6 +22,7 @@ import com.facebook.react.devsupport.interfaces.DevSupportManager;
 import com.facebook.react.devsupport.interfaces.ErrorCustomizer;
 import com.facebook.react.devsupport.interfaces.ErrorType;
 import com.facebook.react.devsupport.interfaces.PackagerStatusCallback;
+import com.facebook.react.devsupport.interfaces.RedBoxHandler;
 import com.facebook.react.devsupport.interfaces.StackFrame;
 import com.facebook.react.modules.debug.interfaces.DeveloperSettings;
 import java.io.File;
@@ -94,6 +96,11 @@ public class DisabledDevSupportManager implements DevSupportManager {
     return null;
   }
 
+  @Override
+  public RedBoxHandler getRedBoxHandler() {
+    return null;
+  }
+
   @Override
   public void onNewReactContextCreated(ReactContext reactContext) {}
 
@@ -166,9 +173,19 @@ public class DisabledDevSupportManager implements DevSupportManager {
     return null;
   }
 
+  @Override
+  public int getLastErrorCookie() {
+    return 0;
+  }
+
   @Override
   public void registerErrorCustomizer(ErrorCustomizer errorCustomizer) {}
 
+  @Override
+  public Pair<String, StackFrame[]> processErrorCustomizers(Pair<String, StackFrame[]> errorInfo) {
+    return errorInfo;
+  }
+
   @Override
   public void setPackagerLocationCustomizer(
       DevSupportManager.PackagerLocationCustomizer packagerLocationCustomizer) {}

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/DoubleTapReloadRecognizer.java

@@ -14,7 +14,7 @@ import android.widget.EditText;
 
 /**
  * A class allows recognizing double key tap of "R", used to reload JS in {@link
- * AbstractReactActivity}, {@link RedBoxDialog} and {@link ReactActivity}.
+ * AbstractReactActivity}, {@link RedBoxDialogSurfaceDelegate} and {@link ReactActivity}.
  */
 public class DoubleTapReloadRecognizer {
   private boolean mDoRefresh = false;

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxDialogSurfaceDelegate.java

@@ -55,7 +55,7 @@ public class LogBoxDialogSurfaceDelegate implements SurfaceDelegate {
 
   @Override
   public void show() {
-    if (isSurfaceVisible() || !isContentViewReady()) {
+    if (isShowing() || !isContentViewReady()) {
       return;
     }
 
@@ -74,7 +74,7 @@ public class LogBoxDialogSurfaceDelegate implements SurfaceDelegate {
 
   @Override
   public void hide() {
-    if (!isSurfaceVisible()) {
+    if (!isShowing()) {
       return;
     }
 
@@ -86,7 +86,8 @@ public class LogBoxDialogSurfaceDelegate implements SurfaceDelegate {
     mDialog = null;
   }
 
-  private boolean isSurfaceVisible() {
-    return mDialog != null;
+  @Override
+  public boolean isShowing() {
+    return mDialog != null && mDialog.isShowing();
   }
 }