Skip to content

Commit

Permalink
Reverting backport of #10969 that didn't go through PR (#11193)
Browse files Browse the repository at this point in the history
* Revert "Change files"

This reverts commit 5e2ca61.

* Revert "Implement rowGap, columnGap and gap flex properties (#10969)"

This reverts commit d7a8d6e.

* Change files

---------

Co-authored-by: Andrew Coates <30809111+acoates-ms@users.noreply.github.com>
  • Loading branch information
jonthysell and acoates-ms committed Feb 9, 2023
1 parent b887e15 commit a4a4675
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.

This file was deleted.

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
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

0 comments on commit a4a4675

Please sign in to comment.