Skip to content

Commit 2f258dd

Browse files
committed
Added state to set some menu groups as collapsed by default
1 parent 50a6a77 commit 2f258dd

3 files changed

Lines changed: 36 additions & 5 deletions

File tree

src/frontend/src/Keybinds.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,23 +97,32 @@ const Keybinds = (data) => {
9797
</li>
9898
);
9999
});
100+
let menuClasses = "menu";
101+
let hamburgerClasses = "hamburger hamburger--minus"
102+
if (data.toggledMenus.includes(value)) {
103+
menuClasses += " collapsed";
104+
}
105+
else {
106+
hamburgerClasses += " is-active";
107+
}
108+
100109
return (
101-
<div key={value} className="menu">
110+
<div key={value} className={menuClasses}>
102111
<span>
103112
<h3 onClick={(event) => data.selectMenu(event)}
104113
onMouseOver={(event) => data.hoverMenu(event)}
105114
onMouseOut={(event) => data.hoverMenu(event)}
106115
className="menu-header"
107116
value={value}>
108117
{value}
109-
<span className="hamburger hamburger--minus is-active" onClick={(event) => data.toggleMenu(event)} value={value}>
118+
<span className={hamburgerClasses} onClick={(event) => data.toggleMenu(event)} value={value}>
110119
<span className="hamburger-box">
111120
<span className="hamburger-inner"></span>
112121
</span>
113122
</span>
114123
</h3>
115124
</span>
116-
<ul className="menuList">
125+
<ul className="menu-list">
117126
{menuRows}
118127
</ul>
119128
</div>

src/frontend/src/Upload.js

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ const Upload = (props) => {
2929
const [filteringRows, setFilteringRows] = useState(false);
3030
const [searchFilter, setSearchFilter] = useState(null);
3131

32+
const [toggledMenus, setToggledMenus] = useState([
33+
"Control Groups 1-10",
34+
"Control Groups 11-20",
35+
"Spectator/Replay Commands",
36+
"BFG: Other",
37+
"BFG: Techs"
38+
]);
39+
3240
const notifications = useRef(null);
3341
const clear = useRef(null); // Button
3442
const cancel = useRef(null); // Button
@@ -676,6 +684,19 @@ const Upload = (props) => {
676684
event.target.classList.toggle("is-active");
677685
let menu = event.target.closest(".menu");
678686
menu.classList.toggle("collapsed");
687+
688+
//let name = menu.getAttribute("value");
689+
//setToggledMenus((oldToggledMenus) => {
690+
// let newToggledMenus = [...oldToggledMenus];
691+
// let index = newToggledMenus.indexOf(name);
692+
// if (index > -1) {
693+
// newToggledMenus.splice(index, 1);
694+
// }
695+
// else {
696+
// newToggledMenus.push(name);
697+
// }
698+
// return newToggledMenus;
699+
//})
679700
}
680701

681702
const onSearchInput = (event) => {
@@ -815,7 +836,8 @@ const Upload = (props) => {
815836
toggleMenu={toggleMenu}
816837
highlighted={highlighted}
817838
searchFilter={searchFilter}
818-
toggleFavorite={toggleFavorite}/>
839+
toggleFavorite={toggleFavorite}
840+
toggledMenus={toggledMenus} />
819841
</>
820842
);
821843
};

src/frontend/src/scss/index.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ $key-transition-time: 0.1s;
302302
padding: 10px;
303303
}
304304

305-
.menuList {
305+
.menu-list {
306306
overflow: hidden;
307307
margin: 0;
308308
padding: 0;

0 commit comments

Comments
 (0)