mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
8131b7bb7b
Summary: This is my proposal for fixing `use_frameworks!` compatibility without breaking all `<React/*>` imports I outlined in https://github.com/facebook/react-native/pull/25393#issuecomment-508457700. If accepted, it will fix https://github.com/facebook/react-native/issues/25349. It builds on the changes I made in https://github.com/facebook/react-native/pull/25496 by ensuring each podspec has a unique value for `header_dir` so that framework imports do not conflict. Every podspec which should be included in the `<React/*>` namespace now includes it's headers from `React-Core.podspec`. The following pods can still be imported with `<React/*>` and so should not have breaking changes: `React-ART`,`React-DevSupport`, `React-CoreModules`, `React-RCTActionSheet`, `React-RCTAnimation`, `React-RCTBlob`, `React-RCTImage`, `React-RCTLinking`, `React-RCTNetwork`, `React-RCTPushNotification`, `React-RCTSettings`, `React-RCTText`, `React-RCTSettings`, `React-RCTVibration`, `React-RCTWebSocket` . There are still a few breaking changes which I hope will be acceptable: - `React-Core.podspec` has been moved to the root of the project. Any `Podfile` that references it will need to update the path. - ~~`React-turbomodule-core`'s headers now live under `<turbomodule/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-turbomodulesamples`'s headers now live under `<turbomodulesamples/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-TypeSaferty`'s headers now live under `<TypeSafety/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511040967. - ~~`React-jscallinvoker`'s headers now live under `<jscallinvoker/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - Each podspec now uses `s.static_framework = true`. This means that a minimum of CocoaPods 1.5 ([released in April 2018](http://blog.cocoapods.org/CocoaPods-1.5.0/)) is now required. This is needed so that the ` __has_include` conditions can still work when frameworks are enabled. Still to do: - ~~Including `React-turbomodule-core` with `use_frameworks!` enabled causes the C++ import failures we saw in https://github.com/facebook/react-native/issues/25349. I'm sure it will be possible to fix this but I need to dig deeper (perhaps a custom modulemap would be needed).~~ Addressed by https://github.com/facebook/react-native/pull/25619/commits/33573511f02f3502a28bad48e085e9a4b8608302. - I haven't got Fabric working yet. I wonder if it would be acceptable to move Fabric out of the `<React/*>` namespace since it is new? � ## Changelog [iOS] [Fixed] - Fixed compatibility with CocoaPods frameworks. Pull Request resolved: https://github.com/facebook/react-native/pull/25619 Test Plan: ### FB ``` buck build catalyst ``` ### Sample Project Everything should work exactly as before, where `use_frameworks!` is not in `Podfile`s. I have a branch on my [sample project](https://github.com/jtreanor/react-native-cocoapods-frameworks) here which has `use_frameworks!` in its `Podfile` to demonstrate this is fixed. You can see that it works with these steps: 1. `git clone git@github.com:jtreanor/react-native-cocoapods-frameworks.git` 2. `git checkout fix-frameworks-subspecs` 3. `cd ios && pod install` 4. `cd .. && react-native run-ios` The sample app will build and run successfully. To see that it still works without frameworks, remove `use_frameworks!` from the `Podfile` and do steps 3 and 4 again. ### RNTesterPods `RNTesterPodsPods` can now work with or without `use_frameworks!`. 1. Go to the `RNTester` directory and run `pod install`. 2. Run the tests in `RNTesterPods.xcworkspace` to see that everything still works fine. 3. Uncomment the `use_frameworks!` line at the top of `RNTester/Podfile` and run `pod install` again. 4. Run the tests again and see that it still works with frameworks enabled. Reviewed By: PeteTheHeat Differential Revision: D16465247 Pulled By: PeteTheHeat fbshipit-source-id: cad837e9cced06d30cc5b372af1c65c7780b9e7a
432 lines
15 KiB
Objective-C
432 lines
15 KiB
Objective-C
/**
|
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
|
*
|
|
* This source code is licensed under the MIT license found in the
|
|
* LICENSE file in the root directory of this source tree.
|
|
*/
|
|
|
|
#import <React/RCTTextShadowView.h>
|
|
|
|
#import <React/RCTBridge.h>
|
|
#import <React/RCTShadowView+Layout.h>
|
|
#import <React/RCTUIManager.h>
|
|
#import <yoga/Yoga.h>
|
|
|
|
#import "NSTextStorage+FontScaling.h"
|
|
#import <React/RCTTextView.h>
|
|
|
|
@implementation RCTTextShadowView
|
|
{
|
|
__weak RCTBridge *_bridge;
|
|
BOOL _needsUpdateView;
|
|
NSMapTable<id, NSTextStorage *> *_cachedTextStorages;
|
|
}
|
|
|
|
- (instancetype)initWithBridge:(RCTBridge *)bridge
|
|
{
|
|
if (self = [super init]) {
|
|
_bridge = bridge;
|
|
_cachedTextStorages = [NSMapTable strongToStrongObjectsMapTable];
|
|
_needsUpdateView = YES;
|
|
YGNodeSetMeasureFunc(self.yogaNode, RCTTextShadowViewMeasure);
|
|
YGNodeSetBaselineFunc(self.yogaNode, RCTTextShadowViewBaseline);
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)didSetProps:(NSArray<NSString *> *)changedProps
|
|
{
|
|
[super didSetProps:changedProps];
|
|
|
|
// When applying a semi-transparent background color to Text component
|
|
// we must set the root text nodes text attribute background color to nil
|
|
// because the background color is drawn on the RCTTextView itself, as well
|
|
// as on the glphy background draw step. By setting this to nil, we allow
|
|
// the RCTTextView backgroundColor to be used, without affecting nested Text
|
|
// components.
|
|
self.textAttributes.backgroundColor = nil;
|
|
self.textAttributes.opacity = NAN;
|
|
}
|
|
|
|
- (BOOL)isYogaLeafNode
|
|
{
|
|
return YES;
|
|
}
|
|
|
|
- (void)dirtyLayout
|
|
{
|
|
[super dirtyLayout];
|
|
YGNodeMarkDirty(self.yogaNode);
|
|
[self invalidateCache];
|
|
}
|
|
|
|
- (void)invalidateCache
|
|
{
|
|
[_cachedTextStorages removeAllObjects];
|
|
_needsUpdateView = YES;
|
|
}
|
|
|
|
#pragma mark - RCTUIManagerObserver
|
|
|
|
- (void)uiManagerWillPerformMounting
|
|
{
|
|
if (YGNodeIsDirty(self.yogaNode)) {
|
|
return;
|
|
}
|
|
|
|
if (!_needsUpdateView) {
|
|
return;
|
|
}
|
|
_needsUpdateView = NO;
|
|
|
|
CGRect contentFrame = self.contentFrame;
|
|
NSTextStorage *textStorage = [self textStorageAndLayoutManagerThatFitsSize:self.contentFrame.size
|
|
exclusiveOwnership:YES];
|
|
|
|
NSNumber *tag = self.reactTag;
|
|
NSMutableArray<NSNumber *> *descendantViewTags = [NSMutableArray new];
|
|
[textStorage enumerateAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
|
|
inRange:NSMakeRange(0, textStorage.length)
|
|
options:0
|
|
usingBlock:
|
|
^(RCTShadowView *shadowView, NSRange range, __unused BOOL *stop) {
|
|
if (!shadowView) {
|
|
return;
|
|
}
|
|
|
|
[descendantViewTags addObject:shadowView.reactTag];
|
|
}
|
|
];
|
|
|
|
[_bridge.uiManager addUIBlock:^(RCTUIManager *uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
|
|
RCTTextView *textView = (RCTTextView *)viewRegistry[tag];
|
|
if (!textView) {
|
|
return;
|
|
}
|
|
|
|
NSMutableArray<UIView *> *descendantViews =
|
|
[NSMutableArray arrayWithCapacity:descendantViewTags.count];
|
|
[descendantViewTags enumerateObjectsUsingBlock:^(NSNumber *_Nonnull descendantViewTag, NSUInteger index, BOOL *_Nonnull stop) {
|
|
UIView *descendantView = viewRegistry[descendantViewTag];
|
|
if (!descendantView) {
|
|
return;
|
|
}
|
|
|
|
[descendantViews addObject:descendantView];
|
|
}];
|
|
|
|
// Removing all references to Shadow Views to avoid unnecessary retaining.
|
|
[textStorage removeAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName range:NSMakeRange(0, textStorage.length)];
|
|
|
|
[textView setTextStorage:textStorage
|
|
contentFrame:contentFrame
|
|
descendantViews:descendantViews];
|
|
}];
|
|
}
|
|
|
|
- (void)postprocessAttributedText:(NSMutableAttributedString *)attributedText
|
|
{
|
|
__block CGFloat maximumLineHeight = 0;
|
|
|
|
[attributedText enumerateAttribute:NSParagraphStyleAttributeName
|
|
inRange:NSMakeRange(0, attributedText.length)
|
|
options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
|
|
usingBlock:
|
|
^(NSParagraphStyle *paragraphStyle, __unused NSRange range, __unused BOOL *stop) {
|
|
if (!paragraphStyle) {
|
|
return;
|
|
}
|
|
|
|
maximumLineHeight = MAX(paragraphStyle.maximumLineHeight, maximumLineHeight);
|
|
}
|
|
];
|
|
|
|
if (maximumLineHeight == 0) {
|
|
// `lineHeight` was not specified, nothing to do.
|
|
return;
|
|
}
|
|
|
|
__block CGFloat maximumFontLineHeight = 0;
|
|
|
|
[attributedText enumerateAttribute:NSFontAttributeName
|
|
inRange:NSMakeRange(0, attributedText.length)
|
|
options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
|
|
usingBlock:
|
|
^(UIFont *font, NSRange range, __unused BOOL *stop) {
|
|
if (!font) {
|
|
return;
|
|
}
|
|
|
|
if (maximumFontLineHeight <= font.lineHeight) {
|
|
maximumFontLineHeight = font.lineHeight;
|
|
}
|
|
}
|
|
];
|
|
|
|
if (maximumLineHeight < maximumFontLineHeight) {
|
|
return;
|
|
}
|
|
|
|
CGFloat baseLineOffset = maximumLineHeight / 2.0 - maximumFontLineHeight / 2.0;
|
|
|
|
[attributedText addAttribute:NSBaselineOffsetAttributeName
|
|
value:@(baseLineOffset)
|
|
range:NSMakeRange(0, attributedText.length)];
|
|
}
|
|
|
|
- (NSAttributedString *)attributedTextWithMeasuredAttachmentsThatFitSize:(CGSize)size
|
|
{
|
|
NSMutableAttributedString *attributedText =
|
|
[[NSMutableAttributedString alloc] initWithAttributedString:[self attributedTextWithBaseTextAttributes:nil]];
|
|
|
|
[attributedText beginEditing];
|
|
|
|
[attributedText enumerateAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
|
|
inRange:NSMakeRange(0, attributedText.length)
|
|
options:0
|
|
usingBlock:
|
|
^(RCTShadowView *shadowView, NSRange range, __unused BOOL *stop) {
|
|
if (!shadowView) {
|
|
return;
|
|
}
|
|
|
|
CGSize fittingSize = [shadowView sizeThatFitsMinimumSize:CGSizeZero
|
|
maximumSize:size];
|
|
NSTextAttachment *attachment = [NSTextAttachment new];
|
|
attachment.bounds = (CGRect){CGPointZero, fittingSize};
|
|
[attributedText addAttribute:NSAttachmentAttributeName value:attachment range:range];
|
|
}
|
|
];
|
|
|
|
[attributedText endEditing];
|
|
|
|
return [attributedText copy];
|
|
}
|
|
|
|
- (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size
|
|
exclusiveOwnership:(BOOL)exclusiveOwnership
|
|
{
|
|
NSValue *key = [NSValue valueWithCGSize:size];
|
|
NSTextStorage *cachedTextStorage = [_cachedTextStorages objectForKey:key];
|
|
|
|
if (cachedTextStorage) {
|
|
if (exclusiveOwnership) {
|
|
[_cachedTextStorages removeObjectForKey:key];
|
|
}
|
|
|
|
return cachedTextStorage;
|
|
}
|
|
|
|
NSTextContainer *textContainer = [[NSTextContainer alloc] initWithSize:size];
|
|
|
|
textContainer.lineFragmentPadding = 0.0; // Note, the default value is 5.
|
|
textContainer.lineBreakMode =
|
|
_maximumNumberOfLines > 0 ? _lineBreakMode : NSLineBreakByClipping;
|
|
textContainer.maximumNumberOfLines = _maximumNumberOfLines;
|
|
|
|
NSLayoutManager *layoutManager = [NSLayoutManager new];
|
|
[layoutManager addTextContainer:textContainer];
|
|
|
|
NSTextStorage *textStorage =
|
|
[[NSTextStorage alloc] initWithAttributedString:[self attributedTextWithMeasuredAttachmentsThatFitSize:size]];
|
|
|
|
[self postprocessAttributedText:textStorage];
|
|
|
|
[textStorage addLayoutManager:layoutManager];
|
|
|
|
if (_adjustsFontSizeToFit) {
|
|
CGFloat minimumFontSize =
|
|
MAX(_minimumFontScale * (self.textAttributes.effectiveFont.pointSize), 4.0);
|
|
[textStorage scaleFontSizeToFitSize:size
|
|
minimumFontSize:minimumFontSize
|
|
maximumFontSize:self.textAttributes.effectiveFont.pointSize];
|
|
}
|
|
|
|
if (!exclusiveOwnership) {
|
|
[_cachedTextStorages setObject:textStorage forKey:key];
|
|
}
|
|
|
|
return textStorage;
|
|
}
|
|
|
|
- (void)layoutWithMetrics:(RCTLayoutMetrics)layoutMetrics
|
|
layoutContext:(RCTLayoutContext)layoutContext
|
|
{
|
|
// If the view got new `contentFrame`, we have to redraw it because
|
|
// and sizes of embedded views may change.
|
|
if (!CGRectEqualToRect(self.layoutMetrics.contentFrame, layoutMetrics.contentFrame)) {
|
|
_needsUpdateView = YES;
|
|
}
|
|
|
|
if (self.textAttributes.layoutDirection != layoutMetrics.layoutDirection) {
|
|
self.textAttributes.layoutDirection = layoutMetrics.layoutDirection;
|
|
[self invalidateCache];
|
|
}
|
|
|
|
[super layoutWithMetrics:layoutMetrics layoutContext:layoutContext];
|
|
}
|
|
|
|
- (void)layoutSubviewsWithContext:(RCTLayoutContext)layoutContext
|
|
{
|
|
NSTextStorage *textStorage =
|
|
[self textStorageAndLayoutManagerThatFitsSize:self.availableSize
|
|
exclusiveOwnership:NO];
|
|
NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
|
|
NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
|
|
NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
|
|
NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange
|
|
actualGlyphRange:NULL];
|
|
|
|
[textStorage enumerateAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
|
|
inRange:characterRange
|
|
options:0
|
|
usingBlock:
|
|
^(RCTShadowView *shadowView, NSRange range, BOOL *stop) {
|
|
if (!shadowView) {
|
|
return;
|
|
}
|
|
|
|
CGRect glyphRect = [layoutManager boundingRectForGlyphRange:range
|
|
inTextContainer:textContainer];
|
|
|
|
NSTextAttachment *attachment =
|
|
[textStorage attribute:NSAttachmentAttributeName atIndex:range.location effectiveRange:nil];
|
|
|
|
CGSize attachmentSize = attachment.bounds.size;
|
|
|
|
UIFont *font = [textStorage attribute:NSFontAttributeName atIndex:range.location effectiveRange:nil];
|
|
|
|
CGRect frame = {{
|
|
RCTRoundPixelValue(glyphRect.origin.x),
|
|
RCTRoundPixelValue(glyphRect.origin.y + glyphRect.size.height - attachmentSize.height + font.descender)
|
|
}, {
|
|
RCTRoundPixelValue(attachmentSize.width),
|
|
RCTRoundPixelValue(attachmentSize.height)
|
|
}};
|
|
|
|
NSRange truncatedGlyphRange = [layoutManager truncatedGlyphRangeInLineFragmentForGlyphAtIndex:range.location];
|
|
BOOL viewIsTruncated = NSIntersectionRange(range, truncatedGlyphRange).length != 0;
|
|
|
|
RCTLayoutContext localLayoutContext = layoutContext;
|
|
localLayoutContext.absolutePosition.x += frame.origin.x;
|
|
localLayoutContext.absolutePosition.y += frame.origin.y;
|
|
|
|
[shadowView layoutWithMinimumSize:frame.size
|
|
maximumSize:frame.size
|
|
layoutDirection:self.layoutMetrics.layoutDirection
|
|
layoutContext:localLayoutContext];
|
|
|
|
RCTLayoutMetrics localLayoutMetrics = shadowView.layoutMetrics;
|
|
localLayoutMetrics.frame.origin = frame.origin; // Reinforcing a proper frame origin for the Shadow View.
|
|
if (viewIsTruncated) {
|
|
localLayoutMetrics.displayType = RCTDisplayTypeNone;
|
|
}
|
|
[shadowView layoutWithMetrics:localLayoutMetrics layoutContext:localLayoutContext];
|
|
}
|
|
];
|
|
|
|
|
|
if (_onTextLayout) {
|
|
NSMutableArray *lineData = [NSMutableArray new];
|
|
[layoutManager
|
|
enumerateLineFragmentsForGlyphRange:glyphRange
|
|
usingBlock:^(CGRect overallRect, CGRect usedRect, NSTextContainer * _Nonnull usedTextContainer, NSRange lineGlyphRange, BOOL * _Nonnull stop) {
|
|
NSRange range = [layoutManager characterRangeForGlyphRange:lineGlyphRange actualGlyphRange:nil];
|
|
NSString *renderedString = [textStorage.string substringWithRange:range];
|
|
UIFont *font = [[textStorage attributedSubstringFromRange:range] attribute:NSFontAttributeName atIndex:0 effectiveRange:nil];
|
|
[lineData addObject:
|
|
@{
|
|
@"text": renderedString,
|
|
@"x": @(usedRect.origin.x),
|
|
@"y": @(usedRect.origin.y),
|
|
@"width": @(usedRect.size.width),
|
|
@"height": @(usedRect.size.height),
|
|
@"descender": @(-font.descender),
|
|
@"capHeight": @(font.capHeight),
|
|
@"ascender": @(font.ascender),
|
|
@"xHeight": @(font.xHeight),
|
|
}];
|
|
}];
|
|
NSDictionary *payload =
|
|
@{
|
|
@"lines": lineData,
|
|
};
|
|
_onTextLayout(payload);
|
|
}
|
|
}
|
|
|
|
- (CGFloat)lastBaselineForSize:(CGSize)size
|
|
{
|
|
NSAttributedString *attributedText =
|
|
[self textStorageAndLayoutManagerThatFitsSize:size exclusiveOwnership:NO];
|
|
|
|
__block CGFloat maximumDescender = 0.0;
|
|
|
|
[attributedText enumerateAttribute:NSFontAttributeName
|
|
inRange:NSMakeRange(0, attributedText.length)
|
|
options:NSAttributedStringEnumerationLongestEffectiveRangeNotRequired
|
|
usingBlock:
|
|
^(UIFont *font, NSRange range, __unused BOOL *stop) {
|
|
if (maximumDescender > font.descender) {
|
|
maximumDescender = font.descender;
|
|
}
|
|
}
|
|
];
|
|
|
|
return size.height + maximumDescender;
|
|
}
|
|
|
|
static YGSize RCTTextShadowViewMeasure(YGNodeRef node, float width, YGMeasureMode widthMode, float height, YGMeasureMode heightMode)
|
|
{
|
|
CGSize maximumSize = (CGSize){
|
|
widthMode == YGMeasureModeUndefined ? CGFLOAT_MAX : RCTCoreGraphicsFloatFromYogaFloat(width),
|
|
heightMode == YGMeasureModeUndefined ? CGFLOAT_MAX : RCTCoreGraphicsFloatFromYogaFloat(height),
|
|
};
|
|
|
|
RCTTextShadowView *shadowTextView = (__bridge RCTTextShadowView *)YGNodeGetContext(node);
|
|
|
|
NSTextStorage *textStorage =
|
|
[shadowTextView textStorageAndLayoutManagerThatFitsSize:maximumSize
|
|
exclusiveOwnership:NO];
|
|
|
|
NSLayoutManager *layoutManager = textStorage.layoutManagers.firstObject;
|
|
NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
|
|
[layoutManager ensureLayoutForTextContainer:textContainer];
|
|
CGSize size = [layoutManager usedRectForTextContainer:textContainer].size;
|
|
|
|
CGFloat letterSpacing = shadowTextView.textAttributes.letterSpacing;
|
|
if (!isnan(letterSpacing) && letterSpacing < 0) {
|
|
size.width -= letterSpacing;
|
|
}
|
|
|
|
size = (CGSize){
|
|
MIN(RCTCeilPixelValue(size.width), maximumSize.width),
|
|
MIN(RCTCeilPixelValue(size.height), maximumSize.height)
|
|
};
|
|
|
|
// Adding epsilon value illuminates problems with converting values from
|
|
// `double` to `float`, and then rounding them to pixel grid in Yoga.
|
|
CGFloat epsilon = 0.001;
|
|
return (YGSize){
|
|
RCTYogaFloatFromCoreGraphicsFloat(size.width + epsilon),
|
|
RCTYogaFloatFromCoreGraphicsFloat(size.height + epsilon)
|
|
};
|
|
}
|
|
|
|
static float RCTTextShadowViewBaseline(YGNodeRef node, const float width, const float height)
|
|
{
|
|
RCTTextShadowView *shadowTextView = (__bridge RCTTextShadowView *)YGNodeGetContext(node);
|
|
|
|
CGSize size = (CGSize){
|
|
RCTCoreGraphicsFloatFromYogaFloat(width),
|
|
RCTCoreGraphicsFloatFromYogaFloat(height)
|
|
};
|
|
|
|
CGFloat lastBaseline = [shadowTextView lastBaselineForSize:size];
|
|
|
|
return RCTYogaFloatFromCoreGraphicsFloat(lastBaseline);
|
|
}
|
|
|
|
@end
|