Skip to content
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

Jump to bottom

Reverting backport of #10969 that didn't go through PR #11193

Merged
merged 4 commits into from
Feb 9, 2023
Merged

Reverting backport of #10969 that didn't go through PR #11193

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
814b5c4
Revert "Change files"
jonthysell Feb 9, 2023
b7b0e50
Revert "Implement rowGap, columnGap and gap flex properties (#10969)"
jonthysell Feb 9, 2023
a40e362
Change files
jonthysell Feb 9, 2023
0b4c314
Merge branch '0.71-stable' into fix71
acoates-ms Feb 9, 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
7 changes: 0 additions & 7 deletions change/react-native-windows-d091bbc2-5182-4197-8bda-cf9090b70828.json
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions change/react-native-windows-f38f4c47-02e7-46e1-95d1-7a663b14c509.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Revert \"Implement rowGap, columnGap and gap flex properties (#10969)\"",
"packageName": "react-native-windows",
"email": "jthysell@microsoft.com",
"dependentChangeType": "patch"
}
9 changes: 0 additions & 9 deletions vnext/Microsoft.ReactNative/Modules/NativeUIManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,15 +626,6 @@ static void StyleYogaNode(
YGValue result = YGValueOrDefault(value, YGValue{YGUndefined, YGUnitPoint} /*default*/, shadowNode, key);

SetYogaUnitValueHelper(yogaNode, result, YGNodeStyleSetMaxHeight, YGNodeStyleSetMaxHeightPercent);
} else if (key == "rowGap") {
float result = NumberOrDefault(value, 0.0f /*default*/);
YGNodeStyleSetGap(yogaNode, YGGutterRow, result);
} else if (key == "columnGap") {
float result = NumberOrDefault(value, 0.0f /*default*/);
YGNodeStyleSetGap(yogaNode, YGGutterColumn, result);
} else if (key == "gap") {
float result = NumberOrDefault(value, 0.0f /*default*/);
YGNodeStyleSetGap(yogaNode, YGGutterAll, result);
} else if (key == "margin") {
YGValue result = YGValueOrDefault(value, YGValue{YGUndefined, YGUnitPoint} /*default*/, shadowNode, key);

Expand Down