@brightspace-ui/core 3.156.4 → 3.157.0

package/components/menu/demo/menu.html

@@ -4,6 +4,12 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<meta charset="UTF-8">
 		<link rel="stylesheet" href="../../demo/styles.css" type="text/css">
+		<script type="module">
+			import { mockFlag } from '../../../helpers/flags.js';
+			const urlParams = new URLSearchParams(window.location.search);
+			mockFlag('GAUD-8295-menu-item-link-new-window-icon', urlParams.get('link-new-window-icon') === 'true');
+			mockFlag('GAUD-8369-menu-item-link-click-changes', urlParams.get('link-click-changes') === 'true');
+		</script>
 		<script type="module">
 			import '../../demo/demo-page.js';
 			import './custom-menu-item.js';
@@ -200,5 +206,12 @@
 				</template>
 			</d2l-demo-snippet>
 		</d2l-demo-page>
+
+		<script>
+			document.addEventListener('click', e => {
+				if (e.target.tagName !== 'D2L-MENU-ITEM-LINK') return;
+				console.log('Click event propagated up for router!', e.target);
+			});
+		</script>
 	</body>
 </html>

package/components/menu/menu-item-link.js

@@ -6,6 +6,7 @@ import { MenuItemMixin } from './menu-item-mixin.js';
 import { menuItemStyles } from './menu-item-styles.js';
 
 const newWindowIconEnabled = getFlag('GAUD-8295-menu-item-link-new-window-icon', true);
+const menuItemClickChangesEnabled = getFlag('GAUD-8369-menu-item-link-click-changes', true);
 
 /**
  * A menu item component used for navigating.
@@ -90,9 +91,14 @@ class MenuItemLink extends (newWindowIconEnabled ? LinkMixin(MenuItemMixin(LitEl
 		];
 	}
 
+	constructor() {
+		super();
+		this._letClickPropagate = true;
+	}
+
 	firstUpdated() {
 		super.firstUpdated();
-		this.addEventListener('click', this._onClick);
+		if (!menuItemClickChangesEnabled) this.addEventListener('click', this._onClick); // remove when cleaning up GAUD-8369-menu-item-link-click-changes
 		this.addEventListener('keydown', this._onKeyDown);
 	}
 
@@ -117,6 +123,7 @@ class MenuItemLink extends (newWindowIconEnabled ? LinkMixin(MenuItemMixin(LitEl
 
 	}
 
+	// remove this function when cleaning up GAUD-8369-menu-item-link-click-changes
 	_getTarget() {
 		if (this.target && this.target !== '') {
 			return this.target;
@@ -129,19 +136,27 @@ class MenuItemLink extends (newWindowIconEnabled ? LinkMixin(MenuItemMixin(LitEl
 		return null;
 	}
 
+	// remove this function when cleaning up GAUD-8369-menu-item-link-click-changes
 	_onClick() {
 		if (this.shadowRoot) this.shadowRoot.querySelector('a').dispatchEvent(new CustomEvent('click'));
 	}
 
 	_onKeyDown(e) {
-		if (e.keyCode === this.__keyCodes.ENTER || e.keyCode === this.__keyCodes.SPACE) {
-			const target = this._getTarget();
-			if (target === '_parent') {
-				window.parent.location.assign(this.href);
-			} else if (target === '_top') {
-				window.top.location.assign(this.href);
-			} else {
-				window.location.assign(this.href);
+		if (menuItemClickChangesEnabled) {
+			if (e.keyCode === this.__keyCodes.ENTER || e.keyCode === this.__keyCodes.SPACE) {
+				this.shadowRoot.querySelector('a').click();
+			}
+		} else { // remove this block when cleaning up GAUD-8369-menu-item-link-click-changes
+			super._onKeyDown(e);
+			if (e.keyCode === this.__keyCodes.ENTER || e.keyCode === this.__keyCodes.SPACE) {
+				const target = this._getTarget();
+				if (target === '_parent') {
+					window.parent.location.assign(this.href);
+				} else if (target === '_top') {
+					window.top.location.assign(this.href);
+				} else {
+					window.location.assign(this.href);
+				}
 			}
 		}
 	}

package/components/menu/menu-item-mixin.js

@@ -1,6 +1,8 @@
+import { getFlag } from '../../helpers/flags.js';
 import { PropertyRequiredMixin } from '../../mixins/property-required/property-required-mixin.js';
 
 const defaultLines = 2;
+const menuItemClickChangesEnabled = getFlag('GAUD-8369-menu-item-link-click-changes', true);
 
 export const MenuItemMixin = superclass => class extends PropertyRequiredMixin(superclass) {
 
@@ -54,7 +56,8 @@ export const MenuItemMixin = superclass => class extends PropertyRequiredMixin(s
 			 */
 			description: { type: String },
 			_ariaDisabled: { type: String, attribute: 'aria-disabled', reflect: true },
-			_ariaLabel: { type: String, attribute: 'aria-label', reflect: true }
+			_ariaLabel: { type: String, attribute: 'aria-label', reflect: true },
+			_letClickPropagate: { state: true }
 		};
 	}
 
@@ -74,6 +77,7 @@ export const MenuItemMixin = superclass => class extends PropertyRequiredMixin(s
 		this.role = 'menuitem';
 		/** @ignore */
 		this.tabindex = -1;
+		this._letClickPropagate = false;
 	}
 
 	firstUpdated(changedProperties) {
@@ -82,7 +86,7 @@ export const MenuItemMixin = superclass => class extends PropertyRequiredMixin(s
 		this.addEventListener('click', this.__onClick);
 		this.addEventListener('d2l-hierarchical-view-hide-complete', this.__onHideComplete);
 		this.addEventListener('dom-change', this.__onDomChange);
-		this.addEventListener('keydown', this.__onKeyDown);
+		this.addEventListener('keydown', this._onKeyDown);
 
 		this.__initializeItem();
 
@@ -152,7 +156,12 @@ export const MenuItemMixin = superclass => class extends PropertyRequiredMixin(s
 	}
 
 	__onClick(e) {
-		e.stopPropagation();
+		if (menuItemClickChangesEnabled) {
+			if (!this._letClickPropagate) e.stopPropagation();
+		} else { // remove this block when cleaning up GAUD-8369-menu-item-link-click-changes
+			e.stopPropagation();
+		}
+
 		this.__action();
 	}
 
@@ -171,7 +180,12 @@ export const MenuItemMixin = superclass => class extends PropertyRequiredMixin(s
 		this.setAttribute('tabindex', '0');
 	}
 
-	__onKeyDown(e) {
+	_onHidden() {
+		/** Dispatched when the visibility of the menu item changes */
+		this.dispatchEvent(new CustomEvent('d2l-menu-item-visibility-change', { bubbles: true, composed: true }));
+	}
+
+	_onKeyDown(e) {
 		if (e.target !== this) {
 			return;
 		}
@@ -188,9 +202,4 @@ export const MenuItemMixin = superclass => class extends PropertyRequiredMixin(s
 		}
 	}
 
-	_onHidden() {
-		/** Dispatched when the visibility of the menu item changes */
-		this.dispatchEvent(new CustomEvent('d2l-menu-item-visibility-change', { bubbles: true, composed: true }));
-	}
-
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightspace-ui/core",
-  "version": "3.156.4",
+  "version": "3.157.0",
   "description": "A collection of accessible, free, open-source web components for building Brightspace applications",
   "type": "module",
   "repository": "https://github.com/BrightspaceUI/core.git",