Skip to content

Commit 916be97

Browse files
LukaFilipovic99jtomic-croz
authored andcommitted
#229 Remove clear button from input fields when they are disabled
1 parent 9b29e42 commit 916be97

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

libs/form-elements/src/Input.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ const Input = React.forwardRef(
284284
</div>
285285
<div className={`absolute flex ${extend ? "items-start top-3" : "items-center inset-y-0"} right-0`}>
286286
{error && <InputIcon icon={finalWarningIcon} inputId={props.id} trailing={true} />}
287-
{props.value && allowClear && finalClearIcon && (
288-
<button type="button" onClick={onReset} disabled={disabled || props.readOnly}>
287+
{!disabled && !props.readOnly && props.value && allowClear && finalClearIcon && (
288+
<button type="button" onClick={onReset}>
289289
{finalClearIcon}
290290
</button>
291291
)}

libs/selectors/src/Autocomplete.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ function Autocomplete<T extends {}>({
943943
inlineTrailingIcon={
944944
<div className={autocompleteTokens.Loading.container}>
945945
{loading && <div className={loadingInnerClassName}>{loadingIcon}</div>}
946-
{validateUsage() && validateValue() && (
946+
{!disabled && validateUsage() && validateValue() && (
947947
<div className={clearClassName} onClick={clear}>
948948
{removeIcon}
949949
</div>

libs/selectors/src/Select.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ function Select<T>({
413413
<div className={tokens.Loading.container}>
414414
{loading && <div className={loadingInnerClassName}>{loadingIcon}</div>}
415415
{error && warningIcon}
416-
{value && !hideClearButton && !error && (
416+
{!disabled && value && !hideClearButton && !error && (
417417
<button type="button" className={clearClassName} onClick={clear}>
418418
{removeIcon}
419419
</button>

libs/selectors/src/TreeSelect.tsx

+8-6
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ export default function TreeSelect<T>({
148148
tokens.Select.fontSize,
149149
tokens.Select.lineHeight,
150150
{ [tokens.Select.error]: error },
151-
{ [tokens.Select.disabled]: disabled }
151+
{ [tokens.Select.disabled]: disabled },
152152
);
153153

154154
const listClassName = cx(tokens.List.master, tokens.List.borderRadius, tokens.List.boxShadow, { invisible: !isOpen });
@@ -158,7 +158,7 @@ export default function TreeSelect<T>({
158158
tokens.List.inner.borderRadius,
159159
tokens.List.inner.backgroundColor,
160160
tokens.List.inner.boxShadow,
161-
tokens.List.inner.outline
161+
tokens.List.inner.outline,
162162
);
163163

164164
const onChange = (item: T | undefined) => {
@@ -197,9 +197,11 @@ export default function TreeSelect<T>({
197197
<div className="flex items-center justify-between">
198198
<div className="flex-grow mr-3 flex-wrap">{valueLabel}</div>
199199
<div className="flex items-center flex-shrink-0 text-gray-400">
200-
<div className="p-2 -m-2 hover:text-gray-700 flex align-center" onClick={clear}>
201-
{closeIcon}
202-
</div>
200+
{!disabled && (
201+
<div className="p-2 -m-2 hover:text-gray-700 flex align-center" onClick={clear}>
202+
{closeIcon}
203+
</div>
204+
)}
203205
<div className="pl-2">
204206
<div className="border-r border-gray-200">&nbsp;</div>
205207
</div>
@@ -273,7 +275,7 @@ function TreeSelectOption<T>({
273275
tokens.Item.base.fontSize,
274276
tokens.Item.base.lineHeight,
275277
tokens.Item.base.color,
276-
"cursor-default select-none"
278+
"cursor-default select-none",
277279
);
278280

279281
const innerItemClassName = cx("flex items-center", levelClasses[level]);

0 commit comments

Comments
 (0)