Skip to content

[pull] main from facebook:main #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jun 29, 2023
Merged

[pull] main from facebook:main #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bd6b28
translation auto-update for i18n/fb4a.config.json on master
Jun 29, 2023
29f2602
Add global hook to assert that base Metro config is called (#38126)
huntie Jun 29, 2023
3f6412b
Remove YGExperimentalFeatureFixAbsoluteTrailingColumnMargin (#37374)
NickGerleman Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/metro-config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ function getDefaultConfig(
watchFolders: [],
};

// Set global hook so that the CLI can detect when this config has been loaded
global.__REACT_NATIVE_METRO_CONFIG_LOADED = true;

return mergeConfig(
getBaseConfig.getDefaultValues(projectRoot),
config,
Expand Down
6 changes: 2 additions & 4 deletions ...es/react-native/ReactAndroid/src/main/java/com/facebook/yoga/YogaExperimentalFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
public enum YogaExperimentalFeature {
WEB_FLEX_BASIS(0),
ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE(1),
FIX_ABSOLUTE_TRAILING_COLUMN_MARGIN(2),
FIX_JNILOCAL_REF_OVERFLOWS(3);
FIX_JNILOCAL_REF_OVERFLOWS(2);

private final int mIntValue;

Expand All @@ -29,8 +28,7 @@ public static YogaExperimentalFeature fromInt(int value) {
switch (value) {
case 0: return WEB_FLEX_BASIS;
case 1: return ABSOLUTE_PERCENTAGE_AGAINST_PADDING_EDGE;
case 2: return FIX_ABSOLUTE_TRAILING_COLUMN_MARGIN;
case 3: return FIX_JNILOCAL_REF_OVERFLOWS;
case 2: return FIX_JNILOCAL_REF_OVERFLOWS;
default: throw new IllegalArgumentException("Unknown enum value: " + value);
}
}
Expand Down
6 changes: 6 additions & 0 deletions packages/react-native/ReactAndroid/src/main/res/views/uimanager/values-km/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,20 @@
<resources exclude-from-buck-resource-map="true">
<string name="link_description" gender="unknown">តំណ</string>
<string name="image_description" gender="unknown">រូបភាព</string>
<string name="imagebutton_description" gender="unknown">ប៊ូតុង, រូបភាព។។</string>
<string name="header_description" gender="unknown">ចំណងជើង</string>
<string name="alert_description" gender="unknown">ជូន​ដំណឹង</string>
<string name="combobox_description" gender="unknown">ប្រអប់បញ្ចូលគ្នា</string>
<string name="menu_description" gender="unknown">ម៉ឺនុយ</string>
<string name="menubar_description" gender="unknown">ម៉ឺនុយ។។</string>
<string name="menuitem_description" gender="unknown">ធាតុម៉ឺនុយ</string>
<string name="progressbar_description" gender="unknown">របារ​ដំណើរការ</string>
<string name="radiogroup_description" gender="unknown">ក្រុមវិទ្យុ។។</string>
<string name="scrollbar_description" gender="unknown">របាររំកិល</string>
<string name="spinbutton_description" gender="unknown">ប៊ូតុង​បង្វិល</string>
<string name="rn_tab_description" gender="unknown">ផ្ទាំង</string>
<string name="tablist_description" gender="unknown">បញ្ជីថេប</string>
<string name="timer_description" gender="unknown">មុខងារកំណត់ម៉ោង</string>
<string name="toolbar_description" gender="unknown">របារ​ឧបករណ៍</string>
<string name="summary_description" gender="unknown">សេចក្ដីសង្ខេប</string>
<string name="state_busy_description" gender="unknown">ជាប់រវល់</string>
Expand Down
5 changes: 5 additions & 0 deletions packages/react-native/ReactAndroid/src/main/res/views/uimanager/values-sq/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@
<string name="image_description" gender="unknown">Imazh</string>
<string name="imagebutton_description" gender="unknown">Buton, imazh</string>
<string name="combobox_description" gender="unknown">Kuti kombinimi</string>
<string name="menu_description" gender="unknown">Meny</string>
<string name="menuitem_description" gender="unknown">Artikull i menysë</string>
<string name="rn_tab_description" gender="unknown">Skedë</string>
<string name="toolbar_description" gender="unknown">Shiriti i mjeteve</string>
<string name="summary_description" gender="unknown">Përmbledhja</string>
<string name="state_expanded_description" gender="unknown">zgjeruar</string>
<string name="state_unselected_description" gender="unknown">i pazgjedhur</string>
<string name="state_off_description" gender="unknown">joaktiv</string>
<string name="state_mixed_description" gender="unknown">përzier</string>
</resources>
2 changes: 0 additions & 2 deletions packages/react-native/ReactCommon/yoga/yoga/YGEnums.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ const char* YGExperimentalFeatureToString(const YGExperimentalFeature value) {
return "web-flex-basis";
case YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge:
return "absolute-percentage-against-padding-edge";
case YGExperimentalFeatureFixAbsoluteTrailingColumnMargin:
return "fix-absolute-trailing-column-margin";
case YGExperimentalFeatureFixJNILocalRefOverflows:
return "fix-jnilocal-ref-overflows";
}
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/ReactCommon/yoga/yoga/YGEnums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ YG_ENUM_SEQ_DECL(
YGExperimentalFeature,
YGExperimentalFeatureWebFlexBasis,
YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge,
YGExperimentalFeatureFixAbsoluteTrailingColumnMargin,
YGExperimentalFeatureFixJNILocalRefOverflows)

YG_ENUM_SEQ_DECL(
Expand Down
10 changes: 2 additions & 8 deletions packages/react-native/ReactCommon/yoga/yoga/Yoga.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,19 +1543,13 @@ static void YGNodeAbsoluteLayoutChild(
depth,
generationCount);

auto trailingMarginOuterSize =
node->getConfig()->isExperimentalFeatureEnabled(
YGExperimentalFeatureFixAbsoluteTrailingColumnMargin)
? isMainAxisRow ? height : width
: width;

if (child->isTrailingPosDefined(mainAxis) &&
!child->isLeadingPositionDefined(mainAxis)) {
child->setLayoutPosition(
node->getLayout().measuredDimensions[dim[mainAxis]] -
child->getLayout().measuredDimensions[dim[mainAxis]] -
node->getTrailingBorder(mainAxis) -
child->getTrailingMargin(mainAxis, trailingMarginOuterSize)
child->getTrailingMargin(mainAxis, isMainAxisRow ? width : height)
.unwrap() -
child->getTrailingPosition(mainAxis, isMainAxisRow ? width : height)
.unwrap(),
Expand Down Expand Up @@ -1598,7 +1592,7 @@ static void YGNodeAbsoluteLayoutChild(
node->getLayout().measuredDimensions[dim[crossAxis]] -
child->getLayout().measuredDimensions[dim[crossAxis]] -
node->getTrailingBorder(crossAxis) -
child->getTrailingMargin(crossAxis, trailingMarginOuterSize)
child->getTrailingMargin(crossAxis, isMainAxisRow ? height : width)
.unwrap() -
child
->getTrailingPosition(crossAxis, isMainAxisRow ? height : width)
Expand Down