Commit f3b4c3d8 authored by tom goriunov's avatar tom goriunov Committed by GitHub

Merge pull request #1443 from blockscout/search-focus-test

Search focus test
parents 6cfb9bd7 3f31351f
import { Box, Popover, PopoverTrigger, PopoverContent, PopoverBody, useDisclosure, PopoverFooter } from '@chakra-ui/react'; import { Box, Portal, Popover, PopoverTrigger, PopoverContent, PopoverBody, useDisclosure, PopoverFooter, useOutsideClick } from '@chakra-ui/react';
import _debounce from 'lodash/debounce'; import _debounce from 'lodash/debounce';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import type { FormEvent, FocusEvent } from 'react'; import type { FormEvent } from 'react';
import React from 'react'; import React from 'react';
import { Element } from 'react-scroll'; import { Element } from 'react-scroll';
...@@ -59,13 +59,15 @@ const SearchBar = ({ isHomepage }: Props) => { ...@@ -59,13 +59,15 @@ const SearchBar = ({ isHomepage }: Props) => {
inputRef.current?.querySelector('input')?.blur(); inputRef.current?.querySelector('input')?.blur();
}, [ onClose ]); }, [ onClose ]);
const handleBlur = React.useCallback((event: FocusEvent<HTMLFormElement>) => { const handleOutsideClick = React.useCallback((event: Event) => {
const isFocusInMenu = menuRef.current?.contains(event.relatedTarget); const isFocusInInput = inputRef.current?.contains(event.target as Node);
const isFocusInInput = inputRef.current?.contains(event.relatedTarget);
if (!isFocusInMenu && !isFocusInInput) { if (!isFocusInInput) {
onClose(); handelHide();
} }
}, [ onClose ]); }, [ handelHide ]);
useOutsideClick({ ref: menuRef, handler: handleOutsideClick });
const handleClear = React.useCallback(() => { const handleClear = React.useCallback(() => {
handleSearchTermChange(''); handleSearchTermChange('');
...@@ -118,13 +120,13 @@ const SearchBar = ({ isHomepage }: Props) => { ...@@ -118,13 +120,13 @@ const SearchBar = ({ isHomepage }: Props) => {
onChange={ handleSearchTermChange } onChange={ handleSearchTermChange }
onSubmit={ handleSubmit } onSubmit={ handleSubmit }
onFocus={ handleFocus } onFocus={ handleFocus }
onBlur={ handleBlur }
onHide={ handelHide } onHide={ handelHide }
onClear={ handleClear } onClear={ handleClear }
isHomepage={ isHomepage } isHomepage={ isHomepage }
value={ searchTerm } value={ searchTerm }
/> />
</PopoverTrigger> </PopoverTrigger>
<Portal>
<PopoverContent <PopoverContent
w={ `${ menuWidth.current }px` } w={ `${ menuWidth.current }px` }
ref={ menuRef } ref={ menuRef }
...@@ -165,6 +167,7 @@ const SearchBar = ({ isHomepage }: Props) => { ...@@ -165,6 +167,7 @@ const SearchBar = ({ isHomepage }: Props) => {
</PopoverFooter> </PopoverFooter>
) } ) }
</PopoverContent> </PopoverContent>
</Portal>
</Popover> </Popover>
); );
}; };
......
...@@ -20,25 +20,33 @@ interface Props { ...@@ -20,25 +20,33 @@ interface Props {
} }
const SearchBarInput = ({ onChange, onSubmit, isHomepage, onFocus, onBlur, onHide, onClear, value }: Props, ref: React.ForwardedRef<HTMLFormElement>) => { const SearchBarInput = ({ onChange, onSubmit, isHomepage, onFocus, onBlur, onHide, onClear, value }: Props, ref: React.ForwardedRef<HTMLFormElement>) => {
const innerRef = React.useRef<HTMLFormElement>(null);
React.useImperativeHandle(ref, () => innerRef.current as HTMLFormElement, []);
const [ isSticky, setIsSticky ] = React.useState(false); const [ isSticky, setIsSticky ] = React.useState(false);
const scrollDirection = useScrollDirection(); const scrollDirection = useScrollDirection();
const isMobile = useIsMobile(); const isMobile = useIsMobile();
const handleScroll = React.useCallback(() => { const handleScroll = React.useCallback(() => {
const TOP_BAR_HEIGHT = 36; const TOP_BAR_HEIGHT = 36;
if (window.pageYOffset >= TOP_BAR_HEIGHT) { if (!isHomepage) {
if (window.scrollY >= TOP_BAR_HEIGHT) {
setIsSticky(true); setIsSticky(true);
} else { } else {
setIsSticky(false); setIsSticky(false);
} }
}, [ ]); }
const clientRect = isMobile && innerRef?.current?.getBoundingClientRect();
if (clientRect && clientRect.y < TOP_BAR_HEIGHT) {
onHide?.();
}
}, [ isMobile, onHide, isHomepage ]);
const handleChange = React.useCallback((event: ChangeEvent<HTMLInputElement>) => { const handleChange = React.useCallback((event: ChangeEvent<HTMLInputElement>) => {
onChange(event.target.value); onChange(event.target.value);
}, [ onChange ]); }, [ onChange ]);
React.useEffect(() => { React.useEffect(() => {
if (!isMobile || isHomepage) { if (!isMobile) {
return; return;
} }
const throttledHandleScroll = throttle(handleScroll, 300); const throttledHandleScroll = throttle(handleScroll, 300);
...@@ -48,22 +56,14 @@ const SearchBarInput = ({ onChange, onSubmit, isHomepage, onFocus, onBlur, onHid ...@@ -48,22 +56,14 @@ const SearchBarInput = ({ onChange, onSubmit, isHomepage, onFocus, onBlur, onHid
return () => { return () => {
window.removeEventListener('scroll', throttledHandleScroll); window.removeEventListener('scroll', throttledHandleScroll);
}; };
// replicate componentDidMount }, [ isMobile, handleScroll ]);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [ isMobile ]);
const bgColor = useColorModeValue('white', 'black'); const bgColor = useColorModeValue('white', 'black');
const transformMobile = scrollDirection !== 'down' ? 'translateY(0)' : 'translateY(-100%)'; const transformMobile = scrollDirection !== 'down' ? 'translateY(0)' : 'translateY(-100%)';
React.useEffect(() => {
if (isMobile && scrollDirection === 'down') {
onHide?.();
}
}, [ scrollDirection, onHide, isMobile ]);
return ( return (
<chakra.form <chakra.form
ref={ ref } ref={ innerRef }
noValidate noValidate
onSubmit={ onSubmit } onSubmit={ onSubmit }
onBlur={ onBlur } onBlur={ onBlur }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment