Skip to content

Commit b9883c2

Browse files
committed
fox some PR comments
1 parent 6e700bb commit b9883c2

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

packages/design-system/src/components/ds-split-button/ds-split-button.tsx

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import classNames from 'classnames';
2-
import { DsSelect } from '../ds-select';
2+
import { DsSelect, type SelectSize } from '../ds-select';
33
import styles from './ds-split-button.module.scss';
4-
import type { DsSplitButtonProps } from './ds-split-button.types';
5-
import { getSelectSize } from './ds-split-button.utils';
4+
import type { DsSplitButtonProps, SplitButtonSize } from './ds-split-button.types';
65
import { DsButtonV3 } from '../ds-button-v3';
76

87
const DsSplitButton = ({
@@ -13,14 +12,14 @@ const DsSplitButton = ({
1312
disabled,
1413
slotProps,
1514
}: DsSplitButtonProps) => {
16-
const { className: buttonClassName, disabled: buttonDisabled, ...buttonRest } = slotProps.button;
15+
const { className: buttonClassName, disabled: buttonDisabled, ...buttonProps } = slotProps.button;
1716

18-
const { className: selectClassName, disabled: selectDisabled, ...selectRest } = slotProps.select;
17+
const { className: selectClassName, disabled: selectDisabled, ...selectProps } = slotProps.select;
1918

2019
return (
2120
<div ref={ref} className={classNames(styles.root, className)} style={style}>
2221
<DsButtonV3
23-
{...buttonRest}
22+
{...buttonProps}
2423
variant="secondary"
2524
size={size}
2625
disabled={buttonDisabled ?? disabled}
@@ -34,7 +33,7 @@ const DsSplitButton = ({
3433
</div>
3534

3635
<DsSelect
37-
{...selectRest}
36+
{...selectProps}
3837
size={getSelectSize(size)}
3938
disabled={selectDisabled ?? disabled}
4039
className={classNames(styles.select, selectClassName)}
@@ -43,4 +42,8 @@ const DsSplitButton = ({
4342
);
4443
};
4544

45+
const getSelectSize = (size: SplitButtonSize): SelectSize => {
46+
return size === 'medium' ? 'default' : 'small';
47+
};
48+
4649
export default DsSplitButton;

packages/design-system/src/components/ds-split-button/ds-split-button.utils.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)