react-native-tvos 0.82.1-0 → 0.83.0-0

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

@@ -6,7 +6,9 @@
  */
 
 #import "RCTFontUtils.h"
+
 #import <CoreText/CoreText.h>
+#import <React/RCTFont+Private.h>
 #import <React/RCTFont.h>
 
 #import <algorithm>
@@ -36,7 +38,7 @@ static RCTFontProperties RCTResolveFontProperties(
     RCTFontProperties fontProperties,
     RCTFontProperties baseFontProperties)
 {
-  fontProperties.family = fontProperties.family.length ? fontProperties.family : baseFontProperties.family;
+  fontProperties.family = (fontProperties.family.length != 0u) ? fontProperties.family : baseFontProperties.family;
   fontProperties.size = !isnan(fontProperties.size) ? fontProperties.size : baseFontProperties.size;
   fontProperties.weight = !isnan(fontProperties.weight) ? fontProperties.weight : baseFontProperties.weight;
   fontProperties.style =
@@ -50,7 +52,7 @@ static RCTFontStyle RCTGetFontStyle(UIFont *font)
 {
   NSDictionary *traits = [font.fontDescriptor objectForKey:UIFontDescriptorTraitsAttribute];
   UIFontDescriptorSymbolicTraits symbolicTraits = [traits[UIFontSymbolicTrait] unsignedIntValue];
-  if (symbolicTraits & UIFontDescriptorTraitItalic) {
+  if ((symbolicTraits & UIFontDescriptorTraitItalic) != 0u) {
     return RCTFontStyleItalic;
   }
 
@@ -167,111 +169,140 @@ static NSArray *RCTFontFeatures(RCTFontVariant fontVariant)
     };
   });
 
-  if (fontVariant & RCTFontVariantSmallCaps) {
+  if ((fontVariant & RCTFontVariantSmallCaps) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantSmallCaps]];
   }
-  if (fontVariant & RCTFontVariantOldstyleNums) {
+  if ((fontVariant & RCTFontVariantOldstyleNums) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantOldstyleNums]];
   }
-  if (fontVariant & RCTFontVariantLiningNums) {
+  if ((fontVariant & RCTFontVariantLiningNums) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantLiningNums]];
   }
-  if (fontVariant & RCTFontVariantTabularNums) {
+  if ((fontVariant & RCTFontVariantTabularNums) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantTabularNums]];
   }
-  if (fontVariant & RCTFontVariantProportionalNums) {
+  if ((fontVariant & RCTFontVariantProportionalNums) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantProportionalNums]];
   }
-  if (fontVariant & RCTFontVariantStylisticOne) {
+  if ((fontVariant & RCTFontVariantStylisticOne) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticOne]];
   }
-  if (fontVariant & RCTFontVariantStylisticTwo) {
+  if ((fontVariant & RCTFontVariantStylisticTwo) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticTwo]];
   }
-  if (fontVariant & RCTFontVariantStylisticThree) {
+  if ((fontVariant & RCTFontVariantStylisticThree) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticThree]];
   }
-  if (fontVariant & RCTFontVariantStylisticFour) {
+  if ((fontVariant & RCTFontVariantStylisticFour) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticFour]];
   }
-  if (fontVariant & RCTFontVariantStylisticFive) {
+  if ((fontVariant & RCTFontVariantStylisticFive) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticFive]];
   }
-  if (fontVariant & RCTFontVariantStylisticSix) {
+  if ((fontVariant & RCTFontVariantStylisticSix) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticSix]];
   }
-  if (fontVariant & RCTFontVariantStylisticSeven) {
+  if ((fontVariant & RCTFontVariantStylisticSeven) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticSeven]];
   }
-  if (fontVariant & RCTFontVariantStylisticEight) {
+  if ((fontVariant & RCTFontVariantStylisticEight) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticEight]];
   }
-  if (fontVariant & RCTFontVariantStylisticNine) {
+  if ((fontVariant & RCTFontVariantStylisticNine) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticNine]];
   }
-  if (fontVariant & RCTFontVariantStylisticTen) {
+  if ((fontVariant & RCTFontVariantStylisticTen) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticTen]];
   }
-  if (fontVariant & RCTFontVariantStylisticEleven) {
+  if ((fontVariant & RCTFontVariantStylisticEleven) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticEleven]];
   }
