Skip to content

Commit 0d6908f

Browse files
joevilchesfacebook-github-bot
joevilches
authored and
facebook-github-bot
committed
Sunset the value namespace (facebook#46930)
Summary: X-link: facebook/yoga#1720 Pull Request resolved: facebook#46930 This is not really needed anymore, we can just use `StyleLength` statics instead Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D63922280 fbshipit-source-id: cd953bae8e9f68574463eafc49c33c2e85ac1856
1 parent b70709d commit 0d6908f

File tree

13 files changed

+145
-169
lines changed

13 files changed

+145
-169
lines changed

‎packages/react-native/React/Tests/Text/RCTParagraphComponentViewTests.mm

+20-20
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ - (void)setUp
121121
auto &props = *sharedProps;
122122
props.layoutConstraints = LayoutConstraints{{0, 0}, {500, 500}};
123123
auto &yogaStyle = props.yogaStyle;
124-
yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
125-
yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(200));
124+
yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
125+
yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
126126
return sharedProps;
127127
})
128128
.children({
@@ -134,10 +134,10 @@ - (void)setUp
134134
props.accessible = true;
135135
auto &yogaStyle = props.yogaStyle;
136136
yogaStyle.setPositionType(yoga::PositionType::Absolute);
137-
yogaStyle.setPosition(yoga::Edge::Left, yoga::value::points(0));
138-
yogaStyle.setPosition(yoga::Edge::Top, yoga::value::points(0));
139-
yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
140-
yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(200));
137+
yogaStyle.setPosition(yoga::Edge::Left, yoga::StyleLength::points(0));
138+
yogaStyle.setPosition(yoga::Edge::Top, yoga::StyleLength::points(0));
139+
yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
140+
yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
141141
return sharedProps;
142142
})
143143
.children({
@@ -214,10 +214,10 @@ - (void)setUp
214214
props.accessible = true;
215215
auto &yogaStyle = props.yogaStyle;
216216
yogaStyle.setPositionType(yoga::PositionType::Absolute);
217-
yogaStyle.setPosition(yoga::Edge::Left, yoga::value::points(0));
218-
yogaStyle.setPosition(yoga::Edge::Top, yoga::value::points(30));
219-
yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
220-
yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(50));
217+
yogaStyle.setPosition(yoga::Edge::Left, yoga::StyleLength::points(0));
218+
yogaStyle.setPosition(yoga::Edge::Top, yoga::StyleLength::points(30));
219+
yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
220+
yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(50));
221221
return sharedProps;
222222
})
223223
.children({
@@ -258,10 +258,10 @@ - (void)setUp
258258
props.accessible = true;
259259
auto &yogaStyle = props.yogaStyle;
260260
yogaStyle.setPositionType(yoga::PositionType::Absolute);
261-
yogaStyle.setPosition(yoga::Edge::Left, yoga::value::points(0));
262-
yogaStyle.setPosition(yoga::Edge::Top, yoga::value::points(90));
263-
yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
264-
yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(50));
261+
yogaStyle.setPosition(yoga::Edge::Left, yoga::StyleLength::points(0));
262+
yogaStyle.setPosition(yoga::Edge::Top, yoga::StyleLength::points(90));
263+
yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
264+
yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(50));
265265
return sharedProps;
266266
})
267267
.children({
@@ -418,8 +418,8 @@ - (void)testEntireParagraphLink
418418
auto &props = *sharedProps;
419419
props.layoutConstraints = LayoutConstraints{{0, 0}, {500, 500}};
420420
auto &yogaStyle = props.yogaStyle;
421-
yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
422-
yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(200));
421+
yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
422+
yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(200));
423423
return sharedProps;
424424
})
425425
.children({
@@ -432,10 +432,10 @@ - (void)testEntireParagraphLink
432432
props.accessibilityTraits = AccessibilityTraits::Link;
433433
auto &yogaStyle = props.yogaStyle;
434434
yogaStyle.setPositionType(yoga::PositionType::Absolute);
435-
yogaStyle.setPosition(yoga::Edge::Left, yoga::value::points(0));
436-
yogaStyle.setPosition(yoga::Edge::Top, yoga::value::points(90));
437-
yogaStyle.setDimension(yoga::Dimension::Width, yoga::value::points(200));
438-
yogaStyle.setDimension(yoga::Dimension::Height, yoga::value::points(20));
435+
yogaStyle.setPosition(yoga::Edge::Left, yoga::StyleLength::points(0));
436+
yogaStyle.setPosition(yoga::Edge::Top, yoga::StyleLength::points(90));
437+
yogaStyle.setDimension(yoga::Dimension::Width, yoga::StyleLength::points(200));
438+
yogaStyle.setDimension(yoga::Dimension::Height, yoga::StyleLength::points(20));
439439
return sharedProps;
440440
})
441441
.children({

‎packages/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h

+8-6
Original file line numberDiff line numberDiff line change
@@ -105,23 +105,25 @@ class AndroidTextInputComponentDescriptor final
105105
!textInputProps.hasPaddingLeft &&
106106
!textInputProps.hasPaddingHorizontal) {
107107
changedPadding = true;
108-
style.setPadding(yoga::Edge::Start, yoga::value::points(theme.start));
108+
style.setPadding(
109+
yoga::Edge::Start, yoga::StyleLength::points(theme.start));
109110
}
110111
if (!textInputProps.hasPadding && !textInputProps.hasPaddingEnd &&
111112
!textInputProps.hasPaddingRight &&
112113
!textInputProps.hasPaddingHorizontal) {
113114
changedPadding = true;
114-
style.setPadding(yoga::Edge::End, yoga::value::points(theme.end));
115+
style.setPadding(yoga::Edge::End, yoga::StyleLength::points(theme.end));
115116
}
116117
if (!textInputProps.hasPadding && !textInputProps.hasPaddingTop &&
117118
!textInputProps.hasPaddingVertical) {
118119
changedPadding = true;
119-
style.setPadding(yoga::Edge::Top, yoga::value::points(theme.top));
120+
style.setPadding(yoga::Edge::Top, yoga::StyleLength::points(theme.top));
120121
}
121122
if (!textInputProps.hasPadding && !textInputProps.hasPaddingBottom &&
122123
!textInputProps.hasPaddingVertical) {
123124
changedPadding = true;
124-
style.setPadding(yoga::Edge::Bottom, yoga::value::points(theme.bottom));
125+
style.setPadding(
126+
yoga::Edge::Bottom, yoga::StyleLength::points(theme.bottom));
125127
}
126128

127129
// If the TextInput initially does not have paddingLeft or paddingStart, a
@@ -132,12 +134,12 @@ class AndroidTextInputComponentDescriptor final
132134
if ((textInputProps.hasPadding || textInputProps.hasPaddingLeft ||
133135
textInputProps.hasPaddingHorizontal) &&
134136
!textInputProps.hasPaddingStart) {
135-
style.setPadding(yoga::Edge::Start, yoga::value::undefined());
137+
style.setPadding(yoga::Edge::Start, yoga::StyleLength::undefined());
136138
}
137139
if ((textInputProps.hasPadding || textInputProps.hasPaddingRight ||
138140
textInputProps.hasPaddingHorizontal) &&
139141
!textInputProps.hasPaddingEnd) {
140-
style.setPadding(yoga::Edge::End, yoga::value::undefined());
142+
style.setPadding(yoga::Edge::End, yoga::StyleLength::undefined());
141143
}
142144

143145
// Note that this is expensive: on every adopt, we need to set the Yoga

‎packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp

+26-22
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,10 @@ void YogaLayoutableShadowNode::setSize(Size size) const {
532532
ensureUnsealed();
533533

534534
auto style = yogaNode_.style();
535-
style.setDimension(yoga::Dimension::Width, yoga::value::points(size.width));
536-
style.setDimension(yoga::Dimension::Height, yoga::value::points(size.height));
535+
style.setDimension(
536+
yoga::Dimension::Width, yoga::StyleLength::points(size.width));
537+
style.setDimension(
538+
yoga::Dimension::Height, yoga::StyleLength::points(size.height));
537539
yogaNode_.setStyle(style);
538540
yogaNode_.setDirty(true);
539541
}
@@ -543,19 +545,21 @@ void YogaLayoutableShadowNode::setPadding(RectangleEdges<Float> padding) const {
543545

544546
auto style = yogaNode_.style();
545547

546-
auto leftPadding = yoga::value::points(padding.left);
547-
auto topPadding = yoga::value::points(padding.top);
548-
auto rightPadding = yoga::value::points(padding.right);
549-
auto bottomPadding = yoga::value::points(padding.bottom);
548+
auto leftPadding = yoga::StyleLength::points(padding.left);
549+
auto topPadding = yoga::StyleLength::points(padding.top);
550+
auto rightPadding = yoga::StyleLength::points(padding.right);
551+
auto bottomPadding = yoga::StyleLength::points(padding.bottom);
550552

551553
if (leftPadding != style.padding(yoga::Edge::Left) ||
552554
topPadding != style.padding(yoga::Edge::Top) ||
553555
rightPadding != style.padding(yoga::Edge::Right) ||
554556
bottomPadding != style.padding(yoga::Edge::Bottom)) {
555-
style.setPadding(yoga::Edge::Top, yoga::value::points(padding.top));
556-
style.setPadding(yoga::Edge::Left, yoga::value::points(padding.left));
557-
style.setPadding(yoga::Edge::Right, yoga::value::points(padding.right));
558-
style.setPadding(yoga::Edge::Bottom, yoga::value::points(padding.bottom));
557+
style.setPadding(yoga::Edge::Top, yoga::StyleLength::points(padding.top));
558+
style.setPadding(yoga::Edge::Left, yoga::StyleLength::points(padding.left));
559+
style.setPadding(
560+
yoga::Edge::Right, yoga::StyleLength::points(padding.right));
561+
style.setPadding(
562+
yoga::Edge::Bottom, yoga::StyleLength::points(padding.bottom));
559563
yogaNode_.setStyle(style);
560564
yogaNode_.setDirty(true);
561565
}
@@ -622,16 +626,16 @@ void YogaLayoutableShadowNode::layoutTree(
622626
auto ownerHeight = yogaFloatFromFloat(maximumSize.height);
623627

624628
yogaStyle.setMaxDimension(
625-
yoga::Dimension::Width, yoga::value::points(maximumSize.width));
629+
yoga::Dimension::Width, yoga::StyleLength::points(maximumSize.width));
626630

627631
yogaStyle.setMaxDimension(
628-
yoga::Dimension::Height, yoga::value::points(maximumSize.height));
632+
yoga::Dimension::Height, yoga::StyleLength::points(maximumSize.height));
629633

630634
yogaStyle.setMinDimension(
631-
yoga::Dimension::Width, yoga::value::points(minimumSize.width));
635+
yoga::Dimension::Width, yoga::StyleLength::points(minimumSize.width));
632636

633637
yogaStyle.setMinDimension(
634-
yoga::Dimension::Height, yoga::value::points(minimumSize.height));
638+
yoga::Dimension::Height, yoga::StyleLength::points(minimumSize.height));
635639

636640
auto direction =
637641
yogaDirectionFromLayoutDirection(layoutConstraints.layoutDirection);
@@ -894,44 +898,44 @@ void YogaLayoutableShadowNode::swapLeftAndRightInYogaStyleProps() {
894898
if (yogaStyle.position(yoga::Edge::Left).isDefined()) {
895899
yogaStyle.setPosition(
896900
yoga::Edge::Start, yogaStyle.position(yoga::Edge::Left));
897-
yogaStyle.setPosition(yoga::Edge::Left, yoga::value::undefined());
901+
yogaStyle.setPosition(yoga::Edge::Left, yoga::StyleLength::undefined());
898902
}
899903

900904
if (yogaStyle.position(yoga::Edge::Right).isDefined()) {
901905
yogaStyle.setPosition(
902906
yoga::Edge::End, yogaStyle.position(yoga::Edge::Right));
903-
yogaStyle.setPosition(yoga::Edge::Right, yoga::value::undefined());
907+
yogaStyle.setPosition(yoga::Edge::Right, yoga::StyleLength::undefined());
904908
}
905909

906910
if (yogaStyle.padding(yoga::Edge::Left).isDefined()) {
907911
yogaStyle.setPadding(
908912
yoga::Edge::Start, yogaStyle.padding(yoga::Edge::Left));
909-
yogaStyle.setPadding(yoga::Edge::Left, yoga::value::undefined());
913+
yogaStyle.setPadding(yoga::Edge::Left, yoga::StyleLength::undefined());
910914
}
911915

912916
if (yogaStyle.padding(yoga::Edge::Right).isDefined()) {
913917
yogaStyle.setPadding(yoga::Edge::End, yogaStyle.padding(yoga::Edge::Right));
914-
yogaStyle.setPadding(yoga::Edge::Right, yoga::value::undefined());
918+
yogaStyle.setPadding(yoga::Edge::Right, yoga::StyleLength::undefined());
915919
}
916920

917921
if (yogaStyle.margin(yoga::Edge::Left).isDefined()) {
918922
yogaStyle.setMargin(yoga::Edge::Start, yogaStyle.margin(yoga::Edge::Left));
919-
yogaStyle.setMargin(yoga::Edge::Left, yoga::value::undefined());
923+
yogaStyle.setMargin(yoga::Edge::Left, yoga::StyleLength::undefined());
920924
}
921925

922926
if (yogaStyle.margin(yoga::Edge::Right).isDefined()) {
923927
yogaStyle.setMargin(yoga::Edge::End, yogaStyle.margin(yoga::Edge::Right));
924-
yogaStyle.setMargin(yoga::Edge::Right, yoga::value::undefined());
928+
yogaStyle.setMargin(yoga::Edge::Right, yoga::StyleLength::undefined());
925929
}
926930

927931
if (yogaStyle.border(yoga::Edge::Left).isDefined()) {
928932
yogaStyle.setBorder(yoga::Edge::Start, yogaStyle.border(yoga::Edge::Left));
929-
yogaStyle.setBorder(yoga::Edge::Left, yoga::value::undefined());
933+
yogaStyle.setBorder(yoga::Edge::Left, yoga::StyleLength::undefined());
930934
}
931935

932936
if (yogaStyle.border(yoga::Edge::Right).isDefined()) {
933937
yogaStyle.setBorder(yoga::Edge::End, yogaStyle.border(yoga::Edge::Right));
934-
yogaStyle.setBorder(yoga::Edge::Right, yoga::value::undefined());
938+
yogaStyle.setBorder(yoga::Edge::Right, yoga::StyleLength::undefined());
935939
}
936940

937941
yogaNode_.setStyle(yogaStyle);

‎packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -790,98 +790,98 @@ void YogaStylableProps::convertRawPropAliases(
790790
rawProps,
791791
"insetBlockEnd",
792792
sourceProps.insetBlockEnd,
793-
yoga::value::undefined());
793+
yoga::StyleLength::undefined());
794794
insetBlockStart = convertRawProp(
795795
context,
796796
rawProps,
797797
"insetBlockStart",
798798
sourceProps.insetBlockStart,
799-
yoga::value::undefined());
799+
yoga::StyleLength::undefined());
800800
insetInlineEnd = convertRawProp(
801801
context,
802802
rawProps,
803803
"insetInlineEnd",
804804
sourceProps.insetInlineEnd,
805-
yoga::value::undefined());
805+
yoga::StyleLength::undefined());
806806
insetInlineStart = convertRawProp(
807807
context,
808808
rawProps,
809809
"insetInlineStart",
810810
sourceProps.insetInlineStart,
811-
yoga::value::undefined());
811+
yoga::StyleLength::undefined());
812812
marginInline = convertRawProp(
813813
context,
814814
rawProps,
815815
"marginInline",
816816
sourceProps.marginInline,
817-
yoga::value::undefined());
817+
yoga::StyleLength::undefined());
818818
marginInlineStart = convertRawProp(
819819
context,
820820
rawProps,
821821
"marginInlineStart",
822822
sourceProps.marginInlineStart,
823-
yoga::value::undefined());
823+
yoga::StyleLength::undefined());
824824
marginInlineEnd = convertRawProp(
825825
context,
826826
rawProps,
827827
"marginInlineEnd",
828828
sourceProps.marginInlineEnd,
829-
yoga::value::undefined());
829+
yoga::StyleLength::undefined());
830830
marginBlock = convertRawProp(
831831
context,
832832
rawProps,
833833
"marginBlock",
834834
sourceProps.marginBlock,
835-
yoga::value::undefined());
835+
yoga::StyleLength::undefined());
836836
marginBlockStart = convertRawProp(
837837
context,
838838
rawProps,
839839
"marginBlockStart",
840840
sourceProps.marginBlockStart,
841-
yoga::value::undefined());
841+
yoga::StyleLength::undefined());
842842
marginBlockEnd = convertRawProp(
843843
context,
844844
rawProps,
845845
"marginBlockEnd",
846846
sourceProps.marginBlockEnd,
847-
yoga::value::undefined());
847+
yoga::StyleLength::undefined());
848848

