From bb50037e0e99e7cf6f1c1e37a106bf7c17a1726b Mon Sep 17 00:00:00 2001
From: Mashy <himesh.kapadia@gmail.com>
Date: Mon, 4 Nov 2019 16:02:48 +1000
Subject: [PATCH] drag equipped items

---
 client/assets/styles/instance.less            |  7 ++++
 client/src/components/instance.constructs.jsx | 36 ++++++++++---------
 client/src/components/vbox.component.jsx      |  3 +-
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/client/assets/styles/instance.less b/client/assets/styles/instance.less
index 0f05fc8b..841993a8 100644
--- a/client/assets/styles/instance.less
+++ b/client/assets/styles/instance.less
@@ -203,6 +203,9 @@
         button {
             height: 3em;
         }
+        label {
+            display: flex;
+        }
     }
 
     .specs {
@@ -228,6 +231,10 @@
             font-size: 75%;
             line-height: initial;
         }
+
+        label {
+            display: flex;
+        }
     }
 
     .stats {
diff --git a/client/src/components/instance.constructs.jsx b/client/src/components/instance.constructs.jsx
index a17aa221..ed43f62e 100644
--- a/client/src/components/instance.constructs.jsx
+++ b/client/src/components/instance.constructs.jsx
@@ -153,15 +153,17 @@ function Construct(props) {
 
         const classes = `${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''} ${border()}`;
         return (
-            <button
-                key={i}
-                disabled={!skill && !equipping}
-                class={classes}
-                onClick={skillClick}
-                onDblClick={skillDblClick}
-                onMouseOver={e => hoverInfo(e, skill && skill.skill)} >
-                {s}
-            </button>
+            <label onDragStart={skillClick} key={i} draggable="true">
+                <button
+                    key={i}
+                    disabled={!skill && !equipping}
+                    class={classes}
+                    onClick={skillClick}
+                    onDblClick={skillDblClick}
+                    onMouseOver={e => hoverInfo(e, skill && skill.skill)} >
+                    {s}
+                </button>
+            </label>
         );
     });
 
@@ -195,13 +197,15 @@ function Construct(props) {
 
 
         return (
-            <button
-                key={i}
-                onClick={specClick}
-                onDblClick={specDblClick}
-                onMouseOver={e => hoverInfo(e, s)} >
-                {shapes[s]()}
-            </button>
+            <label onDragStart={specClick} key={i} draggable="true">
+                <button
+                    key={i}
+                    onClick={specClick}
+                    onDblClick={specDblClick}
+                    onMouseOver={e => hoverInfo(e, s)} >
+                    {shapes[s]()}
+                </button>
+            </label>
         );
     });
 
diff --git a/client/src/components/vbox.component.jsx b/client/src/components/vbox.component.jsx
index e9e8b8e7..14cf1108 100644
--- a/client/src/components/vbox.component.jsx
+++ b/client/src/components/vbox.component.jsx
@@ -306,7 +306,8 @@ class Vbox extends preact.Component {
                 // removing
                 const combinerIndex = combiner.indexOf(i);
                 if (combinerIndex > -1) {
-                    return combinerChange(without(combiner, i));
+                    return true;
+                    // return combinerChange(without(combiner, i));
                 }
 
                 combiner.push(i);