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

package/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental.kt

@@ -1,305 +0,0 @@
-/*
- * 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.views.virtual.viewexperimental
-
-import android.content.Context
-import android.graphics.Rect
-import android.view.View
-import android.view.ViewParent
-import androidx.annotation.VisibleForTesting
-import com.facebook.common.logging.FLog
-import com.facebook.react.R
-import com.facebook.react.common.build.ReactBuildConfig
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
-import com.facebook.react.uimanager.ReactClippingViewGroup
-import com.facebook.react.uimanager.ReactRoot
-import com.facebook.react.views.scroll.VirtualView
-import com.facebook.react.views.scroll.VirtualViewContainer
-import com.facebook.react.views.view.ReactViewGroup
-import com.facebook.react.views.virtual.VirtualViewMode
-import com.facebook.react.views.virtual.VirtualViewModeChangeEmitter
-import com.facebook.react.views.virtual.VirtualViewRenderState
-
-public class ReactVirtualViewExperimental(context: Context) :
-    ReactViewGroup(context), VirtualView, View.OnLayoutChangeListener {
-
-  internal var mode: VirtualViewMode? = null
-  internal var modeChangeEmitter: VirtualViewModeChangeEmitter? = null
-  internal var renderState: VirtualViewRenderState = VirtualViewRenderState.Unknown
-
-  private var scrollView: VirtualViewContainer? = null
-
-  private val lastContainerRelativeRect: Rect = Rect()
-  private val lastClippingRect: Rect = Rect()
-  override val containerRelativeRect: Rect = Rect()
-  private var offsetX: Int = 0
-  private var offsetY: Int = 0
-  private var hadLayout: Boolean = false
-
-  internal val nativeId: String?
-    get() = getTag(R.id.view_tag_native_id) as? String
-
-  override fun onAttachedToWindow() {
-    super.onAttachedToWindow()
-    doAttachedToWindow()
-  }
-
-  @VisibleForTesting
-  internal fun doAttachedToWindow() {
-    scrollView = getScrollView()
-    // onAttachedToWindow is usually called before layout but there are cases where it's called
-    // after. If called after, we need to report the updated layout to the VirtualViewContainer
-    if (hadLayout) {
-      updateParentOffset()
-      reportRectChangeToContainer()
-    }
-    debugLog("doAttachedToWindow")
-  }
-
-  /** From [View#onLayout] */
-  // This is when the view itself has layout changes
-  override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-    super.onLayout(changed, left, top, right, bottom)
-    hadLayout = true
-    if (changed) {
-      containerRelativeRect.set(
-          left + offsetX,
-          top + offsetY,
-          right + offsetX,
-          bottom + offsetY,
-      )
-      debugLog("onLayout") { "containerRelativeRect=$containerRelativeRect" }
-      reportRectChangeToContainer()
-    }
-  }
-
-  // Here we're subscribing to all parent views up to scrollView and when their layout changes
-  override fun onLayoutChange(
-      v: View?,
-      left: Int,
-      top: Int,
-      right: Int,
-      bottom: Int,
-      oldLeft: Int,
-      oldTop: Int,
-      oldRight: Int,
-      oldBottom: Int,
-  ) {
-    if (oldLeft != left || oldTop != top) {
-      updateParentOffset()
-      debugLog("onLayoutChange") { "containerRelativeRect=$containerRelativeRect" }
-      reportRectChangeToContainer()
-    }
-  }
-
-  override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
-    super.onSizeChanged(w, h, oldw, oldh)
-    containerRelativeRect.set(
-        left + offsetX,
-        top + offsetY,
-        right + offsetX,
-        bottom + offsetY,
-    )
-    debugLog("onSizeChanged") { "container=$containerRelativeRect" }
-    reportRectChangeToContainer()
-  }
-
-  override fun onDetachedFromWindow() {
-    super.onDetachedFromWindow()
-    recycleView()
-  }
-
-  override internal fun recycleView() {
-    cleanupLayoutListeners()
-    scrollView?.virtualViewContainerState?.remove(this)
-    scrollView = null
-    mode = null
-    modeChangeEmitter = null
-    hadLayout = false
-    lastContainerRelativeRect.setEmpty()
-    lastClippingRect.setEmpty()
-    containerRelativeRect.setEmpty()
-  }
-
-  override val virtualViewID: String
-    get() {
-      return "${nativeId ?: "unknown"}:::${id}"
-    }
-
-  override fun onModeChange(newMode: VirtualViewMode, thresholdRect: Rect) {
-    modeChangeEmitter ?: return
-    scrollView ?: return
-
-    if (newMode == VirtualViewMode.Visible) {
-      updateClippingRect(null)
-    }
-
-    if (newMode == mode) {
-      debugLog("onModeChange") { "no change $newMode" }
-      return
-    }
-
-    val oldMode = mode
-    mode = newMode
-
-    debugLog("onModeChange") { "$oldMode->$newMode" }
-
-    if (oldMode == VirtualViewMode.Visible) {
-      updateClippingRect(null)
-    }
-
-    when (newMode) {
-      VirtualViewMode.Visible -> {
-        if (renderState == VirtualViewRenderState.Unknown) {
-          // Feature flag is disabled, so use the former logic.
-          modeChangeEmitter?.emitModeChange(
-              VirtualViewMode.Visible,
-              containerRelativeRect,
-              thresholdRect,
-              synchronous = true,
-          )
-        } else {
-          // If the previous mode was prerender and the result of dispatching that event was
-          // committed, we do not need to dispatch an event for visible.
-          val wasPrerenderCommitted =
-              oldMode == VirtualViewMode.Prerender && renderState == VirtualViewRenderState.Rendered
-          if (!wasPrerenderCommitted) {
-            modeChangeEmitter?.emitModeChange(
-                VirtualViewMode.Visible,
-                containerRelativeRect,
-                thresholdRect,
-                synchronous = true,
-            )
-          }
-        }
-      }
-      VirtualViewMode.Prerender -> {
-        if (oldMode != VirtualViewMode.Visible) {
-          modeChangeEmitter?.emitModeChange(
-              VirtualViewMode.Prerender,
-              containerRelativeRect,
-              thresholdRect,
-              synchronous = false,
-          )
-        }
-      }
-      VirtualViewMode.Hidden -> {
-        modeChangeEmitter?.emitModeChange(
-            VirtualViewMode.Hidden,
-            containerRelativeRect,
-            thresholdRect,
-            synchronous = false,
-        )
-      }
-    }
-  }
-
-  // Note: We co-opt subview clipping on ReactVirtualView by returning the
-  // clipping rect of the ScrollView. This means we clip the children of ReactVirtualView
-  // when they are out of the viewport, but not ReactVirtualView itself.
-  override fun updateClippingRect(excludedViews: Set<Int>?) {
-    if (!_removeClippedSubviews) {
-      return
-    }
-
-    // If no ScrollView, or ScrollView has disabled removeClippedSubviews, use default behavior
-    if (scrollView == null) {
-      super.updateClippingRect(excludedViews)
-      return
-    }
-
-    val clippingRect = checkNotNull(clippingRect)
-    val scrollView = checkNotNull(scrollView) as ReactClippingViewGroup
-
-    if (scrollView.removeClippedSubviews) {
-      scrollView.getClippingRect(clippingRect)
-    } else {
-      (scrollView as View).getDrawingRect(clippingRect)
-    }
-
-    clippingRect.intersect(containerRelativeRect)
-    clippingRect.offset(-containerRelativeRect.left, -containerRelativeRect.top)
-
-    if (lastClippingRect == clippingRect) {
-      return
-    }
-
-    updateClippingToRect(clippingRect, excludedViews)
-    lastClippingRect.set(clippingRect)
-  }
-
-  private fun updateParentOffset() {
-    val virtualViewScrollView = scrollView ?: return
-    offsetX = 0
-    offsetY = 0
-    var parent: ViewParent? = parent
-    while (parent != null && parent != virtualViewScrollView) {
-      if (parent is View) {
-        offsetX += parent.left
-        offsetY += parent.top
-      }
-      parent = parent.parent
-    }
-    containerRelativeRect.set(
-        left + offsetX,
-        top + offsetY,
-        right + offsetX,
-        bottom + offsetY,
-    )
-  }
-
-  private fun reportRectChangeToContainer() {
-    if (lastContainerRelativeRect == containerRelativeRect) {
-      debugLog("reportRectChangeToContainer") { "no rect change $containerRelativeRect" }
-      return
-    }
-
-    if (scrollView != null) {
-      scrollView?.virtualViewContainerState?.onChange(this)
-      lastContainerRelativeRect.set(containerRelativeRect)
-    }
-  }
-
-  private fun getScrollView(): VirtualViewContainer? = traverseParentStack(true)
-
-  private fun cleanupLayoutListeners() {
-    traverseParentStack(false)
-  }
-
-  private fun traverseParentStack(addListeners: Boolean): VirtualViewContainer? {
-    var parent: ViewParent? = parent
-    while (parent != null) {
-      if (parent is VirtualViewContainer) {
-        return parent
-      }
-      if (parent is ReactRoot) {
-        // don't look past the root - it could traverse into a separate hierarchy
-        return null
-      }
-      if (parent is View) {
-        // always remove, to ensure listeners aren't added more than once
-        parent.removeOnLayoutChangeListener(this)
-        if (addListeners) {
-          parent.addOnLayoutChangeListener(this)
-        }
-      }
-      parent = parent.parent
-    }
-    return null
-  }
-
-  internal inline fun debugLog(subtag: String, block: () -> String = { "" }) {
-    if (IS_DEBUG_BUILD && ReactNativeFeatureFlags.enableVirtualViewDebugFeatures()) {
-      FLog.d("$DEBUG_TAG:[$virtualViewID]:$subtag", block())
-    }
-  }
-}
-
-private const val DEBUG_TAG: String = "ReactVirtualViewExperimental"
-private val IS_DEBUG_BUILD =
-    ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD || ReactBuildConfig.ENABLE_PERFETTO

