From bef0dbd3309c05a7ad66f3100f74943de558bf3e Mon Sep 17 00:00:00 2001
From: Cory LaViska <cory@abeautifulsite.net>
Date: Fri, 10 May 2024 10:43:40 -0400
Subject: [PATCH] fixes #2001

---
 docs/pages/resources/changelog.md              | 1 +
 src/components/menu-item/menu-item.styles.ts   | 5 +++++
 src/components/menu-item/submenu-controller.ts | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/docs/pages/resources/changelog.md b/docs/pages/resources/changelog.md
index 20f65f33..580304d5 100644
--- a/docs/pages/resources/changelog.md
+++ b/docs/pages/resources/changelog.md
@@ -20,6 +20,7 @@ New versions of Shoelace are released as-needed and generally occur when a criti
 - Fixed a bug in `<sl-button-group>` classes [#1974]
 - Fixed a bug in `<sl-textarea>` that may throw errors on `disconnectedCallback` in test environments [#1985]
 - Fixed a bug in `<sl-color-picker>` that would log a non-passive event listener warning [#2005]
+- Fixed a bug in the submenu controller that allowed submenus to go offscreen and not be scrollable [#2001]
 
 ## 2.15.0
 
diff --git a/src/components/menu-item/menu-item.styles.ts b/src/components/menu-item/menu-item.styles.ts
index 91899489..f756f767 100644
--- a/src/components/menu-item/menu-item.styles.ts
+++ b/src/components/menu-item/menu-item.styles.ts
@@ -147,4 +147,9 @@ export default css`
       outline-offset: -1px;
     }
   }
+
+  ::slotted(sl-menu) {
+    max-width: var(--auto-size-available-width) !important;
+    max-height: var(--auto-size-available-height) !important;
+  }
 `;
diff --git a/src/components/menu-item/submenu-controller.ts b/src/components/menu-item/submenu-controller.ts
index 3d03b07d..82f5b6fc 100644
--- a/src/components/menu-item/submenu-controller.ts
+++ b/src/components/menu-item/submenu-controller.ts
@@ -283,6 +283,8 @@ export class SubmenuController implements ReactiveController {
         flip-fallback-strategy="best-fit"
         skidding="${this.skidding}"
         strategy="fixed"
+        auto-size="vertical"
+        auto-size-padding="10"
       >
         <slot name="submenu"></slot>
       </sl-popup>