Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0

This commit is contained in:
ntr
2019-11-06 14:48:04 +11:00
8 changed files with 80 additions and 14 deletions
@@ -217,7 +217,10 @@ function Construct(props) {
return (
<label onDragStart={specClick} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
<label onDragStart={ev => {
ev.dataTransfer.setData('text', '');
specClick(ev);
}} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
<button
key={i}
onClick={specClick}
+8 -2
View File
@@ -215,7 +215,10 @@ class Vbox extends preact.Component {
const vboxObject = shapes[v] ? shapes[v]() : v;
return (
<label draggable='true'
onDragStart={ev => ev.dataTransfer.setData('text', '')}
onDragStart={ev => {
onClick(ev);
ev.dataTransfer.setData('text', '')
}}
onDragEnd={clearVboxSelected}>
<button
class={classes}
@@ -328,7 +331,10 @@ class Vbox extends preact.Component {
return (
<label
draggable='true'
onDragStart={ev => ev.dataTransfer.setData('text', '')}
onDragStart={ev => {
onClick(ev);
ev.dataTransfer.setData('text', '');
}}
onDragEnd={() => {
if (combiner.length === 1) combinerChange([]);
}}>