react-native 0.72.0-rc.0 → 0.72.0-rc.2

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm

@@ -100,13 +100,23 @@ using namespace facebook::react;
   return RCTDropReactPrefixes(_componentData.name);
 }
 
-- (void)handleCommand:(NSString *)commandName args:(NSArray *)args reactTag:(NSInteger)tag
+- (void)handleCommand:(NSString *)commandName
+                 args:(NSArray *)args
+             reactTag:(NSInteger)tag
+            paperView:(nonnull UIView *)paperView
 {
   Class managerClass = _componentData.managerClass;
   [self _lookupModuleMethodsIfNecessary];
   RCTModuleData *moduleData = [_bridge.batchedBridge moduleDataForName:RCTBridgeModuleNameForClass(managerClass)];
   id<RCTBridgeMethod> method;
-  if ([commandName isKindOfClass:[NSNumber class]]) {
+
+  // We can't use `[NSString intValue]` as "0" is a valid command,
+  // but also a falsy value. [NSNumberFormatter numberFromString] returns a
+  // `NSNumber *` which is NULL when it's to be NULL
+  // and it points to 0 when the string is @"0" (not a falsy value).
+  NSNumberFormatter *formatter = [[NSNumberFormatter alloc] init];
+
+  if ([commandName isKindOfClass:[NSNumber class]] || [formatter numberFromString:commandName] != NULL) {
     method = moduleData ? moduleData.methods[[commandName intValue]] : _moduleMethods[[commandName intValue]];
   } else if ([commandName isKindOfClass:[NSString class]]) {
     method = moduleData ? moduleData.methodsByName[commandName] : _moduleMethodsByName[commandName];
@@ -121,12 +131,14 @@ using namespace facebook::react;
   NSArray *newArgs = [@[ [NSNumber numberWithInteger:tag] ] arrayByAddingObjectsFromArray:args];
 
   if (_bridge) {
+    [self _addViewToRegistry:paperView withTag:tag];
     [_bridge.batchedBridge
         dispatchBlock:^{
           [method invokeWithBridge:self->_bridge module:self->_componentData.manager arguments:newArgs];
           [self->_bridge.uiManager setNeedsLayout];
         }
                 queue:RCTGetUIManagerQueue()];
+    [self _removeViewFromRegistryWithTag:tag];
   } else {
     // TODO T86826778 - Figure out which queue this should be dispatched to.
     [method invokeWithBridge:nil module:self->_componentData.manager arguments:newArgs];
@@ -134,6 +146,41 @@ using namespace facebook::react;
 }
 
 #pragma mark - Private
+- (void)_addViewToRegistry:(UIView *)view withTag:(NSInteger)tag
+{
+  [self _addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    if ([viewRegistry objectForKey:@(tag)] != NULL) {
+      return;
+    }
+    NSMutableDictionary<NSNumber *, UIView *> *mutableViewRegistry =
+        (NSMutableDictionary<NSNumber *, UIView *> *)viewRegistry;
+    [mutableViewRegistry setObject:view forKey:@(tag)];
+  }];
+}
+
+- (void)_removeViewFromRegistryWithTag:(NSInteger)tag
+{
+  [self _addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
+    if ([viewRegistry objectForKey:@(tag)] == NULL) {
+      return;
+    }
+
+    NSMutableDictionary<NSNumber *, UIView *> *mutableViewRegistry =
+        (NSMutableDictionary<NSNumber *, UIView *> *)viewRegistry;
+    [mutableViewRegistry removeObjectForKey:@(tag)];
+  }];
+}
+
+- (void)_addUIBlock:(RCTViewManagerUIBlock)block
+{
+  __weak __typeof__(self) weakSelf = self;
+  [_bridge.batchedBridge
+      dispatchBlock:^{
+        __typeof__(self) strongSelf = weakSelf;
+        [strongSelf->_bridge.uiManager addUIBlock:block];
+      }
+              queue:RCTGetUIManagerQueue()];
+}
 
 // This is copy-pasta from RCTModuleData.
 - (void)_lookupModuleMethodsIfNecessary

package/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.cpp

@@ -15,6 +15,19 @@ TextMeasurement ParagraphLayoutManager::measure(
     AttributedString const &attributedString,
     ParagraphAttributes const &paragraphAttributes,
     LayoutConstraints layoutConstraints) const {
+  bool cacheLastTextMeasurement = CoreFeatures::cacheLastTextMeasurement;
+  if (cacheLastTextMeasurement &&
+      (layoutConstraints.maximumSize.width == availableWidth_ ||
+       layoutConstraints.maximumSize.width ==
+           cachedTextMeasurement_.size.width)) {
+    /* Yoga has requested measurement for this size before. Let's use cached
+     * value. `TextLayoutManager` might not have cached this because it could be
+     * using different width to generate cache key. This happens because Yoga
+     * switches between available width and exact width but since we already
+     * know exact width, it is wasteful to calculate it again.
+     */
+    return cachedTextMeasurement_;
+  }
   if (CoreFeatures::cacheNSTextStorage) {
     size_t newHash = folly::hash::hash_combine(
         0,
@@ -28,11 +41,23 @@ TextMeasurement ParagraphLayoutManager::measure(
     }
   }
 
-  return textLayoutManager_->measure(
-      AttributedStringBox(attributedString),
-      paragraphAttributes,
-      layoutConstraints,
-      hostTextStorage_);
+  if (cacheLastTextMeasurement) {
+    cachedTextMeasurement_ = textLayoutManager_->measure(
+        AttributedStringBox(attributedString),
+        paragraphAttributes,
+        layoutConstraints,
+        hostTextStorage_);
+
+    availableWidth_ = layoutConstraints.maximumSize.width;
+
+    return cachedTextMeasurement_;
+  } else {
+    return textLayoutManager_->measure(
+        AttributedStringBox(attributedString),
+        paragraphAttributes,
+        layoutConstraints,
+        hostTextStorage_);
+  }
 }
 
 LinesMeasurements ParagraphLayoutManager::measureLines(

package/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.h

@@ -54,6 +54,18 @@ class ParagraphLayoutManager {
   std::shared_ptr<TextLayoutManager const> mutable textLayoutManager_{};
   std::shared_ptr<void> mutable hostTextStorage_{};
 
+  /* The width Yoga set as maximum width.
+   * Yoga sometimes calls measure twice with two
+   * different maximum width. One if available space.
+   * The other one is exact space needed for the string.
+   * This happens when node is dirtied but its size is not affected.
+   * To deal with this inefficiency, we cache `TextMeasurement` for each
+   * `ParagraphShadowNode`. If Yoga tries to re-measure with available width
+   * or exact width, we provide it with the cached value.
+   */
+  Float mutable availableWidth_{};
+  TextMeasurement mutable cachedTextMeasurement_{};
+
   size_t mutable hash_{};
 };
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp

@@ -369,21 +369,6 @@ void YogaLayoutableShadowNode::updateYogaProps() {
   YGStyle result{baseStyle};
 
   // Aliases with precedence
-  if (!props.inset.isUndefined()) {
-    result.position()[YGEdgeAll] = props.inset;
-  }
-  if (!props.insetBlock.isUndefined()) {
-    result.position()[YGEdgeVertical] = props.insetBlock;
-  }
-  if (!props.insetInline.isUndefined()) {
-    result.position()[YGEdgeHorizontal] = props.insetInline;
-  }
-  if (!props.insetInlineEnd.isUndefined()) {
-    result.position()[YGEdgeEnd] = props.insetInlineEnd;
-  }
-  if (!props.insetInlineStart.isUndefined()) {
-    result.position()[YGEdgeStart] = props.insetInlineStart;
-  }
   if (!props.marginInline.isUndefined()) {
     result.margin()[YGEdgeHorizontal] = props.marginInline;
   }
@@ -410,12 +395,6 @@ void YogaLayoutableShadowNode::updateYogaProps() {
   }
 
   // Aliases without precedence
-  if (CompactValue(result.position()[YGEdgeBottom]).isUndefined()) {
-    result.position()[YGEdgeBottom] = props.insetBlockEnd;
-  }
-  if (CompactValue(result.position()[YGEdgeTop]).isUndefined()) {
-    result.position()[YGEdgeTop] = props.insetBlockStart;
-  }
   if (CompactValue(result.margin()[YGEdgeTop]).isUndefined()) {
     result.margin()[YGEdgeTop] = props.marginBlockStart;
   }

package/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp

@@ -136,13 +136,6 @@ void YogaStylableProps::setProp(
     static const auto defaults = YogaStylableProps{};
 
     // Aliases
-    RAW_SET_PROP_SWITCH_CASE(inset, "inset");
-    RAW_SET_PROP_SWITCH_CASE(insetBlock, "insetBlock");
-    RAW_SET_PROP_SWITCH_CASE(insetBlockEnd, "insetBlockEnd");
-    RAW_SET_PROP_SWITCH_CASE(insetBlockStart, "insetBlockStart");
-    RAW_SET_PROP_SWITCH_CASE(insetInline, "insetInline");
-    RAW_SET_PROP_SWITCH_CASE(insetInlineEnd, "insetInlineEnd");
-    RAW_SET_PROP_SWITCH_CASE(insetInlineStart, "insetInlineStart");
     RAW_SET_PROP_SWITCH_CASE(marginInline, "marginInline");
     RAW_SET_PROP_SWITCH_CASE(marginInlineStart, "marginInlineStart");
     RAW_SET_PROP_SWITCH_CASE(marginInlineEnd, "marginInlineEnd");
@@ -242,48 +235,6 @@ void YogaStylableProps::convertRawPropAliases(
     const PropsParserContext &context,
     YogaStylableProps const &sourceProps,
     RawProps const &rawProps) {
-  inset = convertRawProp(
-      context,
-      rawProps,
-      "inset",
-      sourceProps.inset,
-      CompactValue::ofUndefined());
-  insetBlock = convertRawProp(
-      context,
-      rawProps,
-      "insetBlock",
-      sourceProps.insetBlock,
-      CompactValue::ofUndefined());
-  insetBlockEnd = convertRawProp(
-      context,
-      rawProps,
-      "insetBlockEnd",
-      sourceProps.insetBlockEnd,
-      CompactValue::ofUndefined());
-  insetBlockStart = convertRawProp(
-      context,
-      rawProps,
-      "insetBlockStart",
-      sourceProps.insetBlockStart,
-      CompactValue::ofUndefined());
-  insetInline = convertRawProp(
-      context,
-      rawProps,
-      "insetInline",
-      sourceProps.insetInline,
-      CompactValue::ofUndefined());
-  insetInlineEnd = convertRawProp(
-      context,
-      rawProps,
-      "insetInlineEnd",
-      sourceProps.insetInlineEnd,
-      CompactValue::ofUndefined());
-  insetInlineStart = convertRawProp(
-      context,
-      rawProps,
-      "insetInlineStart",
-      sourceProps.insetInlineStart,
-      CompactValue::ofUndefined());
   marginInline = convertRawProp(
       context,
       rawProps,

package/ReactCommon/react/renderer/components/view/YogaStylableProps.h

@@ -43,11 +43,6 @@ class YogaStylableProps : public Props {
 
   // Duplicates of existing properties with different names, taking
   // precedence. E.g. "marginBlock" instead of "marginVertical"
-  CompactValue inset;
-  CompactValue insetInline;
-  CompactValue insetInlineEnd;
-  CompactValue insetInlineStart;
-
   CompactValue marginInline;
   CompactValue marginInlineStart;
   CompactValue marginInlineEnd;
@@ -61,10 +56,6 @@ class YogaStylableProps : public Props {
   // BlockEnd/BlockStart map to top/bottom (no writing mode), but we preserve
   // Yoga's precedence and prefer specific edges (e.g. top) to ones which are
   // flow relative (e.g. blockStart).
-  CompactValue insetBlock;
-  CompactValue insetBlockEnd;
-  CompactValue insetBlockStart;
-
   CompactValue marginBlockStart;
   CompactValue marginBlockEnd;
 

package/ReactCommon/react/renderer/core/CoreFeatures.cpp

@@ -15,6 +15,7 @@ bool CoreFeatures::enableMapBuffer = false;
 bool CoreFeatures::blockPaintForUseLayoutEffect = false;
 bool CoreFeatures::useNativeState = false;
 bool CoreFeatures::cacheNSTextStorage = false;
+bool CoreFeatures::cacheLastTextMeasurement = false;
 
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/renderer/core/CoreFeatures.h

@@ -39,6 +39,11 @@ class CoreFeatures {
   // creating it twice. Once when measuring text and once when rendering it.
   // This flag caches it inside ParagraphState.
   static bool cacheNSTextStorage;
+
+  // Yoga might measure multiple times the same Text with the same constraints
+  // This flag enables a caching mechanism to avoid subsequents measurements
+  // of the same Text with the same constrainst.
+  static bool cacheLastTextMeasurement;
 };
 
 } // namespace react

package/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp

@@ -12,6 +12,7 @@
 #include <react/common/mapbuffer/JReadableMapBuffer.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/core/CoreFeatures.h>
 #include <react/renderer/core/conversions.h>
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
@@ -146,7 +147,10 @@ Size measureAndroidComponentMapBuffer(
 TextLayoutManager::TextLayoutManager(
     const ContextContainer::Shared &contextContainer)
     : contextContainer_(contextContainer),
-      measureCache_(kSimpleThreadSafeCacheSizeCap) {}
+      measureCache_(
+          CoreFeatures::cacheLastTextMeasurement
+              ? 8096
+              : kSimpleThreadSafeCacheSizeCap) {}
 
 void *TextLayoutManager::getNativeTextLayoutManager() const {
   return self_;

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

@@ -52,47 +52,9 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
     textStorage = [self _textStorageForNSAttributesString:attributedString
                                       paragraphAttributes:paragraphAttributes
                                                      size:maximumSize];
-  } else {
-    textStorage.layoutManagers.firstObject.textContainers.firstObject.size = maximumSize;
   }
 
-  NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
-  NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
-  [layoutManager ensureLayoutForTextContainer:textContainer];
-
-  CGSize size = [layoutManager usedRectForTextContainer:textContainer].size;
-
-  size = (CGSize){RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height)};
-
-  __block auto attachments = TextMeasurement::Attachments{};
-
-  [textStorage
-      enumerateAttribute:NSAttachmentAttributeName
-                 inRange:NSMakeRange(0, textStorage.length)
-                 options:0
-              usingBlock:^(NSTextAttachment *attachment, NSRange range, BOOL *stop) {
-                if (!attachment) {
-                  return;
-                }
-
-                CGSize attachmentSize = attachment.bounds.size;
-                CGRect glyphRect = [layoutManager boundingRectForGlyphRange:range inTextContainer:textContainer];
-
-                UIFont *font = [textStorage attribute:NSFontAttributeName atIndex:range.location effectiveRange:nil];
-
-                CGRect frame = {
-                    {glyphRect.origin.x,
-                     glyphRect.origin.y + glyphRect.size.height - attachmentSize.height + font.descender},
-                    attachmentSize};
-
-                auto rect = facebook::react::Rect{
-                    facebook::react::Point{frame.origin.x, frame.origin.y},
-                    facebook::react::Size{frame.size.width, frame.size.height}};
-
-                attachments.push_back(TextMeasurement::Attachment{rect, false});
-              }];
-
-  return TextMeasurement{{size.width, size.height}, attachments};
+  return [self _measureTextStorage:textStorage];
 }
 
 - (TextMeasurement)measureAttributedString:(AttributedString)attributedString
@@ -100,10 +62,14 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                          layoutConstraints:(LayoutConstraints)layoutConstraints
                                textStorage:(NSTextStorage *_Nullable)textStorage
 {
-  return [self measureNSAttributedString:[self _nsAttributedStringFromAttributedString:attributedString]
-                     paragraphAttributes:paragraphAttributes
-                       layoutConstraints:layoutConstraints
-                             textStorage:textStorage];
+  if (textStorage) {
+    return [self _measureTextStorage:textStorage];
+  } else {
+    return [self measureNSAttributedString:[self _nsAttributedStringFromAttributedString:attributedString]
+                       paragraphAttributes:paragraphAttributes
+                         layoutConstraints:layoutConstraints
+                               textStorage:nil];
+  }
 }
 
 - (void)drawAttributedString:(AttributedString)attributedString
@@ -111,13 +77,33 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                        frame:(CGRect)frame
                  textStorage:(NSTextStorage *_Nullable)textStorage
 {
+  BOOL createdStorageForFrame = NO;
+
   if (!textStorage) {
     textStorage = [self textStorageForAttributesString:attributedString
                                    paragraphAttributes:paragraphAttributes
                                                   size:frame.size];
+    createdStorageForFrame = YES;
   }
+
   NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
   NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
+  CGPoint origin = frame.origin;
+
+  if (!createdStorageForFrame) {
+    CGRect rect = [layoutManager usedRectForTextContainer:textContainer];
+    static auto threshold = 1.0 / RCTScreenScale() + 0.01; // Size of a pixel plus some small threshold.
+
+    // `rect`'s width is stored in double precesion.
+    // `frame`'s width is also in double precesion but was stored as float in Yoga previously, precesion was lost.
+    if (std::abs(RCTCeilPixelValue(rect.size.width) - frame.size.width) < threshold) {
+      // `textStorage` passed to this method was used to calculate size of frame. If that's the case, it's
+      // width is the same as frame's width. Origin must be adjusted, otherwise glyhps will be painted in wrong
+      // place.
+      // We could create new `NSTextStorage` for the specific frame, but that is expensive.
+      origin.x -= RCTCeilPixelValue(rect.origin.x);
+    }
+  }
 
 #if TARGET_OS_MACCATALYST
   CGContextRef context = UIGraphicsGetCurrentContext();
@@ -126,8 +112,8 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
 #endif
 
   NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
-  [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:frame.origin];
-  [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:frame.origin];
+  [layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:origin];
+  [layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:origin];
 
 #if TARGET_OS_MACCATALYST
   CGContextRestoreGState(context);
@@ -178,35 +164,6 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
   return paragraphLines;
 }
 
-- (NSTextStorage *)_textStorageForNSAttributesString:(NSAttributedString *)attributedString
-                                 paragraphAttributes:(ParagraphAttributes)paragraphAttributes
-                                                size:(CGSize)size
-{
-  NSTextContainer *textContainer = [[NSTextContainer alloc] initWithSize:size];
-
-  textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5.
-  textContainer.lineBreakMode = paragraphAttributes.maximumNumberOfLines > 0
-      ? RCTNSLineBreakModeFromEllipsizeMode(paragraphAttributes.ellipsizeMode)
-      : NSLineBreakByClipping;
-  textContainer.maximumNumberOfLines = paragraphAttributes.maximumNumberOfLines;
-
-  NSLayoutManager *layoutManager = [NSLayoutManager new];
-  layoutManager.usesFontLeading = NO;
-  [layoutManager addTextContainer:textContainer];
-
-  NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedString];
-
-  [textStorage addLayoutManager:layoutManager];
-
-  if (paragraphAttributes.adjustsFontSizeToFit) {
-    CGFloat minimumFontSize = !isnan(paragraphAttributes.minimumFontSize) ? paragraphAttributes.minimumFontSize : 4.0;
-    CGFloat maximumFontSize = !isnan(paragraphAttributes.maximumFontSize) ? paragraphAttributes.maximumFontSize : 96.0;
-    [textStorage scaleFontSizeToFitSize:size minimumFontSize:minimumFontSize maximumFontSize:maximumFontSize];
-  }
-
-  return textStorage;
-}
-
 - (NSTextStorage *)textStorageForAttributesString:(AttributedString)attributedString
                               paragraphAttributes:(ParagraphAttributes)paragraphAttributes
                                              size:(CGSize)size
@@ -246,15 +203,6 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
   return nil;
 }
 
-- (NSAttributedString *)_nsAttributedStringFromAttributedString:(AttributedString)attributedString
-{
-  auto sharedNSAttributedString = _cache.get(attributedString, [](AttributedString attributedString) {
-    return wrapManagedObject(RCTNSAttributedStringFromAttributedString(attributedString));
-  });
-
-  return unwrapManagedObject(sharedNSAttributedString);
-}
-
 - (void)getRectWithAttributedString:(AttributedString)attributedString
                 paragraphAttributes:(ParagraphAttributes)paragraphAttributes
                  enumerateAttribute:(NSString *)enumerateAttribute
@@ -294,4 +242,85 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi
                        }];
 }
 
+#pragma mark - Private
+
+- (NSTextStorage *)_textStorageForNSAttributesString:(NSAttributedString *)attributedString
+                                 paragraphAttributes:(ParagraphAttributes)paragraphAttributes
+                                                size:(CGSize)size
+{
+  NSTextContainer *textContainer = [[NSTextContainer alloc] initWithSize:size];
+
+  textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5.
+  textContainer.lineBreakMode = paragraphAttributes.maximumNumberOfLines > 0
+      ? RCTNSLineBreakModeFromEllipsizeMode(paragraphAttributes.ellipsizeMode)
+      : NSLineBreakByClipping;
+  textContainer.maximumNumberOfLines = paragraphAttributes.maximumNumberOfLines;
+
+  NSLayoutManager *layoutManager = [NSLayoutManager new];
+  layoutManager.usesFontLeading = NO;
+  [layoutManager addTextContainer:textContainer];
+
+  NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedString];
+
+  [textStorage addLayoutManager:layoutManager];
+
+  if (paragraphAttributes.adjustsFontSizeToFit) {
+    CGFloat minimumFontSize = !isnan(paragraphAttributes.minimumFontSize) ? paragraphAttributes.minimumFontSize : 4.0;
+    CGFloat maximumFontSize = !isnan(paragraphAttributes.maximumFontSize) ? paragraphAttributes.maximumFontSize : 96.0;
+    [textStorage scaleFontSizeToFitSize:size minimumFontSize:minimumFontSize maximumFontSize:maximumFontSize];
+  }
+
+  return textStorage;
+}
+
+- (NSAttributedString *)_nsAttributedStringFromAttributedString:(AttributedString)attributedString
+{
+  auto sharedNSAttributedString = _cache.get(attributedString, [](AttributedString attributedString) {
+    return wrapManagedObject(RCTNSAttributedStringFromAttributedString(attributedString));
+  });
+
+  return unwrapManagedObject(sharedNSAttributedString);
+}
+
+- (TextMeasurement)_measureTextStorage:(NSTextStorage *)textStorage
+{
+  NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
+  NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
+  [layoutManager ensureLayoutForTextContainer:textContainer];
+
+  CGSize size = [layoutManager usedRectForTextContainer:textContainer].size;
+
+  size = (CGSize){RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height)};
+
+  __block auto attachments = TextMeasurement::Attachments{};
+
+  [textStorage
+      enumerateAttribute:NSAttachmentAttributeName
+                 inRange:NSMakeRange(0, textStorage.length)
+                 options:0
+              usingBlock:^(NSTextAttachment *attachment, NSRange range, BOOL *stop) {
+                if (!attachment) {
+                  return;
+                }
+
+                CGSize attachmentSize = attachment.bounds.size;
+                CGRect glyphRect = [layoutManager boundingRectForGlyphRange:range inTextContainer:textContainer];
+
+                UIFont *font = [textStorage attribute:NSFontAttributeName atIndex:range.location effectiveRange:nil];
+
+                CGRect frame = {
+                    {glyphRect.origin.x,
+                     glyphRect.origin.y + glyphRect.size.height - attachmentSize.height + font.descender},
+                    attachmentSize};
+
+                auto rect = facebook::react::Rect{
+                    facebook::react::Point{frame.origin.x, frame.origin.y},
+                    facebook::react::Size{frame.size.width, frame.size.height}};
+
+                attachments.push_back(TextMeasurement::Attachment{rect, false});
+              }];
+
+  return TextMeasurement{{size.width, size.height}, attachments};
+}
+
 @end

