react-native-tvos 0.84.1-0 → 0.85.0-0

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt

@@ -15,51 +15,27 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.bridge.buildReadableArray
-import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+import java.io.IOException
 import java.net.SocketTimeoutException
 import okhttp3.Headers
-import okhttp3.Protocol
-import okhttp3.Request
-import okhttp3.Response
+import okhttp3.RequestBody
+import okio.Buffer
 
 /**
  * Utility class for reporting network lifecycle events to JavaScript and InspectorNetworkReporter.
  */
 internal object NetworkEventUtil {
-  @JvmStatic
-  fun onCreateRequest(devToolsRequestId: String, request: Request) {
-    if (ReactNativeFeatureFlags.enableNetworkEventReporting()) {
-      val headersMap = okHttpHeadersToMap(request.headers())
-      var requestBody = ""
+  private const val MAX_BODY_PREVIEW_SIZE = 512 * 1024 // 512KB
 
-      if (ReactBuildConfig.DEBUG) {
-        // Debug build: Process request body for preview (CDP only)
-        requestBody =
-            (request.body() as? ProgressRequestBody)?.getBodyPreview()
-                ?: request.body()?.toString().orEmpty()
-      }
-
-      InspectorNetworkReporter.reportRequestStart(
-          devToolsRequestId,
-          request.url().toString(),
-          request.method(),
-          headersMap,
-          requestBody,
-          request.body()?.contentLength() ?: 0,
-      )
-      InspectorNetworkReporter.reportConnectionTiming(devToolsRequestId, headersMap)
-    }
-  }
-
-  @Deprecated("Compatibility overload")
   @JvmStatic
   fun onCreateRequest(
       devToolsRequestId: String,
       requestUrl: String,
       requestMethod: String,
       requestHeaders: Map<String, String>,
-      requestBody: String,
+      /** Request body for DevTools preview. Only populate in debug builds. */
+      requestBodyForDevTools: String?,
       encodedDataLength: Long,
   ) {
     if (ReactNativeFeatureFlags.enableNetworkEventReporting()) {
@@ -68,7 +44,7 @@ internal object NetworkEventUtil {
           requestUrl,
           requestMethod,
           requestHeaders,
-          requestBody,
+          requestBodyForDevTools.orEmpty(),
           encodedDataLength,
       )
       InspectorNetworkReporter.reportConnectionTiming(devToolsRequestId, requestHeaders)
@@ -229,11 +205,12 @@ internal object NetworkEventUtil {
       requestId: Int,
       devToolsRequestId: String,
       requestUrl: String?,
-      response: Response,
+      statusCode: Int,
+      headers: Map<String, String>,
+      contentLength: Long,
   ) {
-    val headersMap = okHttpHeadersToMap(response.headers())
     val headersBundle = Bundle()
-    for ((headerName, headerValue) in headersMap) {
+    for ((headerName, headerValue) in headers) {
       headersBundle.putString(headerName, headerValue)
     }
 
@@ -241,59 +218,24 @@ internal object NetworkEventUtil {
       InspectorNetworkReporter.reportResponseStart(
           devToolsRequestId,
           requestUrl.orEmpty(),
-          response.code(),
-          headersMap,
-          response.body()?.contentLength() ?: 0,
+          statusCode,
+          headers,
+          contentLength,
       )
     }
     reactContext?.emitDeviceEvent(
         "didReceiveNetworkResponse",
         Arguments.createArray().apply {
           pushInt(requestId)
-          pushInt(response.code())
+          pushInt(statusCode)
           pushMap(Arguments.fromBundle(headersBundle))
           pushString(requestUrl)
         },
     )
   }
 
-  @Deprecated("Compatibility overload")
   @JvmStatic
-  fun onResponseReceived(
-      reactContext: ReactApplicationContext?,
-      requestId: Int,
-      devToolsRequestId: String,
-      statusCode: Int,
-      headers: WritableMap?,
-      url: String?,
-  ) {
-    val headersBuilder = Headers.Builder()
-    headers?.let { map ->
-      val iterator = map.keySetIterator()
-      while (iterator.hasNextKey()) {
-        val key = iterator.nextKey()
-        val value = map.getString(key)
-        if (value != null) {
-          headersBuilder.add(key, value)
-        }
-      }
-    }
-    onResponseReceived(
-        reactContext,
-        requestId,
-        devToolsRequestId,
-        url,
-        Response.Builder()
-            .protocol(Protocol.HTTP_1_1)
-            .request(Request.Builder().url(url.orEmpty()).build())
-            .headers(headersBuilder.build())
-            .code(statusCode)
-            .message("")
-            .build(),
-    )
-  }
-
-  private fun okHttpHeadersToMap(headers: Headers): Map<String, String> {
+  fun okHttpHeadersToMap(headers: Headers): Map<String, String> {
     val responseHeaders = mutableMapOf<String, String>()
     for (i in 0 until headers.size()) {
       val headerName = headers.name(i)
@@ -306,4 +248,33 @@ internal object NetworkEventUtil {
     }
     return responseHeaders
   }
+
+  @JvmStatic
+  fun getRequestBodyPreview(requestBody: RequestBody?): String? {
+    if (requestBody == null) {
+      return null
+    }
+
+    // Unwrap ProgressRequestBody
+    val body = (requestBody as? ProgressRequestBody)?.innerBody() ?: requestBody
+
+    if (body.isOneShot()) {
+      // Fallback - body cannot be read twice
+      return "[Preview unavailable]"
+    }
+
+    return try {
+      val buffer = Buffer()
+      body.writeTo(buffer)
+
+      val size = buffer.size()
+      if (size <= MAX_BODY_PREVIEW_SIZE) {
+        buffer.readUtf8()
+      } else {
+        buffer.readUtf8(MAX_BODY_PREVIEW_SIZE.toLong()) + "... (truncated, ${size} bytes total)"
+      }
+    } catch (e: IOException) {
+      "[Preview unavailable]"
+    }
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

@@ -20,6 +20,7 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.WritableMap
+import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.common.network.OkHttpCallUtil
 import com.facebook.react.module.annotations.ReactModule
 import java.io.IOException
@@ -36,7 +37,6 @@ import okhttp3.JavaNetCookieJar
 import okhttp3.MediaType
 import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
-import okhttp3.Protocol
 import okhttp3.Request
 import okhttp3.RequestBody
 import okhttp3.Response
@@ -310,21 +310,14 @@ public class NetworkingModule(
         if (handler.supports(uri, responseType)) {
           val (res, rawBody) = handler.fetch(uri)
           val encodedDataLength = res.toString().toByteArray().size
-          // fix: UriHandlers which are not using file:// scheme fail in whatwg-fetch at this line
-          // https://github.com/JakeChampion/fetch/blob/main/fetch.js#L547
-          val response =
-              Response.Builder()
-                  .protocol(Protocol.HTTP_1_1)
-                  .request(Request.Builder().url(url.orEmpty()).build())
-                  .code(200)
-                  .message("OK")
-                  .build()
           NetworkEventUtil.onResponseReceived(
               reactApplicationContext,
               requestId,
               devToolsRequestId,
               url,
-              response,
+              200,
+              emptyMap(),
+              encodedDataLength.toLong(),
           )
           NetworkEventUtil.onDataReceived(
               reactApplicationContext,
@@ -611,7 +604,16 @@ public class NetworkingModule(
 
     addRequest(requestId)
     val request = requestBuilder.build()
-    NetworkEventUtil.onCreateRequest(devToolsRequestId, request)
+
+    NetworkEventUtil.onCreateRequest(
+        devToolsRequestId,
+        request.url().toString(),
+        request.method(),
+        NetworkEventUtil.okHttpHeadersToMap(request.headers()),
+        if (ReactBuildConfig.DEBUG) NetworkEventUtil.getRequestBodyPreview(request.body())
+        else null,
+        request.body()?.contentLength() ?: 0,
+    )
 
     client
         .newCall(request)
@@ -645,7 +647,9 @@ public class NetworkingModule(
                     requestId,
                     devToolsRequestId,
                     response.request().url().toString(),
-                    response,
+                    response.code(),
+                    NetworkEventUtil.okHttpHeadersToMap(response.headers()),
+                    response.body()?.contentLength() ?: 0L,
                 )
 
                 try {

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/ProgressRequestBody.kt

@@ -50,6 +50,8 @@ internal class ProgressRequestBody(
     sinkWrapper.flush()
   }
 
+  fun innerBody(): RequestBody = requestBody
+
   private fun outputStreamSink(sink: BufferedSink): Sink {
     return Okio.sink(
         object : FilterOutputStream(sink.outputStream()) {
@@ -78,9 +80,4 @@ internal class ProgressRequestBody(
         }
     )
   }
-
-  fun getBodyPreview(): String {
-    // TODO: Safely implement request body previews
-    return "[Preview unavailable]"
-  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/AndroidInfoHelpers.kt

@@ -77,7 +77,7 @@ public object AndroidInfoHelpers {
         "appDisplayName" to appDisplayName,
         "appIdentifier" to appIdentifier,
         "platform" to "android",
-        "deviceName" to Build.MODEL,
+        "deviceName" to "${Build.MANUFACTURER} ${Build.MODEL}",
         "reactNativeVersion" to getReactNativeVersionString(),
     )
   }

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -13,8 +13,8 @@ public object ReactNativeVersion {
   @JvmField
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
-    "minor" to 84,
-    "patch" to 1,
+    "minor" to 85,
+    "patch" to 0,
     "prerelease" to "0"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.kt

@@ -22,6 +22,7 @@ import com.facebook.react.common.ReactConstants
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.network.CustomClientBuilder
 import com.facebook.react.modules.network.ForwardingCookieHandler
+import com.facebook.react.modules.network.OkHttpClientProvider
 import java.io.IOException
 import java.net.URI
 import java.net.URISyntaxException
@@ -80,7 +81,8 @@ public class WebSocketModule(context: ReactApplicationContext) :
   ) {
     val id = socketID.toInt()
     val okHttpBuilder =
-        OkHttpClient.Builder()
+        OkHttpClientProvider.getOkHttpClient()
+            .newBuilder()
             .connectTimeout(10, TimeUnit.SECONDS)
             .writeTimeout(10, TimeUnit.SECONDS)
             .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
@@ -198,9 +200,6 @@ public class WebSocketModule(context: ReactApplicationContext) :
           }
         },
     )
-
-    // Trigger shutdown of the dispatcher's executor so this process can exit cleanly
-    client.dispatcher().executorService().shutdown()
   }
 
   override fun close(code: Double, reason: String?, socketID: Double) {

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/JSPackagerClient.kt

@@ -9,6 +9,7 @@ package com.facebook.react.packagerconnection
 
 import android.net.Uri
 import com.facebook.common.logging.FLog
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import com.facebook.react.modules.systeminfo.AndroidInfoHelpers.getFriendlyDeviceName
 import com.facebook.react.packagerconnection.ReconnectingWebSocket.MessageCallback
 import okio.ByteString
@@ -28,7 +29,7 @@ public constructor(
   init {
     val url =
         Uri.Builder()
-            .scheme("ws")
+            .scheme(DevSupportHttpClient.wsScheme(settings.debugServerHost))
             .encodedAuthority(settings.debugServerHost)
             .appendPath("message")
             .appendQueryParameter("device", getFriendlyDeviceName())

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.kt

@@ -10,10 +10,9 @@ package com.facebook.react.packagerconnection
 import android.os.Handler
 import android.os.Looper
 import com.facebook.common.logging.FLog
+import com.facebook.react.devsupport.inspector.DevSupportHttpClient
 import java.io.IOException
 import java.nio.channels.ClosedChannelException
-import java.util.concurrent.TimeUnit
-import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.Response
 import okhttp3.WebSocket
@@ -40,12 +39,7 @@ public class ReconnectingWebSocket(
   }
 
   private val handler = Handler(Looper.getMainLooper())
-  private val okHttpClient: OkHttpClient =
-      OkHttpClient.Builder()
-          .connectTimeout(10, TimeUnit.SECONDS)
-          .writeTimeout(10, TimeUnit.SECONDS)
-          .readTimeout(0, TimeUnit.MINUTES) // Disable timeouts for read
-          .build()
+  private val okHttpClient = DevSupportHttpClient.websocketClient
   private var closed = false
   private var suppressConnectionErrors = false
   private var webSocket: WebSocket? = null

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessAtomicRef.kt

@@ -78,6 +78,8 @@ internal class BridgelessAtomicRef<T>(
         try {
           (this as Object).wait()
         } catch (ex: InterruptedException) {
+          // Record the interrupt to restore it after the wait loop completes.
+          // We continue waiting because we need the object to be created.
           wasInterrupted = true
         }
       }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt

@@ -97,13 +97,16 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
 
   @get:Deprecated("Deprecated in Java")
   override val javaScriptContextHolder: JavaScriptContextHolder
-    get() = reactHost.javaScriptContextHolder!!
+    get() =
+        requireNotNull(reactHost.javaScriptContextHolder) {
+          "javaScriptContextHolder is not available"
+        }
 
   @Suppress("INAPPLICABLE_JVM_NAME")
   @get:Deprecated("Deprecated in Java")
   @get:JvmName("getJSCallInvokerHolder") // This is needed to keep backward compatibility
   override val jsCallInvokerHolder: CallInvokerHolder
-    get() = reactHost.jsCallInvokerHolder!!
+    get() = requireNotNull(reactHost.jsCallInvokerHolder) { "jsCallInvokerHolder is not available" }
 
   override val nativeMethodCallInvokerHolder: NativeMethodCallInvokerHolder
     get() =
@@ -124,7 +127,10 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
     get() = reactHost.nativeModules
 
   override val reactQueueConfiguration: ReactQueueConfiguration
-    get() = reactHost.reactQueueConfiguration!!
+    get() =
+        requireNotNull(reactHost.reactQueueConfiguration) {
+          "reactQueueConfiguration is not available"
+        }
 
   override val runtimeExecutor: RuntimeExecutor?
     get() = reactHost.runtimeExecutor

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessReactContext.kt

@@ -49,6 +49,12 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
   private val sourceURLRef = AtomicReference<String>()
   private val TAG: String = this.javaClass.simpleName
 
+  val devSupportManager: DevSupportManager
+    get() = reactHost.devSupportManager
+
+  val defaultHardwareBackBtnHandler: DefaultHardwareBackBtnHandler
+    get() = reactHost.defaultBackButtonHandler
+
   init {
     if (ReactNativeNewArchitectureFeatureFlags.useFabricInterop()) {
       initializeInteropModules()
@@ -103,9 +109,6 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
 
   override fun destroy() = Unit
 
-  val devSupportManager: DevSupportManager
-    get() = reactHost.devSupportManager
-
   override fun registerSegment(segmentId: Int, path: String, callback: Callback) {
     reactHost.registerSegment(segmentId, path, callback)
   }
@@ -131,7 +134,7 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
         logSoftException(
             TAG,
             IllegalArgumentException(
-                "getJSModule(RCTEventEmitter) is not recommended in the new architecture and will stop working with interop disabled. Please use UIManagerHelper.getEventDispatcher or UIManagerHelper.getEventDispatcherForReactTag instead"
+                "getJSModule(RCTEventEmitter) is not recommended in the new architecture and will stop working with interop disabled. Please use UIManagerHelper.getEventDispatcher instead"
             ),
         )
       }
@@ -145,7 +148,7 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
             arrayOf<Class<*>>(jsInterface),
             BridgelessJSModuleInvocationHandler(reactHost, jsInterface),
         ) as JavaScriptModule
-    @Suppress("UNCHECKED_CAST")
+    @Suppress("UNCHECKED_CAST", "KotlinGenericsCast")
     return interfaceProxy as? T
   }
 
@@ -178,7 +181,4 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
   }
 
   override fun getJSCallInvokerHolder(): CallInvokerHolder? = reactHost.jsCallInvokerHolder
-
-  val defaultHardwareBackBtnHandler: DefaultHardwareBackBtnHandler
-    get() = reactHost.defaultBackButtonHandler
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt

@@ -250,6 +250,7 @@ public class ReactHostImpl(
     stateTracker.enterState("onHostResume(activity)")
 
     currentActivity = activity
+    frameTimingsObserver?.setCurrentWindow(activity?.window)
 
     maybeEnableDevSupport(true)
     reactLifecycleStateManager.moveToOnHostResume(currentReactContext, activity)
@@ -851,6 +852,7 @@ public class ReactHostImpl(
   private fun moveToHostDestroy(currentContext: ReactContext?) {
     reactLifecycleStateManager.moveToOnHostDestroy(currentContext)
     currentActivity = null
+    frameTimingsObserver?.setCurrentWindow(null)
   }
 
   private fun raiseSoftException(
@@ -1563,18 +1565,16 @@ public class ReactHostImpl(
           when (state) {
             TracingState.ENABLED_IN_BACKGROUND_MODE,
             TracingState.ENABLED_IN_CDP_MODE -> {
-              currentActivity?.window?.let { window ->
-                val observer =
-                    FrameTimingsObserver(
-                        window,
-                        _screenshotsEnabled,
-                        { frameTimingsSequence ->
-                          inspectorTarget.recordFrameTimings(frameTimingsSequence)
-                        },
-                    )
-                observer.start()
-                frameTimingsObserver = observer
-              }
+              val observer =
+                  FrameTimingsObserver(
+                      _screenshotsEnabled,
+                      { frameTimingsSequence ->
+                        inspectorTarget.recordFrameTimings(frameTimingsSequence)
+                      },
+                  )
+              observer.setCurrentWindow(currentActivity?.window)
+              observer.start()
+              frameTimingsObserver = observer
             }
             TracingState.DISABLED -> {
               frameTimingsObserver?.stop()

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt

@@ -41,7 +41,7 @@ internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) :
 
   external fun stopAndMaybeEmitBackgroundTrace(): Boolean
 
-  external fun stopAndDiscardBackgroundTrace()
+  external fun stopTracing()
 
   external override fun getTracingState(): TracingState
 
@@ -65,7 +65,7 @@ internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) :
   }
 
   override fun stopBackgroundTrace() {
-    stopAndDiscardBackgroundTrace()
+    stopTracing()
   }
 
   fun handleNativePerfIssueAdded(

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactInstance.kt

@@ -7,6 +7,7 @@
 
 package com.facebook.react.runtime
 
+import android.annotation.SuppressLint
 import android.content.res.AssetManager
 import android.view.View
 import com.facebook.common.logging.FLog
@@ -43,6 +44,7 @@ import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.devsupport.InspectorFlags.getIsProfilingBuild
 import com.facebook.react.devsupport.StackTraceHelper
 import com.facebook.react.devsupport.interfaces.DevSupportManager
+import com.facebook.react.fabric.AnimationBackendChoreographer
 import com.facebook.react.fabric.ComponentFactory
 import com.facebook.react.fabric.FabricUIManager
 import com.facebook.react.fabric.FabricUIManagerBinding
@@ -104,6 +106,13 @@ internal class ReactInstance(
   val fabricUIManager: FabricUIManager
   val javaScriptContextHolder: JavaScriptContextHolder
 
+  val nativeModules: Collection<NativeModule>
+    get() = turboModuleManager.modules
+
+  val eventDispatcher: EventDispatcher
+    /** @return The [EventDispatcher] used by [FabricUIManager] to emit UI events to JS. */
+    get() = fabricUIManager.eventDispatcher
+
   init {
     Systrace.beginSection(Systrace.TRACE_TAG_REACT, "ReactInstance.initialize")
 
@@ -250,6 +259,8 @@ internal class ReactInstance(
     // Misc initialization that needs to be done before Fabric init
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
 
+    val animationBackendChoreographer = AnimationBackendChoreographer(context)
+
     val binding = FabricUIManagerBinding()
     binding.register(
         getBufferedRuntimeExecutor(),
@@ -257,6 +268,7 @@ internal class ReactInstance(
         fabricUIManager,
         eventBeatManager,
         componentFactory,
+        animationBackendChoreographer,
     )
 
     // Initialize the FabricUIManager
@@ -340,9 +352,6 @@ internal class ReactInstance(
     return false
   }
 
-  val nativeModules: Collection<NativeModule>
-    get() = turboModuleManager.modules
-
   fun <T : NativeModule> getNativeModule(nativeModuleInterface: Class<T>): T? {
     val annotation = nativeModuleInterface.getAnnotation(ReactModule::class.java)
     if (annotation != null) {
@@ -351,6 +360,7 @@ internal class ReactInstance(
     return null
   }
 
+  @SuppressLint("KotlinGenericsCast")
   fun <T : NativeModule> getNativeModule(nativeModuleName: String): T? {
     synchronized(turboModuleManager) {
       @Suppress("UNCHECKED_CAST")
@@ -473,10 +483,6 @@ internal class ReactInstance(
     }
   }
 
-  val eventDispatcher: EventDispatcher
-    /** @return The [EventDispatcher] used by [FabricUIManager] to emit UI events to JS. */
-    get() = fabricUIManager.eventDispatcher
-
   fun registerSegment(segmentId: Int, path: String) {
     registerSegmentNative(segmentId, path)
   }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt

@@ -45,6 +45,20 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
   private var widthMeasureSpec = 0
   private var heightMeasureSpec = 0
 
+  private val viewportOffset: Point
+    get() {
+      val locationOnScreen = IntArray(2)
+      getLocationOnScreen(locationOnScreen)
+
+      // we need to subtract visibleWindowCoords - to subtract possible window insets, split
+      // screen or multi window
+      val visibleWindowFrame = Rect()
+      getWindowVisibleDisplayFrame(visibleWindowFrame)
+      locationOnScreen[0] -= visibleWindowFrame.left
+      locationOnScreen[1] -= visibleWindowFrame.top
+      return Point(locationOnScreen[0], locationOnScreen[1])
+    }
+
   init {
     if (ReactFeatureFlags.dispatchPointerEvents) {
       jsPointerDispatcher = JSPointerDispatcher(this)
@@ -105,20 +119,6 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
     }
   }
 
-  private val viewportOffset: Point
-    get() {
-      val locationOnScreen = IntArray(2)
-      getLocationOnScreen(locationOnScreen)
-
-      // we need to subtract visibleWindowCoords - to subtract possible window insets, split
-      // screen or multi window
-      val visibleWindowFrame = Rect()
-      getWindowVisibleDisplayFrame(visibleWindowFrame)
-      locationOnScreen[0] -= visibleWindowFrame.left
-      locationOnScreen[1] -= visibleWindowFrame.top
-      return Point(locationOnScreen[0], locationOnScreen[1])
-    }
-
   override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
     // Override in order to still receive events to onInterceptTouchEvent even when some other
     // views disallow that, but propagate it up the tree if possible.