From 4cbf1fe422c8068fd93715dd178a3d0e314fc0c4 Mon Sep 17 00:00:00 2001
From: Thomas Weber <weber_t@mailbox.org>
Date: Sat, 10 Jul 2021 20:42:39 -0500
Subject: [PATCH] Redesign icon input

---
 src/locales/en.json                 |  11 +++
 src/packager/FileInput.svelte       |  20 -----
 src/packager/ImageInput.svelte      | 126 ++++++++++++++++++++++++++++
 src/packager/PackagerOptions.svelte |  10 +--
 4 files changed, 141 insertions(+), 26 deletions(-)
 delete mode 100644 src/packager/FileInput.svelte
 create mode 100644 src/packager/ImageInput.svelte

diff --git a/src/locales/en.json b/src/locales/en.json
index 8ff0e62..5ec9a69 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -301,6 +301,17 @@
       "string": "Downloads will appear here"
     }
   },
+  "fileInput": {
+    "select": {
+      "string": "Select or drop file"
+    },
+    "clear": {
+      "string": "Clear Selection"
+    },
+    "selected": {
+      "string": "Selected {file}"
+    }
+  },
   "nwjs": {
     "furtherStepsWin": {
       "string": "Further steps for Windows"
diff --git a/src/packager/FileInput.svelte b/src/packager/FileInput.svelte
deleted file mode 100644
index d1bf05c..0000000
--- a/src/packager/FileInput.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script>
-  export let file;
-  export let accept;
-  let fileInput;
-
-  const handleChange = (e) => {
-    const files = e.target.files;
-    if (files.length) {
-      file = files[0];
-    } else {
-      file = null;
-    }
-  };
-</script>
-
-<input bind:this={fileInput} type="file" on:change={handleChange} accept={accept}>
-
-{#if file && fileInput.files.length === 0}
-  (Selected {file.name} from previous visit)
-{/if}
diff --git a/src/packager/ImageInput.svelte b/src/packager/ImageInput.svelte
new file mode 100644
index 0000000..679e333
--- /dev/null
+++ b/src/packager/ImageInput.svelte
@@ -0,0 +1,126 @@
+<script>
+  import {_} from '../locales';
+
+  export let file;
+  let fileInput;
+  let dragging;
+
+  $: url = file && URL.createObjectURL(file);
+  $: if (!file && url) {
+    URL.revokeObjectURL(url);
+    url = null;
+  }
+
+  const ACCEPT = [
+    '.png',
+    '.jpg',
+    '.jpeg',
+    '.bmp',
+    '.svg'
+  ];
+
+  const handleChange = (e) => {
+    const files = e.target.files;
+    file = files.length ? files[0] : null;
+  };
+
+  const clear = (e) => {
+    e.stopPropagation();
+    file = null;
+  };
+
+  const handleClickBackground = () => {
+    fileInput.click();
+  };
+
+  const handleDragOver = (e) => {
+    if (!e.dataTransfer.types.includes('Files')) {
+      return;
+    }
+    e.preventDefault();
+    dragging = true;
+  };
+
+  const handleDragLeave = (e) => {
+    e.preventDefault();
+    dragging = false;
+  };
+
+  const handleDrop = (e) => {
+    e.preventDefault();
+    dragging = false;
+    if (e.dataTransfer.types.includes('Files')) {
+      const droppedFile = e.dataTransfer.files[0];
+      if (droppedFile && ACCEPT.some((ext) => droppedFile.name.endsWith(ext))) {
+        file = droppedFile;
+      }
+    }
+  };
+</script>
+
+<style>
+  .container {
+    color: #555;
+    width: 100%;
+    box-sizing: border-box;
+    border: 5px dashed currentColor;
+    transition: .2s border-color, .2s color;
+    border-radius: 20px;
+    min-height: 100px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    overflow: hidden;
+    user-select: none;
+    position: relative;
+    cursor: pointer;
+  }
+  :global([theme="dark"]) .container {
+    color: #999;
+  }
+  .dragging,
+  .container:focus {
+    color: rgb(79, 123, 211);
+  }
+  :global([theme="dark"]) .dragging,
+  :global([theme="dark"]) .container:focus {
+    color: rgb(178, 195, 228);
+  }
+  .placeholder {
+    font-size: 1.5em;
+  }
+  input[type=file] {
+    display: none;
+  }
+  .selected {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-wrap: wrap;
+  }
+  .selected > *:not(:last-child) {
+    margin-right: 12px;
+  }
+</style>
+
+<div
+  class="container"
+  class:dragging
+  tabindex="0"
+  on:click={handleClickBackground}
+  on:dragover={handleDragOver}
+  on:dragleave={handleDragLeave}
+  on:drop={handleDrop}
+>
+  <input bind:this={fileInput} type="file" accept={ACCEPT.join(',')} on:change={handleChange}>
+  {#if file}
+    <div class="selected">
+      <!-- TODO: consider display more sizes so people can see what their icon looks like when small -->
+      <img src={url} alt="Project icon" width="64" height="64">
+      <div>{$_('fileInput.selected').replace('{file}', file.name)}</div>
+      <button on:click={clear}>{$_('fileInput.clear')}</button>
+    </div>
+  {:else}
+    <div class="placeholder">{$_('fileInput.select')}</div>
+  {/if}
+</div>
diff --git a/src/packager/PackagerOptions.svelte b/src/packager/PackagerOptions.svelte
index 98528a0..5aff398 100644
--- a/src/packager/PackagerOptions.svelte
+++ b/src/packager/PackagerOptions.svelte
@@ -4,7 +4,7 @@
   import Section from './Section.svelte';
   import Button from './Button.svelte';
   import ComplexMessage from './ComplexMessage.svelte';
-  import FileInput from './FileInput.svelte';
+  import ImageInput from './ImageInput.svelte';
   import CustomExtensions from './CustomExtensions.svelte';
   import Packager from './packager';
   import writablePersistentStore from './persistent-store';
@@ -232,12 +232,10 @@
     {$_('options.loadingScreenText')}
     <input type="text" bind:value={$options.loadingScreen.text} placeholder={$_('options.loadingScreenTextPlaceholder')}>
   </label>
-  <!-- Ignore because FileInput will have an <input> inside it -->
-  <!-- svelte-ignore a11y-label-has-associated-control -->
-  <label>
+  <div>
     {$_('options.icon')}
-    <FileInput bind:file={$icon} accept=".png,.jpg,.jpeg,.bmp,.svg" />
-  </label>
+    <ImageInput bind:file={$icon} />
+  </div>
 
   <h3>{$_('options.controls')}</h3>
   <label>