fix conflict resolution

Signed-off-by: Juan Pablo Garcia Ripa <sarabadu@gmail.com>
This commit is contained in:
Juan Pablo Garcia Ripa
2022-01-10 17:51:55 +01:00
parent eae85fecac
commit 5bd03f03be
@@ -61,26 +61,12 @@ export const Modal = ({ open = true, toggleModal }: SearchModalProps) => {
const getSearchLink = useRouteRef(rootRouteRef);
const classes = useStyles();
const { term } = useSearch();
const { focusContent } = useLayoutContent();
const { transitions } = useTheme();
const { term, setTerm } = useSearch();
const [value, setValue] = useState<string>(term);
useEffect(() => {
setValue(prevValue => (prevValue !== term ? term : prevValue));
}, [term]);
useDebounce(() => setTerm(value), 500, [value]);
const handleQuery = (newValue: string) => {
setValue(newValue);
};
const handleClear = () => setValue('');
const handleResultClick = () => {
toggleModal();
handleClear();
setTimeout(focusContent, transitions.duration.leavingScreen);
};
@@ -117,7 +103,7 @@ export const Modal = ({ open = true, toggleModal }: SearchModalProps) => {
toggleModal();
setTimeout(focusContent, transitions.duration.leavingScreen);
}}
to={`${getSearchLink()}?query=${value}`}
to={`${getSearchLink()}?query=${term}`}
>
<span className={classes.viewResultsLink}>View Full Results</span>
<LaunchIcon color="primary" />