Fix RootComponentView leak (microsoft#13959)

acoates-ms · rnbot · acoates-ms · commit e2b661c8f625 · 2024-10-15T15:30:10.000-07:00
* Fix RootComponentView leak

* Change files

* format

---------

Co-authored-by: React-Native-Windows Bot &lt;53619745+rnbot@users.noreply.github.com&gt;
diff --git a/change/react-native-windows-408fe985-f784-4dff-aed3-9045a0c7a420.json b/change/react-native-windows-408fe985-f784-4dff-aed3-9045a0c7a420.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Fix RootComponentView leak",
+  "packageName": "react-native-windows",
+  "email": "53619745+rnbot@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp b/vnext/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp
@@ -157,6 +157,7 @@ void ReactNativeIsland::ReactViewHost(winrt::Microsoft::ReactNative::IReactViewH
   }
 
   if (m_reactViewHost) {
+    UninitRootView();
     m_reactViewHost.DetachViewInstance();
   }
 
diff --git a/vnext/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp b/vnext/Microsoft.ReactNative/Fabric/FabricUIManagerModule.cpp
@@ -176,6 +176,9 @@ void FabricUIManager::startSurface(
 
 void FabricUIManager::stopSurface(facebook::react::SurfaceId surfaceId) noexcept {
   m_surfaceManager->stopSurface(surfaceId);
+  auto &rootDescriptor = m_registry.componentViewDescriptorWithTag(surfaceId);
+  m_registry.enqueueComponentViewWithComponentHandle(
+      facebook::react::RootShadowNode::Handle(), surfaceId, rootDescriptor);
 }
 
 winrt::Microsoft::ReactNative::ReactNativeIsland FabricUIManager::GetReactNativeIsland(

Original file line number	Diff line number	Diff line change
`@@ -157,6 +157,7 @@ void ReactNativeIsland::ReactViewHost(winrt::Microsoft::ReactNative::IReactViewH`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`if (m_reactViewHost) {`
	`160`	`+ UninitRootView();`
`160`	`161`	`m_reactViewHost.DetachViewInstance();`
`161`	`162`	`}`
`162`	`163`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,9 @@ void FabricUIManager::startSurface(`
`176`	`176`
`177`	`177`	`void FabricUIManager::stopSurface(facebook::react::SurfaceId surfaceId) noexcept {`
`178`	`178`	`m_surfaceManager->stopSurface(surfaceId);`
	`179`	`+ auto &rootDescriptor = m_registry.componentViewDescriptorWithTag(surfaceId);`
	`180`	`+ m_registry.enqueueComponentViewWithComponentHandle(`
	`181`	`+ facebook::react::RootShadowNode::Handle(), surfaceId, rootDescriptor);`
`179`	`182`	`}`
`180`	`183`
`181`	`184`	`winrt::Microsoft::ReactNative::ReactNativeIsland FabricUIManager::GetReactNativeIsland(`