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

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

@@ -22,10 +22,10 @@ public class YogaConfigJNIFinalizer extends YogaConfigJNIBase {
    }
 
   public void freeNatives() {
-    if (mNativePointer != 0) {
-      long nativePointer = mNativePointer;
-      mNativePointer = 0;
-      YogaNative.jni_YGConfigFreeJNI(nativePointer);
+    if (nativePointer != 0) {
+      long pointer = nativePointer;
+      nativePointer = 0;
+      YogaNative.jni_YGConfigFreeJNI(pointer);
     }
   }
 }

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

@@ -0,0 +1,29 @@
+/*
+ * 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 class YogaDirection(public val intValue: Int) {
+  INHERIT(0),
+  LTR(1),
+  RTL(2);
+
+  public fun intValue(): Int = intValue
+
+  public companion object {
+    @JvmStatic
+    public fun fromInt(value: Int): YogaDirection =
+        when (value) {
+          0 -> INHERIT
+          1 -> LTR
+          2 -> RTL
+          else -> throw IllegalArgumentException("Unknown enum value: $value")
+        }
+  }
+}

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNative.kt

@@ -39,7 +39,7 @@ public object YogaNative {
 
   @JvmStatic public external fun jni_YGConfigGetErrataJNI(nativePointer: Long): Int
 
-  @JvmStatic public external fun jni_YGConfigSetLoggerJNI(nativePointer: Long, logger: YogaLogger)
+  @JvmStatic public external fun jni_YGConfigSetLoggerJNI(nativePointer: Long, logger: YogaLogger?)
 
   // YGNode related
   @JvmStatic public external fun jni_YGNodeNewJNI(): Long

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaNode.kt

@@ -0,0 +1,244 @@
+/*
+ * 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 YogaNode : YogaProps {
+  /** The interface the [getData] object can optionally implement. */
+  public fun interface Inputs {
+    /** Requests the data object to disable mutations of its inputs. */
+    public fun freeze(node: YogaNode, parent: YogaNode?)
+  }
+
+  public abstract fun reset()
+
+  public abstract val childCount: Int
+
+  public abstract fun getChildAt(i: Int): YogaNode
+
+  public abstract fun addChildAt(child: YogaNode, i: Int)
+
+  abstract override fun setIsReferenceBaseline(isReferenceBaseline: Boolean)
+
+  public abstract val isReferenceBaseline: Boolean
+
+  public abstract fun removeChildAt(i: Int): YogaNode
+
+  /**
+   * @returns the [YogaNode] that owns this [YogaNode]. The owner is used to identify the YogaTree
+   *   that a [YogaNode] belongs to. This method will return the parent of the [YogaNode] when the
+   *   [YogaNode] only belongs to one YogaTree or null when the [YogaNode] is shared between two or
+   *   more YogaTrees.
+   */
+  public abstract fun getOwner(): YogaNode?
+
+  @Deprecated(
+      "Use getOwner() instead. This will be removed in the next version. ",
+      replaceWith = ReplaceWith("getOwner()"),
+  )
+  public abstract fun getParent(): YogaNode?
+
+  public abstract fun indexOf(child: YogaNode): Int
+
+  public abstract fun calculateLayout(width: Float, height: Float)
+
+  public abstract fun hasNewLayout(): Boolean
+
+  public abstract fun dirty()
+
+  public abstract fun isDirty(): Boolean
+
+  public abstract fun copyStyle(srcNode: YogaNode)
+
+  public abstract fun markLayoutSeen()
+
+  abstract override val styleDirection: YogaDirection
+
+  abstract override fun setDirection(direction: YogaDirection)
+
+  abstract override var flexDirection: YogaFlexDirection
+
+  abstract override var justifyContent: YogaJustify
+
+  abstract override var alignItems: YogaAlign
+
+  abstract override var alignSelf: YogaAlign
+
+  abstract override var alignContent: YogaAlign
+
+  abstract override var positionType: YogaPositionType
+
+  abstract override var boxSizing: YogaBoxSizing
+
+  abstract override var wrap: YogaWrap
+
+  public abstract var overflow: YogaOverflow?
+
+  public abstract var display: YogaDisplay?
+
+  abstract override var flex: Float
+
+  abstract override var flexGrow: Float
+
+  abstract override var flexShrink: Float
+
+  abstract override val flexBasis: YogaValue
+
+  abstract override fun setFlexBasis(flexBasis: Float)
+
+  abstract override fun setFlexBasisPercent(percent: Float)
+
+  abstract override fun setFlexBasisAuto()
+
+  abstract override fun setFlexBasisMaxContent()
+
+  abstract override fun setFlexBasisFitContent()
+
+  abstract override fun setFlexBasisStretch()
+
+  abstract override fun getMargin(edge: YogaEdge): YogaValue
+
+  abstract override fun setMargin(edge: YogaEdge, margin: Float)
+
+  abstract override fun setMarginPercent(edge: YogaEdge, percent: Float)
+
+  abstract override fun setMarginAuto(edge: YogaEdge)
+
+  abstract override fun getPadding(edge: YogaEdge): YogaValue
+
+  abstract override fun setPadding(edge: YogaEdge, padding: Float)
+
+  abstract override fun setPaddingPercent(edge: YogaEdge, percent: Float)
+
+  abstract override fun getBorder(edge: YogaEdge): Float
+
+  abstract override fun setBorder(edge: YogaEdge, value: Float)
+
+  abstract override fun getPosition(edge: YogaEdge): YogaValue
+
+  abstract override fun setPosition(edge: YogaEdge, position: Float)
+
+  abstract override fun setPositionPercent(edge: YogaEdge, percent: Float)
+
+  public abstract fun setPositionAuto(edge: YogaEdge)
+
+  abstract override val width: YogaValue
+
+  abstract override fun setWidth(width: Float)
+
+  abstract override fun setWidthPercent(percent: Float)
+
+  abstract override fun setWidthAuto()
+
+  abstract override fun setWidthMaxContent()
+
+  abstract override fun setWidthFitContent()
+
+  abstract override fun setWidthStretch()
+
+  abstract override val height: YogaValue
+
+  abstract override fun setHeight(height: Float)
+
+  abstract override fun setHeightPercent(percent: Float)
+
+  abstract override fun setHeightAuto()
+
+  abstract override fun setHeightMaxContent()
+
+  abstract override fun setHeightFitContent()
+
+  abstract override fun setHeightStretch()
+
+  abstract override val minWidth: YogaValue
+
+  abstract override fun setMinWidth(minWidth: Float)
+
+  abstract override fun setMinWidthPercent(percent: Float)
+
+  abstract override fun setMinWidthMaxContent()
+
+  abstract override fun setMinWidthFitContent()
+
+  abstract override fun setMinWidthStretch()
+
+  abstract override val minHeight: YogaValue
+
+  abstract override fun setMinHeight(minHeight: Float)
+
+  abstract override fun setMinHeightPercent(percent: Float)
+
+  abstract override fun setMinHeightMaxContent()
+
+  abstract override fun setMinHeightFitContent()
+
+  abstract override fun setMinHeightStretch()
+
+  abstract override val maxWidth: YogaValue
+
+  abstract override fun setMaxWidth(maxWidth: Float)
+
+  abstract override fun setMaxWidthPercent(percent: Float)
+
+  abstract override fun setMaxWidthMaxContent()
+
+  abstract override fun setMaxWidthFitContent()
+
+  abstract override fun setMaxWidthStretch()
+
+  abstract override val maxHeight: YogaValue
+
+  abstract override fun setMaxHeight(maxHeight: Float)
+
+  abstract override fun setMaxHeightPercent(percent: Float)
+
+  abstract override fun setMaxHeightMaxContent()
+
+  abstract override fun setMaxHeightFitContent()
+
+  abstract override fun setMaxHeightStretch()
+
+  abstract override var aspectRatio: Float
+
+  public abstract fun getGap(gutter: YogaGutter): YogaValue
+
+  public abstract fun setGap(gutter: YogaGutter, gapLength: Float)
+
+  public abstract fun setGapPercent(gutter: YogaGutter, gapLength: Float)
+
+  public abstract val layoutX: Float
+
+  public abstract val layoutY: Float
+
+  public abstract val layoutWidth: Float
+
+  public abstract val layoutHeight: Float
+
+  public abstract fun getLayoutMargin(edge: YogaEdge): Float
+
+  public abstract fun getLayoutPadding(edge: YogaEdge): Float
+
+  public abstract fun getLayoutBorder(edge: YogaEdge): Float
+
+  public abstract val layoutDirection: YogaDirection
+
+  abstract override fun setMeasureFunction(measureFunction: YogaMeasureFunction)
+
+  abstract override fun setBaselineFunction(yogaBaselineFunction: YogaBaselineFunction)
+
+  public abstract val isMeasureDefined: Boolean
+
+  public abstract val isBaselineDefined: Boolean
+
+  public abstract var data: Any?
+
+  public abstract fun cloneWithoutChildren(): YogaNode
+
+  public abstract fun cloneWithChildren(): YogaNode
+
+  public abstract fun setAlwaysFormsContainingBlock(alwaysFormsContainingBlock: Boolean)
+}

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

