fix: retrieve lost cursor after closing search (#899)

This commit is contained in:
JimmFly
2023-02-09 06:05:15 +08:00
committed by GitHub
parent 7583205011
commit 53d60a13b2
3 changed files with 76 additions and 35 deletions

View File

@@ -10,27 +10,39 @@ import { StyledInputContent, StyledLabel } from './style';
import { Command } from 'cmdk';
import { useTranslation } from '@affine/i18n';
export const Input = (props: {
open: boolean;
query: string;
setQuery: Dispatch<SetStateAction<string>>;
setLoading: Dispatch<SetStateAction<boolean>>;
isPublic: boolean;
publishWorkspaceName: string | undefined;
}) => {
const { open, query, setQuery, setLoading, isPublic, publishWorkspaceName } =
props;
const [isComposition, setIsComposition] = useState(false);
const [inputValue, setInputValue] = useState('');
const inputRef = useRef<HTMLInputElement>(null);
const { t } = useTranslation();
useEffect(() => {
inputRef.current?.addEventListener(
'blur',
() => {
inputRef.current?.focus();
},
true
);
setInputValue(props.query);
return inputRef.current?.focus();
}, [inputRef, props.query]);
if (open) {
const inputElement = inputRef.current;
return inputElement?.focus();
}
}, [open]);
useEffect(() => {
const inputElement = inputRef.current;
if (!open) {
return;
}
const handleFocus = () => {
inputElement?.focus();
};
inputElement?.addEventListener('blur', handleFocus, true);
return () => inputElement?.removeEventListener('blur', handleFocus, true);
}, [inputRef, open]);
useEffect(() => {
setInputValue(query);
}, [query]);
return (
<StyledInputContent>
<StyledLabel htmlFor=":r5:">
@@ -43,18 +55,18 @@ export const Input = (props: {
setIsComposition(true);
}}
onCompositionEnd={e => {
props.setQuery(e.data);
setQuery(e.data);
setIsComposition(false);
if (!props.query) {
props.setLoading(true);
if (!query) {
setLoading(true);
}
}}
onValueChange={str => {
setInputValue(str);
if (!isComposition) {
props.setQuery(str);
if (!props.query) {
props.setLoading(true);
setQuery(str);
if (!query) {
setLoading(true);
}
}
}}
@@ -75,9 +87,9 @@ export const Input = (props: {
}
}}
placeholder={
props.isPublic
isPublic
? t('Quick search placeholder2', {
workspace: props.publishWorkspaceName,
workspace: publishWorkspaceName,
})
: t('Quick search placeholder')
}

View File

@@ -100,6 +100,7 @@ export const QuickSearch = ({ open, onClose }: TransitionsModalProps) => {
>
<StyledModalHeader>
<Input
open={open}
query={query}
setQuery={setQuery}
setLoading={setLoading}