From 7a63890c1f94a13839a76370066c765b651afadd Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 25 Feb 2025 15:32:29 +0000
Subject: [PATCH 1/2] Adding zoom capabilities to QR-code reader to help with
 smaller qr codes.

---
 packages/client/manifest.json                             | 6 ++++++
 packages/client/package.json                              | 2 +-
 .../client/src/components/app/forms/CodeScanner.svelte    | 8 ++++++++
 .../src/components/app/forms/CodeScannerField.svelte      | 2 ++
 yarn.lock                                                 | 8 ++++----
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index a2d29d3020..886ad49650 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4492,6 +4492,12 @@
           }
         ]
       },
+      {
+        "type": "text",
+        "label": "Zoom level",
+        "key": "defaultZoom",
+        "defaultValue": "1"
+      },
       {
         "type": "event",
         "label": "On change",
diff --git a/packages/client/package.json b/packages/client/package.json
index 72be403698..a7ea04fd0b 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -28,7 +28,7 @@
     "apexcharts": "^3.48.0",
     "dayjs": "^1.10.8",
     "downloadjs": "1.4.7",
-    "html5-qrcode": "^2.2.1",
+    "html5-qrcode": "^2.3.8",
     "leaflet": "^1.7.1",
     "sanitize-html": "^2.13.0",
     "screenfull": "^6.0.1",
diff --git a/packages/client/src/components/app/forms/CodeScanner.svelte b/packages/client/src/components/app/forms/CodeScanner.svelte
index 008c0f5727..5c5d6ff73b 100644
--- a/packages/client/src/components/app/forms/CodeScanner.svelte
+++ b/packages/client/src/components/app/forms/CodeScanner.svelte
@@ -20,6 +20,7 @@
   export let beepFrequency = 2637
   export let customFrequency = 1046
   export let preferredCamera = "environment"
+  export let defaultZoom = 1
   export let validator
 
   const dispatch = createEventDispatcher()
@@ -58,6 +59,13 @@
       html5QrCode
         .start(cameraSetting, cameraConfig, onScanSuccess)
         .then(() => {
+          if (defaultZoom > 1) {
+            const cameraOptions = html5QrCode.getRunningTrackCameraCapabilities()
+            const zoom = cameraOptions.zoomFeature()
+            if (zoom.isSupported()) {
+              zoom.apply(defaultZoom)
+            }
+          }
           resolve({ initialised: true })
         })
         .catch(err => {
diff --git a/packages/client/src/components/app/forms/CodeScannerField.svelte b/packages/client/src/components/app/forms/CodeScannerField.svelte
index 7c9948554a..dd9e986804 100644
--- a/packages/client/src/components/app/forms/CodeScannerField.svelte
+++ b/packages/client/src/components/app/forms/CodeScannerField.svelte
@@ -17,6 +17,7 @@
   export let beepFrequency
   export let customFrequency
   export let preferredCamera
+  export let defaultZoom
   export let helpText = null
 
   let fieldState
@@ -56,6 +57,7 @@
       {beepFrequency}
       {customFrequency}
       {preferredCamera}
+      {defaultZoom}
       validator={fieldState.validator}
     />
   {/if}
diff --git a/yarn.lock b/yarn.lock
index ceae41458c..64810291c4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12768,10 +12768,10 @@ html-tag@^2.0.0:
     is-self-closing "^1.0.1"
     kind-of "^6.0.0"
 
-html5-qrcode@^2.2.1:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.7.tgz#09ed2ca7473a47bd551088c15fcfcb7cb409a5be"
-  integrity sha512-Jmlok9Ynm49hgVXkdupWryf8o430proIFoQsRl1LmTg4Rq461W72omylR9yw9tsEMtswMEw3wacUM5y0agOBQA==
+html5-qrcode@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/html5-qrcode/-/html5-qrcode-2.3.8.tgz#0b0cdf7a9926cfd4be530e13a51db47592adfa0d"
+  integrity sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ==
 
 htmlparser2@^8.0.0:
   version "8.0.1"

From a1670c309f53a95f3e890cdfd6298c3db08ab778 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 25 Feb 2025 15:42:50 +0000
Subject: [PATCH 2/2] Linting.

---
 packages/client/src/components/app/forms/CodeScanner.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/app/forms/CodeScanner.svelte b/packages/client/src/components/app/forms/CodeScanner.svelte
index 5c5d6ff73b..1a046d7168 100644
--- a/packages/client/src/components/app/forms/CodeScanner.svelte
+++ b/packages/client/src/components/app/forms/CodeScanner.svelte
@@ -60,7 +60,8 @@
         .start(cameraSetting, cameraConfig, onScanSuccess)
         .then(() => {
           if (defaultZoom > 1) {
-            const cameraOptions = html5QrCode.getRunningTrackCameraCapabilities()
+            const cameraOptions =
+              html5QrCode.getRunningTrackCameraCapabilities()
             const zoom = cameraOptions.zoomFeature()
             if (zoom.isSupported()) {
               zoom.apply(defaultZoom)