@@ -57,7 +57,7 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   }
 
   YogaNodeJNIBase(YogaConfig config) {
-    this(YogaNative.jni_YGNodeNewWithConfigJNI(((YogaConfigJNIBase) config).mNativePointer));
+    this(YogaNative.jni_YGNodeNewWithConfigJNI(((YogaConfigJNIBase) config).nativePointer));
     mConfig = config; // makes sure the YogaConfig is not garbage collected
   }
 

package/ReactAndroid/src/main/java/com/facebook/yoga/YogaProps.kt

@@ -0,0 +1,183 @@
+/*
+ * 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 interface YogaProps {
+
+  /* Width properties */
+
+  public fun setWidth(width: Float)
+
+  public fun setWidthPercent(percent: Float)
+
+  public fun setWidthAuto()
+
+  public fun setWidthMaxContent()
+
+  public fun setWidthFitContent()
+
+  public fun setWidthStretch()
+
+  public fun setMinWidth(minWidth: Float)
+
+  public fun setMinWidthPercent(percent: Float)
+
+  public fun setMinWidthMaxContent()
+
+  public fun setMinWidthFitContent()
+
+  public fun setMinWidthStretch()
+
+  public fun setMaxWidth(maxWidth: Float)
+
+  public fun setMaxWidthPercent(percent: Float)
+
+  public fun setMaxWidthMaxContent()
+
+  public fun setMaxWidthFitContent()
+
+  public fun setMaxWidthStretch()
+
+  /* Height properties */
+
+  public fun setHeight(height: Float)
+
+  public fun setHeightPercent(percent: Float)
+
+  public fun setHeightAuto()
+
+  public fun setHeightMaxContent()
+
+  public fun setHeightFitContent()
+
+  public fun setHeightStretch()
+
+  public fun setMinHeight(minHeight: Float)
+
+  public fun setMinHeightPercent(percent: Float)
+
+  public fun setMinHeightMaxContent()
+
+  public fun setMinHeightFitContent()
+
+  public fun setMinHeightStretch()
+
+  public fun setMaxHeight(maxHeight: Float)
+
+  public fun setMaxHeightPercent(percent: Float)
+
+  public fun setMaxHeightMaxContent()
+
+  public fun setMaxHeightFitContent()
+
+  public fun setMaxHeightStretch()
+
+  /* Margin properties */
+
+  public fun setMargin(edge: YogaEdge, margin: Float)
+
+  public fun setMarginPercent(edge: YogaEdge, percent: Float)
+
+  public fun setMarginAuto(edge: YogaEdge)
+
+  /* Padding properties */
+
+  public fun setPadding(edge: YogaEdge, padding: Float)
+
+  public fun setPaddingPercent(edge: YogaEdge, percent: Float)
+
+  /* Position properties */
+
+  public fun setPosition(edge: YogaEdge, position: Float)
+
+  public fun setPositionPercent(edge: YogaEdge, percent: Float)
+
+  /* Border properties */
+
+  public fun setBorder(edge: YogaEdge, value: Float)
+
+  /* Flex basis properties */
+
+  public fun setFlexBasisAuto()
+
+  public fun setFlexBasisPercent(percent: Float)
+
+  public fun setFlexBasis(flexBasis: Float)
+
+  public fun setFlexBasisMaxContent()
+
+  public fun setFlexBasisFitContent()
+
+  public fun setFlexBasisStretch()
+
+  /* Direction property - setter has different name than getter */
+
+  public fun setDirection(direction: YogaDirection)
+
+  /* Other functions */
+
+  public fun setIsReferenceBaseline(isReferenceBaseline: Boolean)
+
+  public fun setMeasureFunction(measureFunction: YogaMeasureFunction)
+
+  public fun setBaselineFunction(yogaBaselineFunction: YogaBaselineFunction)
+
+  /* Mutable properties - getter and setter with matching types */
+
+  public var flexDirection: YogaFlexDirection
+
+  public var justifyContent: YogaJustify
+
+  public var alignItems: YogaAlign
+
+  public var alignSelf: YogaAlign
+
+  public var alignContent: YogaAlign
+
+  public var positionType: YogaPositionType
+
+  public var flexGrow: Float
+
+  public var flexShrink: Float
+
+  public var flex: Float
+
+  public var aspectRatio: Float
+
+  public var wrap: YogaWrap
+
+  public var boxSizing: YogaBoxSizing
+
+  /* Read-only properties - getter only, or setter has different type/name */
+
+  public val styleDirection: YogaDirection
+
+  public val width: YogaValue
+
+  public val minWidth: YogaValue
+
+  public val maxWidth: YogaValue
+
+  public val height: YogaValue
+
+  public val minHeight: YogaValue
+
+  public val maxHeight: YogaValue
+
+  public val flexBasis: YogaValue
+
+  /* Functions with parameters */
+
+  public fun getMargin(edge: YogaEdge): YogaValue
+
+  public fun getPadding(edge: YogaEdge): YogaValue
+
+  public fun getPosition(edge: YogaEdge): YogaValue
+
+  public fun getBorder(edge: YogaEdge): Float
+}

