From 7b02be3defa090b403247e0ae2ecd64df8573650 Mon Sep 17 00:00:00 2001
From: Yihui Liao <liao.yihui18@gmail.com>
Date: Fri, 10 Nov 2023 15:43:43 -0800
Subject: [PATCH 1/2] Fix selected checkbox fill color when checkbox group is
 disabled

---
 packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx b/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx
index 9c736e48148..268092e651c 100644
--- a/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx
+++ b/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx
@@ -27,6 +27,7 @@ function CheckboxGroup(props: SpectrumCheckboxGroupProps, ref: DOMRef<HTMLDivEle
   props = useFormProps(props);
   let {
     isEmphasized,
+    isDisabled,
     children,
     orientation = 'vertical'
   } = props;
@@ -53,7 +54,7 @@ function CheckboxGroup(props: SpectrumCheckboxGroupProps, ref: DOMRef<HTMLDivEle
             }
           )
         }>
-        <Provider isEmphasized={isEmphasized}>
+        <Provider isEmphasized={isEmphasized} isDisabled={isDisabled}>
           <CheckboxGroupContext.Provider value={state}>
             {children}
           </CheckboxGroupContext.Provider>

From 0b7e32b3c66aa8e0d43ce45aeb32d1d63694a63b Mon Sep 17 00:00:00 2001
From: Yihui Liao <liao.yihui18@gmail.com>
Date: Mon, 13 Nov 2023 11:28:15 -0800
Subject: [PATCH 2/2] get isDisable from checkbox group state

---
 packages/@react-spectrum/checkbox/src/Checkbox.tsx      | 6 +++---
 packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/@react-spectrum/checkbox/src/Checkbox.tsx b/packages/@react-spectrum/checkbox/src/Checkbox.tsx
index 517bd625eff..352f930b1c3 100644
--- a/packages/@react-spectrum/checkbox/src/Checkbox.tsx
+++ b/packages/@react-spectrum/checkbox/src/Checkbox.tsx
@@ -32,13 +32,11 @@ function Checkbox(props: SpectrumCheckboxProps, ref: FocusableRef<HTMLLabelEleme
   let {
     isIndeterminate = false,
     isEmphasized = false,
-    isDisabled = false,
     autoFocus,
     children,
     ...otherProps
   } = props;
   let {styleProps} = useStyleProps(otherProps);
-  let {hoverProps, isHovered} = useHover({isDisabled});
 
   let inputRef = useRef<HTMLInputElement>(null);
   let domRef = useFocusableRef(ref, inputRef);
@@ -47,7 +45,7 @@ function Checkbox(props: SpectrumCheckboxProps, ref: FocusableRef<HTMLLabelEleme
   // This is a bit unorthodox. Typically, hooks cannot be called in a conditional,
   // but since the checkbox won't move in and out of a group, it should be safe.
   let groupState = useContext(CheckboxGroupContext);
-  let {inputProps, isInvalid} = groupState
+  let {inputProps, isInvalid, isDisabled} = groupState
     // eslint-disable-next-line react-hooks/rules-of-hooks
     ? useCheckboxGroupItem({
       ...props,
@@ -64,6 +62,8 @@ function Checkbox(props: SpectrumCheckboxProps, ref: FocusableRef<HTMLLabelEleme
     // eslint-disable-next-line react-hooks/rules-of-hooks
     : useCheckbox(props, useToggleState(props), inputRef);
 
+  let {hoverProps, isHovered} = useHover({isDisabled});
+
   let markIcon = isIndeterminate
     ? <DashSmall UNSAFE_className={classNames(styles, 'spectrum-Checkbox-partialCheckmark')} />
     : <CheckmarkSmall UNSAFE_className={classNames(styles, 'spectrum-Checkbox-checkmark')} />;
diff --git a/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx b/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx
index 268092e651c..9c736e48148 100644
--- a/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx
+++ b/packages/@react-spectrum/checkbox/src/CheckboxGroup.tsx
@@ -27,7 +27,6 @@ function CheckboxGroup(props: SpectrumCheckboxGroupProps, ref: DOMRef<HTMLDivEle
   props = useFormProps(props);
   let {
     isEmphasized,
-    isDisabled,
     children,
     orientation = 'vertical'
   } = props;
@@ -54,7 +53,7 @@ function CheckboxGroup(props: SpectrumCheckboxGroupProps, ref: DOMRef<HTMLDivEle
             }
           )
         }>
-        <Provider isEmphasized={isEmphasized} isDisabled={isDisabled}>
+        <Provider isEmphasized={isEmphasized}>
           <CheckboxGroupContext.Provider value={state}>
             {children}
           </CheckboxGroupContext.Provider>