fix(FE-113): fix merge error

This commit is contained in:
ValdiANS
2025-10-21 15:54:25 +07:00
parent e29613a37e
commit 06f1d3f6a4
-6
View File
@@ -97,7 +97,6 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
return { ...base, IndicatorSeparator: () => null }; return { ...base, IndicatorSeparator: () => null };
}, [isAnimated]); }, [isAnimated]);
const internalInputChangeHandler = (val: string, meta: InputActionMeta) => {
const internalInputChangeHandler = (val: string, meta: InputActionMeta) => { const internalInputChangeHandler = (val: string, meta: InputActionMeta) => {
if (meta.action === 'input-change') setInternalInputValue(val); if (meta.action === 'input-change') setInternalInputValue(val);
if (meta.action === 'menu-close') setInternalInputValue(''); if (meta.action === 'menu-close') setInternalInputValue('');
@@ -140,8 +139,6 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
> >
{label} {label}
{required && ( {required && (
<span className='tooltip tooltip-error' data-tip='required'>
<span className='text-error'> *</span>
<span className='tooltip tooltip-error' data-tip='required'> <span className='tooltip tooltip-error' data-tip='required'>
<span className='text-error'> *</span> <span className='text-error'> *</span>
</span> </span>
@@ -150,7 +147,6 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
)} )}
<SelectComponent<T, boolean, GroupBase<T>> <SelectComponent<T, boolean, GroupBase<T>>
instanceId='select'
instanceId='select' instanceId='select'
value={value ?? (isMulti ? [] : null)} value={value ?? (isMulti ? [] : null)}
onChange={handleChange} onChange={handleChange}
@@ -223,11 +219,9 @@ const SelectInput = <T extends OptionType>(props: SelectInputProps<T>) => {
}} }}
/> />
{isError && <p className='w-full text-sm text-error'>{errorMessage}</p>}
{isError && <p className='w-full text-sm text-error'>{errorMessage}</p>} {isError && <p className='w-full text-sm text-error'>{errorMessage}</p>}
{!isError && bottomLabel && ( {!isError && bottomLabel && (
<p className='w-full text-sm opacity-60'>{bottomLabel}</p> <p className='w-full text-sm opacity-60'>{bottomLabel}</p>
<p className='w-full text-sm opacity-60'>{bottomLabel}</p>
)} )}
</div> </div>
); );