merge branch 'm1-sonnguyen' into common

This commit is contained in:
sonnguyenkieio 2021-09-06 14:31:08 +07:00
commit 86c95a7a91
4 changed files with 3 additions and 21 deletions

View File

@ -1,4 +1,3 @@
import { Layout } from 'src/components/common'; import { Layout } from 'src/components/common';
import { HomeBanner, HomeCategories, HomeCollection, HomeCTA, HomeFeature, HomeRecipe, HomeSubscribe, HomeVideo } from 'src/components/modules/home'; import { HomeBanner, HomeCategories, HomeCollection, HomeCTA, HomeFeature, HomeRecipe, HomeSubscribe, HomeVideo } from 'src/components/modules/home';
import {SelectCommon} from 'src/components/common' import {SelectCommon} from 'src/components/common'

View File

@ -1,15 +0,0 @@
import React, { MutableRefObject } from 'react'
interface ScrollTargetProps {
refScrollUp: MutableRefObject<HTMLDivElement>;
}
const ScrollTarget = ({ refScrollUp } : ScrollTargetProps) => {
return (
<div ref={refScrollUp}></div>
)
}
export default ScrollTarget

View File

@ -5,11 +5,10 @@ import s from './ScrollToTop.module.scss'
import ArrowUp from '../../icons/IconArrowUp' import ArrowUp from '../../icons/IconArrowUp'
interface ScrollToTopProps { interface ScrollToTopProps {
target: MutableRefObject<HTMLDivElement>;
visibilityHeight?: number; visibilityHeight?: number;
} }
const ScrollToTop = ({ target, visibilityHeight=450 }: ScrollToTopProps) => { const ScrollToTop = ({ visibilityHeight=450 }: ScrollToTopProps) => {
const [scrollPosition, setSrollPosition] = useState(0); const [scrollPosition, setSrollPosition] = useState(0);
const [showScrollToTop, setShowScrollToTop] = useState("hide"); const [showScrollToTop, setShowScrollToTop] = useState("hide");
@ -26,7 +25,7 @@ const ScrollToTop = ({ target, visibilityHeight=450 }: ScrollToTopProps) => {
}; };
function handleScrollUp() { function handleScrollUp() {
target.current.scrollIntoView({ behavior: "smooth" }); window.scrollTo(0, 0);
} }
function addEventScroll() { function addEventScroll() {
@ -34,7 +33,7 @@ const ScrollToTop = ({ target, visibilityHeight=450 }: ScrollToTopProps) => {
} }
useEffect(() => { useEffect(() => {
addEventScroll() addEventScroll();
}); });
return ( return (

View File

@ -19,7 +19,6 @@ export { default as DateTime} from './DateTime/DateTime'
export { default as HeadingCommon } from './HeadingCommon/HeadingCommon' export { default as HeadingCommon } from './HeadingCommon/HeadingCommon'
export { default as CollectionHeading } from './CollectionHeading/CollectionHeading' export { default as CollectionHeading } from './CollectionHeading/CollectionHeading'
export { default as ScrollToTop } from './ScrollToTop/ScrollToTop' export { default as ScrollToTop } from './ScrollToTop/ScrollToTop'
export { default as ScrollTarget } from './ScrollToTop/ScrollTarget'
export { default as InputSearch} from './InputSearch/InputSearch' export { default as InputSearch} from './InputSearch/InputSearch'
export { default as ButtonIconBuy} from './ButtonIconBuy/ButtonIconBuy' export { default as ButtonIconBuy} from './ButtonIconBuy/ButtonIconBuy'
export { default as Banner} from './Banner/Banner' export { default as Banner} from './Banner/Banner'