construct buttons

client/src/components/instance.constructs.jsx

@@ -124,12 +124,12 @@ function Construct(props) {
         }
 
         // const action = skill ? '' : 'action';
-        const equip = skillList.includes(vbox.bound[itemEquip]) && !skill ? 'equipping' : '';
-        const classes = `${equip} ${!skill ? 'empty' : ''}`;
+        const equipping = skillList.includes(vbox.bound[itemEquip]) && !skill;
+        const classes = `${equipping ? 'equipping' : ''} ${!skill ? 'empty' : ''}`;
         return (
             <button
                 key={i}
-                disabled={!skill && itemEquip === null}
+                disabled={!skill && !equipping}
                 class={classes}
                 onClick={skillClick}
                 onDblClick={skillDblClick}
@@ -143,12 +143,12 @@ function Construct(props) {
         const s = construct.specs[i];
 
         if (!s) {
-            const equip = specList.includes(vbox.bound[itemEquip]) ? 'equip-spec' : 'gray';
+            const equipping = specList.includes(vbox.bound[itemEquip]);
+            const classes = `${equipping ? 'equip-spec' : 'gray'} empty`;
             return (
-                <figure key={i} class={equip} >
-                    {shapes.diamond(equip)}
-                    <figcaption>&nbsp;</figcaption>
-                </figure>
+                <button key={i} class={classes} disabled={!equipping} >
+                    {shapes.None()}
+                </button>
             );
         }
 

client/src/components/shapes.jsx

@@ -38,6 +38,14 @@ module.exports = {
 
     // specs
     // Base
+
+    None: () =>
+    <figure>
+        {diamond(['gray'])}
+        <figcaption>&nbsp;</figcaption>
+    </figure>,
+
+
     Power: () =>
     <figure>
         {circle(['white'])}

client/src/components/vbox.component.jsx

@@ -124,7 +124,7 @@ function Vbox(args) {
     function combinerChange(newCombiner) {
         setCombiner(newCombiner);
 
-        if (combiner.length === 1) {
+        if (newCombiner.length === 1) {
             setItemEquip(newCombiner[0]);
         } else {
             setItemEquip(null);