Skip to content

Commit

Permalink
Fix native modules not being re-initialized on reload (microsoft#6159)
Browse files Browse the repository at this point in the history
* Fix native modules not being re-initialized on reload

When calling `ReactNativeHost::ReloadInstance()`,
`ReactPackageProvider`s are not reiterated and thus not calling
`AddAttributedModules()`. As a consequence, the native modules that were
loaded the first time the app was loaded, no longer "exist" after
a reload.

* Change files
  • Loading branch information
tido64 committed Oct 2, 2020
1 parent 0e315ac commit 9eb6560
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
8 changes: 8 additions & 0 deletions change/react-native-windows-2020-10-02-00-03-14-HEAD.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Fix native modules not being re-initialized on reload",
"packageName": "react-native-windows",
"email": "tn0502@gmail.com",
"dependentChangeType": "patch",
"date": "2020-10-01T22:03:14.221Z"
}
16 changes: 7 additions & 9 deletions vnext/Microsoft.ReactNative/ReactNativeHost.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,16 @@ IAsyncAction ReactNativeHost::ReloadInstance() noexcept {

auto turboModulesProvider = std::make_shared<TurboModulesProvider>();

if (!m_packageBuilder) {
m_packageBuilder = make<ReactPackageBuilder>(
modulesProvider,
m_packageBuilder = make<ReactPackageBuilder>(
modulesProvider,
#ifndef CORE_ABI
viewManagersProvider,
viewManagersProvider,
#endif
turboModulesProvider);
turboModulesProvider);

if (auto packageProviders = InstanceSettings().PackageProviders()) {
for (auto const &packageProvider : packageProviders) {
packageProvider.CreatePackage(m_packageBuilder);
}
if (auto packageProviders = InstanceSettings().PackageProviders()) {
for (auto const &packageProvider : packageProviders) {
packageProvider.CreatePackage(m_packageBuilder);
}
}

Expand Down

0 comments on commit 9eb6560

Please sign in to comment.