react-native-tvos 0.76.5-0 → 0.77.0-0

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

@@ -10,13 +10,16 @@ package com.facebook.react.devsupport;
 import android.app.Activity;
 import android.view.View;
 import androidx.annotation.Nullable;
+import com.facebook.react.bridge.JSBundleLoader;
 import com.facebook.react.bridge.JavaJSExecutor;
 import com.facebook.react.bridge.JavaScriptExecutorFactory;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.interfaces.TaskInterface;
 
 /**
  * Interface used by {@link DevSupportManager} for accessing some fields and methods of {@link
- * ReactInstanceManager} or {@link ReactHostImpl} for the purpose of displaying and handling
- * developer menu options.
+ * ReactInstanceManager} or {@link ReactHost} for the purpose of displaying and handling developer
+ * menu options.
  */
 public interface ReactInstanceDevHelper {
 
@@ -39,4 +42,11 @@ public interface ReactInstanceDevHelper {
   View createRootView(String appKey);
 
   void destroyRootView(View rootView);
+
+  void reload(String s);
+
+  TaskInterface<Boolean> loadBundle(JSBundleLoader bundleLoader);
+
+  @Nullable
+  ReactContext getCurrentReactContext();
 }

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

@@ -21,6 +21,8 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.R;
+import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.SurfaceDelegate;
 import com.facebook.react.devsupport.interfaces.DevSupportManager;
@@ -55,7 +57,7 @@ class RedBoxDialogSurfaceDelegate implements SurfaceDelegate {
       FLog.e(
           ReactConstants.TAG,
           "Unable to launch redbox because react activity "
-              + "is not available, here is the error that redbox would've displayed: "
+              + "are not available, here is the error that redbox would've displayed: "
               + (message != null ? message : "N/A"));
       return;
     }
@@ -82,9 +84,19 @@ class RedBoxDialogSurfaceDelegate implements SurfaceDelegate {
     @Nullable String message = mDevSupportManager.getLastErrorTitle();
     Activity context = mDevSupportManager.getCurrentActivity();
     if (context == null || context.isFinishing()) {
+      final @Nullable ReactContext reactContext = mDevSupportManager.getCurrentReactContext();
+      if (reactContext != null) {
+        /**
+         * If the activity isn't available, try again after the next onHostResume(). onHostResume()
+         * is when the activity gets attached to the react native.
+         */
+        runAfterHostResume(reactContext, this::show);
+        return;
+      }
+
       FLog.e(
           ReactConstants.TAG,
-          "Unable to launch redbox because react activity "
+          "Unable to launch redbox because react activity and react context "
               + "is not available, here is the error that redbox would've displayed: "
               + (message != null ? message : "N/A"));
       return;
@@ -140,11 +152,33 @@ class RedBoxDialogSurfaceDelegate implements SurfaceDelegate {
     mDialog.show();
   }
 
+  private static void runAfterHostResume(ReactContext reactContext, Runnable runnable) {
+    reactContext.addLifecycleEventListener(
+        new LifecycleEventListener() {
+          @Override
+          public void onHostResume() {
+            runnable.run();
+            reactContext.removeLifecycleEventListener(this);
+          }
+
+          @Override
+          public void onHostPause() {}
+
+          @Override
+          public void onHostDestroy() {}
+        });
+  }
+
   @Override
   public void hide() {
     // dismiss redbox if exists
     if (mDialog != null) {
-      mDialog.dismiss();
+      try {
+        mDialog.dismiss();
+      } catch (IllegalArgumentException e) {
+        FLog.e(
+            ReactConstants.TAG, "RedBoxDialogSurfaceDelegate: error while dismissing dialog: ", e);
+      }
       destroyContentView();
       mDialog = null;
     }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/ReleaseDevSupportManager.kt

@@ -53,12 +53,6 @@ public open class ReleaseDevSupportManager : DevSupportManager {
 
   override public fun destroyRootView(rootView: View?): Unit = Unit
 
-  override public fun updateJSError(
-      message: String?,
-      details: ReadableArray?,
-      errorCookie: Int
-  ): Unit = Unit
-
   override public fun hideRedboxDialog(): Unit = Unit
 
   override public fun showDevOptionsDialog(): Unit = Unit
@@ -153,6 +147,9 @@ public open class ReleaseDevSupportManager : DevSupportManager {
   override public val currentActivity: Activity?
     get() = null
 
+  override public val currentReactContext: ReactContext?
+    get() = null
+
   override public fun createSurfaceDelegate(moduleName: String?): SurfaceDelegate? = null
 
   override public fun openDebugger(): Unit = Unit

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

@@ -34,9 +34,13 @@ public class StackTraceHelper {
   public static final String METHOD_NAME_KEY = "methodName";
 
   public static final String MESSAGE_KEY = "message";
+  public static final String ORIGINAL_MESSAGE_KEY = "originalMessage";
+  public static final String NAME_KEY = "name";
+  public static final String COMPONENT_STACK_KEY = "componentStack";
   public static final String STACK_KEY = "stack";
   public static final String ID_KEY = "id";
   public static final String IS_FATAL_KEY = "isFatal";
+  public static final String EXTRA_DATA_KEY = "extraData";
 
   private static final Pattern STACK_FRAME_PATTERN1 =
       Pattern.compile("^(?:(.*?)@)?(.*?)\\:([0-9]+)\\:([0-9]+)$");
@@ -260,22 +264,36 @@ public class StackTraceHelper {
   }
 
   public static JavaOnlyMap convertParsedError(ParsedError error) {
-    List<ParsedError.StackFrame> frames = error.getFrames();
+    List<ParsedError.StackFrame> frames = error.getStack();
     List<ReadableMap> readableMapList = new ArrayList<>();
     for (ParsedError.StackFrame frame : frames) {
       JavaOnlyMap map = new JavaOnlyMap();
-      map.putDouble(COLUMN_KEY, frame.getColumnNumber());
-      map.putDouble(LINE_NUMBER_KEY, frame.getLineNumber());
-      map.putString(FILE_KEY, (String) frame.getFileName());
+      if (frame.getColumn() != null) {
+        map.putDouble(COLUMN_KEY, frame.getColumn());
+      }
+      if (frame.getLineNumber() != null) {
+        map.putDouble(LINE_NUMBER_KEY, frame.getLineNumber());
+      }
+      map.putString(FILE_KEY, (String) frame.getFile());
       map.putString(METHOD_NAME_KEY, (String) frame.getMethodName());
       readableMapList.add(map);
     }
 
     JavaOnlyMap data = new JavaOnlyMap();
     data.putString(MESSAGE_KEY, error.getMessage());
+    if (error.getOriginalMessage() != null) {
+      data.putString(ORIGINAL_MESSAGE_KEY, error.getOriginalMessage());
+    }
+    if (error.getName() != null) {
+      data.putString(NAME_KEY, error.getName());
+    }
+    if (error.getComponentStack() != null) {
+      data.putString(COMPONENT_STACK_KEY, error.getComponentStack());
+    }
     data.putArray(STACK_KEY, JavaOnlyArray.from(readableMapList));
-    data.putInt(ID_KEY, error.getExceptionId());
+    data.putInt(ID_KEY, error.getId());
     data.putBoolean(IS_FATAL_KEY, error.isFatal());
+    data.putMap(EXTRA_DATA_KEY, error.getExtraData());
 
     return data;
   }

package/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/DevSupportManager.kt

@@ -35,6 +35,7 @@ public interface DevSupportManager : JSExceptionHandler {
   public val lastErrorType: ErrorType?
   public val lastErrorCookie: Int
   public val currentActivity: Activity?
+  public val currentReactContext: ReactContext?
 
   public var devSupportEnabled: Boolean
 
@@ -48,8 +49,6 @@ public interface DevSupportManager : JSExceptionHandler {
 
   public fun showNewJSError(message: String?, details: ReadableArray?, errorCookie: Int)
 
-  public fun updateJSError(message: String?, details: ReadableArray?, errorCookie: Int)
-
   public fun hideRedboxDialog()
 
   public fun showDevOptionsDialog()

package/ReactAndroid/src/main/java/com/facebook/react/fabric/DevToolsReactPerfLogger.java

@@ -37,18 +37,17 @@ public class DevToolsReactPerfLogger implements ReactMarker.FabricMarkerListener
   private final List<DevToolsReactPerfLoggerListener> mDevToolsReactPerfLoggerListeners =
       new ArrayList<>();
 
-  public static final LongStreamingStats mStreamingCommitStats = new LongStreamingStats();
-  public static final LongStreamingStats mStreamingLayoutStats = new LongStreamingStats();
-  public static final LongStreamingStats mStreamingDiffStats = new LongStreamingStats();
-  public static final LongStreamingStats mStreamingTransactionEndStats = new LongStreamingStats();
-  public static final LongStreamingStats mStreamingBatchExecutionStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingCommitStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingLayoutStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingDiffStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingTransactionEndStats = new LongStreamingStats();
+  static final LongStreamingStats mStreamingBatchExecutionStats = new LongStreamingStats();
 
   public interface DevToolsReactPerfLoggerListener {
-
     void onFabricCommitEnd(FabricCommitPoint commitPoint);
   }
 
-  public static class FabricCommitPointData {
+  private static class FabricCommitPointData {
     private final long mTimeStamp;
     private final int mCounter;
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -50,7 +50,6 @@ import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.events.EventEmitterWrapper;
 import com.facebook.react.fabric.events.FabricEventEmitter;
 import com.facebook.react.fabric.internal.interop.InteropUIBlockListener;
@@ -159,7 +158,7 @@ public class FabricUIManager
     FabricSoLoader.staticInit();
   }
 
-  @Nullable private Binding mBinding;
+  @Nullable private FabricUIManagerBinding mBinding;
   @NonNull private final ReactApplicationContext mReactApplicationContext;
   @NonNull private final MountingManager mMountingManager;
   @NonNull private final EventDispatcher mEventDispatcher;
@@ -329,12 +328,11 @@ public class FabricUIManager
             mReactApplicationContext, context, surfaceHandler.getModuleName(), rootTag);
     mMountingManager.startSurface(rootTag, reactContext, rootView);
 
-    surfaceHandler.setSurfaceId(rootTag);
-    if (surfaceHandler instanceof SurfaceHandlerBinding) {
-      mBinding.registerSurface((SurfaceHandlerBinding) surfaceHandler);
+    if (!(surfaceHandler instanceof SurfaceHandlerBinding)) {
+      throw new IllegalArgumentException("Invalid SurfaceHandler");
     }
-    surfaceHandler.setMountable(rootView != null);
-    surfaceHandler.start();
+    mBinding.startSurfaceWithSurfaceHandler(
+        rootTag, (SurfaceHandlerBinding) surfaceHandler, rootView != null);
   }
 
   public void attachRootView(final SurfaceHandler surfaceHandler, final View rootView) {
@@ -358,12 +356,10 @@ public class FabricUIManager
     }
 
     mMountingManager.stopSurface(surfaceHandler.getSurfaceId());
-
-    surfaceHandler.stop();
-
-    if (surfaceHandler instanceof SurfaceHandlerBinding) {
-      mBinding.unregisterSurface((SurfaceHandlerBinding) surfaceHandler);
+    if (!(surfaceHandler instanceof SurfaceHandlerBinding)) {
+      throw new IllegalArgumentException("Invalid SurfaceHandler");
     }
+    mBinding.stopSurfaceWithSurfaceHandler((SurfaceHandlerBinding) surfaceHandler);
   }
 
   /** Method called when an event has been dispatched on the C++ side. */
@@ -442,25 +438,19 @@ public class FabricUIManager
     // responsible for initializing and deallocating EventDispatcher. StaticViewConfigs is enabled
     // only in Bridgeless for now.
     // TODO T83943316: Remove this IF once StaticViewConfigs are enabled by default
-    if (!ReactFeatureFlags.enableBridgelessArchitecture) {
+    if (!ReactNativeFeatureFlags.enableBridgelessArchitecture()) {
       mEventDispatcher.onCatalystInstanceDestroyed();
     }
   }
 
   @Override
   public void markActiveTouchForTag(int surfaceId, int reactTag) {
-    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
-    if (surfaceMountingManager != null) {
-      surfaceMountingManager.markActiveTouchForTag(reactTag);
-    }
+    mMountingManager.getSurfaceManager(surfaceId).markActiveTouchForTag(reactTag);
   }
 
   @Override
   public void sweepActiveTouchForTag(int surfaceId, int reactTag) {
-    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
-    if (surfaceMountingManager != null) {
-      surfaceMountingManager.sweepActiveTouchForTag(reactTag);
-    }
+    mMountingManager.getSurfaceManager(surfaceId).sweepActiveTouchForTag(reactTag);
   }
 
   /**
@@ -635,10 +625,10 @@ public class FabricUIManager
    * @return if theme data is available in the output parameters.
    */
   public boolean getThemeData(int surfaceId, float[] defaultTextInputPadding) {
-    Context context =
-        mMountingManager.getSurfaceManagerEnforced(surfaceId, "getThemeData").getContext();
+    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
+    Context context = surfaceMountingManager != null ? surfaceMountingManager.getContext() : null;
     if (context == null) {
-      FLog.w(TAG, "\"themedReactContext\" is null when call \"getThemeData\"");
+      FLog.w(TAG, "Couldn't get context for surfaceId %d in getThemeData", surfaceId);
       return false;
     }
 
@@ -766,6 +756,14 @@ public class FabricUIManager
             isLayoutable));
   }
 
+  @SuppressWarnings("unused")
+  @AnyThread
+  @ThreadConfined(ANY)
+  private void destroyUnmountedView(int surfaceId, int reactTag) {
+    mMountItemDispatcher.addMountItem(
+        MountItemFactory.createDestroyViewMountItem(surfaceId, reactTag));
+  }
+
   @SuppressLint("NotInvokedPrivateMethod")
   @SuppressWarnings("unused")
   @AnyThread
@@ -874,7 +872,7 @@ public class FabricUIManager
     }
   }
 
-  public void setBinding(Binding binding) {
+  public void setBinding(FabricUIManagerBinding binding) {
     mBinding = binding;
   }
 
@@ -1272,7 +1270,7 @@ public class FabricUIManager
                   public void run() {
                     mMountNotificationScheduled = false;
 
-                    final @Nullable Binding binding = mBinding;
+                    final @Nullable FabricUIManagerBinding binding = mBinding;
                     if (binding == null || mDestroyed) {
                       mMountedSurfaceIds.clear();
                       return;

package/ReactAndroid/src/main/java/com/facebook/react/fabric/{BindingImpl.kt → FabricUIManagerBinding.kt}

@@ -8,7 +8,7 @@
 package com.facebook.react.fabric
 
 import android.annotation.SuppressLint
-import com.facebook.jni.HybridData
+import com.facebook.jni.HybridClassBase
 import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.NativeMap
 import com.facebook.react.bridge.ReadableNativeMap
@@ -21,8 +21,12 @@ import com.facebook.react.uimanager.PixelUtil.getDisplayMetricDensity
 
 @DoNotStrip
 @SuppressLint("MissingNativeLoadLibrary")
-public class BindingImpl : Binding {
-  @DoNotStrip @Suppress("NoHungarianNotation") private val mHybridData: HybridData = initHybrid()
+internal class FabricUIManagerBinding : HybridClassBase() {
+  init {
+    initHybrid()
+  }
+
+  private external fun initHybrid()
 
   private external fun installFabricUIManager(
       runtimeExecutor: RuntimeExecutor,
@@ -33,9 +37,9 @@ public class BindingImpl : Binding {
       reactNativeConfig: Any
   )
 
-  external override fun startSurface(surfaceId: Int, moduleName: String, initialProps: NativeMap)
+  public external fun startSurface(surfaceId: Int, moduleName: String, initialProps: NativeMap)
 
-  external override fun startSurfaceWithConstraints(
+  public external fun startSurfaceWithConstraints(
       surfaceId: Int,
       moduleName: String,
       initialProps: NativeMap,
@@ -49,11 +53,19 @@ public class BindingImpl : Binding {
       doLeftAndRightSwapInRTL: Boolean
   )
 
-  external override fun stopSurface(surfaceId: Int)
+  public external fun startSurfaceWithSurfaceHandler(
+      surfaceId: Int,
+      surfaceHandler: SurfaceHandlerBinding,
+      isMountable: Boolean
+  )
+
+  public external fun stopSurface(surfaceId: Int)
 
-  external override fun setPixelDensity(pointScaleFactor: Float)
+  public external fun stopSurfaceWithSurfaceHandler(surfaceHandler: SurfaceHandlerBinding)
 
-  external override fun setConstraints(
+  public external fun setPixelDensity(pointScaleFactor: Float)
+
+  public external fun setConstraints(
       surfaceId: Int,
       minWidth: Float,
       maxWidth: Float,
@@ -65,17 +77,17 @@ public class BindingImpl : Binding {
       doLeftAndRightSwapInRTL: Boolean
   )
 
-  external override fun driveCxxAnimations()
+  public external fun driveCxxAnimations()
 
-  external override fun drainPreallocateViewsQueue()
+  public external fun drainPreallocateViewsQueue()
 
-  external override fun reportMount(surfaceId: Int)
+  public external fun reportMount(surfaceId: Int)
 
-  external override fun getInspectorDataForInstance(
+  public external fun getInspectorDataForInstance(
       eventEmitterWrapper: EventEmitterWrapper?
   ): ReadableNativeMap?
 
-  override fun register(
+  public fun register(
       runtimeExecutor: RuntimeExecutor,
       runtimeScheduler: RuntimeScheduler,
       fabricUIManager: FabricUIManager,
@@ -96,20 +108,14 @@ public class BindingImpl : Binding {
 
   private external fun uninstallFabricUIManager()
 
-  override fun unregister() {
+  public fun unregister() {
     uninstallFabricUIManager()
   }
 
-  external override fun registerSurface(surfaceHandler: SurfaceHandlerBinding)
-
-  external override fun unregisterSurface(surfaceHandler: SurfaceHandlerBinding)
-
   private companion object {
     init {
       FabricSoLoader.staticInit()
       MapBufferSoLoader.staticInit()
     }
-
-    @JvmStatic private external fun initHybrid(): HybridData
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerProviderImpl.java

@@ -47,7 +47,7 @@ public class FabricUIManagerProviderImpl implements UIManagerProvider {
 
     Systrace.beginSection(
         Systrace.TRACE_TAG_REACT_JAVA_BRIDGE, "FabricUIManagerProviderImpl.registerBinding");
-    final Binding binding = new BindingImpl();
+    final FabricUIManagerBinding binding = new FabricUIManagerBinding();
 
     CatalystInstance catalystInstance = reactApplicationContext.getCatalystInstance();
 

package/ReactAndroid/src/main/java/com/facebook/react/fabric/LongStreamingStats.kt

@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.fabric
+
+import java.util.PriorityQueue
+import java.util.Queue
+import kotlin.comparisons.reverseOrder
+
+internal class LongStreamingStats {
+
+  // TODO(T138627466): Calculate median value with better algorithm after Android API 24.
+  private val minHeap: Queue<Long> = PriorityQueue(11)
+  private val maxHeap: Queue<Long> = PriorityQueue(11, reverseOrder())
+  var average: Double = 0.0
+    private set
+
+  private var len = 0
+  var max: Long = 0L
+    private set
+
+  fun add(n: Long) {
+    // To make medians more useful, we discard all zero values
+    // This isn't perfect and certainly makes this a totally invalid median, but, alas...
+    if (n != 0L) {
+      if (minHeap.size == maxHeap.size) {
+        maxHeap.offer(n)
+        minHeap.offer(maxHeap.poll())
+      } else {
+        minHeap.offer(n)
+        maxHeap.offer(minHeap.poll())
+      }
+    }
+
+    len++
+    if (len == 1) {
+      average = n.toDouble()
+    } else {
+      average = (average / (len / (len - 1))) + (n / len)
+    }
+
+    max = (if (n > max) n else max)
+  }
+
+  val median: Double
+    get() {
+      if (minHeap.size == 0 && maxHeap.size == 0) {
+        return 0.0
+      }
+      val median =
+          if (minHeap.size > maxHeap.size) {
+            minHeap.peek()
+          } else {
+            (minHeap.peek() ?: 0 + maxHeap.peek()!!) / 2
+          }
+      return median.toDouble()
+    }
+}

package/ReactAndroid/src/main/java/com/facebook/react/fabric/StateWrapperImpl.java

@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Nullsafe;
-import com.facebook.jni.HybridData;
+import com.facebook.jni.HybridClassBase;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.ReadableNativeMap;
@@ -27,21 +27,18 @@ import com.facebook.react.uimanager.StateWrapper;
 @Nullsafe(Nullsafe.Mode.LOCAL)
 @SuppressLint("MissingNativeLoadLibrary")
 @DoNotStrip
-public class StateWrapperImpl implements StateWrapper {
+public class StateWrapperImpl extends HybridClassBase implements StateWrapper {
   static {
     FabricSoLoader.staticInit();
   }
 
   private static final String TAG = "StateWrapperImpl";
 
-  @DoNotStrip private final HybridData mHybridData;
-  private volatile boolean mDestroyed = false;
-
   private StateWrapperImpl() {
-    mHybridData = initHybrid();
+    initHybrid();
   }
 
-  private static native HybridData initHybrid();
+  private native void initHybrid();
 
   private native ReadableNativeMap getStateDataImpl();
 
@@ -52,7 +49,7 @@ public class StateWrapperImpl implements StateWrapper {
   @Override
   @Nullable
   public ReadableMapBuffer getStateDataMapBuffer() {
-    if (mDestroyed) {
+    if (!isValid()) {
       FLog.e(TAG, "Race between StateWrapperImpl destruction and getState");
       return null;
     }
@@ -62,7 +59,7 @@ public class StateWrapperImpl implements StateWrapper {
   @Override
   @Nullable
   public ReadableNativeMap getStateData() {
-    if (mDestroyed) {
+    if (!isValid()) {
       FLog.e(TAG, "Race between StateWrapperImpl destruction and getState");
       return null;
     }
@@ -71,7 +68,7 @@ public class StateWrapperImpl implements StateWrapper {
 
   @Override
   public void updateState(@NonNull WritableMap map) {
-    if (mDestroyed) {
+    if (!isValid()) {
       FLog.e(TAG, "Race between StateWrapperImpl destruction and updateState");
       return;
     }
@@ -80,15 +77,14 @@ public class StateWrapperImpl implements StateWrapper {
 
   @Override
   public void destroyState() {
-    if (!mDestroyed) {
-      mDestroyed = true;
-      mHybridData.resetNative();
+    if (isValid()) {
+      resetNative();
     }
   }
 
   @Override
   public String toString() {
-    if (mDestroyed) {
+    if (!isValid()) {
       return "<destroyed>";
     }