Skip to content

feat(DatePicker): add triggerButton slot (DS-4767) #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KamilEmeleev merged 2 commits into from
Mar 10, 2026
Merged

feat(DatePicker): add triggerButton slot (DS-4767) #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
963f206
feat(DatePicker): add `triggerButton` slot
KamilEmeleev Mar 10, 2026
bf13c3c
test(DatePicker): simplify triggerButton test
KamilEmeleev Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions packages/components/src/components/DatePicker/DatePicker.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,27 @@ describe('DatePicker', () => {

expect(getRoot()).toHaveTextContent('fail');
});

it('should allow custom open button icon via triggerButton slot', () => {
render(
<DatePicker
{...baseProps}
slotProps={{
triggerButton: {
children: <span data-testid="custom-open-icon" />,
},
}}
/>
);

const openButton = screen.getByRole('button');

expect(screen.getByTestId('custom-open-icon')).toBeInTheDocument();

expect(
openButton.querySelector('[data-testid="custom-open-icon"]')
).toBeInTheDocument();

expect(openButton.querySelector('svg')).not.toBeInTheDocument();
});
});
38 changes: 23 additions & 15 deletions packages/components/src/components/DatePicker/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,31 @@ export function DatePickerRender<T extends DateValue>(
// eslint-disable-next-line no-unsafe-optional-chaining
const { slotProps: rootSlotProps, ...otherRoot } = slotProps?.root || {};

const triggerButtonProps = mergeProps(
{
variant: isInvalid ? 'error' : 'fade-contrast',
className: s.calendar,
children: <IconCalendarO16 />,
},
buttonProps,
slotProps?.triggerButton
);

const mergedRootSlotProps = {
...rootSlotProps,
group: mergeProps(rootSlotProps?.group, groupProps, {
ref: anchorRef,
endAddon: (
<>
{endAddon}
<IconButton
variant={isInvalid ? 'error' : 'fade-contrast'}
className={s.calendar}
{...buttonProps}
>
<IconCalendarO16 />
</IconButton>
</>
),
}),
group: mergeProps(
groupProps,
{
ref: anchorRef,
endAddon: (
<>
{endAddon}
<IconButton {...triggerButtonProps} />
</>
),
},
rootSlotProps?.group
),
};

const rootProps = mergeProps(
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/components/DatePicker/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import type {
DateInputRef,
} from '../DateInput';
import type { FormFieldLabelProps } from '../FormField';
import type { IconButtonProps } from '../IconButton';
import type { PopoverProps } from '../Popover';

export type DatePickerProps<T extends DateValue> = {
Expand Down Expand Up @@ -48,6 +49,7 @@ export type DatePickerProps<T extends DateValue> = {
label?: FormFieldLabelProps;
popover?: PopoverProps;
calendar?: CalendarProps<T>;
triggerButton?: IconButtonProps;
};
} & Omit<AriaDatePickerProps<T>, 'description' | 'validationState'>;

Expand Down