package/ReactAndroid/src/main/java/com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager.kt

@@ -1,110 +0,0 @@
-/*
- * 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.views.virtual.viewexperimental
-
-import android.graphics.Rect
-import androidx.annotation.VisibleForTesting
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
-import com.facebook.react.module.annotations.ReactModule
-import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.ViewManagerDelegate
-import com.facebook.react.uimanager.annotations.ReactProp
-import com.facebook.react.uimanager.events.EventDispatcher
-import com.facebook.react.viewmanagers.VirtualViewExperimentalManagerDelegate
-import com.facebook.react.viewmanagers.VirtualViewExperimentalManagerInterface
-import com.facebook.react.views.view.ReactClippingViewManager
-import com.facebook.react.views.virtual.VirtualViewMode
-import com.facebook.react.views.virtual.VirtualViewModeChangeEmitter
-import com.facebook.react.views.virtual.VirtualViewModeChangeEvent
-import com.facebook.react.views.virtual.VirtualViewRenderState
-
-@ReactModule(name = ReactVirtualViewExperimentalManager.REACT_CLASS)
-public class ReactVirtualViewExperimentalManager :
-    ReactClippingViewManager<ReactVirtualViewExperimental>(),
-    VirtualViewExperimentalManagerInterface<ReactVirtualViewExperimental> {
-
-  private val _delegate = VirtualViewExperimentalManagerDelegate(this)
-
-  override fun getDelegate(): ViewManagerDelegate<ReactVirtualViewExperimental> = _delegate
-
-  override fun getName(): String = REACT_CLASS
-
-  override fun createViewInstance(reactContext: ThemedReactContext): ReactVirtualViewExperimental =
-      ReactVirtualViewExperimental(reactContext)
-
-  @ReactProp(name = "initialHidden")
-  override fun setInitialHidden(view: ReactVirtualViewExperimental, value: Boolean) {
-    if (view.mode == null) {
-      view.mode = if (value) VirtualViewMode.Hidden else VirtualViewMode.Visible
-    }
-  }
-
-  @ReactProp(name = "renderState")
-  override fun setRenderState(view: ReactVirtualViewExperimental, value: Int) {
-    // If disabled, `renderState` will always be `VirtualViewRenderState.Unknown`.
-    if (ReactNativeFeatureFlags.enableVirtualViewRenderState()) {
-      view.renderState =
-          when (value) {
-            1 -> VirtualViewRenderState.Rendered
-            2 -> VirtualViewRenderState.None
-            else -> VirtualViewRenderState.Unknown
-          }
-    }
-  }
-
-  override fun setNativeId(view: ReactVirtualViewExperimental, nativeId: String?) {
-    super.setNativeId(view, nativeId)
-  }
-
-  override fun addEventEmitters(
-      reactContext: ThemedReactContext,
-      view: ReactVirtualViewExperimental,
-  ) {
-    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id) ?: return
-    view.modeChangeEmitter =
-        VirtualViewEventEmitter(view.id, UIManagerHelper.getSurfaceId(reactContext), dispatcher)
-  }
-
-  override fun prepareToRecycleView(
-      reactContext: ThemedReactContext,
-      view: ReactVirtualViewExperimental,
-  ): ReactVirtualViewExperimental? {
-    view.recycleView()
-    return super.prepareToRecycleView(reactContext, view)
-  }
-
-  public companion object {
-    public const val REACT_CLASS: String = "VirtualViewExperimental"
-  }
-}
-
-@VisibleForTesting
-public class VirtualViewEventEmitter(
-    private val viewId: Int,
-    private val surfaceId: Int,
-    private val dispatcher: EventDispatcher,
-) : VirtualViewModeChangeEmitter {
-  override fun emitModeChange(
-      mode: VirtualViewMode,
-      targetRect: Rect,
-      thresholdRect: Rect,
-      synchronous: Boolean,
-  ) {
-    dispatcher.dispatchEvent(
-        VirtualViewModeChangeEvent(
-            surfaceId,
-            viewId,
-            mode,
-            targetRect,
-            thresholdRect,
-            synchronous,
-        )
-    )
-  }
-}

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaConfigJNIBase.java

@@ -1,62 +0,0 @@
-/*
- * 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.yoga;
-
-public abstract class YogaConfigJNIBase extends YogaConfig {
-
-  long mNativePointer;
-  private YogaLogger mLogger;
-
-  private YogaConfigJNIBase(long nativePointer) {
-    if (nativePointer == 0) {
-      throw new IllegalStateException("Failed to allocate native memory");
-    }
-    mNativePointer = nativePointer;
-  }
-
-  YogaConfigJNIBase() {
-    this(YogaNative.jni_YGConfigNewJNI());
-  }
-
-  YogaConfigJNIBase(boolean useVanillaJNI) {
-    this(YogaNative.jni_YGConfigNewJNI());
-  }
-
-  public void setExperimentalFeatureEnabled(YogaExperimentalFeature feature, boolean enabled) {
-    YogaNative.jni_YGConfigSetExperimentalFeatureEnabledJNI(mNativePointer, feature.intValue(), enabled);
-  }
-
-  public void setUseWebDefaults(boolean useWebDefaults) {
-    YogaNative.jni_YGConfigSetUseWebDefaultsJNI(mNativePointer, useWebDefaults);
-  }
-
-  public void setPointScaleFactor(float pixelsInPoint) {
-    YogaNative.jni_YGConfigSetPointScaleFactorJNI(mNativePointer, pixelsInPoint);
-  }
-
-  public void setErrata(YogaErrata errata) {
-    YogaNative.jni_YGConfigSetErrataJNI(mNativePointer, errata.intValue());
-  }
-
-  public YogaErrata getErrata() {
-    return YogaErrata.fromInt(YogaNative.jni_YGConfigGetErrataJNI(mNativePointer));
-  }
-
-  public void setLogger(YogaLogger logger) {
-    mLogger = logger;
-    YogaNative.jni_YGConfigSetLoggerJNI(mNativePointer, logger);
-  }
-
-  public YogaLogger getLogger() {
-    return mLogger;
-  }
-
-  protected long getNativePointer() {
-    return mNativePointer;
-  }
-}

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaDirection.java

@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-
-// @generated by enums.py
-
-package com.facebook.yoga;
-
-public enum YogaDirection {
-  INHERIT(0),
-  LTR(1),
-  RTL(2);
-
-  private final int mIntValue;
-
-  YogaDirection(int intValue) {
-    mIntValue = intValue;
-  }
-
-  public int intValue() {
-    return mIntValue;
-  }
-
-  public static YogaDirection fromInt(int value) {
-    switch (value) {
-      case 0: return INHERIT;
-      case 1: return LTR;
-      case 2: return RTL;
-      default: throw new IllegalArgumentException("Unknown enum value: " + value);
-    }
-  }
-}