refactor: Improve location input component structure and type handling

- Extracted base location input component for better separation of concerns
- Updated ref handling to support forwarded refs
- Improved type safety with explicit ref prop
- Minor improvements to input value handling and suggestion logic
This commit is contained in:
RustamRu 2025-03-11 23:08:27 +03:00
parent 2f8a172b12
commit 3f4e077f7c

View File

@ -1,4 +1,4 @@
import React, { forwardRef, memo, useEffect, useState } from 'react';
import React, { ForwardedRef, forwardRef, memo, useEffect, useState } from 'react';
import {
Input,
Box,
@ -24,129 +24,130 @@ import {
} from './helper';
import { LocationInputProps } from './types';
export const LocationInput = memo(
withYMaps(
forwardRef<HTMLInputElement, LocationInputProps>(function LocationInput(
{ ymaps, value, onChange, ...props },
ref,
) {
const [inputValue, setInputValue] = useState<string>('');
export const BaseLocationInput = withYMaps(
({ ymaps, value = '', onChange, inputRef, ...props }: LocationInputProps & { inputRef: ForwardedRef<HTMLInputElement> }) => {
const [inputValue, setInputValue] = useState<string>('');
useEffect(() => {
setInputValue(value);
}, [value]);
useEffect(() => {
setInputValue(value);
}, [value]);
const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
const [isSuggestionsPanelOpen, setIsSuggestionsPanelOpen] =
useState<boolean>(false);
const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
const [isSuggestionsPanelOpen, setIsSuggestionsPanelOpen] =
useState<boolean>(false);
const onInputChange: InputProps['onChange'] = async (e) => {
const newInputValue = e.target.value;
const onInputChange: InputProps['onChange'] = async (e) => {
const newInputValue = e.target.value;
if (
isValidLocation(newInputValue) &&
(await isRealLocation(ymaps, newInputValue))
) {
onChange(newInputValue);
} else {
setInputValue(newInputValue);
if (newInputValue.trim().length > 3) {
try {
const address = extractAddress(newInputValue);
const results = await ymaps.suggest(address);
setSuggestions(results);
} catch (error) {
console.error(error);
}
} else {
setSuggestions([]);
if (
isValidLocation(newInputValue) &&
(await isRealLocation(ymaps, newInputValue))
) {
onChange(newInputValue);
} else {
setInputValue(newInputValue);
if (newInputValue.trim().length > 3) {
try {
const address = extractAddress(newInputValue);
const results = await ymaps.suggest(address);
setSuggestions(results);
} catch (error) {
console.error(error);
}
setIsSuggestionsPanelOpen(suggestions.length > 1);
}
};
const onFocus: InputProps['onFocus'] = () => {
setIsSuggestionsPanelOpen(suggestions.length > 1);
};
const onBlur: InputProps['onBlur'] = async (e) => {
const inputValue = e.target.value;
if (
isValidLocation(inputValue) &&
(await isRealLocation(ymaps, inputValue))
) {
onChange(inputValue);
} else {
setInputValue(value);
setSuggestions([]);
}
setIsSuggestionsPanelOpen(false);
};
const handleSuggestionClick = async ({ value: address }: Suggestion) => {
try {
const location = await getLocationByAddress(ymaps, address);
const newValue = formatLocation(location);
setInputValue(newValue);
onChange(newValue);
} catch (error) {
console.error(error);
}
};
setIsSuggestionsPanelOpen(suggestions.length > 1);
}
};
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.order-create.form.washing-location-field',
});
const onFocus: InputProps['onFocus'] = () => {
setIsSuggestionsPanelOpen(suggestions.length > 1);
};
return (
<Box width='100%'>
<Popover
isOpen={isSuggestionsPanelOpen}
autoFocus={false}
placement='bottom-start'
>
<PopoverAnchor>
<Input
{...props}
ref={ref}
onBlur={onBlur}
value={inputValue ?? value}
onChange={onInputChange}
onFocus={onFocus}
placeholder={t('placeholder')}
/>
</PopoverAnchor>
<PopoverContent width='100%' maxWidth='100%'>
<PopoverBody border='1px' borderColor='gray.300' p={0}>
<List>
{suggestions.map((suggestion, index) => (
<ListItem
key={index}
p={2}
cursor='pointer'
_hover={{
bgColor: 'primary.50',
}}
_active={{
bgColor: 'primary.100',
}}
onClick={() => handleSuggestionClick(suggestion)}
>
{suggestion.displayName}
</ListItem>
))}
</List>
</PopoverBody>
</PopoverContent>
</Popover>
</Box>
);
}),
true,
['suggest', 'geocode'],
),
const onBlur: InputProps['onBlur'] = async (e) => {
const inputValue = e.target.value;
if (
isValidLocation(inputValue) &&
(await isRealLocation(ymaps, inputValue))
) {
onChange(inputValue);
} else {
setInputValue(value);
}
setIsSuggestionsPanelOpen(false);
};
const handleSuggestionClick = async ({ value: address }: Suggestion) => {
try {
const location = await getLocationByAddress(ymaps, address);
const newValue = formatLocation(location);
setInputValue(newValue);
onChange(newValue);
} catch (error) {
console.error(error);
}
};
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.order-create.form.washing-location-field',
});
return (
<Box width='100%'>
<Popover
isOpen={isSuggestionsPanelOpen}
autoFocus={false}
placement='bottom-start'
>
<PopoverAnchor>
<Input
{...props}
ref={inputRef}
onBlur={onBlur}
value={inputValue || value}
onChange={onInputChange}
onFocus={onFocus}
placeholder={t('placeholder')}
/>
</PopoverAnchor>
<PopoverContent width='100%' maxWidth='100%'>
<PopoverBody border='1px' borderColor='gray.300' p={0}>
<List>
{suggestions.map((suggestion, index) => (
<ListItem
key={index}
p={2}
cursor='pointer'
_hover={{
bgColor: 'primary.50',
}}
_active={{
bgColor: 'primary.100',
}}
onClick={() => handleSuggestionClick(suggestion)}
>
{suggestion.displayName}
</ListItem>
))}
</List>
</PopoverBody>
</PopoverContent>
</Popover>
</Box>
);
},
true,
['suggest', 'geocode'],
);
export const LocationInput = memo(forwardRef<HTMLInputElement, LocationInputProps>(
function LocationInput(props, ref) {
return <BaseLocationInput {...props} inputRef={ref} />;
},
));
// todo: i18n
// todo: replace console.error with toast