-  if (fontVariant & RCTFontVariantStylisticTwelve) {
+  if ((fontVariant & RCTFontVariantStylisticTwelve) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticTwelve]];
   }
-  if (fontVariant & RCTFontVariantStylisticThirteen) {
+  if ((fontVariant & RCTFontVariantStylisticThirteen) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticThirteen]];
   }
-  if (fontVariant & RCTFontVariantStylisticFourteen) {
+  if ((fontVariant & RCTFontVariantStylisticFourteen) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticFourteen]];
   }
-  if (fontVariant & RCTFontVariantStylisticFifteen) {
+  if ((fontVariant & RCTFontVariantStylisticFifteen) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticFifteen]];
   }
-  if (fontVariant & RCTFontVariantStylisticSixteen) {
+  if ((fontVariant & RCTFontVariantStylisticSixteen) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticSixteen]];
   }
-  if (fontVariant & RCTFontVariantStylisticSeventeen) {
+  if ((fontVariant & RCTFontVariantStylisticSeventeen) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticSeventeen]];
   }
-  if (fontVariant & RCTFontVariantStylisticEighteen) {
+  if ((fontVariant & RCTFontVariantStylisticEighteen) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticEighteen]];
   }
-  if (fontVariant & RCTFontVariantStylisticNineteen) {
+  if ((fontVariant & RCTFontVariantStylisticNineteen) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticNineteen]];
   }
-  if (fontVariant & RCTFontVariantStylisticTwenty) {
+  if ((fontVariant & RCTFontVariantStylisticTwenty) != 0) {
     [fontFeatures addObject:mapping[RCTFontVariantStylisticTwenty]];
   }
 
   return fontFeatures;
 }
 
-static UIFont *RCTDefaultFontWithFontProperties(RCTFontProperties fontProperties)
+static RCTDefaultFontResolver defaultFontResolver;
+
+void RCTSetDefaultFontResolver(RCTDefaultFontResolver handler)
+{
+  defaultFontResolver = handler;
+}
+
+static UIFont *RCTDefaultFontWithFontProperties(const RCTFontProperties &fontProperties)
 {
   static NSCache *fontCache;
   static std::mutex fontCacheMutex;
 
   CGFloat effectiveFontSize = fontProperties.sizeMultiplier * fontProperties.size;
-  NSString *cacheKey = [NSString
-      stringWithFormat:@"%.1f/%.2f/%ld", effectiveFontSize, fontProperties.weight, (long)fontProperties.style];
+  NSString *cacheKey = [NSString stringWithFormat:@"%@/%.1f/%.2f/%ld",
+                                                  fontProperties.family,
+                                                  effectiveFontSize,
+                                                  fontProperties.weight,
+                                                  (long)fontProperties.style];
   UIFont *font;
 
   {
     std::lock_guard<std::mutex> lock(fontCacheMutex);
-    if (!fontCache) {
+    if (fontCache == nil) {
       fontCache = [NSCache new];
     }
     font = [fontCache objectForKey:cacheKey];
   }
 
-  if (!font) {
-    font = [UIFont systemFontOfSize:effectiveFontSize weight:fontProperties.weight];
+  if (font == nil) {
+    if (defaultFontResolver != nil) {
+      font = defaultFontResolver(fontProperties);
+    }
+
+    if (font == nil) {
+      font = RCTGetLegacyDefaultFont(effectiveFontSize, fontProperties.weight);
+    }
+
+    if (font == nil) {
+      font = [UIFont systemFontOfSize:effectiveFontSize weight:fontProperties.weight];
+    }
+
+    BOOL isItalicFont = fontProperties.style == RCTFontStyleItalic;
+    BOOL isCondensedFont = [fontProperties.family isEqualToString:@"SystemCondensed"];
 
-    if (fontProperties.style == RCTFontStyleItalic) {
+    if (isItalicFont || isCondensedFont) {
       UIFontDescriptor *fontDescriptor = [font fontDescriptor];
       UIFontDescriptorSymbolicTraits symbolicTraits = fontDescriptor.symbolicTraits;
 
-      symbolicTraits |= UIFontDescriptorTraitItalic;
+      if (isItalicFont) {
+        symbolicTraits |= UIFontDescriptorTraitItalic;
+      }
+
+      if (isCondensedFont) {
+        symbolicTraits |= UIFontDescriptorTraitCondensed;
+      }
 
       fontDescriptor = [fontDescriptor fontDescriptorWithSymbolicTraits:symbolicTraits];
       font = [UIFont fontWithDescriptor:fontDescriptor size:effectiveFontSize];
@@ -308,7 +339,7 @@ UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties)
   CGFloat effectiveFontSize = fontProperties.sizeMultiplier * fontProperties.size;
   UIFont *font;
   UIFontDescriptorSystemDesign design = RCTGetFontDescriptorSystemDesign([fontProperties.family lowercaseString]);
-  if (design) {
+  if (design != nullptr) {
     // Create a system font which `-fontDescriptorWithDesign:` asks for
     // (see:
     // https://developer.apple.com/documentation/uikit/uifontdescriptor/3151797-fontdescriptorwithdesign?language=objc)
@@ -328,12 +359,12 @@ UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties)
       // 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 != nullptr) {
         fontNames = [UIFont fontNamesForFamilyName:font.familyName];
-        fontWeight = fontWeight ?: RCTGetFontWeight(font);
+        fontWeight = (fontWeight != 0.0) ?: RCTGetFontWeight(font);
       } else {
         // Failback to system font.
-        font = [UIFont systemFontOfSize:effectiveFontSize weight:fontProperties.weight];
+        font = RCTDefaultFontWithFontProperties(fontProperties);
       }
     }
 
@@ -354,7 +385,7 @@ UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties)
         }
       }
 
-      if (!font) {
+      if (font == nil) {
         // If we still don't have a match at least return the first font in the
         // fontFamily This is to support built-in font Zapfino and other custom
         // single font families like Impact

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

@@ -116,7 +116,7 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                                                   UIBezierPath *path = [UIBezierPath
                                                       bezierPathWithRoundedRect:CGRectInset(enclosingRect, -2, -2)
                                                                    cornerRadius:2];
-                                                  if (highlightPath) {
+                                                  if (highlightPath != nullptr) {
                                                     [highlightPath appendPath:path];
                                                   } else {
                                                     highlightPath = path;
@@ -159,7 +159,7 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                                            id attribute = [textStorage attribute:key
                                                                          atIndex:characterRange.location - 1
                                                                   effectiveRange:nil];
-                                           if (attribute) {
+                                           if (attribute != nullptr) {
                                              [textStorage addAttribute:key value:attribute range:characterRange];
                                            }
                                          }
@@ -303,7 +303,7 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                           inRange:characterRange
                           options:0
                        usingBlock:^(NSString *value, NSRange range, BOOL *pause) {
-                         if (!value) {
+                         if (value == nullptr) {
                            return;
                          }
 
@@ -388,9 +388,8 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
     size.height = enumeratedLinesHeight;
   }
 
-  size = (CGSize){
-      ceil(size.width * layoutContext.pointScaleFactor) / layoutContext.pointScaleFactor,
-      ceil(size.height * layoutContext.pointScaleFactor) / layoutContext.pointScaleFactor};
+  size = (CGSize){ceil(size.width * layoutContext.pointScaleFactor) / layoutContext.pointScaleFactor,
+                  ceil(size.height * layoutContext.pointScaleFactor) / layoutContext.pointScaleFactor};
 
   __block auto attachments = TextMeasurement::Attachments{};
 
@@ -399,7 +398,7 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                  inRange:NSMakeRange(0, textStorage.length)
                  options:0
               usingBlock:^(NSTextAttachment *attachment, NSRange range, BOOL *stop) {
-                if (!attachment) {
+                if (attachment == nullptr) {
                   return;
                 }
 

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h

@@ -23,38 +23,37 @@ namespace facebook::react {
  */
 class TextLayoutManager {
  public:
-  TextLayoutManager(
-      const std::shared_ptr<const ContextContainer>& contextContainer);
+  TextLayoutManager(const std::shared_ptr<const ContextContainer> &contextContainer);
 
   /*
    * Not copyable.
    */
-  TextLayoutManager(const TextLayoutManager&) = delete;
-  TextLayoutManager& operator=(const TextLayoutManager&) = delete;
+  TextLayoutManager(const TextLayoutManager &) = delete;
+  TextLayoutManager &operator=(const TextLayoutManager &) = delete;
 
   /*
    * Not movable.
    */
-  TextLayoutManager(TextLayoutManager&&) = delete;
-  TextLayoutManager& operator=(TextLayoutManager&&) = delete;
+  TextLayoutManager(TextLayoutManager &&) = delete;
+  TextLayoutManager &operator=(TextLayoutManager &&) = delete;
 
   /*
    * Measures `attributedString` using native text rendering infrastructure.
    */
   TextMeasurement measure(
-      const AttributedStringBox& attributedStringBox,
-      const ParagraphAttributes& paragraphAttributes,
-      const TextLayoutContext& layoutContext,
-      const LayoutConstraints& layoutConstraints) const;
+      const AttributedStringBox &attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
+      const TextLayoutContext &layoutContext,
+      const LayoutConstraints &layoutConstraints) const;
 
   /*
    * Measures lines of `attributedString` using native text rendering
    * infrastructure.
    */
   LinesMeasurements measureLines(
-      const AttributedStringBox& attributedStringBox,
-      const ParagraphAttributes& paragraphAttributes,
-      const Size& size) const;
+      const AttributedStringBox &attributedStringBox,
+      const ParagraphAttributes &paragraphAttributes,
+      const Size &size) const;
 
   /*
    * Returns an opaque pointer to platform-specific TextLayoutManager.

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

@@ -68,7 +68,7 @@ TextMeasurement TextLayoutManager::measure(
           (NSAttributedString *)unwrapManagedObject(attributedStringBox.getOpaquePointer());
 
       auto telemetry = TransactionTelemetry::threadLocalTelemetry();
-      if (telemetry) {
+      if (telemetry != nullptr) {
         telemetry->willMeasureText();
       }
 
@@ -77,7 +77,7 @@ TextMeasurement TextLayoutManager::measure(
                                                    layoutContext:layoutContext
                                                layoutConstraints:layoutConstraints];
 
-      if (telemetry) {
+      if (telemetry != nullptr) {
         telemetry->didMeasureText();
       }
 

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

@@ -22,10 +22,10 @@ class AppRegistryBinding final {
    * Thread synchronization must be enforced externally.
    */
   static void startSurface(
-      jsi::Runtime& runtime,
+      jsi::Runtime &runtime,
       SurfaceId surfaceId,
-      const std::string& moduleName,
-      const folly::dynamic& initialProps,
+      const std::string &moduleName,
+      const folly::dynamic &initialProps,
       DisplayMode displayMode);
 
   /*
@@ -34,17 +34,17 @@ class AppRegistryBinding final {
    * Thread synchronization must be enforced externally.
    */
   static void setSurfaceProps(
-      jsi::Runtime& runtime,
+      jsi::Runtime &runtime,
       SurfaceId surfaceId,
-      const std::string& moduleName,
-      const folly::dynamic& initialProps,
+      const std::string &moduleName,
+      const folly::dynamic &initialProps,
       DisplayMode displayMode);
 
   /*
    * Stops React Native Surface with given id.
    * Thread synchronization must be enforced externally.
    */
-  static void stopSurface(jsi::Runtime& runtime, SurfaceId surfaceId);
+  static void stopSurface(jsi::Runtime &runtime, SurfaceId surfaceId);
 };
 
 } // namespace facebook::react

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

@@ -104,10 +104,12 @@ static PointerEventTarget retargetPointerEvent(
   // More work will be needed to properly take non-trival transforms into
   // account.
   auto layoutMetrics = uiManager.getRelativeLayoutMetrics(
-      *latestNodeToTarget, nullptr, {/* .includeTransform */ true});
+      *latestNodeToTarget,
+      nullptr,
+      {/* .includeTransform */ .includeTransform = true});
   retargetedEvent.offsetPoint = {
-      event.clientPoint.x - layoutMetrics.frame.origin.x,
-      event.clientPoint.y - layoutMetrics.frame.origin.y,
+      .x = event.clientPoint.x - layoutMetrics.frame.origin.x,
+      .y = event.clientPoint.y - layoutMetrics.frame.origin.y,
   };
 
   PointerEventTarget result = {};

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

@@ -34,55 +34,46 @@ struct ActivePointer {
 };
 
 using DispatchEvent = std::function<void(
-    const ShadowNode& targetNode,
-    const std::string& type,
+    const ShadowNode &targetNode,
+    const std::string &type,
     ReactEventPriority priority,
-    const EventPayload& payload)>;
+    const EventPayload &payload)>;
 
 using PointerIdentifier = int32_t;
-using CaptureTargetOverrideRegistry =
-    std::unordered_map<PointerIdentifier, std::weak_ptr<const ShadowNode>>;
+using CaptureTargetOverrideRegistry = std::unordered_map<PointerIdentifier, std::weak_ptr<const ShadowNode>>;
 
-using ActivePointerRegistry =
-    std::unordered_map<PointerIdentifier, ActivePointer>;
-using PointerHoverTrackerRegistry =
-    std::unordered_map<PointerIdentifier, PointerHoverTracker::Unique>;
+using ActivePointerRegistry = std::unordered_map<PointerIdentifier, ActivePointer>;
+using PointerHoverTrackerRegistry = std::unordered_map<PointerIdentifier, PointerHoverTracker::Unique>;
 
 class PointerEventsProcessor final {
  public:
   static std::shared_ptr<const ShadowNode> getShadowNodeFromEventTarget(
-      jsi::Runtime& runtime,
-      const EventTarget* target);
+      jsi::Runtime &runtime,
+      const EventTarget *target);
 
   void interceptPointerEvent(
-      const std::shared_ptr<const ShadowNode>& target,
-      const std::string& type,
+      const std::shared_ptr<const ShadowNode> &target,
+      const std::string &type,
       ReactEventPriority priority,
-      const PointerEvent& event,
-      const DispatchEvent& eventDispatcher,
-      const UIManager& uiManager);
-
-  void setPointerCapture(
-      PointerIdentifier pointerId,
-      const std::shared_ptr<const ShadowNode>& shadowNode);
-  void releasePointerCapture(
-      PointerIdentifier pointerId,
-      const ShadowNode* shadowNode);
-  bool hasPointerCapture(
-      PointerIdentifier pointerId,
-      const ShadowNode* shadowNode);
+      const PointerEvent &event,
+      const DispatchEvent &eventDispatcher,
+      const UIManager &uiManager);
+
+  void setPointerCapture(PointerIdentifier pointerId, const std::shared_ptr<const ShadowNode> &shadowNode);
+  void releasePointerCapture(PointerIdentifier pointerId, const ShadowNode *shadowNode);
+  bool hasPointerCapture(PointerIdentifier pointerId, const ShadowNode *shadowNode);
 
  private:
-  ActivePointer* getActivePointer(PointerIdentifier pointerId);
+  ActivePointer *getActivePointer(PointerIdentifier pointerId);
 
-  void registerActivePointer(const PointerEvent& event);
-  void updateActivePointer(const PointerEvent& event);
-  void unregisterActivePointer(const PointerEvent& event);
+  void registerActivePointer(const PointerEvent &event);
+  void updateActivePointer(const PointerEvent &event);
+  void unregisterActivePointer(const PointerEvent &event);
 
   void processPendingPointerCapture(
-      const PointerEvent& event,
-      const DispatchEvent& eventDispatcher,
-      const UIManager& uiManager);
+      const PointerEvent &event,
+      const DispatchEvent &eventDispatcher,
+      const UIManager &uiManager);
 
   ActivePointerRegistry activePointers_;
 
@@ -100,10 +91,10 @@ class PointerEventsProcessor final {
    * screen entirely)
    */
   void handleIncomingPointerEventOnNode(
-      const PointerEvent& event,
-      const std::shared_ptr<const ShadowNode>& targetNode,
-      const DispatchEvent& eventDispatcher,
-      const UIManager& uiManager);
+      const PointerEvent &event,
+      const std::shared_ptr<const ShadowNode> &targetNode,
+      const DispatchEvent &eventDispatcher,
+      const UIManager &uiManager);
 
   PointerHoverTrackerRegistry previousHoverTrackersPerPointer_;
 };

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

@@ -23,15 +23,12 @@ class PointerHoverTracker {
   using Unique = std::unique_ptr<PointerHoverTracker>;
   using EventPath = std::vector<std::reference_wrapper<const ShadowNode>>;
 
-  PointerHoverTracker(
-      std::shared_ptr<const ShadowNode> target,
-      const UIManager& uiManager);
+  PointerHoverTracker(std::shared_ptr<const ShadowNode> target, const UIManager &uiManager);
 
-  const ShadowNode* getTarget(const UIManager& uiManager) const;
-  bool hasSameTarget(const PointerHoverTracker& other) const;
-  bool areAnyTargetsListeningToEvents(
-      std::initializer_list<ViewEvents::Offset> eventTypes,
-      const UIManager& uiManager) const;
+  const ShadowNode *getTarget(const UIManager &uiManager) const;
+  bool hasSameTarget(const PointerHoverTracker &other) const;
+  bool areAnyTargetsListeningToEvents(std::initializer_list<ViewEvents::Offset> eventTypes, const UIManager &uiManager)
+      const;
 
   /**
    * Performs a diff between the current and given trackers and returns a tuple
@@ -39,9 +36,7 @@ class PointerHoverTracker {
    * have been added. Note that the order of these lists are from parents ->
    * children.
    */
-  std::tuple<EventPath, EventPath> diffEventPath(
-      const PointerHoverTracker& other,
-      const UIManager& uiManager) const;
+  std::tuple<EventPath, EventPath> diffEventPath(const PointerHoverTracker &other, const UIManager &uiManager) const;
 
   void markAsOld();
 
@@ -59,9 +54,7 @@ class PointerHoverTracker {
    * A thin wrapper around `UIManager::getNewestCloneOfShadowNode` that only
    * actually gets the newest clone only if the tracker is marked as "old".
    */
-  const ShadowNode* getLatestNode(
-      const ShadowNode& node,
-      const UIManager& uiManager) const;
+  const ShadowNode *getLatestNode(const ShadowNode &node, const UIManager &uiManager) const;
 
   /**
    * Retrieves the list of shadow node references in the event's path starting

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

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#warning \
-    "The SurfaceRegistryBinding.h header has been renamed to AppRegistryBinding.h"
+#warning "The SurfaceRegistryBinding.h header has been renamed to AppRegistryBinding.h"
 
 #include <react/renderer/uimanager/AppRegistryBinding.h>

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

@@ -70,10 +70,12 @@ std::shared_ptr<ShadowNode> UIManager::createNode(
   auto fallbackDescriptor =
       componentDescriptorRegistry_->getFallbackComponentDescriptor();
 
-  PropsParserContext propsParserContext{surfaceId, *contextContainer_.get()};
+  PropsParserContext propsParserContext{surfaceId, *contextContainer_};
 
   auto family = componentDescriptor.createFamily(
-      {tag, surfaceId, std::move(instanceHandle)});
+      {.tag = tag,
+       .surfaceId = surfaceId,
+       .instanceHandle = std::move(instanceHandle)});
   const auto props = componentDescriptor.cloneProps(
       propsParserContext, nullptr, std::move(rawProps));
   const auto state = componentDescriptor.createInitialState(props, family);
@@ -111,7 +113,7 @@ std::shared_ptr<ShadowNode> UIManager::cloneNode(
       "UIManager::cloneNode", "componentName", shadowNode.getComponentName());
 
   PropsParserContext propsParserContext{
-      shadowNode.getFamily().getSurfaceId(), *contextContainer_.get()};
+      shadowNode.getFamily().getSurfaceId(), *contextContainer_};
 
   auto& componentDescriptor = shadowNode.getComponentDescriptor();
   auto& family = shadowNode.getFamily();
@@ -455,14 +457,14 @@ void UIManager::setNativeProps_DEPRECATED(
                         componentDescriptorRegistry_->at(
                             shadowNode->getComponentHandle());
                     PropsParserContext propsParserContext{
-                        family.getSurfaceId(), *contextContainer_.get()};
+                        family.getSurfaceId(), *contextContainer_};
                     auto props = componentDescriptor.cloneProps(
                         propsParserContext,
                         getShadowNodeInSubtree(*shadowNode, ancestorShadowNode)
                             ->getProps(),
                         RawProps(rawProps));
 
-                    return oldShadowNode.clone({/* .props = */ props});
+                    return oldShadowNode.clone({/* .props = */ .props = props});
                   });
 
               return std::static_pointer_cast<RootShadowNode>(rootNode);
@@ -678,6 +680,16 @@ void UIManager::setNativeAnimatedDelegate(
   nativeAnimatedDelegate_ = delegate;
 }
 
+void UIManager::unstable_setAnimationBackend(
+    std::weak_ptr<UIManagerAnimationBackend> animationBackend) {
+  animationBackend_ = animationBackend;
+}
+
+std::weak_ptr<UIManagerAnimationBackend>
+UIManager::unstable_getAnimationBackend() {
+  return animationBackend_;
+}
+
 void UIManager::animationTick() const {
   if (animationDelegate_ != nullptr &&
       animationDelegate_->shouldAnimateFrame()) {