text was rewritten for iOS, so some Mac changes are necessary to get it compiling
This commit is contained in:
Christopher Hogan
Родитель
9e557f8218
Коммит
cdc5e96a68
|
|
@ -11,6 +11,20 @@
|
|||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
#if TARGET_OS_OSX // [TODO(macOS ISS#2323203)
|
||||
typedef enum UITextAutocorrectionType : NSInteger {
|
||||
UITextAutocorrectionTypeDefault,
|
||||
UITextAutocorrectionTypeNo,
|
||||
UITextAutocorrectionTypeYes,
|
||||
} UITextAutocorrectionType;
|
||||
|
||||
typedef enum UITextSpellCheckingType : NSInteger {
|
||||
UITextSpellCheckingTypeDefault,
|
||||
UITextSpellCheckingTypeNo,
|
||||
UITextSpellCheckingTypeYes,
|
||||
} UITextSpellCheckingType;
|
||||
#endif // TODO(macOS ISS#2323203)]
|
||||
|
||||
@interface RCTConvert (Text)
|
||||
|
||||
+ (UITextAutocorrectionType)UITextAutocorrectionType:(nullable id)json;
|
||||
|
|
|
|||
|
|
@ -144,7 +144,6 @@
|
|||
9F5C18BD230DDCA200E3E5A7 /* RCTBaseTextInputViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B111200FEBA9008D9D16 /* RCTBaseTextInputViewManager.m */; };
|
||||
9F5C18BE230DDCAB00E3E5A7 /* RCTSinglelineTextInputViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B106200FEBA9008D9D16 /* RCTSinglelineTextInputViewManager.m */; };
|
||||
9F5C18BF230DDCB100E3E5A7 /* RCTMultilineTextInputViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B118200FEBA9008D9D16 /* RCTMultilineTextInputViewManager.m */; };
|
||||
9F5C18C0230DDCC500E3E5A7 /* RCTInputAccessoryShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C245F37205E216A00D936E9 /* RCTInputAccessoryShadowView.m */; };
|
||||
9F5C18C1230DDCCD00E3E5A7 /* RCTTextRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 19461664225DC3B300E4E008 /* RCTTextRenderer.m */; };
|
||||
9F5C18C2230DDCDA00E3E5A7 /* RCTVirtualTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B12B200FEBAA008D9D16 /* RCTVirtualTextViewManager.m */; };
|
||||
9F5C18C3230DDCE500E3E5A7 /* RCTBaseTextInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B10A200FEBA9008D9D16 /* RCTBaseTextInputView.m */; };
|
||||
|
|
@ -160,6 +159,8 @@
|
|||
9F5C18D0230DDD8800E3E5A7 /* RCTRawTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B0FE200FEBA9008D9D16 /* RCTRawTextViewManager.m */; };
|
||||
9F5C18D1230DDD9600E3E5A7 /* RCTBaseTextShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B11E200FEBA9008D9D16 /* RCTBaseTextShadowView.m */; };
|
||||
9F5C18D2230DDD9600E3E5A7 /* RCTTextShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5956B122200FEBAA008D9D16 /* RCTTextShadowView.m */; };
|
||||
9F5C1912230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F5C1911230DF3E700E3E5A7 /* RCTTextUIKit.h */; };
|
||||
9F5C1913230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F5C1911230DF3E700E3E5A7 /* RCTTextUIKit.h */; };
|
||||
/* End PBXBuildFile section */
|
||||
|
||||
/* Begin PBXCopyFilesBuildPhase section */
|
||||
|
|
@ -355,6 +356,7 @@
|
|||
8F2807C4202D2B6A005D65E6 /* RCTInputAccessoryView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInputAccessoryView.h; sourceTree = "<group>"; };
|
||||
8F2807C5202D2B6B005D65E6 /* RCTInputAccessoryViewContent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTInputAccessoryViewContent.m; sourceTree = "<group>"; };
|
||||
8F2807C6202D2B6B005D65E6 /* RCTInputAccessoryViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTInputAccessoryViewManager.h; sourceTree = "<group>"; };
|
||||
9F5C1911230DF3E700E3E5A7 /* RCTTextUIKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextUIKit.h; sourceTree = "<group>"; };
|
||||
/* End PBXFileReference section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
|
|
@ -368,6 +370,7 @@
|
|||
5956B12F200FEBAA008D9D16 /* RCTConvert+Text.m */,
|
||||
5956B11A200FEBA9008D9D16 /* RCTTextAttributes.h */,
|
||||
5956B120200FEBA9008D9D16 /* RCTTextAttributes.m */,
|
||||
9F5C1911230DF3E700E3E5A7 /* RCTTextUIKit.h */,
|
||||
5970936820845DDE00D163A7 /* RCTTextTransform.h */,
|
||||
5956B121200FEBAA008D9D16 /* Text */,
|
||||
5956B0FF200FEBA9008D9D16 /* TextInput */,
|
||||
|
|
@ -500,6 +503,7 @@
|
|||
isa = PBXHeadersBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
9F5C1912230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -507,6 +511,7 @@
|
|||
isa = PBXHeadersBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
9F5C1913230DF3E700E3E5A7 /* RCTTextUIKit.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -688,7 +693,6 @@
|
|||
9F5C18C3230DDCE500E3E5A7 /* RCTBaseTextInputView.m in Sources */,
|
||||
9F5C18C2230DDCDA00E3E5A7 /* RCTVirtualTextViewManager.m in Sources */,
|
||||
9F5C18C1230DDCCD00E3E5A7 /* RCTTextRenderer.m in Sources */,
|
||||
9F5C18C0230DDCC500E3E5A7 /* RCTInputAccessoryShadowView.m in Sources */,
|
||||
9F5C18BF230DDCB100E3E5A7 /* RCTMultilineTextInputViewManager.m in Sources */,
|
||||
9F5C18BE230DDCAB00E3E5A7 /* RCTSinglelineTextInputViewManager.m in Sources */,
|
||||
9F5C18BD230DDCA200E3E5A7 /* RCTBaseTextInputViewManager.m in Sources */,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,11 @@
|
|||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#if !TARGET_OS_OSX // [TODO(macOS ISS#2323203)
|
||||
#import <UIKit/UIKit.h>
|
||||
#else
|
||||
#import <AppKit/AppKit.h>
|
||||
#endif // [TODO(macOS ISS#2323203)
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
|
|
|
|||
|
|
@ -5,9 +5,8 @@
|
|||
* LICENSE file in the root directory of this source tree.
|
||||
*/
|
||||
|
||||
#import "RCTTextRenderer.h"
|
||||
|
||||
#import "RCTTextAttributes.h"
|
||||
#import "RCTTextRenderer.h"
|
||||
|
||||
@implementation RCTTextRenderer
|
||||
{
|
||||
|
|
@ -31,7 +30,11 @@
|
|||
|
||||
CGRect boundingBox = CGContextGetClipBoundingBox(ctx);
|
||||
CGContextSaveGState(ctx);
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#3536887)
|
||||
UIGraphicsPushContext(ctx);
|
||||
#else
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
#endif // TODO(macOS ISS#3536887)
|
||||
|
||||
NSLayoutManager *layoutManager = _textStorage.layoutManagers.firstObject;
|
||||
NSTextContainer *textContainer = layoutManager.textContainers.firstObject;
|
||||
|
|
@ -43,7 +46,11 @@
|
|||
[layoutManager drawBackgroundForGlyphRange:glyphRange atPoint:_contentFrame.origin];
|
||||
[layoutManager drawGlyphsForGlyphRange:glyphRange atPoint:_contentFrame.origin];
|
||||
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#3536887)
|
||||
UIGraphicsPopContext();
|
||||
#else
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
#endif // TODO(macOS ISS#3536887)
|
||||
CGContextRestoreGState(ctx);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
#import <MobileCoreServices/UTCoreTypes.h>
|
||||
#else
|
||||
#import <Quartz/Quartz.h> // TODO(macOS ISS#2323203) for CATiledLayer
|
||||
#endif // TODO(macOS ISS#2323203)
|
||||
|
||||
#import <React/RCTAssert.h> // TODO(macOS ISS#2323203)
|
||||
|
|
@ -173,16 +175,17 @@
|
|||
|
||||
- (void)configureLayer
|
||||
{
|
||||
#if TARGET_OS_OSX // [TODO(macOS ISS#2323203)
|
||||
[super drawRect:rect];
|
||||
#endif // ]TODO(macOS ISS#2323203)
|
||||
if (!_textStorage) {
|
||||
return;
|
||||
}
|
||||
|
||||
CALayer *currentLayer;
|
||||
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
CGSize screenSize = RCTScreenSize();
|
||||
#else
|
||||
CGSize screenSize = [[NSScreen mainScreen] frame].size;
|
||||
#endif // TODO(macOS ISS#2323203)
|
||||
CGFloat textViewTileSize = MAX(screenSize.width, screenSize.height) * 1.5;
|
||||
|
||||
if (self.frame.size.width > textViewTileSize || self.frame.size.height > textViewTileSize) {
|
||||
|
|
@ -196,7 +199,11 @@
|
|||
if (_asyncTiledLayer == nil) {
|
||||
RCTTextTiledLayer *layer = [RCTTextTiledLayer layer];
|
||||
layer.delegate = _renderer;
|
||||
layer.contentsScale = RCTScreenScale();
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
layer.contentsScale = RCTScreenScaleRCTScreenScale();
|
||||
#else
|
||||
layer.contentsScale = 1.0;
|
||||
#endif // TODO(macOS ISS#2323203)
|
||||
layer.tileSize = CGSizeMake(textViewTileSize, textViewTileSize);
|
||||
_asyncTiledLayer = layer;
|
||||
[self.layer addSublayer:layer];
|
||||
|
|
@ -215,7 +222,11 @@
|
|||
if (_syncLayer == nil) {
|
||||
CALayer *layer = [CALayer layer];
|
||||
layer.delegate = _renderer;
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
layer.contentsScale = RCTScreenScale();
|
||||
#else
|
||||
layer.contentsScale = 1.0;
|
||||
#endif // TODO(macOS ISS#2323203)
|
||||
_syncLayer = layer;
|
||||
[self.layer addSublayer:layer];
|
||||
[layer setNeedsDisplay];
|
||||
|
|
@ -247,7 +258,11 @@
|
|||
inTextContainer:textContainer
|
||||
usingBlock:
|
||||
^(CGRect enclosingRect, __unused BOOL *anotherStop) {
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#3536887)
|
||||
UIBezierPath *path = [UIBezierPath bezierPathWithRoundedRect:CGRectInset(enclosingRect, -2, -2) cornerRadius:2];
|
||||
#else // TODO(macOS ISS#3536887)
|
||||
NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:CGRectInset(enclosingRect, -2, -2) xRadius:2 yRadius:2];
|
||||
#endif // TODO(macOS ISS#3536887)
|
||||
if (highlightPath) {
|
||||
UIBezierPathAppendPath(highlightPath, path); // TODO(macOS ISS#2323203)
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -373,10 +373,11 @@ static UIColor *defaultPlaceholderColor()
|
|||
{
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
CGSize contentSize = super.contentSize;
|
||||
CGSize placeholderSize = _placeholderView.isHidden ? CGSizeZero : self.placeholderSize;
|
||||
#else // [TODO(macOS ISS#2323203)
|
||||
CGSize contentSize = super.intrinsicContentSize;
|
||||
CGSize placeholderSize = self.placeholderSize;
|
||||
#endif // ]TODO(macOS ISS#2323203)
|
||||
CGSize placeholderSize = _placeholderView.isHidden ? CGSizeZero : self.placeholderSize;
|
||||
// When a text input is empty, it actually displays a placehoder.
|
||||
// So, we have to consider `placeholderSize` as a minimum `contentSize`.
|
||||
// Returning size DOES contain `textContainerInset` (aka `padding`).
|
||||
|
|
@ -406,7 +407,13 @@ static UIColor *defaultPlaceholderColor()
|
|||
- (CGSize)sizeThatFits:(CGSize)size
|
||||
{
|
||||
// Returned fitting size depends on text size and placeholder size.
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
CGSize textSize = [super sizeThatFits:size];
|
||||
#else
|
||||
[self.layoutManager glyphRangeForTextContainer:self.textContainer];
|
||||
NSRect rect = [self.layoutManager usedRectForTextContainer:self.textContainer];
|
||||
CGSize textSize = CGSizeMake(MIN(rect.size.width, size.width), rect.size.height);
|
||||
#endif // TODO(macOS ISS#2323203)
|
||||
CGSize placeholderSize = self.placeholderSize;
|
||||
// Returning size DOES contain `textContainerInset` (aka `padding`).
|
||||
return CGSizeMake(MAX(textSize.width, placeholderSize.width), MAX(textSize.height, placeholderSize.height));
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|||
#endif // ]TODO(macOS ISS#2323203)
|
||||
|
||||
@optional
|
||||
- (void)scrollViewDidScroll:(UIScrollView *)scrollView;
|
||||
- (void)scrollViewDidScroll:(RCTUIScrollView *)scrollView;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -233,7 +233,7 @@ static UIColor *defaultPlaceholderTextColor()
|
|||
|
||||
- (NSString*)placeholder // [TODO(macOS ISS#2323203)
|
||||
{
|
||||
#if !TARGET_OS_OSX
|
||||
#if !TARGET_OS_OSX
|
||||
return super.placeholder;
|
||||
#else
|
||||
return self.placeholderAttributedString.string ?: self.placeholderString;
|
||||
|
|
@ -245,7 +245,9 @@ static UIColor *defaultPlaceholderTextColor()
|
|||
if ([reactTextAttributes isEqual:_reactTextAttributes]) {
|
||||
return;
|
||||
}
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
self.defaultTextAttributes = reactTextAttributes.effectiveTextAttributes;
|
||||
#endif // TODO(macOS ISS#2323203)
|
||||
_reactTextAttributes = reactTextAttributes;
|
||||
[self _updatePlaceholder];
|
||||
}
|
||||
|
|
@ -485,11 +487,12 @@ static UIColor *defaultPlaceholderTextColor()
|
|||
{
|
||||
// Note: `placeholder` defines intrinsic size for `<TextInput>`.
|
||||
NSString *text = self.placeholder ?: @"";
|
||||
CGSize size = [text sizeWithAttributes:[self placeholderEffectiveTextAttributes]];
|
||||
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
CGSize size = [text sizeWithAttributes:[self placeholderEffectiveTextAttributes]];
|
||||
size = CGSizeMake(RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height));
|
||||
#else // [TODO(macOS ISS#2323203)
|
||||
CGSize size = [text sizeWithAttributes:@{NSFontAttributeName: self.font}];
|
||||
CGFloat scale = self.window.backingScaleFactor;
|
||||
RCTAssert(scale != 0.0, @"Layout occurs before the view is in a window?");
|
||||
if (scale == 0) {
|
||||
|
|
|
|||
|
|
@ -175,6 +175,7 @@
|
|||
9F5C182B230B4F7400E3E5A7 /* libRCTBlob-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6484CE5A201A7557004275A4 /* libRCTBlob-macOS.a */; };
|
||||
9F5C182C230B7A6800E3E5A7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D122242EFA400E7F88E /* libReact.a */; };
|
||||
9F5C182D230B7A7E00E3E5A7 /* libRCTPushNotification-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6424F7B21F669A8E0025D741 /* libRCTPushNotification-macOS.a */; };
|
||||
9F5C1958230F46CB00E3E5A7 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F5C1923230F46CB00E3E5A7 /* JavaScriptCore.framework */; };
|
||||
AFEACA842223EB05004E5198 /* CrashyCrash.m in Sources */ = {isa = PBXBuildFile; fileRef = AFEACA832223EB05004E5198 /* CrashyCrash.m */; };
|
||||
BC9C03401DC9F1D600B1C635 /* RCTDevMenuTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BC9C033F1DC9F1D600B1C635 /* RCTDevMenuTests.m */; };
|
||||
C60A228221C9726800B820FE /* RCTFormatErrorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C60A228121C9726800B820FE /* RCTFormatErrorTests.m */; };
|
||||
|
|
@ -893,6 +894,7 @@
|
|||
8385CEF41B873B5C00C6273E /* RCTImageLoaderTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderTests.m; sourceTree = "<group>"; };
|
||||
8385CF031B87479200C6273E /* RCTImageLoaderHelpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTImageLoaderHelpers.m; sourceTree = "<group>"; };
|
||||
8385CF051B8747A000C6273E /* RCTImageLoaderHelpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTImageLoaderHelpers.h; sourceTree = "<group>"; };
|
||||
9F5C1923230F46CB00E3E5A7 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
|
||||
AFEACA822223EB05004E5198 /* CrashyCrash.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CrashyCrash.h; sourceTree = "<group>"; };
|
||||
AFEACA832223EB05004E5198 /* CrashyCrash.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CrashyCrash.m; sourceTree = "<group>"; };
|
||||
BC9C033F1DC9F1D600B1C635 /* RCTDevMenuTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDevMenuTests.m; sourceTree = "<group>"; };
|
||||
|
|
@ -966,6 +968,7 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
9F5C1958230F46CB00E3E5A7 /* JavaScriptCore.framework in Frameworks */,
|
||||
9F5C182C230B7A6800E3E5A7 /* libReact.a in Frameworks */,
|
||||
9F5C182B230B4F7400E3E5A7 /* libRCTBlob-macOS.a in Frameworks */,
|
||||
9F5C182A230B4F7000E3E5A7 /* libART-macOS.a in Frameworks */,
|
||||
|
|
@ -1385,6 +1388,7 @@
|
|||
2DE7E7D81FB2A4F3009E225D /* Frameworks */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
9F5C1923230F46CB00E3E5A7 /* JavaScriptCore.framework */,
|
||||
ED2970982150247000B7C4FE /* JavaScriptCore.framework */,
|
||||
EDEBC7DA214C681C00DD5AC8 /* JavaScriptCore.framework */,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithCoder:(NSCoder *)coder)
|
|||
|
||||
- (void)_updateReactTouchAtIndex:(NSInteger)touchIndex
|
||||
{
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
#if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
|
||||
UITouch *nativeTouch = _nativeTouches[touchIndex];
|
||||
CGPoint windowLocation = [nativeTouch locationInView:nativeTouch.window];
|
||||
RCTAssert(_cachedRootView, @"We were unable to find a root view for the touch");
|
||||
|
|
|
|||
|
|
@ -265,7 +265,6 @@
|
|||
1854FF1B1EF484760008DADC /* UIView+React.h in Headers */ = {isa = PBXBuildFile; fileRef = 13E067531A70F44B002CDEE1 /* UIView+React.h */; };
|
||||
1854FF211EF485000008DADC /* YGEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 130A77031DF767AF001F9587 /* YGEnums.h */; };
|
||||
1854FF221EF485000008DADC /* YGMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 130A77041DF767AF001F9587 /* YGMacros.h */; };
|
||||
1854FF241EF485000008DADC /* (null) in Headers */ = {isa = PBXBuildFile; };
|
||||
1854FF261EF485000008DADC /* Yoga.h in Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
|
||||
1854FF291EF4855F0008DADC /* YGMacros.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77041DF767AF001F9587 /* YGMacros.h */; };
|
||||
1854FF2B1EF4855F0008DADC /* Yoga.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 130A77081DF767AF001F9587 /* Yoga.h */; };
|
||||
|
|
@ -299,7 +298,6 @@
|
|||
18572B9F1EF32003007EAD54 /* RCTUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BF8B4B21EC550F500061E2F /* RCTUIKit.h */; };
|
||||
18632C021EF495D40010A3BB /* libcxxreact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B857F421EC51FCF00A9D063 /* libcxxreact.a */; };
|
||||
18632C051EF495D40010A3BB /* libthird-party.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 188202A21EF48CF700C9B354 /* libthird-party.a */; };
|
||||
18632C061EF495D40010A3BB /* libyoga.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B857F341EC51FCC00A9D063 /* libyoga.a */; };
|
||||
18632C1A1EF49C9D0010A3BB /* CxxModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A71E03699D0018521A /* CxxModule.h */; };
|
||||
18632C1B1EF49C9D0010A3BB /* CxxNativeModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0A91E03699D0018521A /* CxxNativeModule.h */; };
|
||||
18632C1C1EF49C9D0010A3BB /* JSExecutor.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0AB1E03699D0018521A /* JSExecutor.h */; };
|
||||
|
|
@ -1615,6 +1613,11 @@
|
|||
9F5C1830230C67CA00E3E5A7 /* RCTSurfacePresenterStub.m in Sources */ = {isa = PBXBuildFile; fileRef = 0EEEA8DE2239002200A8C82D /* RCTSurfacePresenterStub.m */; };
|
||||
9F5C1840230DB54100E3E5A7 /* RCTSurfacePresenterStub.h in Headers */ = {isa = PBXBuildFile; fileRef = 589515DF2231AD9C0036BDE0 /* RCTSurfacePresenterStub.h */; };
|
||||
9F5C1841230DB6F300E3E5A7 /* RCTSurfacePresenterStub.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 589515DF2231AD9C0036BDE0 /* RCTSurfacePresenterStub.h */; };
|
||||
9F5C195A230F4CB300E3E5A7 /* YGFloatOptional.h in Headers */ = {isa = PBXBuildFile; fileRef = 53DEF6E7205AE59C006A3890 /* YGFloatOptional.h */; };
|
||||
9F5C195C230F4CE200E3E5A7 /* YGMarker.h in Headers */ = {isa = PBXBuildFile; fileRef = AC8360CC21B0256A00FC46B9 /* YGMarker.h */; };
|
||||
9F5C195D230F4CE700E3E5A7 /* YGConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE2080120772F7C009A43B3 /* YGConfig.h */; };
|
||||
9F5C195E230F4CED00E3E5A7 /* YGValue.h in Headers */ = {isa = PBXBuildFile; fileRef = AC6B69E221B1467C00B2B68A /* YGValue.h */; };
|
||||
9F5C195F230F4CF300E3E5A7 /* CompactValue.h in Headers */ = {isa = PBXBuildFile; fileRef = AC90463D21C91CC2005B24B3 /* CompactValue.h */; };
|
||||
9FB7D34C224954A600F31D11 /* libjsinspector-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F2AC95E2239D788005C9C14 /* libjsinspector-macOS.a */; };
|
||||
9FB7D34D224954B300F31D11 /* libjsi-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D78224303D900E7F88E /* libjsi-macOS.a */; };
|
||||
9FB7D34E224954CC00F31D11 /* libjsiexecutor-macOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD21D94224305AA00E7F88E /* libjsiexecutor-macOS.a */; };
|
||||
|
|
@ -3068,7 +3071,6 @@
|
|||
68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTBundleURLProvider.m; sourceTree = "<group>"; };
|
||||
6A15FB0C1BDF663500531DFB /* RCTRootViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRootViewInternal.h; sourceTree = "<group>"; };
|
||||
6B7049C81EDF81E3005670F5 /* RCTPlatform.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTPlatform.m; sourceTree = "<group>"; };
|
||||
6B857F341EC51FCC00A9D063 /* libyoga.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libyoga.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
6B857F421EC51FCF00A9D063 /* libcxxreact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcxxreact.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
6BDE7A171ECA38AC00CC951F /* RCTUIKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTUIKit.m; sourceTree = "<group>"; };
|
||||
6BF8B4B21EC550F500061E2F /* RCTUIKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTUIKit.h; sourceTree = "<group>"; };
|
||||
|
|
@ -3116,6 +3118,7 @@
|
|||
9F0D892F224166050053729F /* Unicode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unicode.cpp; path = folly/Unicode.cpp; sourceTree = "<group>"; };
|
||||
9F2AC95D2239D788005C9C14 /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
9F2AC95E2239D788005C9C14 /* libjsinspector-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsinspector-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
9F5C195B230F4CB300E3E5A7 /* libyoga.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libyoga.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
9FD21D78224303D900E7F88E /* libjsi-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsi-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
9FD21D94224305AA00E7F88E /* libjsiexecutor-macOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libjsiexecutor-macOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReloadCommand.h; sourceTree = "<group>"; };
|
||||
|
|
@ -3189,7 +3192,6 @@
|
|||
18632C021EF495D40010A3BB /* libcxxreact.a in Frameworks */,
|
||||
9FB7D34D224954B300F31D11 /* libjsi-macOS.a in Frameworks */,
|
||||
9FB7D34E224954CC00F31D11 /* libjsiexecutor-macOS.a in Frameworks */,
|
||||
18632C061EF495D40010A3BB /* libyoga.a in Frameworks */,
|
||||
9FB7D34F224954EE00F31D11 /* libdouble-conversion.a in Frameworks */,
|
||||
18632C051EF495D40010A3BB /* libthird-party.a in Frameworks */,
|
||||
);
|
||||
|
|
@ -3833,6 +3835,7 @@
|
|||
9F2AC95E2239D788005C9C14 /* libjsinspector-macOS.a */,
|
||||
9FD21D78224303D900E7F88E /* libjsi-macOS.a */,
|
||||
9FD21D94224305AA00E7F88E /* libjsiexecutor-macOS.a */,
|
||||
9F5C195B230F4CB300E3E5A7 /* libyoga.a */,
|
||||
);
|
||||
name = Products;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -3949,7 +3952,6 @@
|
|||
6B857F421EC51FCF00A9D063 /* libcxxreact.a */,
|
||||
1882027C1EF48B7E00C9B354 /* libdouble-conversion.a */,
|
||||
188202A21EF48CF700C9B354 /* libthird-party.a */,
|
||||
6B857F341EC51FCC00A9D063 /* libyoga.a */,
|
||||
18F3BA0E2142F4DB00AD247D /* RCTWebView.m */,
|
||||
);
|
||||
name = "Recovered References";
|
||||
|
|
@ -4265,16 +4267,20 @@
|
|||
isa = PBXHeadersBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1854FF261EF485000008DADC /* Yoga.h in Headers */,
|
||||
18F3B9E22142F15D00AD247D /* YGNodePrint.h in Headers */,
|
||||
1854FF241EF485000008DADC /* (null) in Headers */,
|
||||
9F5C195F230F4CF300E3E5A7 /* CompactValue.h in Headers */,
|
||||
9F5C195E230F4CED00E3E5A7 /* YGValue.h in Headers */,
|
||||
9F5C195D230F4CE700E3E5A7 /* YGConfig.h in Headers */,
|
||||
9F5C195C230F4CE200E3E5A7 /* YGMarker.h in Headers */,
|
||||
18F3B9DF2142F15400AD247D /* YGStyle.h in Headers */,
|
||||
1854FF211EF485000008DADC /* YGEnums.h in Headers */,
|
||||
18F3B9E32142F16000AD247D /* Yoga-internal.h in Headers */,
|
||||
18F3B9E12142F15A00AD247D /* YGNode.h in Headers */,
|
||||
18F3B9E32142F16000AD247D /* Yoga-internal.h in Headers */,
|
||||
1854FF211EF485000008DADC /* YGEnums.h in Headers */,
|
||||
1854FF261EF485000008DADC /* Yoga.h in Headers */,
|
||||
18F3B9E02142F15800AD247D /* Utils.h in Headers */,
|
||||
18F3B9E22142F15D00AD247D /* YGNodePrint.h in Headers */,
|
||||
1854FF221EF485000008DADC /* YGMacros.h in Headers */,
|
||||
18F3B9DE2142F15100AD247D /* YGLayout.h in Headers */,
|
||||
9F5C195A230F4CB300E3E5A7 /* YGFloatOptional.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
|
@ -5147,7 +5153,7 @@
|
|||
);
|
||||
name = "yoga-macOS";
|
||||
productName = React;
|
||||
productReference = 6B857F341EC51FCC00A9D063 /* libyoga.a */;
|
||||
productReference = 9F5C195B230F4CB300E3E5A7 /* libyoga.a */;
|
||||
productType = "com.apple.product-type.library.static";
|
||||
};
|
||||
6B857F351EC51FCF00A9D063 /* cxxreact-macOS */ = {
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче