github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(checkbox): get disabled prop from parent (#6970)

pull/7025/head
Konv Suu 2023-10-15 20:53:29 -05:00 committed by GitHub
parent f953482a4d
commit b3ef24963f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/checkbox/Checkbox.tsx
View File

@ -15,6 +15,7 @@ import warning from '../_util/warning';
import type { EventHandler } from '../_util/EventInterface'; import type { EventHandler } from '../_util/EventInterface';
import { FormItemInputContext, useInjectFormItemContext } from '../form/FormItemContext'; import { FormItemInputContext, useInjectFormItemContext } from '../form/FormItemContext';
import useConfigInject from '../config-provider/hooks/useConfigInject'; import useConfigInject from '../config-provider/hooks/useConfigInject';
import { useInjectDisabled } from '../config-provider/DisabledContext';
import type { CheckboxChangeEvent, CheckboxProps } from './interface'; import type { CheckboxChangeEvent, CheckboxProps } from './interface';
import { CheckboxGroupContextKey, checkboxProps } from './interface'; import { CheckboxGroupContextKey, checkboxProps } from './interface';
@ -33,6 +34,8 @@ export default defineComponent({
const formItemContext = useInjectFormItemContext(); const formItemContext = useInjectFormItemContext();
const formItemInputContext = FormItemInputContext.useInject(); const formItemInputContext = FormItemInputContext.useInject();
const { prefixCls, direction, disabled } = useConfigInject('checkbox', props); const { prefixCls, direction, disabled } = useConfigInject('checkbox', props);
const contextDisabled = useInjectDisabled();
// style // style
const [wrapSSR, hashId] = useStyle(prefixCls); const [wrapSSR, hashId] = useStyle(prefixCls);
@ -94,7 +97,7 @@ export default defineComponent({
}; };
checkboxProps.name = checkboxGroup.name.value; checkboxProps.name = checkboxGroup.name.value;
checkboxProps.checked = checkboxGroup.mergedValue.value.includes(props.value); checkboxProps.checked = checkboxGroup.mergedValue.value.includes(props.value);
checkboxProps.disabled = mergedDisabled.value || checkboxGroup.disabled.value; checkboxProps.disabled = mergedDisabled.value || contextDisabled.value;
checkboxProps.indeterminate = indeterminate; checkboxProps.indeterminate = indeterminate;
} else { } else {
checkboxProps.onChange = handleChange; checkboxProps.onChange = handleChange;
@ -129,7 +132,6 @@ export default defineComponent({
{...checkboxProps} {...checkboxProps}
class={checkboxClass} class={checkboxClass}
ref={checkboxRef} ref={checkboxRef}
disabled={mergedDisabled.value}
/> />
{children.length ? <span>{children}</span> : null} {children.length ? <span>{children}</span> : null}
</label>, </label>,