#229 Remove clear button from input fields when they are disabled

croz-ltd · May 10, 2024 · 916be97 · 916be97
1 parent 9b29e42
commit 916be97
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/libs/form-elements/src/Input.tsx b/libs/form-elements/src/Input.tsx
@@ -284,8 +284,8 @@ const Input = React.forwardRef(
         </div>
         <div className={`absolute flex ${extend ? "items-start top-3" : "items-center inset-y-0"} right-0`}>
           {error && <InputIcon icon={finalWarningIcon} inputId={props.id} trailing={true} />}
-          {props.value && allowClear && finalClearIcon && (
-            <button type="button" onClick={onReset} disabled={disabled || props.readOnly}>
+          {!disabled && !props.readOnly && props.value && allowClear && finalClearIcon && (
+            <button type="button" onClick={onReset}>
               {finalClearIcon}
             </button>
           )}

diff --git a/libs/selectors/src/Autocomplete.tsx b/libs/selectors/src/Autocomplete.tsx
@@ -943,7 +943,7 @@ function Autocomplete<T extends {}>({
         inlineTrailingIcon={
           <div className={autocompleteTokens.Loading.container}>
             {loading && <div className={loadingInnerClassName}>{loadingIcon}</div>}
-            {validateUsage() && validateValue() && (
+            {!disabled && validateUsage() && validateValue() && (
               <div className={clearClassName} onClick={clear}>
                 {removeIcon}
               </div>

diff --git a/libs/selectors/src/Select.tsx b/libs/selectors/src/Select.tsx
@@ -413,7 +413,7 @@ function Select<T>({
             <div className={tokens.Loading.container}>
               {loading && <div className={loadingInnerClassName}>{loadingIcon}</div>}
               {error && warningIcon}
-              {value && !hideClearButton && !error && (
+              {!disabled && value && !hideClearButton && !error && (
                 <button type="button" className={clearClassName} onClick={clear}>
                   {removeIcon}
                 </button>

diff --git a/libs/selectors/src/TreeSelect.tsx b/libs/selectors/src/TreeSelect.tsx
@@ -148,7 +148,7 @@ export default function TreeSelect<T>({
     tokens.Select.fontSize,
     tokens.Select.lineHeight,
     { [tokens.Select.error]: error },
-    { [tokens.Select.disabled]: disabled }
+    { [tokens.Select.disabled]: disabled },
   );
 
   const listClassName = cx(tokens.List.master, tokens.List.borderRadius, tokens.List.boxShadow, { invisible: !isOpen });
@@ -158,7 +158,7 @@ export default function TreeSelect<T>({
     tokens.List.inner.borderRadius,
     tokens.List.inner.backgroundColor,
     tokens.List.inner.boxShadow,
-    tokens.List.inner.outline
+    tokens.List.inner.outline,
   );
 
   const onChange = (item: T | undefined) => {
@@ -197,9 +197,11 @@ export default function TreeSelect<T>({
           <div className="flex items-center justify-between">
             <div className="flex-grow mr-3 flex-wrap">{valueLabel}</div>
             <div className="flex items-center flex-shrink-0 text-gray-400">
-              <div className="p-2 -m-2 hover:text-gray-700 flex align-center" onClick={clear}>
-                {closeIcon}
-              </div>
+              {!disabled && (
+                <div className="p-2 -m-2 hover:text-gray-700 flex align-center" onClick={clear}>
+                  {closeIcon}
+                </div>
+              )}
               <div className="pl-2">
                 <div className="border-r border-gray-200">&nbsp;</div>
               </div>
@@ -273,7 +275,7 @@ function TreeSelectOption<T>({
     tokens.Item.base.fontSize,
     tokens.Item.base.lineHeight,
     tokens.Item.base.color,
-    "cursor-default select-none"
+    "cursor-default select-none",
   );
 
   const innerItemClassName = cx("flex items-center", levelClasses[level]);