Skip to content
Snippets Groups Projects
Commit 35ce7d0a authored by danieldeng2's avatar danieldeng2
Browse files

Refactor setstate logic

parent bb8b6b98
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ import { ...@@ -6,7 +6,7 @@ import {
faBookOpen, faBookOpen,
faHome, faHome,
faCalendarWeek, faCalendarWeek,
faChalkboardTeacher faChalkboardTeacher,
} from "@fortawesome/free-solid-svg-icons"; } from "@fortawesome/free-solid-svg-icons";
import StandardView from "./pages/StandardView"; import StandardView from "./pages/StandardView";
...@@ -30,28 +30,24 @@ class App extends React.Component<{}, AppState> { ...@@ -30,28 +30,24 @@ class App extends React.Component<{}, AppState> {
toggleLeftBar() { toggleLeftBar() {
if (window.innerWidth < 992) { if (window.innerWidth < 992) {
this.setState(state => ({ this.setState({
toggledRight: false, toggledRight: false,
toggledLeft: !state.toggledLeft });
}));
} else {
this.setState(state => ({
toggledLeft: !state.toggledLeft
}));
} }
this.setState((state) => ({
toggledLeft: !state.toggledLeft,
}));
} }
toggleRightBar() { toggleRightBar() {
if (window.innerWidth < 992) { if (window.innerWidth < 992) {
this.setState(state => ({ this.setState({
toggledRight: !state.toggledRight, toggledLeft: false,
toggledLeft: false });
}));
} else {
this.setState(state => ({
toggledRight: !state.toggledRight
}));
} }
this.setState((state) => ({
toggledRight: !state.toggledRight,
}));
} }
render() { render() {
...@@ -59,18 +55,18 @@ class App extends React.Component<{}, AppState> { ...@@ -59,18 +55,18 @@ class App extends React.Component<{}, AppState> {
{ name: "Home", path: "/home", icon: faHome }, { name: "Home", path: "/home", icon: faHome },
{ name: "Modules", path: "/modules", icon: faChalkboardTeacher }, { name: "Modules", path: "/modules", icon: faChalkboardTeacher },
{ name: "Timeline", path: "/timeline", icon: faCalendarWeek }, { name: "Timeline", path: "/timeline", icon: faCalendarWeek },
{ name: "Exams", path: "/exams", icon: faBookOpen } { name: "Exams", path: "/exams", icon: faBookOpen },
]; ];
return ( return (
<> <>
<TopBar <TopBar
pages={horizontalBarPages} pages={horizontalBarPages}
onFavIconClick={e => { onFavIconClick={(e) => {
e.preventDefault(); e.preventDefault();
this.toggleLeftBar(); this.toggleLeftBar();
}} }}
onUserIconClick={e => { onUserIconClick={(e) => {
e.preventDefault(); e.preventDefault();
this.toggleRightBar(); this.toggleRightBar();
}} }}
...@@ -80,7 +76,7 @@ class App extends React.Component<{}, AppState> { ...@@ -80,7 +76,7 @@ class App extends React.Component<{}, AppState> {
pages={horizontalBarPages} pages={horizontalBarPages}
toggledLeft={this.state.toggledLeft} toggledLeft={this.state.toggledLeft}
toggledRight={this.state.toggledRight} toggledRight={this.state.toggledRight}
onOverlayClick={e => { onOverlayClick={(e) => {
e.preventDefault(); e.preventDefault();
this.setState({ toggledLeft: false, toggledRight: false }); this.setState({ toggledLeft: false, toggledRight: false });
}} }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment