From d67cb49f04c7a55538abeb835ca0c029f33bf742 Mon Sep 17 00:00:00 2001 From: Daniel Cortes Date: Sat, 6 Jun 2020 23:23:33 -0400 Subject: [PATCH] Scroll global --- src/components/Artist.jsx | 8 -------- src/components/Paginate.jsx | 1 + src/components/Search.jsx | 2 -- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/components/Artist.jsx b/src/components/Artist.jsx index 5f2181b..9827c2a 100644 --- a/src/components/Artist.jsx +++ b/src/components/Artist.jsx @@ -3,7 +3,6 @@ import {getArtist, getArtistDiscs} from "../services/entity_service"; import {CoverWithCaption} from './CoverArt'; import {Paginate} from "./Paginate"; import queryString from "query-string"; -import {useLocation} from 'react-router-dom'; const Discs = (props) => { @@ -78,8 +77,6 @@ export const Artist = (props) => { } export const ArtistView = (props) => { - const {pathname} = useLocation(); - const parsedParams = queryString.parse(props.location.search); const [artist, setArtist] = useState(null); @@ -99,10 +96,6 @@ export const ArtistView = (props) => { } }, [mbid, page]) - useEffect(() => { - document.getElementById('root').scrollIntoView({behavior: 'smooth'}); - }, [pathname]); - const makeLink = (page) => { return `/artist/${mbid}?page=${page}`; } @@ -115,7 +108,6 @@ export const ArtistView = (props) => { setDiscs(result.discs); setDiscsPaginate(result.paginate); }); - document.getElementById('root').scrollIntoView({behavior: 'smooth'}); props.history.push(makeLink(page)); } diff --git a/src/components/Paginate.jsx b/src/components/Paginate.jsx index 2d4b0fc..46fe359 100644 --- a/src/components/Paginate.jsx +++ b/src/components/Paginate.jsx @@ -36,6 +36,7 @@ export const Paginate = (props) => { const handleClick = (page) => (evt) => { evt.preventDefault(); + document.getElementById('root').scrollIntoView({behavior: 'smooth'}); if (currentPage !== page) gotoPage(page); } diff --git a/src/components/Search.jsx b/src/components/Search.jsx index 216b067..52efd88 100644 --- a/src/components/Search.jsx +++ b/src/components/Search.jsx @@ -277,8 +277,6 @@ export const Search = (props) => { setWho(who); setPage(page); navigateTo(who, query, page); - - window.scroll({left: 0, top: 0, behavior: 'smooth'}); }; const content = _ => {