Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SearchBar small improvements #2707

Merged
merged 2 commits into from
Oct 16, 2024
Merged

SearchBar small improvements #2707

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
883d0a5
feat(SearchBar): Add `onClear` and `disabledFocus` props
JF-Cozy Oct 16, 2024
3504eb5
fix(SearchBar): Ref wasn't spread correctly
JF-Cozy Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions react/SearchBar/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,14 @@ const SearchBar = forwardRef(
label: labelProp,
componentsProps,
disabledClear,
disabledFocus,
className,
defaultValue,
value,
elevation,
disabled,
onChange,
onClear,
onFocus,
onBlur,
...props
Expand Down Expand Up @@ -155,6 +157,7 @@ const SearchBar = forwardRef(

const handleClear = ev => {
onChange({ ...ev, target: { ...ev.target, value: '' } })
onClear(ev)
setCurrentValue('')
}

Expand All @@ -175,7 +178,7 @@ const SearchBar = forwardRef(
className={cx(className, classes.root, {
[classes.flat]: !elevation,
[classes.elevation]: elevation,
[classes.focused]: isFocused,
[classes.focused]: isFocused && !disabledFocus,
[classes.disabled]: disabled
})}
ref={ref}
Expand Down Expand Up @@ -233,9 +236,11 @@ SearchBar.defaultProps = {
size: 'small',
type: 'search',
disabledClear: false,
disabledFocus: false,
defaultValue: '',
onChange: () => {},
onFocus: () => {},
onClear: () => {},
onBlur: () => {}
}

Expand All @@ -253,6 +258,7 @@ SearchBar.propTypes = {
/** Used only with self-controlled component */
defaultValue: PropTypes.string,
disabledClear: PropTypes.bool,
disabledFocus: PropTypes.bool,
elevation: PropTypes.bool,
placeholder: PropTypes.string,
label: PropTypes.oneOfType([
Expand All @@ -263,13 +269,14 @@ SearchBar.propTypes = {
disabled: PropTypes.bool,
onChange: PropTypes.func,
onFocus: PropTypes.func,
onClear: PropTypes.func,
onBlur: PropTypes.func
}

const SearchBarWithLocales = props => {
const SearchBarWithLocales = forwardRef((props, ref) => {
useExtendI18n(locales)

return <SearchBar {...props} />
}
return <SearchBar {...props} ref={ref} />
})

export default SearchBarWithLocales
Loading