From 22c4d29db57f638a8a376b761cc5cd4d033864b6 Mon Sep 17 00:00:00 2001
From: Alex van Andel <me@alexvanandel.com>
Date: Sat, 16 Oct 2021 11:42:28 +0100
Subject: [PATCH] Chore: Resolves TS errors related to FileReader/ImageUploader
 (#965)

* Resolves TS errors related to FileReader/ImageUploader

* Also tackle cropImage errors

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
---
 components/ImageUploader.tsx | 35 +++++++++++++++++++++--------------
 components/Slider.tsx        | 19 +++++++++++++------
 lib/cropImage.ts             |  5 +++--
 lib/hooks/useFileReader.ts   | 19 +++++++------------
 4 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/components/ImageUploader.tsx b/components/ImageUploader.tsx
index 7dccb69e..aa6d89ad 100644
--- a/components/ImageUploader.tsx
+++ b/components/ImageUploader.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from "react";
+import { FormEvent, useCallback, useEffect, useState } from "react";
 import Cropper from "react-easy-crop";
 
 import { Area, getCroppedImg } from "@lib/cropImage";
@@ -17,6 +17,10 @@ type ImageUploaderProps = {
   target: string;
 };
 
+interface FileEvent<T = Element> extends FormEvent<T> {
+  target: EventTarget & T;
+}
+
 // This is separate to prevent loading the component until file upload
 function CropContainer({
   onCropComplete,
@@ -29,13 +33,13 @@ function CropContainer({
   const [crop, setCrop] = useState({ x: 0, y: 0 });
   const [zoom, setZoom] = useState(1);
 
-  const handleZoomSliderChange = ([value]) => {
+  const handleZoomSliderChange = (value: number) => {
     value < 1 ? setZoom(1) : setZoom(value);
   };
 
   return (
-    <div className="crop-container max-h-40 h-40 w-40 rounded-full">
-      <div className="relative h-40 w-40 rounded-full">
+    <div className="w-40 h-40 rounded-full crop-container max-h-40">
+      <div className="relative w-40 h-40 rounded-full">
         <Cropper
           image={imageSrc}
           crop={crop}
@@ -77,7 +81,10 @@ export default function ImageUploader({
     setImageSrc(props.imageSrc);
   }, [props.imageSrc]);
 
-  const onInputFile = (e) => {
+  const onInputFile = (e: FileEvent<HTMLInputElement>) => {
+    if (!e.target.files?.length) {
+      return;
+    }
     setFile(e.target.files[0]);
   };
 
@@ -110,33 +117,33 @@ export default function ImageUploader({
         </div>
       </DialogTrigger>
       <DialogContent>
-        <div className="sm:flex sm:items-start mb-4">
+        <div className="mb-4 sm:flex sm:items-start">
           <div className="mt-3 text-center sm:mt-0 sm:text-left">
-            <h3 className="font-cal text-lg leading-6 font-bold text-gray-900" id="modal-title">
+            <h3 className="text-lg font-bold leading-6 text-gray-900 font-cal" id="modal-title">
               {t("upload_target", { target })}
             </h3>
           </div>
         </div>
         <div className="mb-4">
-          <div className="cropper mt-6 flex flex-col justify-center items-center p-8 bg-gray-50">
+          <div className="flex flex-col items-center justify-center p-8 mt-6 cropper bg-gray-50">
             {!result && (
-              <div className="flex justify-start items-center bg-gray-500 max-h-20 h-20 w-20 rounded-full">
+              <div className="flex items-center justify-start w-20 h-20 bg-gray-500 rounded-full max-h-20">
                 {!imageSrc && (
-                  <p className="sm:text-xs text-sm text-white w-full text-center">
+                  <p className="w-full text-sm text-center text-white sm:text-xs">
                     {t("no_target", { target })}
                   </p>
                 )}
-                {imageSrc && <img className="h-20 w-20 rounded-full" src={imageSrc} alt={target} />}
+                {imageSrc && <img className="w-20 h-20 rounded-full" src={imageSrc} alt={target} />}
               </div>
             )}
-            {result && <CropContainer imageSrc={result} onCropComplete={setCroppedAreaPixels} />}
-            <label className="mt-8 px-3 py-1 text-xs leading-4 font-medium rounded-sm border border-gray-300 text-gray-700 bg-white hover:bg-gray-50 hover:text-gray-900 hover:shadow-sm focus:outline-none focus:ring-2 focus:ring-offset-1 focus:ring-neutral-900 dark:bg-transparent dark:text-white dark:border-gray-800 dark:hover:bg-gray-900">
+            {result && <CropContainer imageSrc={result as string} onCropComplete={setCroppedAreaPixels} />}
+            <label className="px-3 py-1 mt-8 text-xs font-medium leading-4 text-gray-700 bg-white border border-gray-300 rounded-sm hover:bg-gray-50 hover:text-gray-900 hover:shadow-sm focus:outline-none focus:ring-2 focus:ring-offset-1 focus:ring-neutral-900 dark:bg-transparent dark:text-white dark:border-gray-800 dark:hover:bg-gray-900">
               <input
                 onInput={onInputFile}
                 type="file"
                 name={id}
                 placeholder={t("upload_image")}
-                className="mt-4 pointer-events-none opacity-0 absolute"
+                className="absolute mt-4 opacity-0 pointer-events-none"
                 accept="image/*"
               />
               {t("choose_a_file")}
diff --git a/components/Slider.tsx b/components/Slider.tsx
index 1ed4ba27..40e2daa4 100644
--- a/components/Slider.tsx
+++ b/components/Slider.tsx
@@ -1,15 +1,22 @@
 import * as SliderPrimitive from "@radix-ui/react-slider";
 import React from "react";
 
-const Slider = ({ value, min, max, step, label, changeHandler }) => (
+const Slider = ({
+  value,
+  label,
+  changeHandler,
+  ...props
+}: Omit<SliderPrimitive.SliderProps, "value"> & {
+  value: number;
+  label: string;
+  changeHandler: (value: number) => void;
+}) => (
   <SliderPrimitive.Root
-    className="slider mt-2"
-    min={min}
-    step={step}
-    max={max}
+    className="mt-2 slider"
     value={[value]}
     aria-label={label}
-    onValueChange={changeHandler}>
+    onValueChange={(value: number[]) => changeHandler(value[0] ?? value)}
+    {...props}>
     <SliderPrimitive.Track className="slider-track">
       <SliderPrimitive.Range className="slider-range" />
     </SliderPrimitive.Track>
diff --git a/lib/cropImage.ts b/lib/cropImage.ts
index d1ea42f5..1efedc0e 100644
--- a/lib/cropImage.ts
+++ b/lib/cropImage.ts
@@ -7,7 +7,7 @@ export type Area = {
   y: number;
 };
 
-const createImage = (url) =>
+const createImage = (url: string) =>
   new Promise<HTMLImageElement>((resolve, reject) => {
     const image = new Image();
     image.addEventListener("load", () => resolve(image));
@@ -16,10 +16,11 @@ const createImage = (url) =>
     image.src = url;
   });
 
-export async function getCroppedImg(imageSrc: string, pixelCrop: Area) {
+export async function getCroppedImg(imageSrc: string, pixelCrop: Area): Promise<string> {
   const image = await createImage(imageSrc);
   const canvas = document.createElement("canvas");
   const ctx = canvas.getContext("2d");
+  if (!ctx) throw new Error("Context is null, this should never happen.");
 
   const maxSize = Math.max(image.naturalWidth, image.naturalHeight);
   const resizeRatio = MAX_IMAGE_SIZE / maxSize < 1 ? Math.max(MAX_IMAGE_SIZE / maxSize, 0.75) : 1;
diff --git a/lib/hooks/useFileReader.ts b/lib/hooks/useFileReader.ts
index f4923490..54ac6aa8 100644
--- a/lib/hooks/useFileReader.ts
+++ b/lib/hooks/useFileReader.ts
@@ -11,7 +11,7 @@ export const useFileReader = (options: UseFileReaderProps) => {
   const { method = "readAsText", onLoad } = options;
   const [file, setFile] = useState<File | null>(null);
   const [loading, setLoading] = useState<boolean>(false);
-  const [error, setError] = useState<ProgressEvent<FileReader> | null>(null);
+  const [error, setError] = useState<DOMException | null>(null);
   const [result, setResult] = useState<string | ArrayBuffer | null>(null);
 
   useEffect(() => {
@@ -28,21 +28,16 @@ export const useFileReader = (options: UseFileReaderProps) => {
     const reader = new FileReader();
     reader.onloadstart = () => setLoading(true);
     reader.onloadend = () => setLoading(false);
-    reader.onerror = setError;
+    reader.onerror = () => setError(reader.error);
 
-    reader.onload = (e) => {
-      setResult(e.target.result);
+    reader.onload = (e: ProgressEvent<FileReader>) => {
+      setResult(e.target?.result ?? null);
       if (onLoad) {
-        onLoad(e.target.result);
+        onLoad(e.target?.result ?? null);
       }
     };
-
-    try {
-      reader[method](file);
-    } catch (e) {
-      setError(e);
-    }
+    reader[method](file);
   }, [file, method, onLoad]);
 
-  return [{ result, error, file, loading }, setFile];
+  return [{ result, error, file, loading }, setFile] as const;
 };