Merge pull request #22 from atomdmac/allow-clear-state

feat: Initialize complete state, allow state to be cleared.

src/upload-reducer.tsx

@@ -2,38 +2,54 @@ export const SET_ERROR = 'SET_ERROR';
 export const START_UPLOADING = 'START_UPLOADING';
 export const SET_UPLOAD_PROGRESS = 'SET_UPLOAD_PROGRESS';
 export const FINISH_UPLOADING = 'FINISH_UPLOADING';
+export const RESET = 'RESET';
 
 export type UploadState = {
-  loading?: boolean;
-  progress?: number;
-  error?: string;
-  done?: boolean;
+  loading: boolean;
+  progress: number;
+  error: string | null;
+  done: boolean;
   response?: any;
 };
 
+export const initialState: UploadState = {
+  loading: false,
+  progress: 0,
+  error: null,
+  done: false,
+  response: null
+};
+
 export type Action =
   | { type: 'START_UPLOADING' }
   | { type: 'SET_UPLOAD_PROGRESS'; payload: number }
   | { type: 'SET_ERROR'; payload: string }
-  | { type: 'FINISH_UPLOADING'; payload: any };
+  | { type: 'FINISH_UPLOADING'; payload: any }
+  | { type: 'RESET'; };
 
 export type dispatchType = (action: Action) => void;
+
 // The possible state changes that take place during a file upload
-export function reducer(state: UploadState, action: Action) {
+export function reducer(state: UploadState, action: Action): UploadState {
   switch (action.type) {
     case START_UPLOADING:
-      return { loading: true };
+      return { ...initialState, loading: true };
     case SET_UPLOAD_PROGRESS:
       return { ...state, progress: action.payload };
     case SET_ERROR:
-      return { loading: false, error: action.payload, done: true };
+      return { ...state, loading: false, error: action.payload, done: true };
     case FINISH_UPLOADING:
       return {
+        ...state,
         done: true,
         loading: false,
         response: action.payload,
         error: action.payload.error ? action.payload.response : false,
       };
+    case RESET:
+      return {
+        ...initialState
+      };
     default:
       return state;
   }

src/use-upload.tsx

@@ -7,6 +7,8 @@ import {
   SET_UPLOAD_PROGRESS,
   FINISH_UPLOADING,
   dispatchType,
+  initialState,
+  RESET,
 } from './upload-reducer';
 import { XHRClient, XHROptions, createXhrClient } from './clients/xhr';
 import { FileOrFileList } from './';
@@ -40,12 +42,16 @@ const handleUpload = async ({
   if (response) dispatch({ type: FINISH_UPLOADING, payload: response });
 };
 
+type UseUploadResult = UploadState & {
+  reset: () => void
+}
+
 export const useUpload = (
   files: FileOrFileList,
   options: XHROptions | GraphQLOptions,
-): UploadState => {
+): UseUploadResult => {
   let client = useContext<XHRClient | GraphQLClient | null>(UploadContext);
-  const [state, dispatch] = useReducer(reducer, {});
+  const [state, dispatch] = useReducer(reducer, initialState);
 
   useEffect(() => {
     if (!files) return;
@@ -57,5 +63,8 @@ export const useUpload = (
     });
   }, [files]);
 
-  return state;
+  return {
+    ...state,
+    reset: () => dispatch({ type: RESET })
+  };
 };