Even better selection ux; Upgrade dependencies

Author: simonwep

package-lock.json

@@ -25,8 +25,8 @@
         "dev": "vue-cli-service serve"
     },
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.9.0",
-        "@simonwep/pickr": "^1.2.4",
+        "@fortawesome/fontawesome-free": "^5.10.0",
+        "@simonwep/pickr": "^1.2.6",
         "@simonwep/selection-js": "^1.1.1",
         "normalize.css": "^8.0.1",
         "register-service-worker": "^1.6.2",

package.json

@@ -64,25 +64,25 @@ export default new Selection({
     },
 
     onSelect({selectedElements, originalEvent, target}) {
-        if (!originalEvent.ctrlKey && !originalEvent.metaKey) {
-            store.commit('selection/clear');
-            for (const el of selectedElements) {
-                el.classList.remove('selected');
-            }
+        const targetHash = target.getAttribute('data-hash');
+        const selectedNode = nodes.find(v => v.id === targetHash);
 
-            this.clearSelection();
-        }
+        if (selectedNode) {
+            if (!originalEvent.ctrlKey && !originalEvent.metaKey) {
+                store.commit('selection/clear');
 
-        const targetHash = target.getAttribute('data-hash');
-        const selected = target.classList.contains('selected');
-        if (selected && selection.length) {
-            this.removeFromSelection(target);
-        } else {
-            const selectedNode = nodes.find(v => v.id === targetHash);
+                for (const el of selectedElements) {
+                    el.classList.remove('selected');
+                }
 
-            if (selectedNode) {
                 store.commit('selection/append', [selectedNode]);
+                target.classList.add('selected');
+                this.clearSelection();
                 this.keepSelection();
+            } else if (target.classList.contains('selected')) {
+                store.commit('selection/remove', [selectedNode]);
+                target.classList.remove('selected');
+                this.removeFromSelection(target);
             }
         }
     },

src/vue/components/application/navigator/plugins/selectable.js

@@ -69,7 +69,7 @@
         },
 
         destroyed() {
-            this.pickr && this.pickr.destroy();
+            this.pickr.destroyAndRemove(); // TODO: Mobile style broken
         },
 
         methods: {