fix pointer style for not clickable thumbnail and address PR comments

Expensify · Feb 29, 2024 · ecc5960 · ecc5960
1 parent 878be89
commit ecc5960
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 21 deletions.
diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -303,7 +303,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
 
     const [isAttachmentInvalid, setIsAttachmentInvalid] = useState(false);
 
-    const hideRecieptModal = () => {
+    const navigateBack = () => {
         Navigation.goBack(ROUTES.MONEY_REQUEST_CREATE_TAB_SCAN.getRoute(iouType, transaction.transactionID, reportID));
     };
 
@@ -868,6 +868,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
                     // We don't support scaning password protected PDF receipt
                     enabled={!isAttachmentInvalid}
                     onPassword={() => setIsAttachmentInvalid(true)}
+                    isClickable={false}
                 />
             ) : (
                 <Image
@@ -939,10 +940,10 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
             {shouldShowAllFields && supplementaryFields}
             <ConfirmModal
                 title={translate('attachmentPicker.wrongFileType')}
-                onConfirm={hideRecieptModal}
-                onCancel={hideRecieptModal}
+                onConfirm={navigateBack}
+                onCancel={navigateBack}
                 isVisible={isAttachmentInvalid}
-                prompt={translate('receipt.protectedPDFNotSupportedError')}
+                prompt={translate('attachmentPicker.protectedPDFNotSupported')}
                 confirmText={translate('common.close')}
                 shouldShowCancelButton={false}
             />

diff --git a/src/components/PDFThumbnail/index.css b/src/components/PDFThumbnail/index.css
@@ -0,0 +1,4 @@
+/* These style overrides are necessary so that the PDF thumbnail shows default pointer when it's not clickable */
+.react-pdf__Thumbnail--notClickable {
+    cursor: default;
+}
diff --git a/src/components/PDFThumbnail/index.tsx b/src/components/PDFThumbnail/index.tsx
@@ -1,22 +1,24 @@
-import React, {useMemo} from 'react';
+// @ts-expect-error - We use the same method as PDFView to import the worker
+import pdfWorkerSource from 'pdfjs-dist/legacy/build/pdf.worker';
+import React, {useEffect, useMemo} from 'react';
 import {View} from 'react-native';
 import {Document, pdfjs, Thumbnail} from 'react-pdf';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import useThemeStyles from '@hooks/useThemeStyles';
 import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
+import './index.css';
 import type PDFThumbnailProps from './types';
 
-if (!pdfjs.GlobalWorkerOptions.workerSrc) {
-    pdfjs.GlobalWorkerOptions.workerSrc = new URL(
-        'pdfjs-dist/legacy/build/pdf.worker.min.js',
-        // @ts-expect-error - It is a recommended step for import worker - https://github.com/wojtekmaj/react-pdf/blob/main/packages/react-pdf/README.md#import-worker-recommended
-        import.meta.url,
-    ).toString();
-}
-
-function PDFThumbnail({previewSourceURL, style, isAuthTokenRequired = false, enabled = true, onPassword = () => {}}: PDFThumbnailProps) {
+function PDFThumbnail({previewSourceURL, style, isAuthTokenRequired = false, enabled = true, onPassword = () => {}, isClickable = true}: PDFThumbnailProps) {
     const styles = useThemeStyles();
 
+    useEffect(() => {
+        const workerURL = URL.createObjectURL(new Blob([pdfWorkerSource], {type: 'text/javascript'}));
+        if (pdfjs.GlobalWorkerOptions.workerSrc !== workerURL) {
+            pdfjs.GlobalWorkerOptions.workerSrc = workerURL;
+        }
+    }, []);
+
     const thumbnail = useMemo(
         () => (
             <Document
@@ -31,10 +33,13 @@ function PDFThumbnail({previewSourceURL, style, isAuthTokenRequired = false, ena
                     onPassword();
                 }}
             >
-                <Thumbnail pageIndex={0} />
+                <Thumbnail
+                    pageIndex={0}
+                    className={isClickable ? '' : 'react-pdf__Thumbnail--notClickable'}
+                />
             </Document>
         ),
-        [isAuthTokenRequired, previewSourceURL, onPassword],
+        [isAuthTokenRequired, previewSourceURL, onPassword, isClickable],
     );
 
     return (

diff --git a/src/components/PDFThumbnail/types.ts b/src/components/PDFThumbnail/types.ts
@@ -7,14 +7,17 @@ type PDFThumbnailProps = {
     /** Any additional styles to apply */
     style?: StyleProp<ViewStyle>;
 
-    /** Whether the image requires an authToken */
+    /** Whether the PDF thumbnail requires an authToken */
     isAuthTokenRequired?: boolean;
 
     /** Whether the PDF thumbnail can be loaded */
     enabled?: boolean;
 
     /** Callback to call if PDF is password protected */
     onPassword?: () => void;
+
+    /** Whether the PDF thumbnail is clickable */
+    isClickable?: boolean;
 };
 
 export default PDFThumbnailProps;
diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -338,8 +338,9 @@ export default {
         attachmentTooSmall: 'Attachment too small',
         sizeNotMet: 'Attachment size must be greater than 240 bytes.',
         wrongFileType: 'Invalid file type',
-        notAllowedExtension: 'This file type is not allowed.',
+        notAllowedExtension: 'This file type is not allowed',
         folderNotAllowedMessage: 'Uploading a folder is not allowed. Try a different file.',
+        protectedPDFNotSupported: 'Password-protected PDF is not supported',
     },
     avatarCropModal: {
         title: 'Edit photo',
@@ -572,7 +573,6 @@ export default {
         deleteReceipt: 'Delete receipt',
         deleteConfirmation: 'Are you sure you want to delete this receipt?',
         addReceipt: 'Add receipt',
-        protectedPDFNotSupportedError: 'Password-protected PDF is not supported.',
     },
     iou: {
         amount: 'Amount',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -328,8 +328,9 @@ export default {
         attachmentTooSmall: 'Archivo adjunto demasiado pequeño',
         sizeNotMet: 'El archivo adjunto debe ser más grande que 240 bytes.',
         wrongFileType: 'Tipo de archivo inválido',
-        notAllowedExtension: 'Este tipo de archivo no es compatible.',
+        notAllowedExtension: 'Este tipo de archivo no es compatible',
         folderNotAllowedMessage: 'Subir una carpeta no está permitido. Prueba con otro archivo.',
+        protectedPDFNotSupported: 'Los PDFs con password no son compatibles',
     },
     avatarCropModal: {
         title: 'Editar foto',
@@ -565,7 +566,6 @@ export default {
         deleteReceipt: 'Eliminar recibo',
         deleteConfirmation: '¿Estás seguro de que quieres borrar este recibo?',
         addReceipt: 'Añadir recibo',
-        protectedPDFNotSupportedError: 'Los PDFs con password no son compatibles.',
     },
     iou: {
         amount: 'Importe',