react-native-tvos 0.76.3-0 → 0.77.0-0rc1

package/ReactCommon/react/renderer/scheduler/Scheduler.h

@@ -11,7 +11,6 @@
 #include <mutex>
 
 #include <ReactCommon/RuntimeExecutor.h>
-#include <react/config/ReactNativeConfig.h>
 #include <react/performance/timeline/PerformanceEntryReporter.h>
 #include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
 #include <react/renderer/components/root/RootComponentDescriptor.h>
@@ -85,7 +84,7 @@ class Scheduler final : public UIManagerDelegate {
 #pragma mark - UIManagerDelegate
 
   void uiManagerDidFinishTransaction(
-      MountingCoordinator::Shared mountingCoordinator,
+      std::shared_ptr<const MountingCoordinator> mountingCoordinator,
       bool mountSynchronously) override;
   void uiManagerDidCreateShadowNode(const ShadowNode& shadowNode) override;
   void uiManagerDidDispatchCommand(
@@ -120,7 +119,6 @@ class Scheduler final : public UIManagerDelegate {
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
   RuntimeExecutor runtimeExecutor_;
   std::shared_ptr<UIManager> uiManager_;
-  std::shared_ptr<const ReactNativeConfig> reactNativeConfig_;
 
   std::vector<std::shared_ptr<UIManagerCommitHook>> commitHooks_;
 
@@ -141,6 +139,8 @@ class Scheduler final : public UIManagerDelegate {
    * Must not be nullptr.
    */
   ContextContainer::Shared contextContainer_;
+
+  RuntimeScheduler* runtimeScheduler_{nullptr};
 };
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h

@@ -26,7 +26,8 @@ class SchedulerDelegate {
    * to construct a new one.
    */
   virtual void schedulerDidFinishTransaction(
-      const MountingCoordinator::Shared& mountingCoordinator) = 0;
+      const std::shared_ptr<const MountingCoordinator>&
+          mountingCoordinator) = 0;
 
   /*
    * Called when the runtime scheduler decides that one-or-more previously
@@ -37,7 +38,8 @@ class SchedulerDelegate {
    * correctly apply changes, due to changes in Props representation.
    */
   virtual void schedulerShouldRenderTransactions(
-      const MountingCoordinator::Shared& mountingCoordinator) = 0;
+      const std::shared_ptr<const MountingCoordinator>&
+          mountingCoordinator) = 0;
 
   /*
    * Called right after a new ShadowNode was created.

package/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h

@@ -49,11 +49,10 @@ struct SchedulerToolbox final {
   RuntimeExecutor runtimeExecutor;
 
   /*
-   * Asynchronous & synchronous event beats.
    * Represent connections with the platform-specific run loops and general
    * purpose background queue.
    */
-  EventBeat::Factory asynchronousEventBeatFactory;
+  EventBeat::Factory eventBeatFactory;
 
   /*
    * A list of `UIManagerCommitHook`s that should be registered in `UIManager`.

package/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp

@@ -64,9 +64,9 @@ Size SurfaceManager::measureSurface(
   return size;
 }
 
-MountingCoordinator::Shared SurfaceManager::findMountingCoordinator(
-    SurfaceId surfaceId) const noexcept {
-  auto mountingCoordinator = MountingCoordinator::Shared{};
+std::shared_ptr<const MountingCoordinator>
+SurfaceManager::findMountingCoordinator(SurfaceId surfaceId) const noexcept {
+  auto mountingCoordinator = std::shared_ptr<const MountingCoordinator>{};
 
   visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) {
     mountingCoordinator = surfaceHandler.getMountingCoordinator();

package/ReactCommon/react/renderer/scheduler/SurfaceManager.h

@@ -49,7 +49,7 @@ class SurfaceManager final {
       const LayoutConstraints& layoutConstraints,
       const LayoutContext& layoutContext) const noexcept;
 
-  MountingCoordinator::Shared findMountingCoordinator(
+  std::shared_ptr<const MountingCoordinator> findMountingCoordinator(
       SurfaceId surfaceId) const noexcept;
 
  private:

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm

@@ -7,6 +7,7 @@
 
 #import "RCTFontUtils.h"
 #import <CoreText/CoreText.h>
+#import <React/RCTFont.h>
 
 #import <algorithm>
 #import <cmath>
@@ -45,12 +46,6 @@ static RCTFontProperties RCTResolveFontProperties(
   return fontProperties;
 }
 
-static UIFontWeight RCTGetFontWeight(UIFont *font)
-{
-  NSDictionary *traits = [font.fontDescriptor objectForKey:UIFontDescriptorTraitsAttribute];
-  return [traits[UIFontWeightTrait] doubleValue];
-}
-
 static RCTFontStyle RCTGetFontStyle(UIFont *font)
 {
   NSDictionary *traits = [font.fontDescriptor objectForKey:UIFontDescriptorTraitsAttribute];
@@ -165,17 +160,22 @@ UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties)
     font = RCTDefaultFontWithFontProperties(fontProperties);
   } else {
     NSArray<NSString *> *fontNames = [UIFont fontNamesForFamilyName:fontProperties.family];
+    UIFontWeight fontWeight = fontProperties.weight;
 
     if (fontNames.count == 0) {
       // Gracefully handle being given a font name rather than font family, for
       // example: "Helvetica Light Oblique" rather than just "Helvetica".
       font = [UIFont fontWithName:fontProperties.family size:effectiveFontSize];
-
-      if (!font) {
+      if (font) {
+        fontNames = [UIFont fontNamesForFamilyName:font.familyName];
+        fontWeight = fontWeight ?: RCTGetFontWeight(font);
+      } else {
         // Failback to system font.
         font = [UIFont systemFontOfSize:effectiveFontSize weight:fontProperties.weight];
       }
-    } else {
+    }
+
+    if (fontNames.count > 0) {
       // Get the closest font that matches the given weight for the fontFamily
       CGFloat closestWeight = INFINITY;
       for (NSString *name in fontNames) {
@@ -186,7 +186,7 @@ UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties)
         }
 
         CGFloat testWeight = RCTGetFontWeight(fontMatch);
-        if (ABS(testWeight - fontProperties.weight) < ABS(closestWeight - fontProperties.weight)) {
+        if (ABS(testWeight - fontWeight) < ABS(closestWeight - fontWeight)) {
           font = fontMatch;
           closestWeight = testWeight;
         }

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm

@@ -347,8 +347,33 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
   [layoutManager ensureLayoutForTextContainer:textContainer];
 
+  NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
+  __block BOOL textDidWrap = NO;
+  [layoutManager
+      enumerateLineFragmentsForGlyphRange:glyphRange
+                               usingBlock:^(
+                                   CGRect overallRect,
+                                   CGRect usedRect,
+                                   NSTextContainer *_Nonnull usedTextContainer,
+                                   NSRange lineGlyphRange,
+                                   BOOL *_Nonnull stop) {
+                                 NSRange range = [layoutManager characterRangeForGlyphRange:lineGlyphRange
+                                                                           actualGlyphRange:nil];
+                                 NSUInteger lastCharacterIndex = range.location + range.length - 1;
+                                 BOOL endsWithNewLine =
+                                     [textStorage.string characterAtIndex:lastCharacterIndex] == '\n';
+                                 if (!endsWithNewLine && textStorage.string.length > lastCharacterIndex + 1) {
+                                   textDidWrap = YES;
+                                   *stop = YES;
+                                 }
+                               }];
+
   CGSize size = [layoutManager usedRectForTextContainer:textContainer].size;
 
+  if (textDidWrap) {
+    size.width = textContainer.size.width;
+  }
+
   size = (CGSize){RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height)};
 
   __block auto attachments = TextMeasurement::Attachments{};

package/ReactCommon/react/renderer/uimanager/UIManager.cpp

@@ -126,20 +126,41 @@ std::shared_ptr<ShadowNode> UIManager::cloneNode(
 
   if (!rawProps.isEmpty()) {
     if (family.nativeProps_DEPRECATED != nullptr) {
+      // 1. update the nativeProps_DEPRECATED props.
+      //
+      // In this step, we want the most recent value for the props
+      // managed by setNativeProps.
       // Values in `rawProps` patch (take precedence over)
-      // `nativeProps_DEPRECATED`. For example, if both `nativeProps_DEPRECATED`
-      // and `rawProps` contain key 'A'. Value from `rawProps` overrides what
-      // was previously in `nativeProps_DEPRECATED`.
+      // `nativeProps_DEPRECATED`. For example, if both
+      // `nativeProps_DEPRECATED` and `rawProps` contain key 'A'.
+      // Value from `rawProps` overrides what was previously in
+      // `nativeProps_DEPRECATED`. Notice that the `nativeProps_DEPRECATED`
+      // patch will not get more props from `rawProps`: if the key is not
+      // present in `nativeProps_DEPRECATED`, it will not be added.
+      //
+      // The result of this operation is the new `nativeProps_DEPRECATED`.
       family.nativeProps_DEPRECATED =
           std::make_unique<folly::dynamic>(mergeDynamicProps(
-              *family.nativeProps_DEPRECATED,
-              (folly::dynamic)rawProps,
+              *family.nativeProps_DEPRECATED, // source
+              (folly::dynamic)rawProps, // patch
               NullValueStrategy::Ignore));
 
+      // 2. Compute the final set of props.
+      //
+      // This step takes the new props handled by `setNativeProps` and
+      // merges them in the `rawProps` managed by React.
+      // The new props handled by `nativeProps` now takes precedence
+      // on the props handled by React, as we want to make sure that
+      // all the props are applied to the component.
+      // We use these finalProps as source of truth for the component.
+      auto finalProps = mergeDynamicProps(
+          (folly::dynamic)rawProps, // source
+          *family.nativeProps_DEPRECATED, // patch
+          NullValueStrategy::Override);
+
+      // 3. Clone the props by using finalProps.
       props = componentDescriptor.cloneProps(
-          propsParserContext,
-          shadowNode.getProps(),
-          RawProps(*family.nativeProps_DEPRECATED));
+          propsParserContext, shadowNode.getProps(), RawProps(finalProps));
     } else {
       props = componentDescriptor.cloneProps(
           propsParserContext, shadowNode.getProps(), std::move(rawProps));
@@ -361,9 +382,6 @@ void UIManager::updateState(const StateUpdate& stateUpdate) const {
   auto& callback = stateUpdate.callback;
   auto& family = stateUpdate.family;
   auto& componentDescriptor = family->getComponentDescriptor();
-  auto clonedByNativeStateTraits = ShadowNodeTraits();
-  clonedByNativeStateTraits.set(
-      ShadowNodeTraits::Trait::ClonedByNativeStateUpdate);
 
   shadowTreeRegistry_.visit(
       family->getSurfaceId(), [&](const ShadowTree& shadowTree) {
@@ -372,8 +390,7 @@ void UIManager::updateState(const StateUpdate& stateUpdate) const {
               auto isValid = true;
 
               auto rootNode = oldRootShadowNode.cloneTree(
-                  *family,
-                  [&](const ShadowNode& oldShadowNode) {
+                  *family, [&](const ShadowNode& oldShadowNode) {
                     auto newData =
                         callback(oldShadowNode.getState()->getDataPointer());
 
@@ -389,10 +406,8 @@ void UIManager::updateState(const StateUpdate& stateUpdate) const {
                     return oldShadowNode.clone(
                         {.props = ShadowNodeFragment::propsPlaceholder(),
                          .children = ShadowNodeFragment::childrenPlaceholder(),
-                         .state = newState,
-                         .traits = clonedByNativeStateTraits});
-                  },
-                  clonedByNativeStateTraits);
+                         .state = newState});
+                  });
 
               return isValid
                   ? std::static_pointer_cast<RootShadowNode>(rootNode)
@@ -613,7 +628,7 @@ RootShadowNode::Unshared UIManager::shadowTreeWillCommit(
 }
 
 void UIManager::shadowTreeDidFinishTransaction(
-    MountingCoordinator::Shared mountingCoordinator,
+    std::shared_ptr<const MountingCoordinator> mountingCoordinator,
     bool mountSynchronously) const {
   SystraceSection s("UIManager::shadowTreeDidFinishTransaction");
 

package/ReactCommon/react/renderer/uimanager/UIManager.h

@@ -119,7 +119,7 @@ class UIManager final : public ShadowTreeDelegate {
 #pragma mark - ShadowTreeDelegate
 
   void shadowTreeDidFinishTransaction(
-      MountingCoordinator::Shared mountingCoordinator,
+      std::shared_ptr<const MountingCoordinator> mountingCoordinator,
       bool mountSynchronously) const override;
 
   RootShadowNode::Unshared shadowTreeWillCommit(

package/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h

@@ -31,7 +31,7 @@ class UIManagerAnimationDelegate {
   /**
    * Set ComponentDescriptor registry.
    *
-   * @param componentDescriptorRegistry
+   * @param componentDescriptorRegistry the registry of componentDescriptors
    */
   virtual void setComponentDescriptorRegistry(
       const SharedComponentDescriptorRegistry& componentDescriptorRegistry) = 0;

package/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

@@ -483,9 +483,7 @@ jsi::Value UIManagerBinding::get(
           uiManager->completeSurface(
               surfaceId,
               shadowNodeList,
-              {.enableStateReconciliation = true,
-               .mountSynchronously = false,
-               .shouldYield = nullptr});
+              {.enableStateReconciliation = true, .mountSynchronously = false});
 
           return jsi::Value::undefined();
         });

