fix review findings

This commit is contained in:
Eduard Heimbuch
2020-03-02 14:13:51 +01:00
parent d15ef12c1c
commit e110033e3b
31 changed files with 167 additions and 200 deletions

View File

@@ -30,7 +30,6 @@ type Props = RouteComponentProps &
type State = {
menuCollapsed: boolean;
setMenuCollapsed: (collapsed: boolean) => void;
};
class Profile extends React.Component<Props, State> {
@@ -38,21 +37,10 @@ class Profile extends React.Component<Props, State> {
super(props);
this.state = {
menuCollapsed: isMenuCollapsed(),
setMenuCollapsed: (collapsed: boolean) => this.setState({ menuCollapsed: collapsed })
menuCollapsed: isMenuCollapsed()
};
}
componentDidUpdate() {
if (this.state.menuCollapsed && this.isCollapseForbidden()) {
this.setState({ menuCollapsed: false });
}
}
isCollapseForbidden = () => {
return this.props.location.pathname.includes("/settings/");
};
onCollapseProfileMenu = (collapsed: boolean) => {
this.setState({ menuCollapsed: collapsed }, () => storeMenuCollapsed(collapsed));
};
@@ -93,7 +81,9 @@ class Profile extends React.Component<Props, State> {
};
return (
<MenuContext.Provider value={this.state}>
<MenuContext.Provider
value={{ menuCollapsed, setMenuCollapsed: (collapsed: boolean) => this.setState({ menuCollapsed: collapsed }) }}
>
<Page title={me.displayName}>
<div className="columns">
<div className="column">
@@ -105,7 +95,7 @@ class Profile extends React.Component<Props, State> {
<Navigation>
<Section
label={t("profile.navigationLabel")}
onCollapse={this.isCollapseForbidden() ? undefined : () => this.onCollapseProfileMenu(!menuCollapsed)}
onCollapse={() => this.onCollapseProfileMenu(!menuCollapsed)}
collapsed={menuCollapsed}
>
<NavLink