From 552ecc9064825db5c5d62d0e43299a2ebcd94fdb Mon Sep 17 00:00:00 2001
From: Henry Heino <46334387+personalizedrefrigerator@users.noreply.github.com>
Date: Mon, 30 Jun 2025 13:11:59 -0700
Subject: [PATCH] Android, iOS: Fix camera screen (#12624)

---
 .eslintignore                                                | 1 +
 .gitignore                                                   | 1 +
 .../app-mobile/components/CameraView/Camera/index.web.tsx    | 5 +++++
 packages/app-mobile/components/CameraView/CameraView.tsx     | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 packages/app-mobile/components/CameraView/Camera/index.web.tsx

diff --git a/.eslintignore b/.eslintignore
index 89f3dc798c..2be4e8f5f5 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -617,6 +617,7 @@ packages/app-mobile/components/BottomDrawer.js
 packages/app-mobile/components/CameraView/ActionButtons.js
 packages/app-mobile/components/CameraView/Camera/index.jest.js
 packages/app-mobile/components/CameraView/Camera/index.js
+packages/app-mobile/components/CameraView/Camera/index.web.js
 packages/app-mobile/components/CameraView/Camera/types.js
 packages/app-mobile/components/CameraView/CameraView.test.js
 packages/app-mobile/components/CameraView/CameraView.js
diff --git a/.gitignore b/.gitignore
index 435260b56f..23feed9129 100644
--- a/.gitignore
+++ b/.gitignore
@@ -592,6 +592,7 @@ packages/app-mobile/components/BottomDrawer.js
 packages/app-mobile/components/CameraView/ActionButtons.js
 packages/app-mobile/components/CameraView/Camera/index.jest.js
 packages/app-mobile/components/CameraView/Camera/index.js
+packages/app-mobile/components/CameraView/Camera/index.web.js
 packages/app-mobile/components/CameraView/Camera/types.js
 packages/app-mobile/components/CameraView/CameraView.test.js
 packages/app-mobile/components/CameraView/CameraView.js
diff --git a/packages/app-mobile/components/CameraView/Camera/index.web.tsx b/packages/app-mobile/components/CameraView/Camera/index.web.tsx
new file mode 100644
index 0000000000..12f5f1810f
--- /dev/null
+++ b/packages/app-mobile/components/CameraView/Camera/index.web.tsx
@@ -0,0 +1,5 @@
+
+// Use the mock camera component on web -- for now, the default Camera
+// component is Android/iOS only
+import Camera from './index.jest';
+export default Camera;
diff --git a/packages/app-mobile/components/CameraView/CameraView.tsx b/packages/app-mobile/components/CameraView/CameraView.tsx
index 04701bdfeb..ca3359d034 100644
--- a/packages/app-mobile/components/CameraView/CameraView.tsx
+++ b/packages/app-mobile/components/CameraView/CameraView.tsx
@@ -15,7 +15,7 @@ import fitRectIntoBounds from './utils/fitRectIntoBounds';
 import useBarcodeScanner from './utils/useBarcodeScanner';
 import ScannedBarcodes from './ScannedBarcodes';
 import { CameraRef } from './Camera/types';
-import Camera from './Camera/index.jest';
+import Camera from './Camera/index';
 import { CameraResult, OnInsertBarcode } from './types';
 import Logger from '@joplin/utils/Logger';
 import useBackHandler from '../../utils/hooks/useBackHandler';