package/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h

@@ -23,7 +23,7 @@ class UIManagerDelegate {
    * For this moment the tree is already laid out and sealed.
    */
   virtual void uiManagerDidFinishTransaction(
-      MountingCoordinator::Shared mountingCoordinator,
+      std::shared_ptr<const MountingCoordinator> mountingCoordinator,
       bool mountSynchronously) = 0;
 
   /*

package/ReactCommon/react/renderer/uimanager/consistency/tests/LazyShadowTreeRevisionConsistencyManagerTest.cpp

@@ -24,7 +24,7 @@ class FakeShadowTreeDelegate : public ShadowTreeDelegate {
   };
 
   void shadowTreeDidFinishTransaction(
-      MountingCoordinator::Shared mountingCoordinator,
+      std::shared_ptr<const MountingCoordinator> mountingCoordinator,
       bool mountSynchronously) const override {};
 };
 

package/ReactCommon/react/renderer/uimanager/tests/PointerEventsProcessorTest.cpp

@@ -87,8 +87,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
             listenToAllPointerEvents(props);
             props.layoutConstraints = LayoutConstraints{{0,0}, {500, 500}};
             auto &yogaStyle = props.yogaStyle;
-            yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(400));
-            yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(400));
+            yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(400));
+            yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(400));
             yogaStyle.setDisplay(yoga::Display::Flex);
             yogaStyle.setFlexDirection(yoga::FlexDirection::Row);
             yogaStyle.setAlignItems(yoga::Align::Center);
@@ -109,8 +109,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
                 yogaStyle.setFlexDirection(yoga::FlexDirection::Column);
                 yogaStyle.setAlignItems(yoga::Align::FlexEnd);
                 yogaStyle.setJustifyContent(yoga::Justify::Center);
-                yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(150));
-                yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(300));
+                yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(150));
+                yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(300));
                 return sharedProps;
               })
               .children({
@@ -123,8 +123,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
                     auto &props = *sharedProps;
                     listenToAllPointerEvents(props);
                     auto &yogaStyle = props.yogaStyle;
-                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(100));
-                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(200));
+                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(100));
+                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
                     return sharedProps;
                   })
               }),
@@ -141,8 +141,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
                 yogaStyle.setFlexDirection(yoga::FlexDirection::Column);
                 yogaStyle.setAlignItems(yoga::Align::FlexStart);
                 yogaStyle.setJustifyContent(yoga::Justify::Center);
-                yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(150));
-                yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(300));
+                yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(150));
+                yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(300));
                 return sharedProps;
               })
               .children({
@@ -155,8 +155,8 @@ class PointerEventsProcessorTest : public ::testing::Test {
                     auto &props = *sharedProps;
                     listenToAllPointerEvents(props);
                     auto &yogaStyle = props.yogaStyle;
-                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(100));
-                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(200));
+                    yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(100));
+                    yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
                     return sharedProps;
                   })
               })

package/ReactCommon/react/runtime/React-RuntimeCore.podspec

@@ -19,9 +19,10 @@ end
 folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
+folly_dep_name = folly_config[:dep_name]
 
-folly_dep_name = 'RCT-Folly/Fabric'
-boost_compiler_flags = '-Wno-documentation'
+boost_config = get_boost_config()
+boost_compiler_flags = boost_config[:compiler_flags] 
 
 Pod::Spec.new do |s|
   s.name                   = "React-RuntimeCore"
@@ -57,6 +58,8 @@ Pod::Spec.new do |s|
   s.dependency "React-runtimescheduler"
   s.dependency "React-utils"
   s.dependency "React-featureflags"
+  
+  add_dependency(s, "React-Fabric")
 
   if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
     s.dependency "hermes-engine"

package/ReactCommon/react/runtime/React-RuntimeHermes.podspec

@@ -19,8 +19,10 @@ end
 folly_config = get_folly_config()
 folly_compiler_flags = folly_config[:compiler_flags]
 folly_version = folly_config[:version]
-folly_dep_name = 'RCT-Folly/Fabric'
-boost_compiler_flags = '-Wno-documentation'
+folly_dep_name = folly_config[:dep_name]
+
+boost_config = get_boost_config()
+boost_compiler_flags = boost_config[:compiler_flags] 
 
 Pod::Spec.new do |s|
   s.name                   = "React-RuntimeHermes"