diff --git a/packages/checkbox/src/use-checkbox.ts b/packages/checkbox/src/use-checkbox.ts index d41201bd7a9..b43689a3440 100644 --- a/packages/checkbox/src/use-checkbox.ts +++ b/packages/checkbox/src/use-checkbox.ts @@ -11,6 +11,7 @@ import React, { ChangeEvent, KeyboardEvent, useCallback, + useEffect, useRef, useState, } from "react" @@ -189,6 +190,12 @@ export function useCheckbox(props: UseCheckboxProps = {}) { } }, [isIndeterminate]) + useEffect(() => { + if (isDisabled) { + setFocused.off() + } + }, [isDisabled, setFocused]) + const trulyDisabled = isDisabled && !isFocusable const onKeyDown = useCallback(