From 814b5c462d2e328fc6440b2518ca19474b754bcd Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 9 Feb 2023 09:42:50 -0800 Subject: [PATCH 1/3] Revert "Change files" This reverts commit 5e2ca61e977684ae395258ff7f62022fe929a303. --- ...ative-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename change/{react-native-windows-d091bbc2-5182-4197-8bda-cf9090b70828.json => react-native-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json} (60%) diff --git a/change/react-native-windows-d091bbc2-5182-4197-8bda-cf9090b70828.json b/change/react-native-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json similarity index 60% rename from change/react-native-windows-d091bbc2-5182-4197-8bda-cf9090b70828.json rename to change/react-native-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json index 4a88aa5517c..e3afd086e8c 100644 --- a/change/react-native-windows-d091bbc2-5182-4197-8bda-cf9090b70828.json +++ b/change/react-native-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json @@ -1,7 +1,7 @@ { - "type": "patch", - "comment": "Implement rowGap, columnGap and gap flex properties (#10969)", + "type": "prerelease", + "comment": "Implement rowGap, columnGap and gap flex properties", "packageName": "react-native-windows", - "email": "26607885+chrisglein@users.noreply.github.com", + "email": "30809111+acoates-ms@users.noreply.github.com", "dependentChangeType": "patch" } From b7b0e503e1b3cfc383fc4c26d1f9e9ea399c0dde Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 9 Feb 2023 09:43:05 -0800 Subject: [PATCH 2/3] Revert "Implement rowGap, columnGap and gap flex properties (#10969)" This reverts commit d7a8d6e01255f31410e5b5e0ea7d3bbb141867f4. --- ...ive-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json | 7 ------- vnext/Microsoft.ReactNative/Modules/NativeUIManager.cpp | 9 --------- 2 files changed, 16 deletions(-) delete mode 100644 change/react-native-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json diff --git a/change/react-native-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json b/change/react-native-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json deleted file mode 100644 index e3afd086e8c..00000000000 --- a/change/react-native-windows-45082565-4f32-499f-acd3-ecd7c71a43ae.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "prerelease", - "comment": "Implement rowGap, columnGap and gap flex properties", - "packageName": "react-native-windows", - "email": "30809111+acoates-ms@users.noreply.github.com", - "dependentChangeType": "patch" -} diff --git a/vnext/Microsoft.ReactNative/Modules/NativeUIManager.cpp b/vnext/Microsoft.ReactNative/Modules/NativeUIManager.cpp index 4233e8f8748..fdfcb5bbf8e 100644 --- a/vnext/Microsoft.ReactNative/Modules/NativeUIManager.cpp +++ b/vnext/Microsoft.ReactNative/Modules/NativeUIManager.cpp @@ -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); From a40e36230e2c773accd25e43ffa880db23809671 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 9 Feb 2023 09:45:13 -0800 Subject: [PATCH 3/3] Change files --- ...ative-windows-f38f4c47-02e7-46e1-95d1-7a663b14c509.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/react-native-windows-f38f4c47-02e7-46e1-95d1-7a663b14c509.json diff --git a/change/react-native-windows-f38f4c47-02e7-46e1-95d1-7a663b14c509.json b/change/react-native-windows-f38f4c47-02e7-46e1-95d1-7a663b14c509.json new file mode 100644 index 00000000000..7c2f2ccb2c8 --- /dev/null +++ b/change/react-native-windows-f38f4c47-02e7-46e1-95d1-7a663b14c509.json @@ -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" +}