Unfork and modularize Yoga (#12591)

marlenecota · web-flow · commit a948daf08007 · 2024-01-11T10:24:11.000-08:00
* Unfork Yoga * Change files * Remove yoga.cpp from react-native-platform-override e2etests * Update comment reference * Revert "Remove yoga.cpp from react-native-platform-override e2etests" This reverts commit a4dbd44. * re-add yoga to fake overrides.json * remove react-native-platform-override change file
diff --git a/.cspell.json b/.cspell.json
@@ -19,8 +19,7 @@
         "packages/@react-native-windows/tester",
         "packages/react-native-platform-override/src/e2etest/collateral",
         "vnext/Folly/TEMP_UntilFollyUpdate",
-        "vnext/ReactCommon/TEMP_UntilReactCommonUpdate",
-        "vnext/ReactCommon/Yoga.cpp"
+        "vnext/ReactCommon/TEMP_UntilReactCommonUpdate"
     ],
     "useGitignore": true,
     "ignoreRegExpList": [
diff --git a/change/react-native-windows-eb1aa605-b8b7-498c-881c-f263fad4cd2e.json b/change/react-native-windows-eb1aa605-b8b7-498c-881c-f263fad4cd2e.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Unfork Yoga",
+  "packageName": "react-native-windows",
+  "email": "email not defined",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/Modules/NativeUIManager.cpp b/vnext/Microsoft.ReactNative/Modules/NativeUIManager.cpp
@@ -163,7 +163,7 @@ NativeUIManager::NativeUIManager(winrt::Microsoft::ReactNative::ReactContext con
   // To Debug Yoga layout, uncomment the following line.
   // YGConfigSetPrintTreeFlag(m_yogaConfig, true);
 
-  // Additional logging can be enabled editing yoga.cpp (e.g. gPrintChanges,
+  // Additional logging can be enabled editing CalculateLayout.cpp (e.g. gPrintChanges,
   // gPrintSkips)
 #endif
 }
diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj
@@ -131,7 +131,12 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsinspector-modern\InspectorInterfaces.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.cpp" />
     <CLCompile Include="$(ReactNativeDir)\ReactCommon\reactperflogger\reactperflogger\BridgeNativeModulePerfLogger.cpp" />
+    <ClCompile Include="$(YogaDir)\yoga\YGConfig.cpp" />
     <ClCompile Include="$(YogaDir)\yoga\YGEnums.cpp" />
+    <ClCompile Include="$(YogaDir)\yoga\YGNode.cpp" />
+    <ClCompile Include="$(YogaDir)\yoga\YGNodeLayout.cpp" />
+    <ClCompile Include="$(YogaDir)\yoga\YGNodeStyle.cpp" />
+    <ClCompile Include="$(YogaDir)\yoga\YGPixelGrid.cpp" />
     <ClCompile Include="$(YogaDir)\yoga\YGValue.cpp" />
     <ClCompile Include="$(YogaDir)\yoga\algorithm\Baseline.cpp" />
     <ClCompile Include="$(YogaDir)\yoga\algorithm\Cache.cpp" />
@@ -150,10 +155,6 @@
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\mapbuffer\MapBuffer.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\mapbuffer\MapBufferBuilder.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\react\renderer\telemetry\TransactionTelemetry.cpp" />
-    <!--
-      Using a patched copy of Yoga due to https://github.com/microsoft/react-native-windows/issues/3994
-    -->
-    <ClCompile Include="Yoga.cpp" AdditionalIncludeDirectories="$(YogaDir)\yoga;%(AdditionalIncludeDirectories)" />
     <ClCompile Include="$(YogaDir)\yoga\event\event.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
diff --git a/vnext/ReactCommon/ReactCommon.vcxproj.filters b/vnext/ReactCommon/ReactCommon.vcxproj.filters
@@ -120,6 +120,9 @@
     <ClCompile Include="$(YogaDir)\yoga\Utils.cpp">
       <Filter>yoga</Filter>
     </ClCompile>
+    <ClCompile Include="$(YogaDir)\yoga\YGConfig.cpp">
+      <Filter>yoga</Filter>
+    </ClCompile>
     <ClCompile Include="$(YogaDir)\yoga\YGEnums.cpp">
       <Filter>yoga</Filter>
     </ClCompile>
@@ -129,9 +132,18 @@
     <ClCompile Include="$(YogaDir)\yoga\YGNode.cpp">
       <Filter>yoga</Filter>
     </ClCompile>
+    <ClCompile Include="$(YogaDir)\yoga\YGNodeLayout.cpp">
+      <Filter>yoga</Filter>
+    </ClCompile>
+    <ClCompile Include="$(YogaDir)\yoga\YGNodeStyle.cpp">
+      <Filter>yoga</Filter>
+    </ClCompile>
     <ClCompile Include="$(YogaDir)\yoga\YGNodePrint.cpp">
       <Filter>yoga</Filter>
     </ClCompile>
+    <ClCompile Include="$(YogaDir)\yoga\YGPixelGrid.cpp">
+      <Filter>yoga</Filter>
+    </ClCompile>
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\jsi\jsi\jsi.cpp">
       <Filter>jsi\jsi</Filter>
     </ClCompile>
@@ -175,7 +187,6 @@
       <Filter>react\renderer\debug</Filter>
     </ClCompile>
     <ClCompile Include="pch.cpp" />
-    <ClCompile Include="Yoga.cpp" />
     <ClCompile Include="$(ReactNativeDir)\ReactCommon\logger\react_native_log.cpp">
       <Filter>logger</Filter>
     </ClCompile>
diff --git a/vnext/ReactCommon/Yoga.cpp b/vnext/ReactCommon/Yoga.cpp

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ NativeUIManager::NativeUIManager(winrt::Microsoft::ReactNative::ReactContext con`
`163`	`163`	`// To Debug Yoga layout, uncomment the following line.`
`164`	`164`	`// YGConfigSetPrintTreeFlag(m_yogaConfig, true);`
`165`	`165`
`166`		`- // Additional logging can be enabled editing yoga.cpp (e.g. gPrintChanges,`
	`166`	`+ // Additional logging can be enabled editing CalculateLayout.cpp (e.g. gPrintChanges,`
`167`	`167`	`// gPrintSkips)`
`168`	`168`	`#endif`
`169`	`169`	`}`