Merge da76ca4 into 74fb409

IDuxFE · Mar 30, 2022 · c663f76 · c663f76
2 parents 74fb409 + da76ca4
commit c663f76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packages/components/checkbox/__tests__/checkboxGroup.spec.ts b/packages/components/checkbox/__tests__/checkboxGroup.spec.ts
@@ -65,12 +65,14 @@ describe('CheckboxGroup', () => {
   test('dataSource work', async () => {
     let dataSource = [
       { label: 'option1', value: 'option1' },
-      { label: 'option2', value: 'option2' },
+      { label: 'option2', value: 'option2', disabled: true },
     ]
     const wrapper = CheckboxGroupMount({ props: { dataSource } })
 
     expect(wrapper.findAll('.ix-checkbox').length).toBe(2)
 
+    expect(wrapper.findAll('.ix-checkbox-disabled').length).toBe(1)
+
     dataSource = [
       { label: 'option1', value: 'option1' },
       { label: 'option2', value: 'option2' },

diff --git a/packages/components/checkbox/src/Checkbox.tsx b/packages/components/checkbox/src/Checkbox.tsx
@@ -106,7 +106,7 @@ const useCheckbox = (props: CheckboxProps, checkboxGroup: CheckboxGroupContext |
   if (checkboxGroup) {
     const { props: groupProps, accessor } = checkboxGroup
     isChecked = computed(() => (accessor.valueRef.value ?? []).includes(props.value ?? props.trueValue))
-    isDisabled = computed(() => accessor.disabled.value ?? !!props.disabled)
+    isDisabled = computed(() => props.disabled ?? accessor.disabled.value)
 
     handleBlur = (evt: FocusEvent) => {
       isFocused.value = false