feat(ui5-menu-item): add endContent slot

packages/main/src/Button.ts

@@ -426,6 +426,7 @@ class Button extends UI5Element implements IButton, IFormElement {
 		if (this._cancelAction) {
 			e.preventDefault();
 		}
+		markEvent(e, "button");
 
 		if (isSpace(e) || isEnter(e)) {
 			if (this.active) {

packages/main/src/ListItemBase.ts

@@ -115,6 +115,9 @@ class ListItemBase extends UI5Element implements ITabbable {
 	}
 
 	_onkeydown(e: KeyboardEvent) {
+		if (getEventMark(e) === "button") {
+			return;
+		}
 		if (isTabNext(e)) {
 			return this._handleTabNext(e);
 		}
@@ -133,6 +136,9 @@ class ListItemBase extends UI5Element implements ITabbable {
 	}
 
 	_onkeyup(e: KeyboardEvent) {
+		if (getEventMark(e) === "button") {
+			return;
+		}
 		if (isSpace(e)) {
 			this.fireItemPress(e);
 		}

packages/main/src/Menu.ts

@@ -335,6 +335,10 @@ class Menu extends UI5Element {
 	}
 
 	_itemKeyDown(e: KeyboardEvent) {
+		if (!isLeft(e) && !isRight(e)) {
+			return;
+		}
+
 		const shouldCloseMenu = this.isRtl ? isRight(e) : isLeft(e);
 		const shouldOpenMenu = this.isRtl ? isLeft(e) : isRight(e);
 		const item = e.target as MenuItem;

packages/main/src/MenuItem.hbs

@@ -20,6 +20,8 @@
 			>
 			</ui5-icon>
 		</div>
+	{{else if hasEndContent}}
+		<slot name="endContent"></slot>
 	{{else if additionalText}}
 		<span part="additional-text" class="ui5-li-additional-text">{{additionalText}}</span>
 	{{/if}}

packages/main/src/MenuItem.ts

@@ -158,6 +158,15 @@ class MenuItem extends ListItem {
 	@slot({ "default": true, type: HTMLElement, invalidateOnChildChange: true })
 	items!: Array<MenuItem>;
 
+	/**
+	 * Defines the components that should be displayed at the end of the menu item.
+	 *
+	 * **Note:** It is highly recommended to slot only components of type `ui5-button`,`ui5-link` or `ui5-icon`.
+	 * @public
+	 */
+	@slot({ type: HTMLElement, invalidateOnChildChange: true })
+	endContent!: Array<HTMLElement>;
+
 	get placement(): `${PopoverPlacement}` {
 		return this.isRtl ? "Start" : "End";
 	}
@@ -170,6 +179,10 @@ class MenuItem extends ListItem {
 		return !!(this.items.length || this.loading);
 	}
 
+	get hasEndContent() {
+		return !!(this.endContent.length);
+	}
+
 	get hasIcon() {
 		return !!this.icon;
 	}

packages/main/src/themes/MenuItem.css

@@ -82,7 +82,7 @@
 }
 
 :host::part(content) {
-	padding-inline-end: 0.5rem;
+	padding-inline-end: 0.25rem;
 }
 
 .ui5-menu-item-submenu-icon {

packages/main/test/pages/Menu.html

@@ -59,7 +59,8 @@
 	<ui5-title level="H5" class="header-title">Event logger</ui5-title>
 	<ui5-input id="eventLogger" style="width: 100%;"></ui5-input>
 
-	<ui5-button id="btnOpen2">Open Menu</ui5-button> <br/>
+	<ui5-title level="H5" class="header-title">Menu with disabled items that have popovers</ui5-title>
+	<ui5-button id="btnOpen2">Open Menu</ui5-button> <br/><br/>
 	<ui5-menu id="menu2" header-text="My ui5-menu">
 		<ui5-menu-item id="newFolder" text="New Folder" additional-text="Ctrl+F" icon="add-folder" disabled></ui5-menu-item>
 		<ui5-menu-item text="Open" icon="open-folder" starts-section>
@@ -70,6 +71,37 @@
 		<ui5-menu-item text="Exit" icon="journey-arrive"></ui5-menu-item>
 	</ui5-menu>
 
+	<ui5-title level="H5" class="header-title">Menu with items that have endContent</ui5-title>
+	<ui5-button id="btnOpenEndContent">Open Menu</ui5-button>
+	<ui5-menu id="menuEndContent" header-text="My ui5-menu">
+		<ui5-menu-item text="New File" accessible-name="Opens a file explorer" additional-text="Ctrl+Alt+Shift+N" tooltip="Select a file - prevent default" icon="add-document">
+			<ui5-button id="newLock" slot="endContent" icon="locked" design="Transparent"></ui5-button>
+			<ui5-button id="newUnlock" slot="endContent" icon="unlocked" design="Transparent"></ui5-button>
+			<ui5-button id="newFavorite" slot="endContent" icon="favorite" design="Transparent"></ui5-button>
+		</ui5-menu-item>
+		<ui5-menu-item text="New Folder with very long title for a menu item" additional-text="Ctrl+F" icon="add-folder" disabled></ui5-menu-item>
+		<ui5-menu-item text="Open" icon="open-folder" accessible-name="Choose platform" starts-section>
+			<ui5-menu-item text="Open Locally" icon="open-folder" additional-text="Ctrl+K">
+				<ui5-menu-item text="Open from C"></ui5-menu-item>
+				<ui5-menu-item text="Open from D"></ui5-menu-item>
+				<ui5-menu-item text="Open from E" disabled></ui5-menu-item>
+			</ui5-menu-item>
+			<ui5-menu-item text="Open from SAP Cloud" additional-text="Ctrl+L"></ui5-menu-item>
+		</ui5-menu-item>
+		<ui5-menu-item text="Save with very long title for a menu item text inside" icon="save">
+			<ui5-menu-item text="Save Locally" icon="save">
+				<ui5-menu-item text="Save on C" icon="save"></ui5-menu-item>
+				<ui5-menu-item text="Save on D" icon="save"></ui5-menu-item>
+				<ui5-menu-item text="Save on E" icon="save"></ui5-menu-item>
+			</ui5-menu-item>
+			<ui5-menu-item text="Save on Cloud" icon="upload-to-cloud"></ui5-menu-item>
+		</ui5-menu-item>
+		<ui5-menu-item text="Close" additional-text="Ctrl+W"></ui5-menu-item>
+		<ui5-menu-item text="Preferences" icon="action-settings" starts-section disabled></ui5-menu-item>
+		<ui5-menu-item text="Exit" icon="journey-arrive"></ui5-menu-item>
+	</ui5-menu>
+
+
 	<ui5-popover id="detailsPopover" initialFocus="detailsLink">
 			<div>
 				<ui5-label for="detailsLink">For more information:</ui5-label>
@@ -87,6 +119,11 @@
 			menu.open = !menu.open;
 		});
 
+		btnOpenEndContent.addEventListener("click", function() {
+			menuEndContent.opener = "btnOpenEndContent";
+			menuEndContent.open = !menu.open;
+		});
+
 		btnAddOpener.addEventListener("click", function() {
 			menu.opener="btnToggleOpen";
 		});
@@ -178,6 +215,24 @@
 			});
 		});
 
+		newLock.addEventListener("click", function(event) {
+			console.warn("Lock button clicked");
+			event.target.parentElement.disabled = true;
+		});
+
+		newUnlock.addEventListener("click", function(event) {
+			console.warn("Unlock button clicked");
+			event.target.parentElement.disabled = false;
+		});
+
+		newFavorite.addEventListener("click", function(event) {
+			console.warn("Favorite button clicked");
+		});
+
+		menuEndContent.addEventListener("ui5-item-click", function(event) {
+			console.warn("Item clicked: " + event.detail.item.text);
+		});
+
 	</script>
 </body>
 </html>

packages/main/test/specs/Menu.spec.js

@@ -170,6 +170,22 @@ describe("Menu interaction", () => {
 			assert.ok(await menuItem.getProperty("disabled"), "The menu item is disabled");
 			assert.ok(await menuItem.getProperty("focused"), "The menu item is focused");
 		});
+
+		it("Add endContent to a menu item", async () => {
+			await browser.url(`test/pages/Menu.html`);
+			const openButton = await browser.$("#btnOpenEndContent");
+			await openButton.click();
+
+			const menu = await browser.$("#menuEndContent");
+			const menuItem = await browser.$("#menuEndContent > ui5-menu-item[text='New File']");
+			const endContent = await menuItem.$$("[ui5-button]");
+			const lockButton = await endContent[0];
+			await lockButton.click();
+
+			assert.equal(await endContent.length, 3, "The menu item has 3 components in the 'endContent' slot");
+			assert.ok(await menuItem.getProperty("disabled"), "The menu item is disabled");
+			assert.ok(await menu.getProperty("open"), "The menu remains open");
+		});
 	});
 
 describe("Menu Accessibility", () => {

packages/website/docs/_components_pages/main/Menu/Menu.mdx

@@ -5,6 +5,7 @@ slug: ../../Menu
 import Basic from "../../../_samples/main/Menu/Basic/Basic.md";
 import SubMenu from "../../../_samples/main/Menu/SubMenu/SubMenu.md";
 import AditionalText from "../../../_samples/main/Menu/AditionalText/AditionalText.md";
+import MenuEndContent from "../../../_samples/main/Menu/MenuEndContent/MenuEndContent.md";
 
 <%COMPONENT_OVERVIEW%>
 
@@ -22,4 +23,8 @@ You can nest menu items to create sub menus.
 
 ### Menu Item with Additional Text
 
-<AditionalText />
+<AditionalText />
+
+### Menu Item with End Content
+
+<MenuEndContent />

packages/website/docs/_samples/main/Menu/MenuEndContent/MenuEndContent.md

@@ -0,0 +1,4 @@
+import html from '!!raw-loader!./sample.html';
+import js from '!!raw-loader!./main.js';
+
+<Editor html={html} js={js} />

packages/website/docs/_samples/main/Menu/MenuEndContent/main.js

@@ -0,0 +1,36 @@
+import "@ui5/webcomponents/dist/Menu.js";
+import "@ui5/webcomponents/dist/MenuItem.js";
+import "@ui5/webcomponents/dist/Button.js";
+
+import "@ui5/webcomponents-icons/dist/add-document.js";
+import "@ui5/webcomponents-icons/dist/add-folder.js";
+import "@ui5/webcomponents-icons/dist/open-folder.js";
+import "@ui5/webcomponents-icons/dist/action-settings.js";
+import "@ui5/webcomponents-icons/dist/journey-arrive.js";
+import "@ui5/webcomponents-icons/dist/slim-arrow-down.js";
+import "@ui5/webcomponents-icons/dist/add.js";
+import "@ui5/webcomponents-icons/dist/hint.js";
+import "@ui5/webcomponents-icons/dist/favorite.js";
+
+const btnOpenEndContent = document.getElementById("btnOpenEndContent");
+const menuEndContent = document.getElementById("menuEndContent");
+const btnNewAdd = document.getElementById("newAdd");
+const btnNewHint = document.getElementById("newHint");
+const btnNewFavorite = document.getElementById("newFavorite");
+
+btnOpenEndContent.addEventListener("click", function(event) {
+	menuEndContent.opener = btnOpenEndContent;
+	menuEndContent.open = !menuEndContent.open;
+});
+
+btnNewAdd.addEventListener("click", function(event) {
+	alert("Add button pressed");
+});
+
+btnNewHint.addEventListener("click", function(event) {
+	alert("Hint button pressed");
+});
+
+btnNewFavorite.addEventListener("click", function(event) {
+	alert("Favorite button pressed");
+});

packages/website/docs/_samples/main/Menu/MenuEndContent/sample.html

@@ -0,0 +1,41 @@
+<!-- playground-fold -->
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Sample</title>
+</head>
+
+<body style="background-color: var(--sapBackgroundColor); height: 350px">
+    <!-- playground-fold-end -->
+
+	<ui5-button id="btnOpenEndContent">Open Menu</ui5-button>
+
+	<ui5-menu id="menuEndContent" header-text="My ui5-menu">
+		<ui5-menu-item text="New File" accessible-name="Opens a file explorer" additional-text="Ctrl+Alt+Shift+N" tooltip="Select a file - prevent default" icon="add-document">
+			<ui5-button id="newAdd" slot="endContent" icon="add" design="Transparent"></ui5-button>
+			<ui5-button id="newHint" slot="endContent" icon="hint" design="Transparent"></ui5-button>
+			<ui5-button id="newFavorite" slot="endContent" icon="favorite" design="Transparent"></ui5-button>
+		</ui5-menu-item>
+		<ui5-menu-item text="New Folder" additional-text="Ctrl+F" icon="add-folder"></ui5-menu-item>
+		<ui5-menu-item text="Open" icon="open-folder" accessible-name="Choose platform" starts-section>
+			<ui5-menu-item text="Open Locally" icon="open-folder" additional-text="Ctrl+K"></ui5-menu-item>
+			<ui5-menu-item text="Open from SAP Cloud" additional-text="Ctrl+L"></ui5-menu-item>
+		</ui5-menu-item>
+		<ui5-menu-item text="Save with very long title for a menu item text inside" icon="save">
+			<ui5-menu-item text="Save Locally" icon="save"></ui5-menu-item>
+			<ui5-menu-item text="Save on Cloud" icon="upload-to-cloud"></ui5-menu-item>
+		</ui5-menu-item>
+		<ui5-menu-item text="Close" additional-text="Ctrl+W"></ui5-menu-item>
+		<ui5-menu-item text="Preferences" icon="action-settings" starts-section></ui5-menu-item>
+		<ui5-menu-item text="Exit" icon="journey-arrive"></ui5-menu-item>
+	</ui5-menu>
+
+    <!-- playground-fold -->
+    <script type="module" src="main.js"></script>
+</body>
+
+</html>
+<!-- playground-fold-end -->