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
126 lines
3.2 KiB
Objective-C
126 lines
3.2 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/ARTText.h>
|
|
|
|
#import <CoreText/CoreText.h>
|
|
|
|
@implementation ARTText
|
|
|
|
- (void)setAlignment:(CTTextAlignment)alignment
|
|
{
|
|
[self invalidate];
|
|
_alignment = alignment;
|
|
}
|
|
|
|
static void ARTFreeTextFrame(ARTTextFrame frame)
|
|
{
|
|
if (frame.count) {
|
|
// We must release each line before freeing up this struct
|
|
for (int i = 0; i < frame.count; i++) {
|
|
CFRelease(frame.lines[i]);
|
|
}
|
|
free(frame.lines);
|
|
free(frame.widths);
|
|
}
|
|
}
|
|
|
|
- (void)setTextFrame:(ARTTextFrame)frame
|
|
{
|
|
if (frame.lines != _textFrame.lines) {
|
|
ARTFreeTextFrame(_textFrame);
|
|
}
|
|
[self invalidate];
|
|
_textFrame = frame;
|
|
}
|
|
|
|
- (void)dealloc
|
|
{
|
|
ARTFreeTextFrame(_textFrame);
|
|
}
|
|
|
|
- (void)renderLayerTo:(CGContextRef)context
|
|
{
|
|
ARTTextFrame frame = self.textFrame;
|
|
|
|
if ((!self.fill && !self.stroke) || !frame.count) {
|
|
return;
|
|
}
|
|
|
|
// to-do: draw along a path
|
|
|
|
CGTextDrawingMode mode = kCGTextStroke;
|
|
if (self.fill) {
|
|
if ([self.fill applyFillColor:context]) {
|
|
mode = kCGTextFill;
|
|
} else {
|
|
|
|
for (int i = 0; i < frame.count; i++) {
|
|
CGContextSaveGState(context);
|
|
// Inverse the coordinate space since CoreText assumes a bottom-up coordinate space
|
|
CGContextScaleCTM(context, 1.0, -1.0);
|
|
CGContextSetTextDrawingMode(context, kCGTextClip);
|
|
[self renderLineTo:context atIndex:i];
|
|
// Inverse the coordinate space back to the original before filling
|
|
CGContextScaleCTM(context, 1.0, -1.0);
|
|
[self.fill paint:context];
|
|
// Restore the state so that the next line can be clipped separately
|
|
CGContextRestoreGState(context);
|
|
}
|
|
|
|
if (!self.stroke) {
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
if (self.stroke) {
|
|
CGContextSetStrokeColorWithColor(context, self.stroke);
|
|
CGContextSetLineWidth(context, self.strokeWidth);
|
|
CGContextSetLineCap(context, self.strokeCap);
|
|
CGContextSetLineJoin(context, self.strokeJoin);
|
|
ARTCGFloatArray dash = self.strokeDash;
|
|
if (dash.count) {
|
|
CGContextSetLineDash(context, 0, dash.array, dash.count);
|
|
}
|
|
if (mode == kCGTextFill) {
|
|
mode = kCGTextFillStroke;
|
|
}
|
|
}
|
|
|
|
CGContextSetTextDrawingMode(context, mode);
|
|
|
|
// Inverse the coordinate space since CoreText assumes a bottom-up coordinate space
|
|
CGContextScaleCTM(context, 1.0, -1.0);
|
|
for (int i = 0; i < frame.count; i++) {
|
|
[self renderLineTo:context atIndex:i];
|
|
}
|
|
}
|
|
|
|
- (void)renderLineTo:(CGContextRef)context atIndex:(int)index
|
|
{
|
|
ARTTextFrame frame = self.textFrame;
|
|
CGFloat shift;
|
|
switch (self.alignment) {
|
|
case kCTTextAlignmentRight:
|
|
shift = frame.widths[index];
|
|
break;
|
|
case kCTTextAlignmentCenter:
|
|
shift = (frame.widths[index] / 2);
|
|
break;
|
|
default:
|
|
shift = 0;
|
|
break;
|
|
}
|
|
// We should consider snapping this shift to device pixels to improve rendering quality
|
|
// when a line has subpixel width.
|
|
CGContextSetTextPosition(context, -shift, -frame.baseLine - frame.lineHeight * index);
|
|
CTLineRef line = frame.lines[index];
|
|
CTLineDraw(line, context);
|
|
}
|
|
|
|
@end
|