From 6d965426e0b7730ca06cc91c812be61f357ddfce Mon Sep 17 00:00:00 2001 From: RachelElysia <71795832+RachelElysia@users.noreply.github.com> Date: Tue, 26 Mar 2024 09:55:49 -0400 Subject: [PATCH] Fleet UI: Users can see a tooltip on a disabled checkbox (#17664) --- changes/16345-disabled-checkbox-tooltip | 1 + .../forms/fields/Checkbox/Checkbox.tsx | 17 +++++--- .../forms/fields/Checkbox/_styles.scss | 17 ++++++++ .../TeamHostExpiryToggle.tsx | 40 ++++++++----------- .../TeamHostExpiryToggle/_styles.scss | 4 -- frontend/styles/var/mixins.scss | 7 ++++ 6 files changed, 53 insertions(+), 33 deletions(-) create mode 100644 changes/16345-disabled-checkbox-tooltip diff --git a/changes/16345-disabled-checkbox-tooltip b/changes/16345-disabled-checkbox-tooltip new file mode 100644 index 0000000000..5e83ded1e1 --- /dev/null +++ b/changes/16345-disabled-checkbox-tooltip @@ -0,0 +1 @@ +- UI fix: users can see a tooltip on a disabled checkbox diff --git a/frontend/components/forms/fields/Checkbox/Checkbox.tsx b/frontend/components/forms/fields/Checkbox/Checkbox.tsx index 8380b4279c..83ddcb43be 100644 --- a/frontend/components/forms/fields/Checkbox/Checkbox.tsx +++ b/frontend/components/forms/fields/Checkbox/Checkbox.tsx @@ -55,21 +55,26 @@ const Checkbox = (props: ICheckboxProps) => { className, baseClass ); + + const checkBoxTickClass = classnames(`${baseClass}__tick`, { + [`${baseClass}__tick--disabled`]: disabled, + [`${baseClass}__tick--indeterminate`]: indeterminate, + }); + + const checkBoxLabelClass = classnames(checkBoxClass, { + [`${baseClass}__label--disabled`]: disabled, + }); + const formFieldProps = { ...pick(props, ["helpText", "label", "error", "name"]), className: wrapperClassName, type: "checkbox", } as IFormFieldProps; - const checkBoxTickClass = classnames(`${checkBoxClass}__tick`, { - [`${checkBoxClass}__tick--disabled`]: disabled, - [`${checkBoxClass}__tick--indeterminate`]: indeterminate, - }); - return ( <> -