@momo-kits/camerakit 0.89.1-beta.7 → 0.89.1-beta.8

package/Camera.android.tsx

@@ -4,33 +4,39 @@ import {
   findNodeHandle,
   NativeModules,
   requireNativeComponent,
+  View,
 } from 'react-native';
 import {CameraApi} from './type';
 
-const {RNCameraKitModule} = NativeModules;
-const NativeCamera = requireNativeComponent('RNCameraManager');
+let Module: any;
+let NativeCamera: React.ComponentType = View;
+
+if (NativeModules?.CameraKitManager) {
+  Module = NativeModules.CameraKitModule;
+  NativeCamera = requireNativeComponent('CKCameraManager');
+} else {
+  Module = NativeModules.RNCameraKitModule;
+  NativeCamera = requireNativeComponent('RNCameraManager');
+}
 
 const Camera = React.forwardRef((props: any, ref) => {
   const nativeRef = React.useRef();
 
   React.useImperativeHandle<any, CameraApi>(ref, () => ({
     capture: async (options = {}) => {
-      return await RNCameraKitModule.capture(
+      return await Module.capture(
         options,
         findNodeHandle(nativeRef.current ?? null),
       );
     },
     startCamera: () => {
-      RNCameraKitModule.startCamera(findNodeHandle(nativeRef.current ?? null));
+      Module.startCamera(findNodeHandle(nativeRef.current ?? null));
     },
     stopCamera: () => {
-      RNCameraKitModule.stopCamera(findNodeHandle(nativeRef.current ?? null));
+      Module.stopCamera(findNodeHandle(nativeRef.current ?? null));
     },
     readImageQRCode: (base64: string) => {
-      RNCameraKitModule.readImageQRCode(
-        base64,
-        findNodeHandle(nativeRef.current ?? null),
-      );
+      Module.readImageQRCode(base64, findNodeHandle(nativeRef.current ?? null));
     },
   }));
 

package/Camera.ios.tsx

@@ -1,16 +1,24 @@
 import React from 'react';
-import {NativeModules, requireNativeComponent} from 'react-native';
+import {NativeModules, requireNativeComponent, View} from 'react-native';
 import {CameraApi} from './type';
 
-const {RNCameraKitManager} = NativeModules;
-const NativeCamera = requireNativeComponent('RNCameraKit');
+let Module: any;
+let NativeCamera: React.ComponentType = View;
+
+if (NativeModules?.CameraKitManager) {
+  Module = NativeModules.CameraKitManager;
+  NativeCamera = requireNativeComponent('CameraKit');
+} else {
+  Module = NativeModules.RNCameraKitManager;
+  NativeCamera = requireNativeComponent('RNCameraKit');
+}
 
 const Camera = React.forwardRef((props: any, ref: any) => {
   React.useImperativeHandle<any, CameraApi>(ref, () => ({
-    capture: RNCameraKitManager.capture,
-    startCamera: RNCameraKitManager.startCamera,
-    stopCamera: RNCameraKitManager.stopCamera,
-    readImageQRCode: RNCameraKitManager.readImageQRCode,
+    capture: Module.capture,
+    startCamera: Module.startCamera,
+    stopCamera: Module.stopCamera,
+    readImageQRCode: Module.readImageQRCode,
   }));
 
   return <NativeCamera style={{minWidth: 100, minHeight: 100}} {...props} />;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/camerakit",
-    "version": "0.89.1-beta.7",
+    "version": "0.89.1-beta.8",
     "private": false,
     "main": "index.tsx",
     "peerDependencies": {