Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edit sticky app bar & header #583

Merged
merged 4 commits into from
Sep 27, 2021
Merged

Edit sticky app bar & header #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fede5c2
edit_sticky_appBar_&_header
0shar0 Sep 23, 2021
7e6d06e
edit_sticky_appBar_&_header
0shar0 Sep 23, 2021
71a8515
edit_sticky_appBar_&_header
0shar0 Sep 23, 2021
b204523
fixed typo
0shar0 Sep 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/AutoPaginationPostList/AutoPaginationPostList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ export const AutoPaginationPostList: React.FC<IAutoPaginationPostListProps> = ({

return (
<div>
<PostsList postsList={posts.slice(0, posts.length - 5)} />
<PostsList postsList={posts.slice(0, posts.length - 1)} />
<div ref={lastElement}>
<PostsList postsList={posts.slice(-5)} />
<PostsList postsList={posts.slice(-1)} />
</div>
</div>
);
Expand Down
4 changes: 4 additions & 0 deletions src/components/Header/Header.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ export const useStyles = makeStyles(
headerMobile: {
height: 85,
backgroundColor: theme.palette.common.black,
position: 'sticky',
top: 0,
left: 0,
zIndex:1500,
},
container: {
height: '100%',
Expand Down
195 changes: 108 additions & 87 deletions src/components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
import React, { useContext, useState } from 'react';
import {
Box,
Button,
Container,
Input,
Menu,
MenuItem,
Toolbar,
Typography,
} from '@material-ui/core';
import { Box, Button, Container, Input, Menu, MenuItem, Slide, Toolbar, Typography } from '@material-ui/core';
import { Link, NavLink, Route } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import SearchIcon from '@material-ui/icons/Search';
Expand All @@ -21,6 +12,8 @@ import i18n, { langTokens } from '../../locales/localizationInit';
import { IHeaderProps } from './types';
import { ScreenContext } from '../../old/provider/MobileProvider/ScreenContext';
import { BurgerMenu } from '../BurgerMenu/BurgerMenu';
import { useActions } from '../../shared/hooks';
import { makeHeaderInvisible, makeHeaderVisible } from '../../models/headerVisibility';

export const navElems: IHeaderProps[] = [
{
Expand All @@ -45,92 +38,120 @@ export const Header: React.FC = () => {
const { t } = useTranslation();
const { authenticated } = useContext(AuthContext);

const [visible, setVisible] = useState<boolean>(true);
const [oldPageOffsetY, setOldPageOffsetY] = useState<number>(0);
const [searchInput, setSearchInput] = useState<null | Element>(null);
const [mobileMenuOpen, setMobileMenuOpen] = useState<boolean>(false);

const { mobile } = useContext(ScreenContext);

const [boundMakeHeaderVisible, boundMakeHeaderInvisible] = useActions([
makeHeaderVisible,
makeHeaderInvisible,
]);

const transitionDuration = {
enter: 200,
exit: 200,
};

window.onscroll = () => {
setOldPageOffsetY(visualViewport.pageTop);
if (visualViewport.pageTop >= oldPageOffsetY) {
setVisible(false);
boundMakeHeaderInvisible();
} else {
setVisible(true);
boundMakeHeaderVisible();
}
};

return (
<div id="header" className={mobile ? classes.headerMobile : classes.header}>
<Container className={classes.container}>
<Toolbar className={classes.toolbar}>
{mobile && (
<BurgerMenu
navigation={navElems}
mobileMenuOpen={mobileMenuOpen}
setMobileMenuOpen={(b) => setMobileMenuOpen(b)}
/>
)}
<Box display="flex">
{!mobileMenuOpen && !searchInput && (
<Link to="/">
<Typography
className={mobile ? classes.logoMobile : classes.logo}
variant="h1"
>
{t(langTokens.common.projectName)}
</Typography>
</Link>
<Slide in={!mobile || visible} timeout={transitionDuration}>
<div
id="header"
className={mobile ? classes.headerMobile : classes.header}
>
<Container className={classes.container}>
<Toolbar className={classes.toolbar}>
{mobile && (
<BurgerMenu
navigation={navElems}
mobileMenuOpen={mobileMenuOpen}
setMobileMenuOpen={(b) => setMobileMenuOpen(b)}
/>
)}
{!mobile && (
<Box className={classes.tabs}>
{navElems.map((item) => (
<NavLink
to={item.url}
key={item.id}
className={classes.tab}
exact
<Box display="flex">
{!mobileMenuOpen && !searchInput && (
<Link to="/">
<Typography
className={mobile ? classes.logoMobile : classes.logo}
variant="h1"
>
<Typography variant="h5" className={classes.tabLabel}>
{item.label}
</Typography>
</NavLink>
))}
</Box>
)}
</Box>
{!mobile && (
<Box className={classes.actionsContainer}>
{authenticated && <PostCreationMenu />}
{authenticated ? (
<AccountMenu />
) : (
<Route path="/opendoctorgate">
<LoginModal />
</Route>
{t(langTokens.common.projectName)}
</Typography>
</Link>
)}
{!mobile && (
<Box className={classes.tabs}>
{navElems.map((item) => (
<NavLink
to={item.url}
key={item.id}
className={classes.tab}
exact
>
<Typography variant="h5" className={classes.tabLabel}>
{item.label}
</Typography>
</NavLink>
))}
</Box>
)}
</Box>
)}
{mobile && (
<div>
<Button
aria-controls="simple-menu"
aria-haspopup="true"
onClick={(e) => setSearchInput(e.currentTarget)}
>
<SearchIcon className={classes.searchIcon} />
</Button>
<Menu
classes={{ list: classes.label, paper: classes.paper }}
id="simple-menu"
anchorEl={searchInput}
keepMounted
open={Boolean(searchInput)}
onClose={() => setSearchInput(null)}
>
<MenuItem className={classes.searchInputWrapper}>
<Input
disableUnderline
className={classes.searchInput}
placeholder={t(langTokens.common.inputSearchPlaceholder)}
/>
<SearchIcon className={classes.searchInputIcon} />
</MenuItem>
</Menu>
</div>
)}
</Toolbar>
</Container>
</div>
{!mobile && (
<Box className={classes.actionsContainer}>
{authenticated && <PostCreationMenu />}
{authenticated ? (
<AccountMenu />
) : (
<Route path="/opendoctorgate">
<LoginModal />
</Route>
)}
</Box>
)}
{mobile && (
<div>
<Button
aria-controls="simple-menu"
aria-haspopup="true"
onClick={(e) => setSearchInput(e.currentTarget)}
>
<SearchIcon className={classes.searchIcon} />
</Button>
<Menu
classes={{ list: classes.label, paper: classes.paper }}
id="simple-menu"
anchorEl={searchInput}
keepMounted
open={Boolean(searchInput)}
onClose={() => setSearchInput(null)}
>
<MenuItem className={classes.searchInputWrapper}>
<Input
disableUnderline
className={classes.searchInput}
placeholder={t(langTokens.common.inputSearchPlaceholder)}
/>
<SearchIcon className={classes.searchInputIcon} />
</MenuItem>
</Menu>
</div>
)}
</Toolbar>
</Container>
</div>
</Slide>
);
};
Loading