package/build.gradle.kts

@@ -1 +1,18 @@
+/*
+ * 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.
+ */
 
+// This is the top level build.gradle.kts file used when the users
+// is doing a build from source. It's triggered as the user
+// will add an `includeBuild(../node_modules/react-native)` in
+// their settings.gradle.kts file.
+// More on this here: https://reactnative.dev/contributing/how-to-build-from-source
+plugins {
+  id("com.android.library") version "7.4.2" apply false
+  id("com.android.application") version "7.4.2" apply false
+  id("de.undercouch.download") version "5.0.1" apply false
+  kotlin("android") version "1.7.22" apply false
+}

package/gradle.properties

@@ -0,0 +1 @@
+android.useAndroidX=true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.72.0-rc.0",
+  "version": "0.72.0-rc.2",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -79,27 +79,27 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.2.1",
-    "@react-native-community/cli": "11.0.0-alpha.2",
-    "@react-native-community/cli-platform-android": "11.0.0-alpha.2",
-    "@react-native-community/cli-platform-ios": "11.0.0-alpha.2",
+    "@react-native-community/cli": "11.2.1",
+    "@react-native-community/cli-platform-android": "11.2.1",
+    "@react-native-community/cli-platform-ios": "11.2.1",
     "@react-native/assets-registry": "^0.72.0",
     "@react-native/codegen": "^0.72.4",
     "@react-native/gradle-plugin": "^0.72.6",
     "@react-native/js-polyfills": "^0.72.1",
     "@react-native/normalize-colors": "^0.72.0",
-    "@react-native/virtualized-lists": "^0.72.3",
+    "@react-native/virtualized-lists": "^0.72.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "base64-js": "^1.1.2",
-    "deprecated-react-native-prop-types": "^4.0.0",
+    "deprecated-react-native-prop-types": "4.1.0",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.5",
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.2.1",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "0.75.1",
-    "metro-source-map": "0.75.1",
+    "metro-runtime": "0.76.2",
+    "metro-source-map": "0.76.2",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",

package/scripts/cocoapods/__tests__/codegen_utils-test.rb

@@ -15,6 +15,14 @@ require_relative "./test_utils/CodegenUtilsMock.rb"
 require_relative "./test_utils/CodegenScriptPhaseExtractorMock.rb"
 require_relative "./test_utils/FileUtilsMock.rb"
 
+# mocking the min_ios_version_supported function
+# as it is not possible to require the original react_native_pod
+# without incurring in circular deps
+# TODO: move `min_ios_version_supported` to utils.rb
+def min_ios_version_supported
+    return '12.4'
+end
+
 class CodegenUtilsTests < Test::Unit::TestCase
     :base_path
 
@@ -527,7 +535,7 @@ class CodegenUtilsTests < Test::Unit::TestCase
           'source' => { :git => '' },
           'header_mappings_dir' => './',
           'platforms' => {
-            'ios' => '11.0',
+            'ios' => '12.4',
           },
           'source_files' => "**/*.{h,mm,cpp}",
           'pod_target_xcconfig' => {