Added progress spinner in ImageUplaod (#91)

src/app/molecules/image-upload/ImageUpload.jsx

@@ -1,48 +1,73 @@
-import React, { useRef } from 'react';
+import React, { useState, useRef } from 'react';
 import PropTypes from 'prop-types';
+import './ImageUpload.scss';
 
 import initMatrix from '../../../client/initMatrix';
 
-import SettingsIC from '../../../../public/res/ic/outlined/settings.svg';
+import Text from '../../atoms/text/Text';
 import Avatar from '../../atoms/avatar/Avatar';
-
-import RawIcon from '../../atoms/system-icons/RawIcon';
-import './ImageUpload.scss';
+import Spinner from '../../atoms/spinner/Spinner';
 
 function ImageUpload({
-  text, bgColor, imageSrc, onUpload,
+  text, bgColor, imageSrc, onUpload, onRequestRemove,
 }) {
+  const [uploadPromise, setUploadPromise] = useState(null);
   const uploadImageRef = useRef(null);
 
-  // Uploads image and passes resulting URI to onUpload function provided in component props.
-  function uploadImage(e) {
+  async function uploadImage(e) {
     const file = e.target.files.item(0);
-    if (file !== null) { // TODO Add upload progress spinner
-      initMatrix.matrixClient.uploadContent(file, { onlyContentUri: false }).then((res) => {
-        if (res.content_uri !== null) {
-          onUpload({ content_uri: res.content_uri });
-        }
-      }, (err) => {
-        console.log(err); // TODO Replace with alert banner.
-      });
+    if (file === null) return;
+    try {
+      const uPromise = initMatrix.matrixClient.uploadContent(file, { onlyContentUri: false });
+      setUploadPromise(uPromise);
+
+      const res = await uPromise;
+      if (typeof res?.content_uri === 'string') onUpload(res.content_uri);
+      setUploadPromise(null);
+    } catch {
+      setUploadPromise(null);
     }
+    uploadImageRef.current.value = null;
+  }
+
+  function cancelUpload() {
+    initMatrix.matrixClient.cancelUpload(uploadPromise);
+    setUploadPromise(null);
+    uploadImageRef.current.value = null;
   }
 
   return (
-    <button type="button" className="img-upload" onClick={() => { uploadImageRef.current.click(); }}>
-      <div className="img-upload__mask">
+    <div className="img-upload__wrapper">
+      <button
+        type="button"
+        className="img-upload"
+        onClick={() => {
+          if (uploadPromise !== null) return;
+          uploadImageRef.current.click();
+        }}
+      >
         <Avatar
           imageSrc={imageSrc}
           text={text.slice(0, 1)}
           bgColor={bgColor}
           size="large"
         />
-      </div>
-      <div className="img-upload__icon">
-        <RawIcon size="small" src={SettingsIC} />
-      </div>
+        <div className={`img-upload__process ${uploadPromise === null ? ' img-upload__process--stopped' : ''}`}>
+          {uploadPromise === null && <Text variant="b3">Upload</Text>}
+          {uploadPromise !== null && <Spinner size="small" />}
+        </div>
+      </button>
+      { (typeof imageSrc === 'string' || uploadPromise !== null) && (
+        <button
+          className="img-upload__btn-cancel"
+          type="button"
+          onClick={uploadPromise === null ? onRequestRemove : cancelUpload}
+        >
+          <Text variant="b3">{uploadPromise ? 'Cancel' : 'Remove'}</Text>
+        </button>
+      )}
       <input onChange={uploadImage} style={{ display: 'none' }} ref={uploadImageRef} type="file" />
-    </button>
+    </div>
   );
 }
 
@@ -50,14 +75,14 @@ ImageUpload.defaultProps = {
   text: null,
   bgColor: 'transparent',
   imageSrc: null,
-  onUpload: null,
 };
 
 ImageUpload.propTypes = {
   text: PropTypes.string,
   bgColor: PropTypes.string,
   imageSrc: PropTypes.string,
-  onUpload: PropTypes.func,
+  onUpload: PropTypes.func.isRequired,
+  onRequestRemove: PropTypes.func.isRequired,
 };
 
 export default ImageUpload;