ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clear vboxselect and combiner on unequip select && highlight unequip

Browse Source
This commit is contained in:
Mashy 2019-11-19 21:40:14 +10:00
parent 2a82666498
commit 5c0a76b9a6
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client/assets/styles/instance.less
View File

@ -162,6 +162,23 @@
}
.construct-list {
button {
&.highlight {
color: black;
background: @white;
// border: 1px solid @white; (this bangs around the vbox)
// overwrite the classes on white svg elements
svg {
stroke-width: 0.75em;
}
.white {
stroke: black;
}
}
}
.name {
grid-area: name;
margin-bottom: 0.5em;

14
client/src/components/instance.constructs.jsx
View File

@ -71,6 +71,8 @@ const addState = connect(
}
function setItemUnequip(v) {
dispatch(actions.setVboxSelected([]));
dispatch(actions.setCombiner([]));
return dispatch(actions.setItemUnequip(v));
}
@ -138,7 +140,7 @@ function Construct(props) {
function skillClick(e) {
if (!skill) return false;
setItemUnequip([construct.id, skill.skill]);
setItemUnequip([construct.id, skill.skill, i]);
e.stopPropagation();
return true;
}
@ -161,7 +163,9 @@ function Construct(props) {
return borderFn();
};
const classes = `${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''} ${border()}`;
const highlight = itemUnequip[0] === construct.id && itemUnequip[1] === s ? 'highlight' : '';
const classes = `${highlight} ${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''} ${border()}`;
return (
<label onDragStart={ev => {
ev.dataTransfer.setData('text', '');
@ -195,7 +199,7 @@ function Construct(props) {
function specClick(e) {
e.stopPropagation();
setItemUnequip([construct.id, s]);
setItemUnequip([construct.id, s, i]);
}
function specDblClick(e) {
@ -205,8 +209,7 @@ function Construct(props) {
e.preventDefault();
return true;
}
const highlight = itemUnequip[0] === construct.id && itemUnequip[1] === s && i === itemUnequip[2];
return (
<label onDragStart={ev => {
ev.dataTransfer.setData('text', '');
@ -214,6 +217,7 @@ function Construct(props) {
}} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
<button
key={i}
class={`${highlight ? 'highlight' : ''}`}
onClick={specClick}
onDblClick={specDblClick}
onMouseOver={e => hoverInfo(e, s)} >