Fix torch related bug

Fix for #634 Issue was related to track not getting updated on camera restart.
mebjas · Nov 30, 2022 · bed403b · bed403b
1 parent 55acb4b
commit bed403b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/minified/html5-qrcode.min.js b/minified/html5-qrcode.min.js
diff --git a/src/html5-qrcode-scanner.ts b/src/html5-qrcode-scanner.ts
@@ -778,6 +778,9 @@ export class Html5QrcodeScanner {
                             Html5QrcodeScannerStatus.STATUS_WARNING);
                     }
                 );
+            } else {
+                torchButton.updateTorchCapability(
+                    cameraCapabilities.torchFeature());
             }
             torchButton.show();
         };

diff --git a/src/ui/scanner/torch-button.ts b/src/ui/scanner/torch-button.ts
@@ -118,11 +118,14 @@ export interface TorchButtonOptions {
 /** Helper class for creating Torch UI component. */
 export class TorchButton implements TorchButtonController {
     private readonly torchButton: HTMLButtonElement;
-    private readonly torchController: TorchController;
+    private readonly onTorchActionFailureCallback: OnTorchActionFailureCallback;
+
+    private torchController: TorchController;
 
     private constructor(
         torchCapability: BooleanCameraCapability,
         onTorchActionFailureCallback: OnTorchActionFailureCallback) {
+        this.onTorchActionFailureCallback = onTorchActionFailureCallback;
         this.torchButton
             = BaseUiElementFactory.createElement<HTMLButtonElement>(
             "button", PublicUiElementIdAndClasses.TORCH_BUTTON_ID);
@@ -154,11 +157,18 @@ export class TorchButton implements TorchButtonController {
                 $this.torchButton.classList.add(
                     PublicUiElementIdAndClasses.TORCH_BUTTON_CLASS_TORCH_OFF);
             }
-    });
+        });
 
         parentElement.appendChild(this.torchButton);
     }
 
+    public updateTorchCapability(torchCapability: BooleanCameraCapability) {
+        this.torchController = new TorchController(
+            torchCapability,
+            /* buttonController= */ this,
+            this.onTorchActionFailureCallback);
+    }
+
     /** Returns the torch button. */
     public getTorchButton(): HTMLButtonElement {
         return this.torchButton;