delete "reclaim" & "vboxHighlight" state variables

This commit is contained in:
Mashy
2019-11-21 11:10:34 +10:00
parent 26c1c49c4e
commit 917858174c
11 changed files with 3 additions and 34 deletions
-2
View File
@@ -33,11 +33,9 @@ const addState = connect(
function accountPage() {
dispatch(actions.setGame(null));
dispatch(actions.setInstance(null));
dispatch(actions.setReclaiming(false));
dispatch(actions.setActiveSkill(null));
dispatch(actions.setInfo(null));
dispatch(actions.setItemUnequip([]));
dispatch(actions.setVboxHighlight([]));
return dispatch(actions.setNav('account'));
}
-2
View File
@@ -32,11 +32,9 @@ const addState = connect(
function setNav(place) {
dispatch(actions.setGame(null));
dispatch(actions.setInstance(null));
dispatch(actions.setReclaiming(false));
dispatch(actions.setActiveSkill(null));
dispatch(actions.setInfo(null));
dispatch(actions.setItemUnequip([]));
dispatch(actions.setVboxHighlight([]));
dispatch(actions.setMtxActive(null));
return dispatch(actions.setNav(place));
}
@@ -27,9 +27,7 @@ const addState = connect(
function clearItems() {
dispatch(actions.setReclaiming(false));
dispatch(actions.setItemUnequip([]));
dispatch(actions.setVboxHighlight([]));
dispatch(actions.setVboxSelected({ shopSelect: [], stashSelect: [] }));
return true;
}
@@ -258,7 +258,6 @@ class InstanceConstructs extends preact.Component {
sendVboxApply,
sendVboxAcceptEquip,
sendVboxUnequipApply,
setVboxHighlight,
setItemUnequip,
} = props;
@@ -281,7 +280,6 @@ class InstanceConstructs extends preact.Component {
sendVboxUnequipApply,
setInfo,
itemInfo,
setVboxHighlight,
vboxSelected,
tutorial,
});
-2
View File
@@ -33,11 +33,9 @@ const addState = connect(
function setNav(place) {
dispatch(actions.setGame(null));
dispatch(actions.setInstance(null));
dispatch(actions.setReclaiming(false));
dispatch(actions.setActiveSkill(null));
dispatch(actions.setInfo(null));
dispatch(actions.setItemUnequip([]));
dispatch(actions.setVboxHighlight([]));
return dispatch(actions.setNav(place));
}
+2 -15
View File
@@ -16,7 +16,6 @@ const addState = connect(
ws,
instance,
player,
reclaiming,
vboxSelected,
itemInfo,
itemUnequip,
@@ -47,7 +46,6 @@ const addState = connect(
return {
instance,
player,
reclaiming,
sendVboxAccept,
sendVboxCombine,
sendVboxDiscard,
@@ -61,12 +59,6 @@ const addState = connect(
},
function receiveDispatch(dispatch) {
function setReclaiming(v) {
dispatch(actions.setItemUnequip([]));
dispatch(actions.setVboxSelected({ shopSelect: [], stashSelect: [] }));
return dispatch(actions.setReclaiming(v));
}
function setInfo(item) {
return dispatch(actions.setInfo(item));
}
@@ -78,7 +70,6 @@ const addState = connect(
}
return {
setReclaiming,
setInfo,
setVboxSelected,
};
@@ -119,7 +110,6 @@ class Vbox extends preact.Component {
shouldComponentUpdate(newProps) {
// Single variable props
if (newProps.itemUnequip !== this.props.itemUnequip) return true;
if (newProps.reclaiming !== this.props.reclaiming) return true;
if (newProps.tutorial !== this.props.tutorial) return true;
if (newProps.vboxSelected !== this.props.vboxSelected) return true;
if (newProps.player !== this.props.player) return true;
@@ -132,7 +122,6 @@ class Vbox extends preact.Component {
// Changing state variables
itemUnequip,
player,
reclaiming,
tutorial,
vboxSelected,
instance,
@@ -147,7 +136,6 @@ class Vbox extends preact.Component {
sendVboxReclaim,
setVboxSelected,
setInfo,
setReclaiming,
} = args;
if (!player) return false;
@@ -418,7 +406,7 @@ class Vbox extends preact.Component {
const tutorialDisabled = tutorial && tutorial < 8 && instance.time_control === 'Practice' && instance.rounds.length === 1;
return (
<div class={`stash-hdr ${reclaiming ? 'reclaiming' : ''}`}>
<div class={'stash-hdr'}>
<div class='items'>
<h3
onTouchStart={e => e.target.scrollIntoView(true)}
@@ -426,8 +414,7 @@ class Vbox extends preact.Component {
</h3>
<button
disabled={tutorialDisabled || !refund}
class='vbox-btn reclaim'
onMouseOver={e => hoverInfo(e, 'reclaim')}
class='vbox-btn'
onClick={e => e.stopPropagation()}
onMouseDown={e => {
e.stopPropagation();