Skip to content

Commit 9b0b06a

Browse files
committed
revert: revert "feat(ui): add dVerticalCenter to checkbox and radio"
This reverts commit cfe1fe7.
1 parent d2dc4f1 commit 9b0b06a

8 files changed

Lines changed: 4 additions & 56 deletions

File tree

packages/ui/src/components/checkbox/Checkbox.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export interface DCheckboxProps extends React.HTMLAttributes<HTMLElement> {
1919
};
2020
dFormControl?: DFormControl;
2121
dModel?: boolean;
22-
dVerticalCenter?: boolean;
2322
dDisabled?: boolean;
2423
dIndeterminate?: boolean;
2524
dInputRender?: DCloneHTMLElement<React.InputHTMLAttributes<HTMLInputElement>>;
@@ -37,7 +36,6 @@ export const DCheckbox: {
3736
dRef,
3837
dFormControl,
3938
dModel,
40-
dVerticalCenter = false,
4139
dDisabled = false,
4240
dIndeterminate = false,
4341
dInputRender,
@@ -66,7 +64,6 @@ export const DCheckbox: {
6664
<label
6765
{...restProps}
6866
className={getClassName(restProps.className, `${dPrefix}checkbox`, {
69-
[`${dPrefix}checkbox--vertical-center`]: dVerticalCenter,
7067
'is-indeterminate': dIndeterminate,
7168
'is-checked': checked,
7269
'is-disabled': disabled,

packages/ui/src/components/checkbox/CheckboxGroup.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export interface DCheckboxGroupProps<V extends DId> extends Omit<React.HTMLAttri
1212
dFormControl?: DFormControl;
1313
dModel?: V[];
1414
dList: DCheckboxItem<V>[];
15-
dVerticalCenter?: boolean;
1615
dDisabled?: boolean;
1716
dVertical?: boolean;
1817
onModelChange?: (values: V[]) => void;
@@ -24,7 +23,6 @@ export function DCheckboxGroup<V extends DId>(props: DCheckboxGroupProps<V>): JS
2423
dFormControl,
2524
dList,
2625
dModel,
27-
dVerticalCenter = false,
2826
dDisabled = false,
2927
dVertical = false,
3028
onModelChange,
@@ -41,7 +39,6 @@ export function DCheckboxGroup<V extends DId>(props: DCheckboxGroupProps<V>): JS
4139
dFormControl={dFormControl}
4240
dList={dList}
4341
dModel={dModel}
44-
dVerticalCenter={dVerticalCenter}
4542
dDisabled={dDisabled}
4643
dRender={(nodes) => (
4744
<div

packages/ui/src/components/checkbox/CheckboxGroupRenderer.tsx

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,14 @@ export interface DCheckboxGroupRendererProps<V extends DId> {
1616
dFormControl?: DFormControl;
1717
dModel?: V[];
1818
dList: DCheckboxItem<V>[];
19-
dVerticalCenter?: boolean;
2019
dDisabled?: boolean;
2120
dRender: (nodes: React.ReactElement[]) => JSX.Element | null;
2221
onModelChange?: (values: V[]) => void;
2322
}
2423

2524
const { COMPONENT_NAME } = registerComponentMate({ COMPONENT_NAME: 'DCheckbox.GroupRenderer' as const });
2625
export function DCheckboxGroupRenderer<V extends DId>(props: DCheckboxGroupRendererProps<V>): JSX.Element | null {
27-
const {
28-
dFormControl,
29-
dList,
30-
dModel,
31-
dVerticalCenter = false,
32-
dDisabled = false,
33-
dRender,
34-
onModelChange,
35-
} = useComponentConfig(COMPONENT_NAME, props);
26+
const { dFormControl, dList, dModel, dDisabled = false, dRender, onModelChange } = useComponentConfig(COMPONENT_NAME, props);
3627

3728
//#region Context
3829
const { gDisabled } = useGeneralContext();
@@ -47,7 +38,6 @@ export function DCheckboxGroupRenderer<V extends DId>(props: DCheckboxGroupRende
4738
dList.map((item, index) => (
4839
<DCheckbox
4940
key={item.value}
50-
dVerticalCenter={dVerticalCenter}
5141
dDisabled={item.disabled || disabled}
5242
dInputRender={(el) =>
5343
cloneHTMLElement(el, {

packages/ui/src/components/radio/Radio.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ export interface DRadioProps extends React.HTMLAttributes<HTMLElement> {
2222
};
2323
dFormControl?: DFormControl;
2424
dModel?: boolean;
25-
dVerticalCenter?: boolean;
2625
dDisabled?: boolean;
2726
dInputRender?: DCloneHTMLElement<React.InputHTMLAttributes<HTMLInputElement>>;
2827
onModelChange?: (checked: boolean) => void;
@@ -43,7 +42,6 @@ export const DRadio: {
4342
dRef,
4443
dFormControl,
4544
dModel,
46-
dVerticalCenter = false,
4745
dDisabled = false,
4846
dInputRender,
4947
onModelChange,
@@ -83,7 +81,6 @@ export const DRadio: {
8381
<label
8482
{...restProps}
8583
className={getClassName(restProps.className, `${dPrefix}radio`, {
86-
[`${dPrefix}radio--vertical-center`]: dVerticalCenter,
8784
[`${dPrefix}radio--button`]: __type,
8885
[`${dPrefix}radio--button-${__type}`]: __type,
8986
[`${dPrefix}radio--${gSize}`]: gSize,

packages/ui/src/components/radio/RadioGroup.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export interface DRadioGroupProps<V extends DId> extends Omit<React.HTMLAttribut
1919
dList: DRadioItem<V>[];
2020
dModel?: V | null;
2121
dName?: string;
22-
dVerticalCenter?: boolean;
2322
dDisabled?: boolean;
2423
dType?: 'outline' | 'fill';
2524
dSize?: DSize;
@@ -34,7 +33,6 @@ export function DRadioGroup<V extends DId>(props: DRadioGroupProps<V>): JSX.Elem
3433
dList,
3534
dModel,
3635
dName,
37-
dVerticalCenter = false,
3836
dDisabled = false,
3937
dType,
4038
dSize,
@@ -65,7 +63,6 @@ export function DRadioGroup<V extends DId>(props: DRadioGroupProps<V>): JSX.Elem
6563
dList={dList}
6664
dModel={dModel}
6765
dName={dName}
68-
dVerticalCenter={dVerticalCenter}
6966
dDisabled={dDisabled}
7067
dRender={(nodes) => (
7168
<DCompose

packages/ui/src/components/radio/RadioGroupRenderer.tsx

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,14 @@ export interface DRadioGroupRendererProps<V extends DId> {
2323
dList: DRadioItem<V>[];
2424
dModel?: V | null;
2525
dName?: string;
26-
dVerticalCenter?: boolean;
2726
dDisabled?: boolean;
2827
dRender: (nodes: React.ReactElement[]) => JSX.Element | null;
2928
onModelChange?: (value: V) => void;
3029
}
3130

3231
const { COMPONENT_NAME } = registerComponentMate({ COMPONENT_NAME: 'DRadio.GroupRenderer' as const });
3332
export function DRadioGroupRenderer<V extends DId>(props: DRadioGroupRendererProps<V>): JSX.Element | null {
34-
const {
35-
dFormControl,
36-
dList,
37-
dModel,
38-
dName,
39-
dVerticalCenter = false,
40-
dDisabled = false,
41-
dRender,
42-
onModelChange,
43-
} = useComponentConfig(COMPONENT_NAME, props);
33+
const { dFormControl, dList, dModel, dName, dDisabled = false, dRender, onModelChange } = useComponentConfig(COMPONENT_NAME, props);
4434

4535
//#region Context
4636
const { gDisabled } = useGeneralContext();
@@ -67,7 +57,6 @@ export function DRadioGroupRenderer<V extends DId>(props: DRadioGroupRendererPro
6757
<DRadio
6858
key={item.value}
6959
dModel={item.value === value}
70-
dVerticalCenter={dVerticalCenter}
7160
dDisabled={item.disabled || disabled}
7261
dInputRender={(el) =>
7362
cloneHTMLElement(el, {

packages/ui/src/styles/components/checkbox.scss

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
position: relative;
2121
display: inline-flex;
22-
line-height: 1.25;
22+
align-items: center;
2323

2424
&:hover {
2525
@include e(input) {
@@ -96,17 +96,8 @@
9696
}
9797
}
9898

99-
@include m(vertical-center) {
100-
align-items: center;
101-
102-
@include e(state-container) {
103-
top: unset;
104-
}
105-
}
106-
10799
@include e(state-container) {
108100
position: relative;
109-
top: calc((1.25em - 16px) / 2);
110101
flex-shrink: 0;
111102
width: 16px;
112103
height: 16px;

packages/ui/src/styles/components/radio.scss

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@include b(radio) {
55
position: relative;
66
display: inline-flex;
7-
line-height: 1.25;
7+
align-items: center;
88

99
&:hover {
1010
@include e(input) {
@@ -50,7 +50,6 @@
5050
}
5151

5252
@include m(button) {
53-
align-items: center;
5453
height: var(--#{$rd-prefix}size);
5554
white-space: nowrap;
5655
cursor: pointer;
@@ -115,17 +114,8 @@
115114
}
116115
}
117116

118-
@include m(vertical-center) {
119-
align-items: center;
120-
121-
@include e(state-container) {
122-
top: unset;
123-
}
124-
}
125-
126117
@include e(input-wrapper) {
127118
position: relative;
128-
top: calc((1.25em - 16px) / 2);
129119
flex-shrink: 0;
130120
width: 16px;
131121
height: 16px;

0 commit comments

Comments
 (0)