self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-08-10 22:11:50 +02:00
Code Issues Releases Activity

Android, iOS: Fix camera screen (#12624)

Browse Source
This commit is contained in:
Henry Heino
2025-06-30 13:11:59 -07:00
committed by GitHub
parent 7d4864193f
commit 552ecc9064
4 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@@ -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

1
.gitignore vendored
View File

@@ -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

5
packages/app-mobile/components/CameraView/Camera/index.web.tsx Normal file
View File

@@ -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;

2
packages/app-mobile/components/CameraView/CameraView.tsx
View File

@@ -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';