Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

feat(design): add `indeterminate` property support to Checkbox component (#1870)

白熱f522a345e32f
diff --git a/packages/design/src/components/checkbox/Checkbox.stories.tsx b/packages/design/src/components/checkbox/Checkbox.stories.tsx
index 2a48438c04..f14880ceb5 100644
--- a/packages/design/src/components/checkbox/Checkbox.stories.tsx
+++ b/packages/design/src/components/checkbox/Checkbox.stories.tsx
@@ -15,7 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React from 'react';
+import React, { useState } from 'react';
import { Checkbox } from './Checkbox';
@@ -32,7 +32,12 @@ export default meta;
export const CheckboxBasic = {
render() {
- return <Checkbox value="c0">checkbox 1</Checkbox>;
+ const [checked, setChecked] = useState(false);
+ function handleChange(value: string | number | boolean) {
+ setChecked(value as boolean);
+ }
+
+ return <Checkbox checked={checked} onChange={handleChange}>checkbox 1</Checkbox>;
},
};
@@ -40,10 +45,28 @@ export const CheckboxDisabled = {
render() {
return (
<>
- <Checkbox value="c1" disabled>
+ <Checkbox disabled>
checkbox 1
</Checkbox>
- <Checkbox value="c2" disabled checked>
+ <Checkbox disabled checked>
+ checkbox 2
+ </Checkbox>
+ </>
+ );
+ },
+};
+
+export const CheckboxIndeterminate = {
+ render() {
+ const [checked, setChecked] = useState(false);
+ function handleChange(value: string | number | boolean) {
+ setChecked(value as boolean);
+ }
+
+ return (
+ <>
+ <Checkbox checked={checked} onChange={handleChange} indeterminate>checkbox 1</Checkbox>
+ <Checkbox disabled indeterminate>
checkbox 2
</Checkbox>
</>
diff --git a/packages/design/src/components/checkbox/Checkbox.tsx b/packages/design/src/components/checkbox/Checkbox.tsx
index 00487f3714..770968d9bb 100644
--- a/packages/design/src/components/checkbox/Checkbox.tsx
+++ b/packages/design/src/components/checkbox/Checkbox.tsx
@@ -38,6 +38,12 @@ export interface ICheckboxProps {
*/
checked?: boolean;
+ /**
+ * Used for setting the checkbox to indeterminate
+ * @default false
+ */
+ indeterminate?: boolean;
+
/**
* Used for setting the currently selected value
* Only used when the checkbox is in a group
@@ -60,7 +66,7 @@ export interface ICheckboxProps {
* Checkbox Component
*/
export function Checkbox(props: ICheckboxProps) {
- const { children, className, style, checked, value, disabled = false, onChange } = props;
+ const { children, className, style, checked = false, indeterminate = false, value, disabled = false, onChange } = props;
const inputRef = useRef<HTMLInputElement>(null);
@@ -79,6 +85,7 @@ export function Checkbox(props: ICheckboxProps) {
const _className = clsx(className, styles.checkbox, {
[styles.checkboxDisabled]: disabled,
+ [styles.checkboxIndeterminate]: indeterminate && !checked,
});
return (
diff --git a/packages/design/src/components/checkbox/__tests__/index.spec.tsx b/packages/design/src/components/checkbox/__tests__/index.spec.tsx
index 03bed94bc1..2852857571 100644
--- a/packages/design/src/components/checkbox/__tests__/index.spec.tsx
+++ b/packages/design/src/components/checkbox/__tests__/index.spec.tsx
@@ -15,21 +15,31 @@
*/
import { fireEvent, render } from '@testing-library/react';
-import React from 'react';
+import React, { useState } from 'react';
import { describe, expect, it } from 'vitest';
import { Checkbox } from '../Checkbox';
describe('Checkbox', () => {
- const component = <Checkbox value="0">text</Checkbox>;
-
it('click Checkbox', async () => {
- const { container } = render(component);
+ function Component() {
+ const [checked, setChecked] = useState(false);
+
+ function handleChange(value: string | number | boolean) {
+ setChecked(value as boolean);
+ }
+
+ return <Checkbox checked={checked} onChange={handleChange}>text</Checkbox>;
+ }
- fireEvent.click(container.querySelector('input')!);
+ const root = render(<Component />);
- const $input = container.querySelector('input');
+ fireEvent.click(root.container.querySelector('input')!);
+
+ const $input = root.container.querySelector('input');
expect($input?.checked).toBe(true);
+
+ root.unmount();
});
});
diff --git a/packages/design/src/components/checkbox/index.module.less b/packages/design/src/components/checkbox/index.module.less
index eadb9137f6..172c34f358 100644
--- a/packages/design/src/components/checkbox/index.module.less
+++ b/packages/design/src/components/checkbox/index.module.less
@@ -49,6 +49,32 @@
border-color: rgb(var(--grey-300));
}
}
+
+ &.checkbox-indeterminate {
+ .checkbox-target-inner {
+ background-color: rgb(var(--grey-300));
+ }
+ }
+ }
+
+ &-indeterminate {
+ .checkbox-target {
+ &-inner {
+ background-color: rgb(var(--primary-color));
+
+ &::after {
+ top: 50%;
+ left: 50%;
+ width: calc(100% - 2px);
+ height: 2px;
+ background-color: rgb(var(--bg-color-secondary));
+ border: none;
+ border-radius: var(--border-radius-base);
+ opacity: 1;
+ transform: translate(-50%, -50%);
+ }
+ }
+ }
}
&-target {
diff --git a/packages/design/src/components/select/index.module.less b/packages/design/src/components/select/index.module.less
index 55b2d149d1..e46fc3801e 100644
--- a/packages/design/src/components/select/index.module.less
+++ b/packages/design/src/components/select/index.module.less
@@ -225,7 +225,6 @@
&-dropdown {
position: absolute;
- min-height: 100px;
z-index: 1060;
background: rgb(var(--bg-color-secondary));