make SearchInput handle clearing by itself
This commit is contained in:
@@ -1,9 +1,10 @@
|
|||||||
import React from 'react'
|
import React, {useRef, useState} from 'react'
|
||||||
import {TextInput, View} from 'react-native'
|
import {TextInput, View} from 'react-native'
|
||||||
import {msg} from '@lingui/macro'
|
import {msg} from '@lingui/macro'
|
||||||
import {useLingui} from '@lingui/react'
|
import {useLingui} from '@lingui/react'
|
||||||
|
|
||||||
import {HITSLOP_10} from '#/lib/constants'
|
import {HITSLOP_10} from '#/lib/constants'
|
||||||
|
import {mergeRefs} from '#/lib/merge-refs'
|
||||||
import {isNative} from '#/platform/detection'
|
import {isNative} from '#/platform/detection'
|
||||||
import {atoms as a, useTheme} from '#/alf'
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
import {Button, ButtonIcon} from '#/components/Button'
|
import {Button, ButtonIcon} from '#/components/Button'
|
||||||
@@ -13,26 +14,35 @@ import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
|
|||||||
|
|
||||||
type SearchInputProps = Omit<TextField.InputProps, 'label'> & {
|
type SearchInputProps = Omit<TextField.InputProps, 'label'> & {
|
||||||
label?: TextField.InputProps['label']
|
label?: TextField.InputProps['label']
|
||||||
/**
|
|
||||||
* Called when the user presses the (X) button
|
|
||||||
*/
|
|
||||||
onClearText?: () => void
|
onClearText?: () => void
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SearchInput = React.forwardRef<TextInput, SearchInputProps>(
|
export const SearchInput = React.forwardRef<TextInput, SearchInputProps>(
|
||||||
function SearchInput({value, label, onClearText, ...rest}, ref) {
|
function SearchInput({label, onChangeText: onChangeTextProp, ...rest}, ref) {
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
const showClear = value && value.length > 0
|
const [showClear, setShowClear] = useState(false)
|
||||||
|
const inputRef = useRef<TextInput>()
|
||||||
|
|
||||||
|
const handleChangeText = (text: string) => {
|
||||||
|
setShowClear(text.length > 0)
|
||||||
|
onChangeTextProp?.(text)
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleClear = () => {
|
||||||
|
inputRef.current?.clear()
|
||||||
|
setShowClear(false)
|
||||||
|
onChangeTextProp?.('')
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View style={[a.w_full, a.relative]}>
|
<View style={[a.w_full, a.relative]}>
|
||||||
<TextField.Root>
|
<TextField.Root>
|
||||||
<TextField.Icon icon={MagnifyingGlassIcon} />
|
<TextField.Icon icon={MagnifyingGlassIcon} />
|
||||||
<TextField.Input
|
<TextField.Input
|
||||||
inputRef={ref}
|
inputRef={mergeRefs([ref, inputRef])}
|
||||||
|
onChangeText={handleChangeText}
|
||||||
label={label || _(msg`Search`)}
|
label={label || _(msg`Search`)}
|
||||||
value={value}
|
|
||||||
placeholder={_(msg`Search`)}
|
placeholder={_(msg`Search`)}
|
||||||
returnKeyType="search"
|
returnKeyType="search"
|
||||||
keyboardAppearance={t.scheme}
|
keyboardAppearance={t.scheme}
|
||||||
@@ -42,13 +52,7 @@ export const SearchInput = React.forwardRef<TextInput, SearchInputProps>(
|
|||||||
autoCorrect={false}
|
autoCorrect={false}
|
||||||
autoComplete="off"
|
autoComplete="off"
|
||||||
autoCapitalize="none"
|
autoCapitalize="none"
|
||||||
style={[
|
style={[showClear && {paddingRight: 24}]}
|
||||||
showClear
|
|
||||||
? {
|
|
||||||
paddingRight: 24,
|
|
||||||
}
|
|
||||||
: {},
|
|
||||||
]}
|
|
||||||
{...rest}
|
{...rest}
|
||||||
/>
|
/>
|
||||||
</TextField.Root>
|
</TextField.Root>
|
||||||
@@ -66,7 +70,7 @@ export const SearchInput = React.forwardRef<TextInput, SearchInputProps>(
|
|||||||
]}>
|
]}>
|
||||||
<Button
|
<Button
|
||||||
testID="searchTextInputClearBtn"
|
testID="searchTextInputClearBtn"
|
||||||
onPress={onClearText}
|
onPress={handleClear}
|
||||||
label={_(msg`Clear search query`)}
|
label={_(msg`Clear search query`)}
|
||||||
hitSlop={HITSLOP_10}
|
hitSlop={HITSLOP_10}
|
||||||
size="tiny"
|
size="tiny"
|
||||||
|
|||||||
Reference in New Issue
Block a user