fix: memory leak

howljs · Jun 2, 2022 · d2f63e4 · d2f63e4
1 parent 366e689
commit d2f63e4
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 4 deletions.
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -353,7 +353,7 @@ PODS:
     - React-jsi (= 0.68.2)
     - React-logger (= 0.68.2)
     - React-perflogger (= 0.68.2)
-  - RNCardScanner (1.0.5):
+  - RNCardScanner (1.0.7):
     - React-Core
   - RNScreens (3.13.1):
     - React-Core
@@ -556,7 +556,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: 79040b92bfa9c3c2d2cb4f57e981164ec7ab9374
   React-runtimeexecutor: b960b687d2dfef0d3761fbb187e01812ebab8b23
   ReactCommon: 095366164a276d91ea704ce53cb03825c487a3f2
-  RNCardScanner: ede91abf432c6cb7cc33df6d7f99092bdd6dd14c
+  RNCardScanner: b1c393b9730d0bbe057ac6a3fdb427f505fb3d9f
   RNScreens: 40a2cb40a02a609938137a1e0acfbf8fc9eebf19
   SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608
   Yoga: 99652481fcd320aefa4a7ef90095b95acd181952

diff --git a/ios/CardScanner/CardScannerView.h b/ios/CardScanner/CardScannerView.h
@@ -23,5 +23,9 @@
 
 - (void)resetResult;
 
+- (void)startCamera;
+
+- (void)stopCamera;
+
 @end
 
diff --git a/ios/CardScanner/CardScannerView.m b/ios/CardScanner/CardScannerView.m
@@ -54,6 +54,23 @@ - (void)resetResult {
     [_recognizer resetResult];
 }
 
+- (void)startCamera {
+    [_recognizer startCamera];
+}
+
+- (void)stopCamera {
+    [_recognizer stopCamera];
+}
+
+- (void)didMoveToWindow
+{
+    [super didMoveToWindow];
+    BOOL isVisible = self.superview && self.window;
+    if (!isVisible) {
+        [_recognizer stopCamera];
+    }
+}
+
 #pragma mark PayCardsRecognizerPlatformDelegate
 
 - (void)payCardsRecognizer:(PayCardsRecognizer * _Nonnull)payCardsRecognizer didRecognize:(PayCardsRecognizerResult * _Nonnull)result {

diff --git a/ios/CardScanner/CardScannerViewManager.m b/ios/CardScanner/CardScannerViewManager.m
@@ -36,6 +36,22 @@ - (UIView *)view
     }];
 }
 
+RCT_EXPORT_METHOD(startCamera: (nonnull NSNumber *)viewTag)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, CardScannerView *> *viewRegistry) {
+        CardScannerView *view = viewRegistry[viewTag];
+        [view startCamera];
+    }];
+}
+
+RCT_EXPORT_METHOD(stopCamera: (nonnull NSNumber *)viewTag)
+{
+    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *uiManager, NSDictionary<NSNumber *, CardScannerView *> *viewRegistry) {
+        CardScannerView *view = viewRegistry[viewTag];
+        [view stopCamera];
+    }];
+}
+
 RCT_EXPORT_VIEW_PROPERTY(frameColor, UIColor);
 
 RCT_EXPORT_VIEW_PROPERTY(onDidScanCard, RCTBubblingEventBlock)

diff --git a/ios/CardScanner/PayCardsRecognizer.xcframework/Info.plist b/ios/CardScanner/PayCardsRecognizer.xcframework/Info.plist
@@ -6,11 +6,12 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-i386_x86_64-simulator</string>
+			<string>ios-arm64_i386_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>PayCardsRecognizer.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
+				<string>arm64</string>
 				<string>i386</string>
 				<string>x86_64</string>
 			</array>

diff --git a/...rdsRecognizer.xcframework/ios-arm64_armv7/PayCardsRecognizer.framework/PayCardsRecognizer b/...rdsRecognizer.xcframework/ios-arm64_armv7/PayCardsRecognizer.framework/PayCardsRecognizer
diff --git a/...er.framework/Headers/PayCardsRecognizer.h → ...er.framework/Headers/PayCardsRecognizer.h b/...er.framework/Headers/PayCardsRecognizer.h → ...er.framework/Headers/PayCardsRecognizer.h
diff --git a/...mework/Headers/PayCardsRecognizerResult.h → ...mework/Headers/PayCardsRecognizerResult.h b/...mework/Headers/PayCardsRecognizerResult.h → ...mework/Headers/PayCardsRecognizerResult.h
diff --git a/...r/PayCardsRecognizer.framework/Info.plist → ...r/PayCardsRecognizer.framework/Info.plist b/...r/PayCardsRecognizer.framework/Info.plist → ...r/PayCardsRecognizer.framework/Info.plist
diff --git a/...gnizer.framework/Modules/module.modulemap → ...gnizer.framework/Modules/module.modulemap b/...gnizer.framework/Modules/module.modulemap → ...gnizer.framework/Modules/module.modulemap
diff --git a/...dsRecognizer.framework/PayCardsRecognizer → ...dsRecognizer.framework/PayCardsRecognizer b/...dsRecognizer.framework/PayCardsRecognizer → ...dsRecognizer.framework/PayCardsRecognizer
diff --git a/...er.framework/_CodeSignature/CodeResources → ...er.framework/_CodeSignature/CodeResources b/...er.framework/_CodeSignature/CodeResources → ...er.framework/_CodeSignature/CodeResources
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rn-card-scanner",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Credit card scanner for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

diff --git a/src/index.tsx b/src/index.tsx
@@ -78,6 +78,8 @@ const CardScanner: React.ForwardRefRenderFunction<
 
       const toggleFlashId = getCommandId(Commands.toggleFlash);
       const resetResultId = getCommandId(Commands.resetResult);
+      const startCameraId = getCommandId(Commands.startCamera);
+      const stopCameraId = getCommandId(Commands.stopCamera);
 
       return {
         toggleFlash() {
@@ -86,6 +88,12 @@ const CardScanner: React.ForwardRefRenderFunction<
         resetResult() {
           UIManager.dispatchViewManagerCommand(viewId, resetResultId, []);
         },
+        startCamera() {
+          UIManager.dispatchViewManagerCommand(viewId, startCameraId, []);
+        },
+        stopCamera() {
+          UIManager.dispatchViewManagerCommand(viewId, stopCameraId, []);
+        },
       };
     },
     []