@momo-kits/camerakit 0.89.1-beta.1 → 0.89.1-beta.3

package/Camera.android.tsx

@@ -23,12 +23,6 @@ const Camera = React.forwardRef((props: any, ref) => {
     startCamera: () => {
       CameraKitModule.startCamera(findNodeHandle(nativeRef.current ?? null));
     },
-    startCameraWithId: (cameraId: string) => {
-      CameraKitModule.startCameraWithId(
-        findNodeHandle(nativeRef.current ?? null),
-        cameraId,
-      );
-    },
     stopCamera: () => {
       CameraKitModule.stopCamera(findNodeHandle(nativeRef.current ?? null));
     },
@@ -38,11 +32,6 @@ const Camera = React.forwardRef((props: any, ref) => {
         findNodeHandle(nativeRef.current ?? null),
       );
     },
-    getInfoCamera: async () => {
-      return await CameraKitModule.getCameraInfo(
-        findNodeHandle(nativeRef.current ?? null),
-      );
-    },
   }));
 
   return (

package/Camera.ios.tsx

@@ -12,11 +12,7 @@ const Camera = React.forwardRef((props: any, ref: any) => {
     },
     startCamera: CameraKitManager.startCamera,
     stopCamera: CameraKitManager.stopCamera,
-    startCameraWithId: CameraKitManager.startCameraWithId,
     readImageQRCode: CameraKitManager.readImageQRCode,
-    getInfoCamera: async () => {
-      return await CameraKitManager.getInfoCamera();
-    },
   }));
 
   return <NativeCamera style={{minWidth: 100, minHeight: 100}} {...props} />;

package/index.tsx

@@ -3,90 +3,102 @@ import {Platform, StyleSheet, View} from 'react-native';
 import styles from './styles';
 import CameraIOS from './Camera.ios';
 import CameraAndroid from './Camera.android';
-import {CameraKitProps} from './type';
+import {CameraApi, CameraKitProps} from './type';
 
 const Camera = Platform.OS == 'ios' ? CameraIOS : CameraAndroid;
 
 const EventThrottleMs = 500;
 
