X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/23915c3b1a23837f30ca5a0def807869a224b1db..refs/heads/development:/resources/js/components/dropzone.js

diff --git a/resources/js/components/dropzone.js b/resources/js/components/dropzone.js
index 7faa5489f..598e0d8d4 100644
--- a/resources/js/components/dropzone.js
+++ b/resources/js/components/dropzone.js
@@ -1,48 +1,81 @@
 import {Component} from './component';
-import {Clipboard} from '../services/clipboard';
+import {Clipboard} from '../services/clipboard.ts';
+import {
+    elem, getLoading, onSelect, removeLoading,
+} from '../services/dom.ts';
 
 export class Dropzone extends Component {
 
     setup() {
         this.container = this.$el;
+        this.statusArea = this.$refs.statusArea;
+        this.dropTarget = this.$refs.dropTarget;
+        this.selectButtons = this.$manyRefs.selectButton || [];
+
+        this.isActive = true;
+
         this.url = this.$opts.url;
+        this.method = (this.$opts.method || 'post').toUpperCase();
         this.successMessage = this.$opts.successMessage;
-        this.removeMessage = this.$opts.removeMessage;
-        this.uploadLimit = Number(this.$opts.uploadLimit); // TODO - Use
-        this.uploadLimitMessage = this.$opts.uploadLimitMessage; // TODO - Use
-        this.timeoutMessage = this.$opts.timeoutMessage; // TODO - Use
-        // window.uploadTimeout // TODO - Use
-        // TODO - Click-to-upload buttons/areas
-        // TODO - Drop zone highlighting of existing element
-        //   (Add overlay via additional temp element).
+        this.errorMessage = this.$opts.errorMessage;
+        this.uploadLimitMb = Number(this.$opts.uploadLimit);
+        this.uploadLimitMessage = this.$opts.uploadLimitMessage;
+        this.zoneText = this.$opts.zoneText;
+        this.fileAcceptTypes = this.$opts.fileAccept;
+        this.allowMultiple = this.$opts.allowMultiple === 'true';
 
         this.setupListeners();
     }
 
+    /**
+     * Public method to allow external disabling/enabling of this drag+drop dropzone.
+     * @param {Boolean} active
+     */
+    toggleActive(active) {
+        this.isActive = active;
+    }
+
     setupListeners() {
-        this.container.addEventListener('dragenter', event => {
-            this.container.style.border = '1px dotted tomato';
-            event.preventDefault();
-        });
+        onSelect(this.selectButtons, this.manualSelectHandler.bind(this));
+        this.setupDropTargetHandlers();
+    }
 
-        this.container.addEventListener('dragover', event => {
-            event.preventDefault();
-        });
+    setupDropTargetHandlers() {
+        let depth = 0;
 
         const reset = () => {
-            this.container.style.border = null;
+            this.hideOverlay();
+            depth = 0;
         };
 
-        this.container.addEventListener('dragend', event => {
-            reset();
+        this.dropTarget.addEventListener('dragenter', event => {
+            event.preventDefault();
+            depth += 1;
+
+            if (depth === 1 && this.isActive) {
+                this.showOverlay();
+            }
         });
 
-        this.container.addEventListener('dragleave', event => {
-            reset();
+        this.dropTarget.addEventListener('dragover', event => {
+            event.preventDefault();
         });
 
-        this.container.addEventListener('drop', event => {
+        this.dropTarget.addEventListener('dragend', reset);
+        this.dropTarget.addEventListener('dragleave', () => {
+            depth -= 1;
+            if (depth === 0) {
+                reset();
+            }
+        });
+        this.dropTarget.addEventListener('drop', event => {
             event.preventDefault();
+            reset();
+
+            if (!this.isActive) {
+                return;
+            }
+
             const clipboard = new Clipboard(event.dataTransfer);
             const files = clipboard.getFiles();
             for (const file of files) {
@@ -51,67 +84,152 @@ export class Dropzone extends Component {
         });
     }
 
+    manualSelectHandler() {
+        const input = elem('input', {
+            type: 'file',
+            style: 'left: -400px; visibility: hidden; position: fixed;',
+            accept: this.fileAcceptTypes,
+            multiple: this.allowMultiple ? '' : null,
+        });
+        this.container.append(input);
+        input.click();
+        input.addEventListener('change', () => {
+            for (const file of input.files) {
+                this.createUploadFromFile(file);
+            }
+            input.remove();
+        });
+    }
+
+    showOverlay() {
+        const overlay = this.dropTarget.querySelector('.dropzone-overlay');
+        if (!overlay) {
+            const zoneElem = elem('div', {class: 'dropzone-overlay'}, [this.zoneText]);
+            this.dropTarget.append(zoneElem);
+        }
+    }
+
+    hideOverlay() {
+        const overlay = this.dropTarget.querySelector('.dropzone-overlay');
+        if (overlay) {
+            overlay.remove();
+        }
+    }
+
     /**
      * @param {File} file
      * @return {Upload}
      */
     createUploadFromFile(file) {
-        const {dom, status} = this.createDomForFile(file);
-        this.container.append(dom);
-
-        const formData = new FormData();
-        formData.append('file', file, file.name);
-
-        // TODO - Change to XMLHTTPRequest so we can track progress.
-        const uploadPromise = window.$http.post(this.url, formData);
+        const {
+            dom, status, progress, dismiss,
+        } = this.createDomForFile(file);
+        this.statusArea.append(dom);
+        const component = this;
 
         const upload = {
             file,
             dom,
+            updateProgress(percentComplete) {
+                progress.textContent = `${percentComplete}%`;
+                progress.style.width = `${percentComplete}%`;
+            },
             markError(message) {
                 status.setAttribute('data-status', 'error');
                 status.textContent = message;
+                removeLoading(dom);
+                this.updateProgress(100);
             },
             markSuccess(message) {
                 status.setAttribute('data-status', 'success');
                 status.textContent = message;
+                removeLoading(dom);
+                setTimeout(dismiss, 2400);
+                component.$emit('upload-success', {
+                    name: file.name,
+                });
             },
         };
 
-        uploadPromise.then(returnData => {
-            upload.markSuccess(returnData.statusText);
-        }).catch(err => {
-            upload.markError(err?.data?.message || err.message);
-        });
+        // Enforce early upload filesize limit
+        if (file.size > (this.uploadLimitMb * 1000000)) {
+            upload.markError(this.uploadLimitMessage);
+            return upload;
+        }
+
+        this.startXhrForUpload(upload);
 
         return upload;
     }
 
     /**
-     * @param {File} file
-     * @return {{image: Element, dom: Element, progress: Element, label: Element, status: Element}}
+     * @param {Upload} upload
      */
-    createDomForFile(file) {
-        const dom = document.createElement('div');
-        const label = document.createElement('div');
-        const status = document.createElement('div');
-        const progress = document.createElement('div');
-        const image = document.createElement('img');
+    startXhrForUpload(upload) {
+        const formData = new FormData();
+        formData.append('file', upload.file, upload.file.name);
+        if (this.method !== 'POST') {
+            formData.append('_method', this.method);
+        }
+        const component = this;
+
+        const req = window.$http.createXMLHttpRequest('POST', this.url, {
+            error() {
+                upload.markError(component.errorMessage);
+            },
+            readystatechange() {
+                if (this.readyState === XMLHttpRequest.DONE && this.status === 200) {
+                    upload.markSuccess(component.successMessage);
+                } else if (this.readyState === XMLHttpRequest.DONE && this.status >= 400) {
+                    upload.markError(window.$http.formatErrorResponseText(this.responseText));
+                }
+            },
+        });
 
-        dom.classList.add('dropzone-file-item');
-        status.classList.add('dropzone-file-item-status');
-        progress.classList.add('dropzone-file-item-progress');
+        req.upload.addEventListener('progress', evt => {
+            const percent = Math.min(Math.ceil((evt.loaded / evt.total) * 100), 100);
+            upload.updateProgress(percent);
+        });
 
-        image.src = ''; // TODO - file icon
-        label.innerText = file.name;
+        req.setRequestHeader('Accept', 'application/json');
+        req.send(formData);
+    }
+
+    /**
+     * @param {File} file
+     * @return {{image: Element, dom: Element, progress: Element, status: Element, dismiss: function}}
+     */
+    createDomForFile(file) {
+        const image = elem('img', {src: "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'%3E%3Cpath d='M9.224 7.373a.924.924 0 0 0-.92.925l-.006 7.404c0 .509.412.925.921.925h5.557a.928.928 0 0 0 .926-.925v-5.553l-2.777-2.776Zm3.239 3.239V8.067l2.545 2.545z' style='fill:%23000;fill-opacity:.75'/%3E%3C/svg%3E"});
+        const status = elem('div', {class: 'dropzone-file-item-status'}, []);
+        const progress = elem('div', {class: 'dropzone-file-item-progress'});
+        const imageWrap = elem('div', {class: 'dropzone-file-item-image-wrap'}, [image]);
+
+        const dom = elem('div', {class: 'dropzone-file-item'}, [
+            imageWrap,
+            elem('div', {class: 'dropzone-file-item-text-wrap'}, [
+                elem('div', {class: 'dropzone-file-item-label'}, [file.name]),
+                getLoading(),
+                status,
+            ]),
+            progress,
+        ]);
 
         if (file.type.startsWith('image/')) {
             image.src = URL.createObjectURL(file);
         }
 
-        dom.append(image, label, progress, status);
+        const dismiss = () => {
+            dom.classList.add('dismiss');
+            dom.addEventListener('animationend', () => {
+                dom.remove();
+            });
+        };
+
+        dom.addEventListener('click', dismiss);
+
         return {
-            dom, label, image, progress, status,
+            dom, progress, status, dismiss,
         };
     }
 
@@ -121,6 +239,7 @@ export class Dropzone extends Component {
  * @typedef Upload
  * @property {File} file
  * @property {Element} dom
+ * @property {function(Number)} updateProgress
  * @property {function(String)} markError
  * @property {function(String)} markSuccess
  */