Skip to content

Commit a0ff8c7

Browse files
javachefacebook-github-bot
authored andcommitted
Fix ReactLegacy and delete RCTViewControllerProtocol
Summary: It's always bothered that we have this protocol and I figured it could just be merged with RCTWrapperViewController. Closes #17290 Reviewed By: mmmulani Differential Revision: D6611544 Pulled By: javache fbshipit-source-id: a50b9d5adbeb2c48dbadbbfc1c77ccf6d1aae144
1 parent 2e008bc commit a0ff8c7

File tree

9 files changed

+370
-149
lines changed

9 files changed

+370
-149
lines changed

RNTester/RNTester.xcodeproj/project.pbxproj

+30
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,20 @@
412412
remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
413413
remoteInfo = "fishhook-tvOS";
414414
};
415+
3DCE53211FEAB1C500613583 /* PBXContainerItemProxy */ = {
416+
isa = PBXContainerItemProxy;
417+
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
418+
proxyType = 2;
419+
remoteGlobalIDString = EBF21BDC1FC498900052F4D5;
420+
remoteInfo = jsinspector;
421+
};
422+
3DCE53231FEAB1C500613583 /* PBXContainerItemProxy */ = {
423+
isa = PBXContainerItemProxy;
424+
containerPortal = 14AADEFF1AC3DB95002390C9 /* React.xcodeproj */;
425+
proxyType = 2;
426+
remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5;
427+
remoteInfo = "jsinspector-tvOS";
428+
};
415429
5281CA501EEAC9A700AC40CD /* PBXContainerItemProxy */ = {
416430
isa = PBXContainerItemProxy;
417431
containerPortal = 5281CA4B1EEAC9A700AC40CD /* RCTBlob.xcodeproj */;
@@ -826,6 +840,8 @@
826840
3D05748E1DE6008900184BB4 /* libcxxreact.a */,
827841
3D0574901DE6008900184BB4 /* libjschelpers.a */,
828842
3D0574921DE6008900184BB4 /* libjschelpers.a */,
843+
3DCE53221FEAB1C500613583 /* libjsinspector.a */,
844+
3DCE53241FEAB1C500613583 /* libjsinspector-tvOS.a */,
829845
3D507F421EBC88B700B56834 /* libthird-party.a */,
830846
2D66FF8C1ECA405900F0A767 /* libthird-party.a */,
831847
3D507F441EBC88B700B56834 /* libdouble-conversion.a */,
@@ -1497,6 +1513,20 @@
14971513
remoteRef = 3DBE0D341F3B18670099AA32 /* PBXContainerItemProxy */;
14981514
sourceTree = BUILT_PRODUCTS_DIR;
14991515
};
1516+
3DCE53221FEAB1C500613583 /* libjsinspector.a */ = {
1517+
isa = PBXReferenceProxy;
1518+
fileType = archive.ar;
1519+
path = libjsinspector.a;
1520+
remoteRef = 3DCE53211FEAB1C500613583 /* PBXContainerItemProxy */;
1521+
sourceTree = BUILT_PRODUCTS_DIR;
1522+
};
1523+
3DCE53241FEAB1C500613583 /* libjsinspector-tvOS.a */ = {
1524+
isa = PBXReferenceProxy;
1525+
fileType = archive.ar;
1526+
path = "libjsinspector-tvOS.a";
1527+
remoteRef = 3DCE53231FEAB1C500613583 /* PBXContainerItemProxy */;
1528+
sourceTree = BUILT_PRODUCTS_DIR;
1529+
};
15001530
5281CA511EEAC9A700AC40CD /* libRCTBlob.a */ = {
15011531
isa = PBXReferenceProxy;
15021532
fileType = archive.ar;

RNTester/RNTesterLegacy.xcodeproj/project.pbxproj

+10
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
3D4153641F277011005B8EFE /* libART-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D4153621F276FF9005B8EFE /* libART-tvOS.a */; };
111111
3D56F9F11D6F6E9B00F53A06 /* RNTesterBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 3D13F83E1D6F6AE000E69E0E /* RNTesterBundle.bundle */; };
112112
3DB99D0C1BA0340600302749 /* RNTesterIntegrationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 3DB99D0B1BA0340600302749 /* RNTesterIntegrationTests.m */; };
113+
3DCE52BC1FEAAF8F00613583 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1380DC9B1E70C0DD00E7C47D /* libReact.a */; };
113114
3DD981D61D33C6FB007DC7BE /* RNTesterUnitTestsBundle.js in Resources */ = {isa = PBXBuildFile; fileRef = 3DD981D51D33C6FB007DC7BE /* RNTesterUnitTestsBundle.js */; };
114115
68FF44381CF6111500720EFD /* RCTBundleURLProviderTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 68FF44371CF6111500720EFD /* RCTBundleURLProviderTests.m */; };
115116
834C36EC1AF8DED70019C93C /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 834C36D21AF8DA610019C93C /* libRCTSettings.a */; };
@@ -535,6 +536,7 @@
535536
isa = PBXFrameworksBuildPhase;
536537
buildActionMask = 2147483647;
537538
files = (
539+
3DCE52BC1FEAAF8F00613583 /* libReact.a in Frameworks */,
538540
3D4153641F277011005B8EFE /* libART-tvOS.a in Frameworks */,
539541
2DD323E31DA2DE3F000FE1B8 /* libRCTAnimation.a in Frameworks */,
540542
3D302F221DF8285100D6DDAE /* libRCTImage-tvOS.a in Frameworks */,
@@ -833,6 +835,13 @@
833835
name = Products;
834836
sourceTree = "<group>";
835837
};
838+
3DCE52B31FEAAF8F00613583 /* Frameworks */ = {
839+
isa = PBXGroup;
840+
children = (
841+
);
842+
name = Frameworks;
843+
sourceTree = "<group>";
844+
};
836845
58005BE51ABA80530062E044 /* Products */ = {
837846
isa = PBXGroup;
838847
children = (
@@ -862,6 +871,7 @@
862871
14D6D6EA1B2205C0001FB087 /* OCMock */,
863872
2DD323911DA2DD8B000FE1B8 /* RNTester-tvOS */,
864873
83CBBA001A601CBA00E9B192 /* Products */,
874+
3DCE52B31FEAAF8F00613583 /* Frameworks */,
865875
);
866876
indentWidth = 2;
867877
sourceTree = "<group>";

React/Modules/RCTRedBoxExtraDataViewController.m

+7
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,12 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style
4141
constraintEqualToAnchor:contentLayout.widthAnchor
4242
multiplier:0.3].active = YES;
4343

