Merge pull request #1512 from riccardobl/clearbug
Fix some issues in clear button for input fields
This commit is contained in:
commit
a253e42829
|
@ -33,6 +33,7 @@ import EyeClose from '@/svgs/eye-close-line.svg'
|
||||||
import Info from './info'
|
import Info from './info'
|
||||||
import { useMe } from './me'
|
import { useMe } from './me'
|
||||||
import classNames from 'classnames'
|
import classNames from 'classnames'
|
||||||
|
import { useIsClient } from './use-client'
|
||||||
|
|
||||||
export class SessionRequiredError extends Error {
|
export class SessionRequiredError extends Error {
|
||||||
constructor () {
|
constructor () {
|
||||||
|
@ -455,6 +456,7 @@ function InputInner ({
|
||||||
const [field, meta, helpers] = noForm ? [{}, {}, {}] : useField(props)
|
const [field, meta, helpers] = noForm ? [{}, {}, {}] : useField(props)
|
||||||
const formik = noForm ? null : useFormikContext()
|
const formik = noForm ? null : useFormikContext()
|
||||||
const storageKeyPrefix = useContext(StorageKeyPrefixContext)
|
const storageKeyPrefix = useContext(StorageKeyPrefixContext)
|
||||||
|
const isClient = useIsClient()
|
||||||
|
|
||||||
const storageKey = storageKeyPrefix ? storageKeyPrefix + '-' + props.name : undefined
|
const storageKey = storageKeyPrefix ? storageKeyPrefix + '-' + props.name : undefined
|
||||||
|
|
||||||
|
@ -538,7 +540,7 @@ function InputInner ({
|
||||||
isInvalid={invalid}
|
isInvalid={invalid}
|
||||||
isValid={showValid && meta.initialValue !== meta.value && meta.touched && !meta.error}
|
isValid={showValid && meta.initialValue !== meta.value && meta.touched && !meta.error}
|
||||||
/>
|
/>
|
||||||
{(clear && field.value) &&
|
{(isClient && clear && field.value && !props.readOnly) &&
|
||||||
<Button
|
<Button
|
||||||
variant={null}
|
variant={null}
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
|
|
Loading…
Reference in New Issue