react-native-tvos 0.78.0-0rc3 → 0.79.0-0

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerLegacyView.kt

@@ -19,18 +19,19 @@ internal class ReactHorizontalScrollContainerLegacyView(context: Context) :
     ReactViewGroup(context) {
   private val isRTL: Boolean = I18nUtil.instance.isRTL(context)
 
-  override fun setRemoveClippedSubviews(removeClippedSubviews: Boolean) {
-    // removeClippedSubviews logic may read metrics before the offsetting we do in onLayout() and is
-    // such unsafe
-    if (isRTL) {
-      super.setRemoveClippedSubviews(false)
-      return
+  override var removeClippedSubviews: Boolean
+    get() = super.removeClippedSubviews
+    set(value) {
+      // removeClippedSubviews logic may read metrics before the offsetting we do in onLayout() and
+      // is such unsafe
+      if (isRTL) {
+        super.removeClippedSubviews = false
+      } else {
+        super.removeClippedSubviews = value
+      }
     }
 
-    super.setRemoveClippedSubviews(removeClippedSubviews)
-  }
-
-  protected override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+  override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
     if (isRTL) {
       // When the layout direction is RTL, we expect Yoga to give us a layout
       // that extends off the screen to the left so we re-center it with left=0

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollContainerViewManager.kt

@@ -16,10 +16,10 @@ import com.facebook.react.uimanager.common.ViewUtil
 import com.facebook.react.views.view.ReactViewGroup
 import com.facebook.react.views.view.ReactViewManager
 
-/** View manager for {@link ReactHorizontalScrollContainerView} components. */
+/** View manager for [ReactHorizontalScrollContainerView] components. */
 @ReactModule(name = ReactHorizontalScrollContainerViewManager.REACT_CLASS)
 public class ReactHorizontalScrollContainerViewManager : ReactViewManager() {
-  override public fun getName(): String = REACT_CLASS
+  public override fun getName(): String = REACT_CLASS
 
   protected override fun createViewInstance(
       reactTag: Int,
@@ -43,6 +43,6 @@ public class ReactHorizontalScrollContainerViewManager : ReactViewManager() {
 
   public companion object {
     public const val REACT_CLASS: String = "AndroidHorizontalScrollContentView"
-    private @UIManagerType var uiManagerType: Int? = null
+    @UIManagerType private var uiManagerType: Int? = null
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java

@@ -71,6 +71,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
     implements ReactClippingViewGroup,
         ViewGroup.OnHierarchyChangeListener,
         View.OnLayoutChangeListener,
+        ReactAccessibleScrollView,
         ReactOverflowViewWithInset,
         HasScrollState,
         HasStateWrapper,
@@ -464,6 +465,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
   }
 
   /** Returns whether the given descendent is partially scrolled in view */
+  @Override
   public boolean isPartiallyScrolledInView(View descendent) {
     int scrollDelta = getScrollDelta(descendent);
     descendent.getDrawingRect(mTempRect);

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java

@@ -76,6 +76,7 @@ public class ReactScrollView extends ScrollView
     implements ReactClippingViewGroup,
         ViewGroup.OnHierarchyChangeListener,
         View.OnLayoutChangeListener,
+        ReactAccessibleScrollView,
         ReactOverflowViewWithInset,
         HasScrollState,
         HasStateWrapper,
@@ -380,7 +381,8 @@ public class ReactScrollView extends ScrollView
   }
 
   /** Returns whether the given descendent is partially scrolled in view */
-  boolean isPartiallyScrolledInView(View descendent) {
+  @Override
+  public boolean isPartiallyScrolledInView(View descendent) {
     int scrollDelta = getScrollDelta(descendent);
     descendent.getDrawingRect(mTempRect);
     return scrollDelta != 0 && Math.abs(scrollDelta) < mTempRect.width();

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewAccessibilityDelegate.kt

@@ -25,25 +25,25 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa
 
   override fun onInitializeAccessibilityEvent(host: View, event: AccessibilityEvent) {
     super.onInitializeAccessibilityEvent(host, event)
-    if (host is ReactScrollView || host is ReactHorizontalScrollView) {
+    if (host is ReactAccessibleScrollView) {
       onInitializeAccessibilityEventInternal(host, event)
     } else {
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           AssertionException(
-              "ReactScrollViewAccessibilityDelegate should only be used with ReactScrollView or ReactHorizontalScrollView, not with class: ${host.javaClass.simpleName}"))
+              "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}"))
     }
   }
 
   override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) {
     super.onInitializeAccessibilityNodeInfo(host, info)
-    if (host is ReactScrollView || host is ReactHorizontalScrollView) {
+    if (host is ReactAccessibleScrollView) {
       onInitializeAccessibilityNodeInfoInternal(host, info)
     } else {
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           AssertionException(
-              "ReactScrollViewAccessibilityDelegate should only be used with ReactScrollView or ReactHorizontalScrollView, not with class: ${host.javaClass.simpleName}"))
+              "ReactScrollViewAccessibilityDelegate should only be used with ReactAccessibleScrollView, not with class: ${host.javaClass.simpleName}"))
     }
   }
 
@@ -61,9 +61,7 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa
     for (index in 0..<contentView.childCount) {
       val nextChild = contentView.getChildAt(index)
       val isVisible: Boolean =
-          if (view is ReactScrollView) {
-            view.isPartiallyScrolledInView(nextChild)
-          } else if (view is ReactHorizontalScrollView) {
+          if (view is ReactAccessibleScrollView) {
             view.isPartiallyScrolledInView(nextChild)
           } else {
             return
@@ -127,9 +125,7 @@ internal class ReactScrollViewAccessibilityDelegate : AccessibilityDelegateCompa
       info.setCollectionInfo(collectionInfoCompat)
     }
 
-    if (view is ReactScrollView) {
-      info.isScrollable = view.scrollEnabled
-    } else if (view is ReactHorizontalScrollView) {
+    if (view is ReactAccessibleScrollView) {
       info.isScrollable = view.scrollEnabled
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt

@@ -108,12 +108,13 @@ public object ReactScrollViewHelper {
     // Throttle the scroll event if scrollEventThrottle is set to be equal or more than 17 ms.
     // We limit the delta to 17ms so that small throttles intended to enable 60fps updates will not
     // inadvertently filter out any scroll events.
-    if (scrollView.scrollEventThrottle >= Math.max(17, now - scrollView.lastScrollDispatchTime)) {
+    if (scrollEventType == ScrollEventType.SCROLL &&
+        scrollView.scrollEventThrottle >= Math.max(17, now - scrollView.lastScrollDispatchTime)) {
       // Scroll events are throttled.
       return
     }
     val contentView = scrollView.getChildAt(0) ?: return
-    for (scrollListener in scrollListeners) {
+    for (scrollListener in scrollListeners.toList()) {
       scrollListener.get()?.onScroll(scrollView, scrollEventType, xVelocity, yVelocity)
     }
     val reactContext = scrollView.context as ReactContext
@@ -138,7 +139,9 @@ public object ReactScrollViewHelper {
               contentView.height,
               scrollView.width,
               scrollView.height))
-      scrollView.lastScrollDispatchTime = now
+      if (scrollEventType == ScrollEventType.SCROLL) {
+        scrollView.lastScrollDispatchTime = now
+      }
     }
   }
 
@@ -473,8 +476,7 @@ public object ReactScrollViewHelper {
     public val stateWrapper: StateWrapper?
   }
 
-  private class OverScrollerDurationGetter internal constructor(context: Context?) :
-      OverScroller(context) {
+  private class OverScrollerDurationGetter(context: Context?) : OverScroller(context) {
     // This is the default in AOSP, hardcoded in OverScroller.java.
     private var currentScrollAnimationDuration = 250
     val scrollAnimationDuration: Int

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/VelocityHelper.kt

@@ -18,17 +18,17 @@ internal class VelocityHelper {
   private var velocityTracker: VelocityTracker? = null
 
   /* Needs to call ACTION_UP/CANCEL to update the xVelocity/yVelocity */
-  public var xVelocity = 0f
+  var xVelocity = 0f
     private set
 
-  public var yVelocity = 0f
+  var yVelocity = 0f
     private set
 
   /**
    * Call from a ScrollView in onTouchEvent. Calculating the velocity for END_DRAG movement and send
    * them back to react ScrollResponder.js
    */
-  public fun calculateVelocity(ev: MotionEvent): Unit {
+  fun calculateVelocity(ev: MotionEvent): Unit {
     if (velocityTracker == null) {
       velocityTracker = VelocityTracker.obtain()
     }

package/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/RefreshEvent.kt

@@ -19,11 +19,11 @@ internal class RefreshEvent : Event<RefreshEvent> {
 
   constructor(surfaceId: Int, viewTag: Int) : super(surfaceId, viewTag)
 
-  override public fun getEventName(): String {
+  override fun getEventName(): String {
     return "topRefresh"
   }
 
-  override protected fun getEventData(): WritableMap? {
+  override fun getEventData(): WritableMap? {
     return Arguments.createMap()
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitch.kt

@@ -45,7 +45,7 @@ internal class ReactSwitch(context: Context) : SwitchCompat(context) {
         RippleDrawable(createRippleDrawableColorStateList(color), ColorDrawable(color), null)
   }
 
-  public fun setColor(drawable: Drawable, color: Int?): Unit {
+  fun setColor(drawable: Drawable, color: Int?): Unit {
     if (color == null) {
       drawable.clearColorFilter()
     } else {
@@ -53,11 +53,11 @@ internal class ReactSwitch(context: Context) : SwitchCompat(context) {
     }
   }
 
-  public fun setTrackColor(color: Int?): Unit {
+  fun setTrackColor(color: Int?): Unit {
     setColor(super.getTrackDrawable(), color)
   }
 
-  public fun setThumbColor(color: Int?): Unit {
+  fun setThumbColor(color: Int?): Unit {
     setColor(super.getThumbDrawable(), color)
 
     // Set the ripple color if background is instance of RippleDrawable
@@ -67,7 +67,7 @@ internal class ReactSwitch(context: Context) : SwitchCompat(context) {
     }
   }
 
-  public fun setOn(on: Boolean): Unit {
+  fun setOn(on: Boolean): Unit {
     // If the switch has a different value than the value sent by JS, we must change it.
     if (isChecked != on) {
       super.setChecked(on)
@@ -76,7 +76,7 @@ internal class ReactSwitch(context: Context) : SwitchCompat(context) {
     allowChange = true
   }
 
-  public fun setTrackColorForTrue(color: Int?): Unit {
+  fun setTrackColorForTrue(color: Int?): Unit {
     if (color == trackColorForTrue) {
       return
     }
@@ -86,7 +86,7 @@ internal class ReactSwitch(context: Context) : SwitchCompat(context) {
     }
   }
 
-  public fun setTrackColorForFalse(color: Int?): Unit {
+  fun setTrackColorForFalse(color: Int?): Unit {
     if (color == trackColorForFalse) {
       return
     }

package/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchEvent.kt

@@ -21,7 +21,7 @@ internal class ReactSwitchEvent(surfaceId: Int, viewId: Int, private val isCheck
       replaceWith = ReplaceWith("ReactSwitchEvent(surfaceId, viewId, isChecked)"))
   constructor(viewId: Int, isChecked: Boolean) : this(ViewUtil.NO_SURFACE_ID, viewId, isChecked)
 
-  public override fun getEventName(): String = EVENT_NAME
+  override fun getEventName(): String = EVENT_NAME
 
   public override fun getEventData(): WritableMap? =
       Arguments.createMap().apply {

package/ReactAndroid/src/main/java/com/facebook/react/views/switchview/ReactSwitchManager.kt

@@ -138,7 +138,7 @@ internal class ReactSwitchManager :
   }
 
   internal companion object {
-    public const val REACT_CLASS: String = "AndroidSwitch"
+    const val REACT_CLASS: String = "AndroidSwitch"
 
     private val ON_CHECKED_CHANGE_LISTENER =
         CompoundButton.OnCheckedChangeListener { buttonView, isChecked ->

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactRawTextManager.kt

@@ -19,27 +19,27 @@ import com.facebook.react.uimanager.ViewManager
 @ReactModule(name = ReactRawTextManager.REACT_CLASS)
 public class ReactRawTextManager : ViewManager<View, ReactRawTextShadowNode>() {
 
-  override public fun getName(): String {
+  public override fun getName(): String {
     return REACT_CLASS
   }
 
-  override public fun createViewInstance(context: ThemedReactContext): ReactTextView =
+  public override fun createViewInstance(context: ThemedReactContext): ReactTextView =
       throw IllegalStateException("Attempt to create a native view for RCTRawText")
 
-  override protected fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? =
+  protected override fun prepareToRecycleView(reactContext: ThemedReactContext, view: View): View? =
       throw IllegalStateException("Attempt to recycle a native view for RCTRawText")
 
-  override public fun updateExtraData(view: View, extraData: Any): Unit = Unit
+  public override fun updateExtraData(view: View, extraData: Any): Unit = Unit
 
-  override public fun getShadowNodeClass(): Class<ReactRawTextShadowNode> {
+  public override fun getShadowNodeClass(): Class<ReactRawTextShadowNode> {
     return ReactRawTextShadowNode::class.java
   }
 
-  override public fun createShadowNodeInstance(): ReactRawTextShadowNode {
+  public override fun createShadowNodeInstance(): ReactRawTextShadowNode {
     return ReactRawTextShadowNode()
   }
 
   internal companion object {
-    public const val REACT_CLASS: String = "RCTRawText"
+    const val REACT_CLASS: String = "RCTRawText"
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java

@@ -9,6 +9,7 @@ package com.facebook.react.views.text;
 
 import android.content.Context;
 import android.graphics.Canvas;
+import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.Layout;
@@ -19,6 +20,7 @@ import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;
 import android.util.TypedValue;
 import android.view.Gravity;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -756,6 +758,30 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     return super.dispatchHoverEvent(event);
   }
 
+  @Override
+  public final void onFocusChanged(
+      boolean gainFocus, int direction, @Nullable Rect previouslyFocusedRect) {
+    super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+    AccessibilityDelegateCompat accessibilityDelegateCompat =
+        ViewCompat.getAccessibilityDelegate(this);
+    if (accessibilityDelegateCompat != null
+        && accessibilityDelegateCompat instanceof ReactTextViewAccessibilityDelegate) {
+      ((ReactTextViewAccessibilityDelegate) accessibilityDelegateCompat)
+          .onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+    }
+  }
+
+  @Override
+  public boolean dispatchKeyEvent(KeyEvent event) {
+    AccessibilityDelegateCompat accessibilityDelegateCompat =
+        ViewCompat.getAccessibilityDelegate(this);
+    return (accessibilityDelegateCompat != null
+            && accessibilityDelegateCompat instanceof ReactTextViewAccessibilityDelegate
+            && ((ReactTextViewAccessibilityDelegate) accessibilityDelegateCompat)
+                .dispatchKeyEvent(event))
+        || super.dispatchKeyEvent(event);
+  }
+
   private void applyTextAttributes() {
     // Workaround for an issue where text can be cut off with an ellipsis when
     // using certain font sizes and padding. Sets the provided text size and