Skip to content

Commit cf6976c

Browse files
authored
fix(components): fix date picker layout in submenu (#1793)
* fix(components): fix date picker layout in submenu * add story * changeset * undo screenshot change 🤦‍♂️
1 parent ad7c4e6 commit cf6976c

File tree

3 files changed

+52
-6
lines changed

3 files changed

+52
-6
lines changed

.changeset/giant-spies-fry.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@launchpad-ui/components": patch
3+
---
4+
5+
fix date picker layout in submenus

packages/components/src/styles/Popover.module.css

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,14 @@
3636
stroke-width: 1px;
3737
}
3838

39-
&[data-trigger='DialogTrigger'] {
40-
padding: var(--lp-spacing-300);
41-
}
42-
43-
&[data-trigger='ComboBoxDialog'] {
39+
&[data-trigger='DialogTrigger'],
40+
&[data-trigger='ComboBoxDialog'],
41+
&[data-trigger='SubmenuTrigger'] {
4442
padding: var(--lp-spacing-300);
4543
}
4644

4745
&:is([data-trigger='DatePicker'], [data-trigger='DateRangePicker']) {
48-
padding: var(--lp-spacing-600);
46+
padding: var(--lp-spacing-300);
4947
}
5048

5149
&[data-placement='top'] {

packages/components/stories/DatePicker.stories.tsx

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { Group } from '../src/Group';
1616
import { Heading } from '../src/Heading';
1717
import { IconButton } from '../src/IconButton';
1818
import { Label } from '../src/Label';
19+
import { Menu, MenuItem, MenuTrigger, SubmenuTrigger } from '../src/Menu';
1920
import { Popover } from '../src/Popover';
2021

2122
const meta: Meta<typeof DatePicker> = {
@@ -139,3 +140,45 @@ export const InForms: Story = {
139140
await expect(await within(body).findByRole('application'));
140141
},
141142
};
143+
144+
export const InSubmenu: Story = {
145+
args: {
146+
children: (
147+
<MenuTrigger>
148+
<Button>Select</Button>
149+
<Popover>
150+
<Menu>
151+
<SubmenuTrigger>
152+
<MenuItem id="calendar">Choose custom date</MenuItem>
153+
<Popover>
154+
<Dialog>
155+
<Calendar>
156+
<header>
157+
<IconButton
158+
slot="previous"
159+
icon="chevron-left"
160+
aria-label="previous"
161+
size="small"
162+
variant="minimal"
163+
/>
164+
<Heading />
165+
<IconButton
166+
slot="next"
167+
icon="chevron-right"
168+
aria-label="next"
169+
size="small"
170+
variant="minimal"
171+
/>
172+
</header>
173+
<CalendarGrid>{(date) => <CalendarCell date={date} />}</CalendarGrid>
174+
</Calendar>
175+
</Dialog>
176+
</Popover>
177+
</SubmenuTrigger>
178+
</Menu>
179+
</Popover>
180+
</MenuTrigger>
181+
),
182+
defaultValue: parseDate('2025-01-01'),
183+
},
184+
};

0 commit comments

Comments
 (0)