-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix: VisionCamera session is not deinitialized/recycled when screen gets unmounted on native-stack
#49936
Merged
mountiny
merged 3 commits into
Expensify:main
from
margelo:@chrispader/fix-vision-camera-session-not-stopped-on-screen-unmount
Oct 3, 2024
Merged
Fix: VisionCamera session is not deinitialized/recycled when screen gets unmounted on native-stack
#49936
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
55 changes: 55 additions & 0 deletions
55
...-native-vision-camera+4.0.0-beta.13+002+native-stack-unmount-recycle-camera-session.patch
This file contains 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,55 @@ | ||
diff --git a/node_modules/react-native-vision-camera/ios/RNCameraView.mm b/node_modules/react-native-vision-camera/ios/RNCameraView.mm | ||
index b90427e..0be4171 100644 | ||
--- a/node_modules/react-native-vision-camera/ios/RNCameraView.mm | ||
+++ b/node_modules/react-native-vision-camera/ios/RNCameraView.mm | ||
@@ -34,26 +34,43 @@ + (ComponentDescriptorProvider)componentDescriptorProvider | ||
return concreteComponentDescriptorProvider<CameraViewComponentDescriptor>(); | ||
} | ||
|
||
-- (instancetype)initWithFrame:(CGRect)frame | ||
-{ | ||
- self = [super initWithFrame:frame]; | ||
-if (self) { | ||
- static const auto defaultProps = std::make_shared<const CameraViewProps>(); | ||
+- (void) initCamera { | ||
+ static const auto defaultProps = std::make_shared<const CameraViewProps>(); | ||
_props = defaultProps; | ||
|
||
- //The remaining part of the initializer is standard Objective-C code to create views and layout them with AutoLayout. Here we can change whatever we want to. | ||
+ // The remaining part of the initializer is standard bjective-C code to create views and layout them with utoLayout. Here we can change whatever we want to. | ||
_view = [[CameraView alloc] init]; | ||
_view.delegate = self; | ||
|
||
self.contentView = _view; | ||
} | ||
|
||
-return self; | ||
+- (instancetype)initWithFrame:(CGRect)frame | ||
+{ | ||
+ self = [super initWithFrame:frame]; | ||
+ if (self) { | ||
+ [self initCamera]; | ||
+ } | ||
+ | ||
+ return self; | ||
+} | ||
+ | ||
+- (void) prepareForRecycle { | ||
+ [super prepareForRecycle]; | ||
+ | ||
+ self.contentView = _view; | ||
+ _view.delegate = nil; | ||
+ _view = nil; | ||
+ self.contentView = nil; | ||
} | ||
|
||
// why we need this func -> https://reactnative.dev/docs/next/the-new-architecture/pillars-fabric-components#write-the-native-ios-code | ||
- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps | ||
{ | ||
+ if (_view == nil) { | ||
+ [self initCamera]; | ||
+ } | ||
+ | ||
const auto &newViewProps = *std::static_pointer_cast<CameraViewProps const>(props); | ||
const auto &oldViewProps = *std::static_pointer_cast<CameraViewProps const>(_props); | ||
|
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.
@chrispader can you please create an issue in Expensify and link it here that will track removing these patches once we add support upstream? We can then make it monthly and make sure this gets done over time