fix: camera scanner is not working

akopachov · Oct 30, 2024 · 2743153 · 2743153
1 parent f534267
commit 2743153
Showing 1 changed file with 19 additions and 22 deletions.
diff --git a/src/components/camera-qr-scanner/camera-qr-scanner.svelte b/src/components/camera-qr-scanner/camera-qr-scanner.svelte
@@ -4,36 +4,16 @@
   import { onDestroy, onMount } from 'svelte';
 
   let videoEl: HTMLVideoElement | null = $state(null);
-  let qrScanner: QrScanner;
+  let qrScanner: QrScanner | null;
 
   let { scanned }: { scanned: (arg: { data: string }) => void } = $props();
 
   let availableCameraDevices: MediaDeviceInfo[] | null = $state(null);
-  let selectedCamera: MediaDeviceInfo;
+  let selectedCamera: MediaDeviceInfo | null = $state(null);
   let isScanning = $state(true);
   let scannerStartingPromise: Promise<void> | null;
 
   async function startQrScanner(camera: MediaDeviceInfo) {
-    if (qrScanner && camera) {
-      if (scannerStartingPromise) {
-        scannerStartingPromise.then(() => startQrScanner(camera));
-        return;
-      }
-      await qrScanner.setCamera(camera.deviceId);
-      await qrScanner.start();
-      scannerStartingPromise = null;
-    }
-  }
-
-  $effect(() => {
-    if (isScanning) {
-      startQrScanner(selectedCamera);
-    } else {
-      qrScanner?.stop();
-    }
-  });
-
-  $effect(() => {
     if (videoEl) {
       if (qrScanner) {
         qrScanner.stop();
@@ -52,6 +32,23 @@
         },
       );
     }
+    if (qrScanner && camera) {
+      if (scannerStartingPromise) {
+        scannerStartingPromise.then(() => startQrScanner(camera));
+        return;
+      }
+      await qrScanner.setCamera(camera.deviceId);
+      await qrScanner.start();
+      scannerStartingPromise = null;
+    }
+  }
+
+  $effect(() => {
+    if (isScanning && selectedCamera) {
+      startQrScanner(selectedCamera);
+    } else {
+      qrScanner?.stop();
+    }
   });
 
   async function loadCameraDevices() {