From 704e7067ffba6635e8d0cd851533af38f21430be Mon Sep 17 00:00:00 2001
From: Alexis Georges <alexis@gggl.es>
Date: Mon, 20 Oct 2025 08:20:47 -0400
Subject: [PATCH 1/4] fix(components): fix date picker layout in submenu

---
 packages/components/src/styles/Popover.module.css | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/components/src/styles/Popover.module.css b/packages/components/src/styles/Popover.module.css
index c1797a27a..a2604b8dc 100644
--- a/packages/components/src/styles/Popover.module.css
+++ b/packages/components/src/styles/Popover.module.css
@@ -36,16 +36,14 @@
 		stroke-width: 1px;
 	}
 
-	&[data-trigger='DialogTrigger'] {
-		padding: var(--lp-spacing-300);
-	}
-
-	&[data-trigger='ComboBoxDialog'] {
+	&[data-trigger='DialogTrigger'],
+	&[data-trigger='ComboBoxDialog'],
+	&[data-trigger='SubmenuTrigger'] {
 		padding: var(--lp-spacing-300);
 	}
 
 	&:is([data-trigger='DatePicker'], [data-trigger='DateRangePicker']) {
-		padding: var(--lp-spacing-600);
+		padding: var(--lp-spacing-300);
 	}
 
 	&[data-placement='top'] {

From 686d3ddfe602c0a6295f16144b75e6cc0f856911 Mon Sep 17 00:00:00 2001
From: Alexis Georges <alexis@gggl.es>
Date: Mon, 20 Oct 2025 08:34:12 -0400
Subject: [PATCH 2/4] add story

---
 .../components/stories/DatePicker.stories.tsx | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/packages/components/stories/DatePicker.stories.tsx b/packages/components/stories/DatePicker.stories.tsx
index 1b51a0914..ef55ec068 100644
--- a/packages/components/stories/DatePicker.stories.tsx
+++ b/packages/components/stories/DatePicker.stories.tsx
@@ -16,6 +16,7 @@ import { Group } from '../src/Group';
 import { Heading } from '../src/Heading';
 import { IconButton } from '../src/IconButton';
 import { Label } from '../src/Label';
+import { Menu, MenuItem, MenuTrigger, SubmenuTrigger } from '../src/Menu';
 import { Popover } from '../src/Popover';
 
 const meta: Meta<typeof DatePicker> = {
@@ -139,3 +140,45 @@ export const InForms: Story = {
 		await expect(await within(body).findByRole('application'));
 	},
 };
+
+export const InSubmenu: Story = {
+	args: {
+		children: (
+			<MenuTrigger>
+				<Button>Select</Button>
+				<Popover>
+					<Menu>
+						<SubmenuTrigger>
+							<MenuItem id="calendar">Choose custom date</MenuItem>
+							<Popover>
+								<Dialog>
+									<Calendar>
+										<header>
+											<IconButton
+												slot="previous"
+												icon="chevron-left"
+												aria-label="previous"
+												size="small"
+												variant="minimal"
+											/>
+											<Heading />
+											<IconButton
+												slot="next"
+												icon="chevron-right"
+												aria-label="next"
+												size="small"
+												variant="minimal"
+											/>
+										</header>
+										<CalendarGrid>{(date) => <CalendarCell date={date} />}</CalendarGrid>
+									</Calendar>
+								</Dialog>
+							</Popover>
+						</SubmenuTrigger>
+					</Menu>
+				</Popover>
+			</MenuTrigger>
+		),
+		defaultValue: parseDate('2025-01-01'),
+	},
+};

From 2341f7c2f50b767dfe9ef768685432913d12768e Mon Sep 17 00:00:00 2001
From: Alexis Georges <alexis@gggl.es>
Date: Mon, 20 Oct 2025 08:39:49 -0400
Subject: [PATCH 3/4] changeset

---
 .changeset/giant-spies-fry.md                     | 5 +++++
 packages/components/src/styles/Popover.module.css | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/giant-spies-fry.md

diff --git a/.changeset/giant-spies-fry.md b/.changeset/giant-spies-fry.md
new file mode 100644
index 000000000..ea6d1439b
--- /dev/null
+++ b/.changeset/giant-spies-fry.md
@@ -0,0 +1,5 @@
+---
+"@launchpad-ui/components": patch
+---
+
+fix date picker layout in submenus
diff --git a/packages/components/src/styles/Popover.module.css b/packages/components/src/styles/Popover.module.css
index a2604b8dc..cee709daa 100644
--- a/packages/components/src/styles/Popover.module.css
+++ b/packages/components/src/styles/Popover.module.css
@@ -43,7 +43,7 @@
 	}
 
 	&:is([data-trigger='DatePicker'], [data-trigger='DateRangePicker']) {
-		padding: var(--lp-spacing-300);
+		padding: var(--lp-spacing-600);
 	}
 
 	&[data-placement='top'] {

From bc89943992fc28509736d0c21432ba52700e1a3b Mon Sep 17 00:00:00 2001
From: Alexis Georges <alexis@gggl.es>
Date: Mon, 20 Oct 2025 08:45:45 -0400
Subject: [PATCH 4/4] =?UTF-8?q?undo=20screenshot=20change=20=F0=9F=A4=A6?=
 =?UTF-8?q?=E2=80=8D=E2=99=82=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/components/src/styles/Popover.module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/styles/Popover.module.css b/packages/components/src/styles/Popover.module.css
index cee709daa..a2604b8dc 100644
--- a/packages/components/src/styles/Popover.module.css
+++ b/packages/components/src/styles/Popover.module.css
@@ -43,7 +43,7 @@
 	}
 
 	&:is([data-trigger='DatePicker'], [data-trigger='DateRangePicker']) {
-		padding: var(--lp-spacing-600);
+		padding: var(--lp-spacing-300);
 	}
 
 	&[data-placement='top'] {