Merge "[FEATURE] sap.ui.unified.MenuItem: HasPopup enumeration consumed"

SAP · Oct 8, 2020 · 0d95920 · 0d95920
2 parents 3c152c4 + 0549fd5
commit 0d95920
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/sap.ui.unified/src/sap/ui/unified/MenuItem.js b/src/sap.ui.unified/src/sap/ui/unified/MenuItem.js
@@ -3,8 +3,8 @@
  */
 
 // Provides control sap.ui.unified.MenuItem.
-sap.ui.define(['sap/ui/core/IconPool', './MenuItemBase', './library'],
-	function(IconPool, MenuItemBase, library) {
+sap.ui.define(['sap/ui/core/IconPool', './MenuItemBase', './library', 'sap/ui/core/library'],
+	function(IconPool, MenuItemBase, library, coreLibrary) {
 	"use strict";
 
 
@@ -97,7 +97,7 @@ sap.ui.define(['sap/ui/core/IconPool', './MenuItemBase', './library'],
 				labelledby: {value: /*oMenu.getId() + "-label " + */this.getId() + "-txt " + this.getId() + "-scuttxt", append: true}
 			});
 			if (oSubMenu) {
-				rm.attr("aria-haspopup", true);
+				rm.attr("aria-haspopup", coreLibrary.aria.HasPopup.Menu.toLowerCase());
 				rm.attr("aria-owns", oSubMenu.getId());
 			}
 		}

diff --git a/src/sap.ui.unified/test/sap/ui/unified/qunit/MenuItem.qunit.js b/src/sap.ui.unified/test/sap/ui/unified/qunit/MenuItem.qunit.js
@@ -38,6 +38,21 @@ sap.ui.define([
 		oLabel.destroy();
 	});
 
+	QUnit.test("aria-haspopup", function (assert) {
+		var oMenuItem = new MenuItem({ text: "Plain" }),
+			oMenuItemWithSubmenu = new MenuItem({ text: "With submenu", submenu: new Menu() }),
+			oMenu = new Menu({ items: [oMenuItem, oMenuItemWithSubmenu] });
+
+		oMenu.placeAt("qunit-fixture");
+		sap.ui.getCore().applyChanges();
+
+		oMenu.open();
+		assert.notOk(oMenuItem.$().attr("aria-haspopup"), "Menu items don't have aria-haspopup when there's no submenu");
+		assert.strictEqual(oMenuItemWithSubmenu.$().attr("aria-haspopup"), "menu", "Submenu presence is indicated in aria-haspopup");
+
+		oMenu.destroy();
+	});
+
 	QUnit.module("Events", {
 		beforeEach: function() {
 			this.oMenuItem = new MenuItem({