@brightspace-ui/core 3.163.0 → 3.164.0

package/components/list/list-item-button-mixin.js

@@ -28,7 +28,7 @@ export const ListItemButtonMixin = superclass => class extends ListItemMixin(sup
 			[slot="outside-control-container"] {
 				margin: 0 -12px;
 			}
-			:host([_list-item-interactive-enabled]) button {
+			button {
 				background-color: transparent;
 				border: none;
 				color: unset;
@@ -45,22 +45,6 @@ export const ListItemButtonMixin = superclass => class extends ListItemMixin(sup
 				text-align: start;
 				width: 100%;
 			}
-			/** clean up with flag GAUD-7495-list-interactive-content */
-			:host(:not([_list-item-interactive-enabled])) button {
-				background-color: transparent;
-				border: none;
-				cursor: pointer;
-				display: block;
-				height: 100%;
-				outline: none;
-				width: 100%;
-			}
-			/** clean up with flag GAUD-7495-list-interactive-content */
-			:host(:not([_list-item-interactive-enabled]):not([button-disabled]):not([no-primary-action])) [slot="content"],
-			:host(:not([_list-item-interactive-enabled]):not([no-primary-action])) [slot="control-action"] ~ [slot="content"],
-			:host(:not([_list-item-interactive-enabled]):not([no-primary-action])) [slot="outside-control-action"] ~ [slot="content"] {
-				pointer-events: none;
-			}
 			:host(:not([button-disabled])) [slot="control-action"],
 			:host(:not([button-disabled])) [slot="outside-control-action"] {
 				grid-column-end: control-end;
@@ -100,8 +84,6 @@ export const ListItemButtonMixin = superclass => class extends ListItemMixin(sup
 			/** Dispatched when the item's primary button action is clicked */
 			this.dispatchEvent(new CustomEvent('d2l-list-item-button-click', { bubbles: true }));
 
-			if (!this._listItemInteractiveEnabled) return; // clean up with flag GAUD-7495-list-interactive-content
-
 			e.stopPropagation();
 
 			// Dispatches click event from the list item to maintain existing functionality in consumers that listen for the click event
@@ -121,11 +103,11 @@ export const ListItemButtonMixin = superclass => class extends ListItemMixin(sup
 	}
 
 	_renderPrimaryAction(labelledBy, content) {
-		return html`<button 
-			id="${this._primaryActionId}" 
+		return html`<button
+			id="${this._primaryActionId}"
 			aria-current="${ifDefined(this._ariaCurrent)}"
-			aria-labelledby="${labelledBy}" 
-			@click="${this._onButtonClick}" 
+			aria-labelledby="${labelledBy}"
+			@click="${this._onButtonClick}"
 			@focusin="${this._onButtonFocus}"
 			?disabled="${this.buttonDisabled}">
 			${content || nothing}

package/components/list/list-item-link-mixin.js

@@ -23,7 +23,7 @@ export const ListItemLinkMixin = superclass => class extends ListItemMixin(super
 			:host([action-href]:not([action-href=""])) {
 				--d2l-list-item-content-text-color: var(--d2l-color-celestine);
 			}
-			:host([_list-item-interactive-enabled]) a[href] {
+			a[href] {
 				color: unset;
 				display: block;
 				height: 100%;
@@ -31,19 +31,6 @@ export const ListItemLinkMixin = superclass => class extends ListItemMixin(super
 				text-decoration: none;
 				width: 100%;
 			}
-			/** clean up with flag GAUD-7495-list-interactive-content */
-			:host(:not([_list-item-interactive-enabled])) a[href] {
-				display: block;
-				height: 100%;
-				outline: none;
-				width: 100%;
-			}
-			/** clean up with flag GAUD-7495-list-interactive-content */
-			:host(:not([_list-item-interactive-enabled])[action-href]:not([action-href=""])) [slot="content"],
-			:host(:not([_list-item-interactive-enabled]):not([no-primary-action])) [slot="control-action"] ~ [slot="content"],
-			:host(:not([_list-item-interactive-enabled]):not([no-primary-action])) [slot="outside-control-action"] ~ [slot="content"] {
-				pointer-events: none;
-			}
 			:host([action-href]:not([action-href=""])) [slot="control-action"],
 			:host([action-href]:not([action-href=""])) [slot="outside-control-action"] {
 				grid-column-end: control-end;
@@ -77,8 +64,6 @@ export const ListItemLinkMixin = superclass => class extends ListItemMixin(super
 			/** Dispatched when the item's primary link action is clicked */
 			this.dispatchEvent(new CustomEvent('d2l-list-item-link-click', { bubbles: true }));
 
-			if (!this._listItemInteractiveEnabled) return; // clean up with flag GAUD-7495-list-interactive-content
-
 			e.stopPropagation();
 
 			// Dispatches click event from the list item to maintain existing functionality in consumers that listen for the click event

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

@@ -41,13 +41,11 @@ function addTabListener() {
 	});
 }
 
-const listItemInteractiveFlag = getFlag('GAUD-7495-list-interactive-content', true);
 const useNewStylesFlag = getFlag('GAUD-7495-list-item-new-styles', true);
 
 let hasDisplayedKeyboardTooltip = false;
 
 export function isInteractiveInListItemComposedPath(e, isPrimaryAction) {
-	if (!listItemInteractiveFlag) return false;
 	const listInteractiveElems = {
 		...interactiveElements,
 		'd2l-button': true,
@@ -118,7 +116,6 @@ export const ListItemMixin = superclass => class extends composeMixins(
 			_focusingPrimaryAction: { type: Boolean, attribute: '_focusing-primary-action', reflect: true },
 			_highlight: { type: Boolean, reflect: true },
 			_highlighting: { type: Boolean, reflect: true },
-			_listItemInteractiveEnabled: { type: Boolean, reflect: true, attribute: '_list-item-interactive-enabled' },
 			_listItemNewStyles: { type: Boolean, reflect: true, attribute: '_list-item-new-styles' },
 			_showAddButton: { type: Boolean, attribute: '_show-add-button', reflect: true },
 			_siblingHasColor: { state: true },
@@ -474,7 +471,6 @@ export const ListItemMixin = superclass => class extends composeMixins(
 		this._hasColorSlot = false;
 		this._hasListItemContent = true;
 		this._hasNestedList = false;
-		this._listItemInteractiveEnabled = listItemInteractiveFlag;
 		this._listItemNewStyles = useNewStylesFlag;
 		this._siblingHasColor = false;
 	}
@@ -725,7 +721,7 @@ export const ListItemMixin = superclass => class extends composeMixins(
 			'd2l-list-item-content-none': !this._hasListItemContent
 		};
 
-		const alignNested = ((this.draggable && this.selectable) || (this.expandable && this.selectable && this.color) || (this._listItemInteractiveEnabled && this.expandable && !this.selectable)) ? 'control' : undefined;
+		const alignNested = ((this.draggable && this.selectable) || (this.expandable && this.selectable && this.color) || (this.expandable && !this.selectable)) ? 'control' : undefined;
 		const contentAreaContent = html`
 			<div slot="content"
 				class="${classMap(contentClasses)}"
@@ -737,9 +733,9 @@ export const ListItemMixin = superclass => class extends composeMixins(
 			</div>
 		`;
 
-		const primaryAction = ((!this.noPrimaryAction && this._renderPrimaryAction) ? this._renderPrimaryAction(this._contentId, this._listItemInteractiveEnabled ? contentAreaContent : nothing) : null);
-		const renderExpandableActionContent = this._listItemInteractiveEnabled && !primaryAction && !this.selectable && this.expandable && !this.noPrimaryAction;
-		const renderCheckboxActionContent = this._listItemInteractiveEnabled && !primaryAction && this.selectable && !this.noPrimaryAction;
+		const primaryAction = ((!this.noPrimaryAction && this._renderPrimaryAction) ? this._renderPrimaryAction(this._contentId, contentAreaContent) : null);
+		const renderExpandableActionContent = !primaryAction && !this.selectable && this.expandable && !this.noPrimaryAction;
+		const renderCheckboxActionContent = !primaryAction && this.selectable && !this.noPrimaryAction;
 
 		let tooltipForId = null;
 		if (this._showAddButton) {
@@ -804,7 +800,7 @@ export const ListItemMixin = superclass => class extends composeMixins(
 					@mouseleave="${this._onMouseLeavePrimaryAction}">
 						${primaryAction}
 				</div>` : nothing}
-				${!this._listItemInteractiveEnabled || (!primaryAction && !renderExpandableActionContent && !renderCheckboxActionContent) ? contentAreaContent : nothing}
+				${(!primaryAction && !renderExpandableActionContent && !renderCheckboxActionContent) ? contentAreaContent : nothing}
 				<div slot="actions"
 					@mouseenter="${this._onMouseEnter}"
 					@mouseleave="${this._onMouseLeave}"

package/package.json

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