(feat): add method to deallocate reactNativeFactory instance #301
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@callstack/react-native-brownfield': minor | ||
| --- | ||
|
|
||
| feat: add method to deallocate reactNativeFactory instance |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,6 +59,7 @@ final class ReactNativeHostRuntime { | |
| delegate.bundlePath = bundlePath | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Bundle instance to lookup the JavaScript bundle. | ||
| * Default value: Bundle.main | ||
|
|
@@ -68,6 +69,7 @@ final class ReactNativeHostRuntime { | |
| delegate.bundle = bundle | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Dynamic bundle URL provider called on every bundle load. | ||
| * When set, this overrides the default bundleURL() behavior in the delegate. | ||
|
|
@@ -79,17 +81,23 @@ final class ReactNativeHostRuntime { | |
| delegate.bundleURLOverride = bundleURLOverride | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * React Native factory instance created when starting React Native. | ||
| * Default value: nil | ||
| */ | ||
| private var reactNativeFactory: RCTReactNativeFactory? = nil | ||
|
|
||
| private var factory: RCTReactNativeFactory { | ||
|
Contributor
Author
There was a problem hiding this comment. same here - please, @hurali97 , check my second commit |
||
| if let existingFactory = reactNativeFactory { | ||
| return existingFactory | ||
| } | ||
|
|
||
| delegate.dependencyProvider = RCTAppDependencyProvider() | ||
| let createdFactory = RCTReactNativeFactory(delegate: delegate) | ||
| reactNativeFactory = createdFactory | ||
| return createdFactory | ||
| } | ||
|
|
||
| /** | ||
| * Starts React Native with default parameters. | ||
|
|
@@ -98,12 +106,28 @@ final class ReactNativeHostRuntime { | |
| startReactNative(onBundleLoaded: nil) | ||
| } | ||
|
|
||
| /** | ||
| * Stops React Native and releases the underlying factory instance. | ||
| */ | ||
| public func stopReactNative() { | ||
| if !Thread.isMainThread { | ||
| DispatchQueue.main.async { [weak self] in self?.stopReactNative() } | ||
| return | ||
| } | ||
|
|
||
| guard let factory = reactNativeFactory else { return } | ||
|
|
||
| factory.bridge?.invalidate() | ||
|
Member
There was a problem hiding this comment. I believe we can skip this invocation as we do not support old arch anymore? And if I recall correctly on newer versions of RN, this
Collaborator
There was a problem hiding this comment. I think we still do - we have a separate sourceset on Android. Not all APIs support it (e.g. I'd leave it as-is, unless you object?
Member
There was a problem hiding this comment. I recall we did a few PRs to remove the old arch support, when react-native decided to drop it. For instance, here - we previously provided a way for old arch but that was removed. As part of this - we dropped support for old arch on Android - #148 I see that we still have a few places with old arch, we can plan removing those now. |
||
|
|
||
| reactNativeFactory = nil | ||
| } | ||
|
|
||
| public func view( | ||
| moduleName: String, | ||
| initialProps: [AnyHashable: Any]?, | ||
| launchOptions: [AnyHashable: Any]? = nil | ||
| ) -> UIView? { | ||
| factory.rootViewFactory.view( | ||
| withModuleName: moduleName, | ||
| initialProperties: initialProps, | ||
| launchOptions: launchOptions | ||
|
|
@@ -144,9 +168,6 @@ final class ReactNativeHostRuntime { | |
| public func startReactNative(onBundleLoaded: (() -> Void)?) { | ||
| guard reactNativeFactory == nil else { return } | ||
|
|
||
| if let onBundleLoaded { | ||
| jsBundleLoadObserver.observeOnce(onBundleLoaded: onBundleLoaded) | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We already create a factory instance in
startReactNativeand assign it asreactNativeFactory. So I believe we do not need to create anotherfactoryinstance here. I know that it will only create a new instance ifreactNativeFactoryisnilBUT if we think about it, this instance will only be nil ifstartReactNativehasn't been called ORstopReactNativehave been called already.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hurali97 some duplicated code removed in my second commit, please check it again