Skip to content

Commit f1055bc

Browse files
priteshrnandgaonkarfacebook-github-bot
priteshrnandgaonkar
authored and
facebook-github-bot
committed
Make YGNode as c++ struct with properties exposed through accessors
Reviewed By: emilsjolander Differential Revision: D6592257 fbshipit-source-id: 641e8b9462ad00731a094511f9f5608b23a6bb21
1 parent 30da262 commit f1055bc

File tree

11 files changed

+1902
-1039
lines changed

11 files changed

+1902
-1039
lines changed

‎Libraries/Text/RCTShadowText.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ - (instancetype)init
7474
_writingDirection = NSWritingDirectionNatural;
7575
_cachedLayoutDirection = UIUserInterfaceLayoutDirectionLeftToRight;
7676

77-
YGNodeSetMeasureFunc(self.yogaNode, RCTMeasure);
77+
YGNodeSetMeasureFunc(self.yogaNode, RCTMeasure);
7878

7979
[[NSNotificationCenter defaultCenter] addObserver:self
8080
selector:@selector(contentSizeMultiplierDidChange:)

‎Libraries/Text/RCTText.xcodeproj/project.pbxproj

+6-7
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@
1515
2D3B5F331D9B102D00451313 /* RCTTextSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = 19FC5C841D41A4120090108F /* RCTTextSelection.m */; };
1616
2D3B5F341D9B103100451313 /* RCTRawTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */; };
1717
2D3B5F351D9B103300451313 /* RCTShadowRawText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */; };
18-
2D3B5F361D9B106F00451313 /* RCTShadowText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CB1A9E6C5C00147676 /* RCTShadowText.m */; };
1918
2D3B5F371D9B106F00451313 /* RCTText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B512141A9E6EFF00147676 /* RCTText.m */; };
2019
2D3B5F381D9B106F00451313 /* RCTTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CD1A9E6C5C00147676 /* RCTTextManager.m */; };
2120
2D3B5F391D9B106F00451313 /* RCTTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 1362F0FD1B4D51F400E06D8C /* RCTTextField.m */; };
2221
2D3B5F3A1D9B106F00451313 /* RCTTextFieldManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 1362F0FF1B4D51F400E06D8C /* RCTTextFieldManager.m */; };
2322
2D3B5F3B1D9B106F00451313 /* RCTTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6ABD1AF0CD0600FFC3E0 /* RCTTextView.m */; };
2423
2D3B5F3C1D9B106F00451313 /* RCTTextViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 131B6ABF1AF0CD0600FFC3E0 /* RCTTextViewManager.m */; };
25-
2DEAB2901F84BA4300FC6B42 /* RCTFontAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = A85C82991F742AA20036C019 /* RCTFontAttributes.m */; };
24+
5335D53F1FE8196200883D58 /* RCTShadowText.m in Sources */ = {isa = PBXBuildFile; fileRef = 5335D53E1FE8196100883D58 /* RCTShadowText.m */; };
2625
58B511CE1A9E6C5C00147676 /* RCTRawTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */; };
2726
58B511CF1A9E6C5C00147676 /* RCTShadowRawText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */; };
28-
58B511D01A9E6C5C00147676 /* RCTShadowText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CB1A9E6C5C00147676 /* RCTShadowText.m */; };
2927
58B511D11A9E6C5C00147676 /* RCTTextManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B511CD1A9E6C5C00147676 /* RCTTextManager.m */; };
3028
58B512161A9E6EFF00147676 /* RCTText.m in Sources */ = {isa = PBXBuildFile; fileRef = 58B512141A9E6EFF00147676 /* RCTText.m */; };
3129
598F41261F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 598F41251F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m */; };
@@ -89,13 +87,13 @@
8987
19FC5C841D41A4120090108F /* RCTTextSelection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextSelection.m; sourceTree = "<group>"; };
9088
19FC5C861D41A4220090108F /* RCTTextSelection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTTextSelection.h; sourceTree = "<group>"; };
9189
2D2A287B1D9B048500D4039D /* libRCTText-tvOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libRCTText-tvOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
90+
5335D53E1FE8196100883D58 /* RCTShadowText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowText.m; sourceTree = "<group>"; };
9291
58B5119B1A9E6C1200147676 /* libRCTText.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTText.a; sourceTree = BUILT_PRODUCTS_DIR; };
9392
58B511C61A9E6C5C00147676 /* RCTRawTextManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTRawTextManager.h; sourceTree = "<group>"; };
9493
58B511C71A9E6C5C00147676 /* RCTRawTextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRawTextManager.m; sourceTree = "<group>"; };
9594
58B511C81A9E6C5C00147676 /* RCTShadowRawText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowRawText.h; sourceTree = "<group>"; };
9695
58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowRawText.m; sourceTree = "<group>"; };
9796
58B511CA1A9E6C5C00147676 /* RCTShadowText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTShadowText.h; sourceTree = "<group>"; };
98-
58B511CB1A9E6C5C00147676 /* RCTShadowText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTShadowText.m; sourceTree = "<group>"; };
9997
58B511CC1A9E6C5C00147676 /* RCTTextManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTextManager.h; sourceTree = "<group>"; };
10098
58B511CD1A9E6C5C00147676 /* RCTTextManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTextManager.m; sourceTree = "<group>"; };
10199
58B512141A9E6EFF00147676 /* RCTText.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTText.m; sourceTree = "<group>"; };
@@ -125,6 +123,7 @@
125123
58B511921A9E6C1200147676 = {
126124
isa = PBXGroup;
127125
children = (
126+
5335D53E1FE8196100883D58 /* RCTShadowText.m */,
128127
58B5119C1A9E6C1200147676 /* Products */,
129128
598F41231F145D4900B8495B /* RCTBackedTextInputDelegate.h */,
130129
598F41241F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.h */,
@@ -140,7 +139,6 @@
140139
58B511C81A9E6C5C00147676 /* RCTShadowRawText.h */,
141140
58B511C91A9E6C5C00147676 /* RCTShadowRawText.m */,
142141
58B511CA1A9E6C5C00147676 /* RCTShadowText.h */,
143-
58B511CB1A9E6C5C00147676 /* RCTShadowText.m */,
144142
59F60E8D1E661BDD0081153B /* RCTShadowTextField.h */,
145143
59F60E8E1E661BDD0081153B /* RCTShadowTextField.m */,
146144
59F60E8F1E661BDD0081153B /* RCTShadowTextView.h */,
@@ -259,7 +257,6 @@
259257
2D3B5F371D9B106F00451313 /* RCTText.m in Sources */,
260258
2D3B5F381D9B106F00451313 /* RCTTextManager.m in Sources */,
261259
2D3B5F391D9B106F00451313 /* RCTTextField.m in Sources */,
262-
2D3B5F361D9B106F00451313 /* RCTShadowText.m in Sources */,
263260
2D3B5F3B1D9B106F00451313 /* RCTTextView.m in Sources */,
264261
59AF89AB1EDCBCC700F004B1 /* RCTUITextField.m in Sources */,
265262
598F41271F145D4900B8495B /* RCTBackedTextInputDelegateAdapter.m in Sources */,
@@ -283,6 +280,7 @@
283280
files = (
284281
58B511D11A9E6C5C00147676 /* RCTTextManager.m in Sources */,
285282
131B6AC01AF0CD0600FFC3E0 /* RCTTextView.m in Sources */,
283+
5335D53F1FE8196200883D58 /* RCTShadowText.m in Sources */,
286284
58B511CE1A9E6C5C00147676 /* RCTRawTextManager.m in Sources */,
287285
19FC5C851D41A4120090108F /* RCTTextSelection.m in Sources */,
288286
1362F1001B4D51F400E06D8C /* RCTTextField.m in Sources */,
@@ -298,7 +296,6 @@
298296
131B6AC11AF0CD0600FFC3E0 /* RCTTextViewManager.m in Sources */,
299297
59F60E931E661BDD0081153B /* RCTShadowTextView.m in Sources */,
300298
58B511CF1A9E6C5C00147676 /* RCTShadowRawText.m in Sources */,
301-
58B511D01A9E6C5C00147676 /* RCTShadowText.m in Sources */,
302299
);
303300
runOnlyForDeploymentPostprocessing = 0;
304301
};
@@ -432,6 +429,7 @@
432429
58B511B01A9E6C1300147676 /* Debug */ = {
433430
isa = XCBuildConfiguration;
434431
buildSettings = {
432+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
435433
CLANG_STATIC_ANALYZER_MODE = deep;
436434
OTHER_LDFLAGS = "-ObjC";
437435
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -442,6 +440,7 @@
442440
58B511B11A9E6C1300147676 /* Release */ = {
443441
isa = XCBuildConfiguration;
444442
buildSettings = {
443+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
445444
CLANG_STATIC_ANALYZER_MODE = deep;
446445
OTHER_LDFLAGS = "-ObjC";
447446
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)