849849
paddingInline = convertRawProp(
850850
context,
851851
rawProps,
852852
"paddingInline",
853853
sourceProps.paddingInline,
854-
yoga::value::undefined());
854+
yoga::StyleLength::undefined());
855855
paddingInlineStart = convertRawProp(
856856
context,
857857
rawProps,
858858
"paddingInlineStart",
859859
sourceProps.paddingInlineStart,
860-
yoga::value::undefined());
860+
yoga::StyleLength::undefined());
861861
paddingInlineEnd = convertRawProp(
862862
context,
863863
rawProps,
864864
"paddingInlineEnd",
865865
sourceProps.paddingInlineEnd,
866-
yoga::value::undefined());
866+
yoga::StyleLength::undefined());
867867
paddingBlock = convertRawProp(
868868
context,
869869
rawProps,
870870
"paddingBlock",
871871
sourceProps.paddingBlock,
872-
yoga::value::undefined());
872+
yoga::StyleLength::undefined());
873873
paddingBlockStart = convertRawProp(
874874
context,
875875
rawProps,
876876
"paddingBlockStart",
877877
sourceProps.paddingBlockStart,
878-
yoga::value::undefined());
878+
yoga::StyleLength::undefined());
879879
paddingBlockEnd = convertRawProp(
880880
context,
881881
rawProps,
882882
"paddingBlockEnd",
883883
sourceProps.paddingBlockEnd,
884-
yoga::value::undefined());
884+
yoga::StyleLength::undefined());
885885
}
886886

