From bfd9a692701dcc20c68d274e0b80f885f085a542 Mon Sep 17 00:00:00 2001
From: Najika Yoo <naj.halsema@gmail.com>
Date: Fri, 1 Mar 2024 12:55:48 -0800
Subject: [PATCH 1/4] chore: add stories for menu items with value slot

---
 packages/menu/stories/menu.stories.ts | 55 ++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/packages/menu/stories/menu.stories.ts b/packages/menu/stories/menu.stories.ts
index 0a27439540..4bc91a47f9 100644
--- a/packages/menu/stories/menu.stories.ts
+++ b/packages/menu/stories/menu.stories.ts
@@ -168,7 +168,7 @@ export const menuItemWithDescription = (): TemplateResult => {
                 Open a copy
                 <span slot="description">Illustrator for iPad</span>
             </sp-menu-item>
-            <sp-menu-item>
+            <sp-menu-item disabled>
                 <sp-icon-share slot="icon"></sp-icon-share>
                 Share link
                 <span slot="description">Enable comments and download</span>
@@ -373,3 +373,56 @@ export const MenuGroupSelectsMultiple = (): TemplateResult => {
         </sp-popover>
     `;
 };
+
+export const menuWithValueSlots = (): TemplateResult => {
+    return html`
+        <sp-menu style="width: 150px">
+            <sp-menu-item>
+                Undo
+                <span slot="value">⌘​Z</span>
+            </sp-menu-item>
+            <sp-menu-item disabled>
+                Redo
+                <span slot="value">⇧⌘​Z</span>
+            </sp-menu-item>
+            <sp-menu-divider></sp-menu-divider>
+            <sp-menu-item>
+                Cut
+                <span slot="value">⌘​X</span>
+            </sp-menu-item>
+            <sp-menu-item>
+                Copy
+                <span slot="value">⌘​S</span>
+            </sp-menu-item>
+            <sp-menu-item disabled>
+                Paste
+                <span slot="value">⌘​P</span>
+            </sp-menu-item>
+        </sp-menu>
+        <sp-popover open style="width: 150px">
+            <sp-menu>
+                <sp-menu-item>
+                    Undo
+                    <span slot="value">⌘​Z</span>
+                </sp-menu-item>
+                <sp-menu-item disabled>
+                    Redo
+                    <span slot="value">⇧⌘​Z</span>
+                </sp-menu-item>
+                <sp-menu-divider></sp-menu-divider>
+                <sp-menu-item>
+                    Cut
+                    <span slot="value">⌘​X</span>
+                </sp-menu-item>
+                <sp-menu-item>
+                    Copy
+                    <span slot="value">⌘​S</span>
+                </sp-menu-item>
+                <sp-menu-item disabled>
+                    Paste
+                    <span slot="value">⌘​P</span>
+                </sp-menu-item>
+            </sp-menu>
+        </sp-popover>
+    `;
+};

From 512d04e159e5686290a33b821b2372603d6075b4 Mon Sep 17 00:00:00 2001
From: Najika Yoo <naj.halsema@gmail.com>
Date: Fri, 1 Mar 2024 13:33:01 -0800
Subject: [PATCH 2/4] fix(menu): add css for disabled menu item value slot

---
 packages/menu/src/menu-item.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/menu/src/menu-item.css b/packages/menu/src/menu-item.css
index 179b4de8ac..7cae07526d 100644
--- a/packages/menu/src/menu-item.css
+++ b/packages/menu/src/menu-item.css
@@ -23,6 +23,16 @@ governing permissions and limitations under the License.
     pointer-events: none;
 }
 
+:host([disabled]) [name='value']::slotted(*) {
+    color: var(
+        --highcontrast-menu-item-color-disabled,
+        var(
+            --mod-menu-item-label-icon-color-disabled,
+            var(--spectrum-menu-item-label-icon-color-disabled)
+        )
+    );
+}
+
 :host([has-submenu][disabled]) .chevron {
     color: var(
         --highcontrast-menu-item-color-disabled,

From 686fa6e78586a47ae3fd13d4171392ca5aa5d42d Mon Sep 17 00:00:00 2001
From: Najika Yoo <naj.halsema@gmail.com>
Date: Fri, 1 Mar 2024 13:43:36 -0800
Subject: [PATCH 3/4] ci: update hash

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6b7e325bc2..9b9b0875d1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ executors:
 parameters:
     current_golden_images_hash:
         type: string
-        default: 2b61b82c83bc3f5e7cfff9eaf4695fc67e591aeb
+        default: 512d04e159e5686290a33b821b2372603d6075b4
     wireit_cache_name:
         type: string
         default: wireit

From a15e841f13b48df28badfbb0220559451877c01c Mon Sep 17 00:00:00 2001
From: Najika Yoo <naj.halsema@gmail.com>
Date: Fri, 1 Mar 2024 14:09:19 -0800
Subject: [PATCH 4/4] ci: update hash

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9b9b0875d1..9868b7dae6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ executors:
 parameters:
     current_golden_images_hash:
         type: string
-        default: 512d04e159e5686290a33b821b2372603d6075b4
+        default: 686fa6e78586a47ae3fd13d4171392ca5aa5d42d
     wireit_cache_name:
         type: string
         default: wireit