package/ReactAndroid/src/main/jni/CMakeLists.txt

@@ -82,6 +82,8 @@ add_react_common_subdir(react/debug)
 add_react_common_subdir(react/featureflags)
 add_react_common_subdir(react/performance/cdpmetrics)
 add_react_common_subdir(react/performance/timeline)
+add_react_common_subdir(react/renderer/animated)
+add_react_common_subdir(react/renderer/animationbackend)
 add_react_common_subdir(react/renderer/animations)
 add_react_common_subdir(react/renderer/attributedstring)
 add_react_common_subdir(react/renderer/componentregistry)
@@ -200,6 +202,8 @@ add_library(reactnative
           $<TARGET_OBJECTS:react_newarchdefaults>
           $<TARGET_OBJECTS:react_performance_cdpmetrics>
           $<TARGET_OBJECTS:react_performance_timeline>
+          $<TARGET_OBJECTS:react_renderer_animated>
+          $<TARGET_OBJECTS:react_renderer_animationbackend>
           $<TARGET_OBJECTS:react_renderer_animations>
           $<TARGET_OBJECTS:react_renderer_attributedstring>
           $<TARGET_OBJECTS:react_renderer_componentregistry>
@@ -293,6 +297,8 @@ target_include_directories(reactnative
         $<TARGET_PROPERTY:react_newarchdefaults,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_performance_cdpmetrics,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_performance_timeline,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_animated,INTERFACE_INCLUDE_DIRECTORIES>
+        $<TARGET_PROPERTY:react_renderer_animationbackend,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_renderer_animations,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_renderer_attributedstring,INTERFACE_INCLUDE_DIRECTORIES>
         $<TARGET_PROPERTY:react_renderer_componentregistry,INTERFACE_INCLUDE_DIRECTORIES>

package/ReactAndroid/src/main/jni/react/fabric/AndroidAnimationChoreographer.h

@@ -0,0 +1,38 @@
+/*
+ * 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/renderer/animationbackend/AnimationChoreographer.h>
+
+#include "JAnimationBackendChoreographer.h"
+
+namespace facebook::react {
+
+class AndroidAnimationChoreographer : public AnimationChoreographer {
+ public:
+  explicit AndroidAnimationChoreographer(jni::alias_ref<JAnimationBackendChoreographer> jChoreographer)
+      : jChoreographer_(jni::make_global(jChoreographer))
+  {
+  }
+
+  void resume() override
+  {
+    jChoreographer_->resume();
+  }
+
+  void pause() override
+  {
+    jChoreographer_->pause();
+  }
+
+ private:
+  jni::global_ref<JAnimationBackendChoreographer> jChoreographer_;
+};
+
+} // namespace facebook::react

package/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp

@@ -21,11 +21,11 @@
 #include <react/renderer/components/scrollview/ScrollViewComponentDescriptor.h>
 #include <react/renderer/components/text/ParagraphComponentDescriptor.h>
 #include <react/renderer/components/text/RawTextComponentDescriptor.h>
+#include <react/renderer/components/text/SelectableParagraphComponentDescriptor.h>
 #include <react/renderer/components/text/TextComponentDescriptor.h>
 #include <react/renderer/components/view/LayoutConformanceComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
 #include <react/renderer/components/virtualview/VirtualViewComponentDescriptor.h>
-#include <react/renderer/components/virtualviewexperimental/VirtualViewExperimentalComponentDescriptor.h>
 
 namespace facebook::react::CoreComponentsRegistry {
 
@@ -72,6 +72,9 @@ void addCoreComponents(
           AndroidHorizontalScrollContentViewComponentDescriptor>());
   providerRegistry->add(
       concreteComponentDescriptorProvider<ParagraphComponentDescriptor>());
+  providerRegistry->add(
+      concreteComponentDescriptorProvider<
+          SelectableParagraphComponentDescriptor>());
   providerRegistry->add(
       concreteComponentDescriptorProvider<
           AndroidDrawerLayoutComponentDescriptor>());
@@ -83,9 +86,6 @@ void addCoreComponents(
           LayoutConformanceComponentDescriptor>());
   providerRegistry->add(
       concreteComponentDescriptorProvider<VirtualViewComponentDescriptor>());
-  providerRegistry->add(
-      concreteComponentDescriptorProvider<
-          VirtualViewExperimentalComponentDescriptor>());
 }
 
 } // namespace facebook::react::CoreComponentsRegistry

package/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp

@@ -1206,4 +1206,11 @@ void FabricMountingManager::synchronouslyUpdateViewOnUIThread(
   synchronouslyUpdateViewOnUIThreadJNI(javaUIManager_, viewTag, propsMap);
 }
 
+void FabricMountingManager::scheduleReactRevisionMerge(SurfaceId surfaceId) {
+  static const auto scheduleReactRevisionMerge =
+      JFabricUIManager::javaClassStatic()->getMethod<void(int32_t)>(
+          "scheduleReactRevisionMerge");
+  scheduleReactRevisionMerge(javaUIManager_, surfaceId);
+}
+
 } // namespace facebook::react

package/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h

@@ -54,6 +54,8 @@ class FabricMountingManager final {
 
   void synchronouslyUpdateViewOnUIThread(Tag viewTag, const folly::dynamic &props);
 
+  void scheduleReactRevisionMerge(SurfaceId surfaceId);
+
  private:
   bool isOnMainThread();