887887
} // namespace facebook::react

‎packages/react-native/ReactCommon/react/renderer/components/view/conversions.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -437,31 +437,31 @@ inline void fromRawValue(
437437
const RawValue& value,
438438
yoga::Style::Length& result) {
439439
if (value.hasType<Float>()) {
440-
result = yoga::value::points((float)value);
440+
result = yoga::StyleLength::points((float)value);
441441
return;
442442
} else if (value.hasType<std::string>()) {
443443
const auto stringValue = (std::string)value;
444444
if (stringValue == "auto") {
445-
result = yoga::value::ofAuto();
445+
result = yoga::StyleLength::ofAuto();
446446
return;
447447
} else {
448448
if (stringValue.back() == '%') {
449449
auto tryValue = folly::tryTo<float>(
450450
std::string_view(stringValue).substr(0, stringValue.length() - 1));
451451
if (tryValue.hasValue()) {
452-
result = yoga::value::percent(tryValue.value());
452+
result = yoga::StyleLength::percent(tryValue.value());
453453
return;
454454
}
455455
} else {
456456
auto tryValue = folly::tryTo<float>(stringValue);
457457
if (tryValue.hasValue()) {
458-
result = yoga::value::points(tryValue.value());
458+
result = yoga::StyleLength::points(tryValue.value());
459459
return;
460460
}
461461
}
462462
}
463463
}
464-
result = yoga::value::undefined();
464+
result = yoga::StyleLength::undefined();
465465
}
466466

467467
inline void fromRawValue(

0 commit comments

Comments
 (0)