44+
4445
self.keyLabel.textColor = [UIColor whiteColor];
4546
self.keyLabel.numberOfLines = 0;
47+
#if !TARGET_OS_TV
4648
self.keyLabel.lineBreakMode = UILineBreakModeWordWrap;
49+
#endif
4750
self.keyLabel.font = [UIFont fontWithName:@"Menlo-Regular" size:12.0f];
4851

4952
self.valueLabel = [UILabel new];
@@ -62,7 +65,9 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style
6265

6366
self.valueLabel.textColor = [UIColor whiteColor];
6467
self.valueLabel.numberOfLines = 0;
68+
#if !TARGET_OS_TV
6569
self.valueLabel.lineBreakMode = UILineBreakModeWordWrap;
70+
#endif
6671
self.valueLabel.font = [UIFont fontWithName:@"Menlo-Regular" size:12.0f];
6772
}
6873
return self;
@@ -98,7 +103,9 @@ - (instancetype)init
98103
_tableView.dataSource = self;
99104
_tableView.backgroundColor = [UIColor clearColor];
100105
_tableView.estimatedRowHeight = 200;
106+
#if !TARGET_OS_TV
101107
_tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
108+
#endif
102109
_tableView.rowHeight = UITableViewAutomaticDimension;
103110
_tableView.allowsSelection = NO;
104111

0 commit comments

Comments
 (0)