-const CameraKit: React.FC<CameraKitProps> = ({
-  onBarCodeRead,
-  onMRZ,
-  onImageCaptured,
-  type = 'back',
-  torchMode = 'off',
-  zoomMode = 'off',
-  zoomRate = 1.0,
-  onOpenCamera = data => {},
-  customFinder,
-  style,
-}) => {
-  const cameraRef = useRef<any>(null);
-  const [lastEvent, setLastEvent] = useState<string | null>(null);
-  const [lastEventTime, setLastEventTime] = useState<Date | null>(null);
+const CameraKit = React.forwardRef(
+  (
+    {
+      onBarCodeRead,
+      onMRZ,
+      onImageCaptured,
+      type = 'back',
+      torchMode = 'off',
+      zoomMode = 'off',
+      zoomRate = 1.0,
+      onOpenCamera = data => {},
+      customFinder,
+      style,
+    }: CameraKitProps,
+    ref,
+  ) => {
+    const cameraRef = useRef<any>(null);
+    const [lastEvent, setLastEvent] = useState<string | null>(null);
+    const [lastEventTime, setLastEventTime] = useState<Date | null>(null);
 
-  const readImageQRCode = (base64: string) => {
-    cameraRef.current?.readImageQRCode(base64);
-  };
+    React.useImperativeHandle<any, CameraApi>(ref, () => ({
+      capture,
+      startCamera,
+      stopCamera,
+      readImageQRCode,
+    }));
 
-  const startCamera = () => {
-    cameraRef.current?.startCamera();
-  };
+    const readImageQRCode = (base64: string) => {
+      cameraRef.current?.readImageQRCode(base64);
+    };
 
-  const stopCamera = () => {
-    cameraRef.current?.stopCamera();
-  };
+    const startCamera = () => {
+      cameraRef.current?.startCamera();
+    };
 
-  const capture = async (options: any) => {
-    try {
-      const data = await cameraRef.current?.capture(options);
-      onImageCaptured?.({...data, url: data.uri});
-    } catch (e: any) {
-      onImageCaptured?.({error: e.message});
-    }
-  };
+    const stopCamera = () => {
+      cameraRef.current?.stopCamera();
+    };
 
-  const onBarCodeReadHandler = ({nativeEvent}: any) => {
-    const value = JSON.stringify(nativeEvent);
-    const outdated = lastEventTime
-      ? new Date().getTime() - lastEventTime.getTime() > EventThrottleMs
-      : true;
-    if (value && value === lastEvent && !outdated) {
-      return;
-    }
-    onBarCodeRead?.({data: nativeEvent?.codeStringValue});
-    setLastEvent(value);
-    setLastEventTime(new Date());
-  };
+    const capture = async (options: any) => {
+      try {
+        const data = await cameraRef.current?.capture(options);
+        onImageCaptured?.({...data, url: data.uri});
+      } catch (e: any) {
+        onImageCaptured?.({error: e.message});
+      }
+    };
 
-  const onMRZHandler = ({nativeEvent}: any) => {
-    onMRZ?.({data: nativeEvent?.docMRZ});
-  };
+    const onBarCodeReadHandler = ({nativeEvent}: any) => {
+      const value = JSON.stringify(nativeEvent);
+      const outdated = lastEventTime
+        ? new Date().getTime() - lastEventTime.getTime() > EventThrottleMs
+        : true;
+      if (value && value === lastEvent && !outdated) {
+        return;
+      }
+      onBarCodeRead?.({data: nativeEvent?.codeStringValue});
+      setLastEvent(value);
+      setLastEventTime(new Date());
+    };
 
-  const onOpenCameraHandler = (native: any) => {
-    onOpenCamera?.(native.nativeEvent);
-  };
+    const onMRZHandler = ({nativeEvent}: any) => {
+      onMRZ?.({data: nativeEvent?.docMRZ});
+    };
 
-  return (
-    <View style={[styles.container, style]}>
-      <Camera
-        ref={cameraRef}
-        style={styles.camera}
-        cameraType={type}
-        torchMode={torchMode}
-        focusMode={torchMode}
-        zoomMode={zoomMode}
-        zoomRate={zoomRate}
-        scanBarcode={!!onBarCodeRead}
-        onReadCode={onBarCodeReadHandler}
-        onMRZ={onMRZHandler}
-        onOpenCamera={onOpenCameraHandler}
-      />
-      {customFinder && (
-        <View style={StyleSheet.absoluteFill}>{customFinder()}</View>
-      )}
-    </View>
-  );
-};
+    const onOpenCameraHandler = (native: any) => {
+      onOpenCamera?.(native.nativeEvent);
+    };
 
-export default CameraKit;
+    return (
+      <View style={[styles.container, style]}>
+        <Camera
+          ref={cameraRef}
+          style={styles.camera}
+          cameraType={type}
+          torchMode={torchMode}
+          focusMode={torchMode}
+          zoomMode={zoomMode}
+          zoomRate={zoomRate}
+          scanBarcode={!!onBarCodeRead}
+          onReadCode={onBarCodeReadHandler}
+          onMRZ={onMRZHandler}
+          onOpenCamera={onOpenCameraHandler}
+        />
+        {customFinder && (
+          <View style={StyleSheet.absoluteFill}>{customFinder()}</View>
+        )}
+      </View>
+    );
+  },
+);
+
+export {CameraKit};

package/package.json

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

package/type.ts

@@ -17,9 +17,7 @@ export type CameraApi = {
   capture: (option: any) => Promise<any>;
   stopCamera: () => void;
   startCamera: () => void;
-  startCameraWithId: (cameraId: string) => void;
   readImageQRCode: (base64: string) => void;
-  getInfoCamera: () => Promise<any>;
 };
 
 export type CameraType = 'font' | 'back';