Keep propertyBag alive for duration of InstanceDestroyed event (#12364)

* Keep propertyBag alive for duration of InstanceDestroyed event * Change files
microsoft · Nov 8, 2023 · b87abc8 · b87abc8
1 parent 46d5f9d
commit b87abc8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/change/react-native-windows-3ff759df-eda0-48ed-8bc0-518bd22e9ae2.json b/change/react-native-windows-3ff759df-eda0-48ed-8bc0-518bd22e9ae2.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Keep propertyBag alive for duration of InstanceDestroyed event",
+  "packageName": "react-native-windows",
+  "email": "30809111+acoates-ms@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp
@@ -258,6 +258,12 @@ ReactInstanceWin::ReactInstanceWin(
   m_whenDestroyedResult =
       m_whenDestroyed.AsFuture().Then<Mso::Executors::Inline>([whenLoaded = m_whenLoaded,
                                                                onDestroyed = m_options.OnInstanceDestroyed,
+                                                               // If the ReactHost has been released, this
+                                                               // instance might be the only thing keeping
+                                                               // the propertyBag alive.
+                                                               // We want it to remain alive for the
+                                                               // InstanceDestroyed callbacks
+                                                               propBag = m_options.Properties,
                                                                reactContext = m_reactContext]() noexcept {
         whenLoaded.TryCancel(); // It only has an effect if whenLoaded was not set before
         Microsoft::ReactNative::HermesRuntimeHolder::storeTo(ReactPropertyBag(reactContext->Properties()), nullptr);