@popsure/dirty-swan 0.38.1 → 0.38.3

package/src/lib/components/multiDropzone/index.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useState, useRef } from 'react';
 import classnames from 'classnames';
 import { useDropzone, FileRejection } from 'react-dropzone';
 import AnimateHeight from 'react-animate-height';
@@ -6,20 +6,20 @@ import generateId from '../../util/generateId';
 import styles from './style.module.scss';
 import icons from './icons/index'; // TODO: inline all of the svgs
 import UploadFileCell from './UploadFileCell';
-import { 
-  formatAcceptFileList, 
-  getErrorMessage, 
-  getFormattedAcceptObject, 
-  getUploadStatus 
+import {
+  formatAcceptFileList,
+  getErrorMessage,
+  getFormattedAcceptObject,
+  getUploadStatus,
 } from './utils';
 
-import { 
-  AcceptType, 
-  ErrorMessage, 
+import {
+  AcceptType,
+  ErrorMessage,
   FileType,
-  TextOverrides, 
-  UploadedFile, 
-  UploadStatus 
+  TextOverrides,
+  UploadedFile,
+  UploadStatus,
 } from './types';
 
 import { formatBytes } from '../../util/formatBytes';
@@ -50,21 +50,23 @@ const MultiDropzone = ({
   const [errors, setErrors] = useState<ErrorMessage[]>([]);
   const formattedAccept = getFormattedAcceptObject(accept);
   const fileList = formatAcceptFileList(formattedAccept);
-  const maxSizePlaceholder = maxSize && maxSize > 0
-  ? `${textOverrides?.sizeUpToText || "up to"} ${formatBytes(maxSize)}`
-  : "";
-const placeholder = `${textOverrides?.supportsTextShort || "Supports"} ${fileList || "JPEG, PNG, PDF"} ${maxSizePlaceholder}`;
+  const maxSizePlaceholder =
+    maxSize && maxSize > 0
+      ? `${textOverrides?.sizeUpToText || 'up to'} ${formatBytes(maxSize)}`
+      : '';
+  const placeholder = `${textOverrides?.supportsTextShort || 'Supports'} ${
+    fileList || 'JPEG, PNG, PDF'
+  } ${maxSizePlaceholder}`;
   const isOverMaxFiles = maxFiles > 0 && uploadedFiles.length > maxFiles;
 
-  const removeError = (removeId: string) => (
-    setErrors(errors.filter(({ id }) => id !== removeId))
-  );
+  const removeError = (removeId: string) =>
+    setErrors(errors.filter(({ id }) => id !== removeId));
 
   const onDrop = useCallback(
     (acceptedFiles: File[], filesRejected: FileRejection[]) => {
       onFileSelect(acceptedFiles);
 
-      setErrors((previousErrors) => ([
+      setErrors((previousErrors) => [
         ...previousErrors,
         ...filesRejected.map(({ errors }) => ({
           id: generateId(),
@@ -73,13 +75,12 @@ const placeholder = `${textOverrides?.supportsTextShort || "Supports"} ${fileLis
             { fileList, maxSize },
             textOverrides
           ),
-        }))
-      ]));
+        })),
+      ]);
     },
     [fileList, maxSize, onFileSelect, textOverrides]
   );
 
-
   const { getRootProps, getInputProps } = useDropzone({
     accept: formattedAccept,
     disabled: uploading,
@@ -87,6 +88,8 @@ const placeholder = `${textOverrides?.supportsTextShort || "Supports"} ${fileLis
     onDrop,
   });
 
+  const uniqueId = useRef(generateId());
+
   return (
     <div className={styles.container}>
       <div
@@ -100,6 +103,7 @@ const placeholder = `${textOverrides?.supportsTextShort || "Supports"} ${fileLis
       >
         <input
           data-testid="ds-drop-input"
+          id={uniqueId.current}
           {...getInputProps()}
         />
         <img
@@ -107,31 +111,39 @@ const placeholder = `${textOverrides?.supportsTextShort || "Supports"} ${fileLis
           src={isCondensed ? icons.uploadSmallIcon : icons.uploadIcon}
           alt="purple cloud with an arrow"
         />
-        <div className={`p-h4 mt8 ${isCondensed ? styles.textInline : ''}`}>
+        <label
+          htmlFor={uniqueId.current}
+          className={`p-h4 mt8 d-block c-pointer ${
+            isCondensed ? styles.textInline : ''
+          }`}
+        >
           {uploading
             ? textOverrides?.currentlyUploadingText ||
               'Please wait while uploading file...'
             : textOverrides?.instructionsText || 'Choose file or drag & drop'}
-        </div>
+        </label>
         <div className="p-p--small tc-grey-500">
           {textOverrides?.supportsText || placeholder}
         </div>
       </div>
 
-      {errors.map(({ id, message }) => message && (
-        <UploadFileCell
-          uploadStatus="ERROR"
-          file={{
-            error: message,
-            id,
-            name: message,
-            progress: 0,
-          }}
-          key={id}
-          onRemoveFile={() => removeError(id)}
-          uploading={false}
-        />
-      ))}
+      {errors.map(
+        ({ id, message }) =>
+          message && (
+            <UploadFileCell
+              uploadStatus="ERROR"
+              file={{
+                error: message,
+                id,
+                name: message,
+                progress: 0,
+              }}
+              key={id}
+              onRemoveFile={() => removeError(id)}
+              uploading={false}
+            />
+          )
+      )}
 
       {uploadedFiles.length > 0 && (
         <div className="w100 mt16">
@@ -149,7 +161,7 @@ const placeholder = `${textOverrides?.supportsTextShort || "Supports"} ${fileLis
 
       <AnimateHeight duration={300} height={isOverMaxFiles ? 'auto' : 0}>
         <p className="tc-red-500 p-p--small">
-          {textOverrides?.tooManyFilesError || "Too many files."}
+          {textOverrides?.tooManyFilesError || 'Too many files.'}
         </p>
       </AnimateHeight>
     </div>

package/src/lib/components/multiDropzone/style.module.scss

@@ -1,4 +1,4 @@
-@use "../../scss/public/grid" as *;
+@use '../../scss/public/grid' as *;
 
 .container {
   background-color: transparent;
@@ -33,5 +33,5 @@
 
 .dropzoneContainerDisabled {
   pointer-events: none;
-  opacity: 0.4
+  opacity: 0.4;
 }