@brightspace-ui/core 3.164.0 → 3.164.1

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

@@ -343,8 +343,7 @@ export const ListItemDragDropMixin = superclass => class extends superclass {
 				}
 				:host([selected]) d2l-list-item-drag-handle,
 				:host([current]) d2l-list-item-drag-handle,
-				:host([_focusing-elem]) d2l-list-item-drag-handle,
-				:host([_list-item-new-styles][_focusing]) d2l-list-item-drag-handle,
+				:host([_focusing]) d2l-list-item-drag-handle,
 				d2l-list-item-drag-handle:hover,
 				d2l-list-item-drag-handle.d2l-hovering,
 				d2l-list-item-drag-handle.d2l-focusing {

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

@@ -5,13 +5,12 @@ import './list-item-generic-layout.js';
 import './list-item-placement-marker.js';
 import '../tooltip/tooltip.js';
 import '../expand-collapse/expand-collapse-content.js';
-import { css, html, nothing, unsafeCSS } from 'lit';
+import { css, html, nothing } from 'lit';
 import { findComposedAncestor, getComposedChildren, getComposedParent } from '../../helpers/dom.js';
 import { interactiveElements, isInteractiveInComposedPath } from '../../helpers/interactive.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { composeMixins } from '../../helpers/composeMixins.js';
 import { getFirstFocusableDescendant } from '../../helpers/focus.js';
-import { getFlag } from '../../helpers/flags.js';
 import { getUniqueId } from '../../helpers/uniqueId.js';
 import { getValidHexColor } from '../../helpers/color.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
@@ -41,8 +40,6 @@ function addTabListener() {
 	});
 }
 
-const useNewStylesFlag = getFlag('GAUD-7495-list-item-new-styles', true);
-
 let hasDisplayedKeyboardTooltip = false;
 
 export function isInteractiveInListItemComposedPath(e, isPrimaryAction) {
@@ -116,7 +113,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 },
-			_listItemNewStyles: { type: Boolean, reflect: true, attribute: '_list-item-new-styles' },
 			_showAddButton: { type: Boolean, attribute: '_show-add-button', reflect: true },
 			_siblingHasColor: { state: true },
 		};
@@ -148,15 +144,15 @@ export const ListItemMixin = superclass => class extends composeMixins(
 
 			:host(:first-of-type) [slot="control-container"]::before,
 			[slot="control-container"]::after,
-			:host([_list-item-new-styles]:not([_separators="none"])[expandable][expanded]:not(:last-of-type))::after,
-			:host([_list-item-new-styles]:not([_separators="none"])[_has-nested-list]:not([expandable]):not(:last-of-type))::after {
+			:host(:not([_separators="none"])[expandable][expanded]:not(:last-of-type))::after,
+			:host(:not([_separators="none"])[_has-nested-list]:not([expandable]):not(:last-of-type))::after {
 				border-top: 1px solid var(--d2l-color-mica);
 				content: "";
 				position: absolute;
 				width: 100%;
 			}
-			:host([_list-item-new-styles][draggable][expandable][expanded]:not(:last-of-type))::after,
-			:host([_list-item-new-styles][draggable][_has-nested-list]:not([expandable]):not(:last-of-type))::after {
+			:host([draggable][expandable][expanded]:not(:last-of-type))::after,
+			:host([draggable][_has-nested-list]:not([expandable]):not(:last-of-type))::after {
 				inset-inline-start: 1.5rem; /* left and right margins of 0.3rem + drag handle width of 0.9rem */
 				width: calc(100% - 1.5rem);
 			}
@@ -220,22 +216,22 @@ export const ListItemMixin = superclass => class extends composeMixins(
 				outline-offset: -4px;
 			}
 			@supports selector(:has(a, b)) {
-				:host([_list-item-new-styles][_focusing-primary-action]) .d2l-list-item-content {
+				:host([_focusing-primary-action]) .d2l-list-item-content {
 					--d2l-list-item-content-text-border-radius: initial;
 					--d2l-list-item-content-text-outline: initial;
 					--d2l-list-item-content-text-outline-offset: initial;
 				}
-				:host([_list-item-new-styles][_focusing-primary-action]):has(:focus-visible) .d2l-list-item-content {
+				:host([_focusing-primary-action]):has(:focus-visible) .d2l-list-item-content {
 					--d2l-list-item-content-text-border-radius: 3px;
 					--d2l-list-item-content-text-outline: 2px solid var(--d2l-color-celestine);
 					--d2l-list-item-content-text-outline-offset: 1px;
 				}
-				:host([_list-item-new-styles][_focusing-primary-action]:not([padding-type="none"])) .d2l-list-item-content-none {
+				:host([_focusing-primary-action]:not([padding-type="none"])) .d2l-list-item-content-none {
 					border-radius: initial;
 					outline: initial;
 					outline-offset: initial;
 				}
-				:host([_list-item-new-styles][_focusing-primary-action]:not([padding-type="none"])):has(:focus-visible) .d2l-list-item-content-none {
+				:host([_focusing-primary-action]:not([padding-type="none"])):has(:focus-visible) .d2l-list-item-content-none {
 					border-radius: 8px;
 					outline: var(--d2l-list-item-content-text-outline);
 					outline-offset: -4px;
@@ -328,7 +324,7 @@ export const ListItemMixin = superclass => class extends composeMixins(
 			.d2l-list-item-content-extend-separators [slot="outside-control-container"] {
 				margin: 0;
 			}
-			:host([_list-item-new-styles][draggable]) [slot="outside-control-container"] {
+			:host([draggable]) [slot="outside-control-container"] {
 				margin-inline-end: -12px;
 			}
 
@@ -351,27 +347,17 @@ export const ListItemMixin = superclass => class extends composeMixins(
 			:host([_hovering-selection]) [slot="outside-control-container"],
 			:host([_focusing-primary-action]) [slot="outside-control-container"],
 			:host(:not([selection-disabled]):not([skeleton])[selected][_hovering-selection]) [slot="outside-control-container"],
-			:host(:not([_list-item-new-styles]):not([selection-disabled]):not([skeleton])[selectable][_focusing]) [slot="outside-control-container"],
-			:host([_list-item-new-styles]:not([selection-disabled]):not([button-disabled]):not([skeleton])[_focusing]:not([current])) [slot="outside-control-container"] {
-				border-color: ${unsafeCSS(useNewStylesFlag ? 'var(--d2l-color-mica)' : '#b6cbe8')}; /* stylelint-disable-line */
-				margin-bottom: -1px;
-			}
-			/* clean up with GAUD-7495-list-item-new-styles flag */
-			:host(:not([selection-disabled]):not([button-disabled]):not([skeleton])[_focusing-elem]:not([current])) [slot="outside-control-container"] {
+			:host(:not([selection-disabled]):not([button-disabled]):not([skeleton])[_focusing]:not([current])) [slot="outside-control-container"] {
 				border-color: var(--d2l-color-mica);
 				margin-bottom: -1px;
 			}
-			/* clean up with GAUD-7495-list-item-new-styles flag */
-			:host(:not([selection-disabled]):not([skeleton])[selected]) [slot="outside-control-container"].hide-bottom-border {
-				background-image: linear-gradient(#f3fbff, #f3fbff), linear-gradient(to right, ${unsafeCSS(useNewStylesFlag ? 'var(--d2l-color-mica)' : '#b6cbe8')} 20%, transparent 20%, transparent 80%, ${unsafeCSS(useNewStylesFlag ? 'var(--d2l-color-mica)' : '#b6cbe8')} 80%); /* stylelint-disable-line */
-			}
 			:host([_hovering-control]) d2l-button-add,
 			:host([_hovering-primary-action]) d2l-button-add,
 			:host([_hovering-selection]) d2l-button-add,
 			:host([_focusing-primary-action]) d2l-button-add,
 			:host(:not([selection-disabled]):not([skeleton])[selectable][_focusing]) d2l-button-add,
 			:host(:not([selection-disabled]):not([skeleton])[selected]) d2l-button-add {
-				--d2l-button-add-line-color: ${unsafeCSS(useNewStylesFlag ? 'var(--d2l-color-mica)' : '#b6cbe8')}; /* stylelint-disable-line */
+				--d2l-button-add-line-color: var(--d2l-color-mica);
 			}
 			:host([_hovering-control]) [slot="outside-control-container"],
 			:host([_hovering-primary-action]) [slot="outside-control-container"],
@@ -380,7 +366,7 @@ export const ListItemMixin = superclass => class extends composeMixins(
 			}
 			:host(:not([selection-disabled]):not([skeleton])[selected]) [slot="outside-control-container"] {
 				background-color: #f3fbff;
-				border-color: ${unsafeCSS(useNewStylesFlag ? 'var(--d2l-color-mica)' : '#b6cbe8')}; /* stylelint-disable-line */
+				border-color: var(--d2l-color-mica);
 				margin-bottom: -1px;
 			}
 
@@ -471,7 +457,6 @@ export const ListItemMixin = superclass => class extends composeMixins(
 		this._hasColorSlot = false;
 		this._hasListItemContent = true;
 		this._hasNestedList = false;
-		this._listItemNewStyles = useNewStylesFlag;
 		this._siblingHasColor = false;
 	}
 
@@ -642,9 +627,7 @@ export const ListItemMixin = superclass => class extends composeMixins(
 	}
 
 	_onFocusIn(e) {
-		if (this._listItemNewStyles) {
-			e.stopPropagation(); // prevent _focusing from being set on the parent
-		}
+		e.stopPropagation(); // prevent _focusing from being set on the parent
 		this._focusing = true;
 		if (this.role !== 'row' || !tabPressed || hasDisplayedKeyboardTooltip) return;
 		this._displayKeyboardTooltip = true;

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

@@ -17,7 +17,6 @@ export const ListItemNavMixin = superclass => class extends ListItemLinkMixin(su
 			 */
 			preventNavigation: { type: Boolean, attribute: 'prevent-navigation' },
 			_childCurrent: { type: Boolean, reflect: true, attribute: '_child-current' },
-			_focusingElem: { type: Boolean, reflect: true, attribute: '_focusing-elem' },
 			_hasCurrentParent: { type: Boolean, reflect: true, attribute: '_has-current-parent' },
 			_nextSiblingCurrent: { type: Boolean, reflect: true, attribute: '_next-sibling-current' },
 		};
@@ -66,21 +65,6 @@ export const ListItemNavMixin = superclass => class extends ListItemLinkMixin(su
 			:host([current]) .d2l-list-item-color-outer {
 				padding-block: 3px;
 			}
-
-			/* clean up with GAUD-7495-list-item-new-styles flag */
-			@supports selector(:has(a, b)) {
-				:host([_focusing-primary-action]) .d2l-list-item-content {
-					--d2l-list-item-content-text-border-radius: initial;
-					--d2l-list-item-content-text-outline: initial;
-					--d2l-list-item-content-text-outline-offset: initial;
-				}
-				:host([_focusing-primary-action]):has(:focus-visible) .d2l-list-item-content {
-					--d2l-list-item-content-text-border-radius: 3px;
-					--d2l-list-item-content-text-outline: 2px solid var(--d2l-color-celestine);
-					--d2l-list-item-content-text-outline-offset: 1px;
-				}
-			}
-
 		` ];
 
 		super.styles && styles.unshift(super.styles);
@@ -91,7 +75,6 @@ export const ListItemNavMixin = superclass => class extends ListItemLinkMixin(su
 		super();
 		this.current = false;
 		this._childCurrent = false;
-		this._focusingElem = false;
 		this._hasCurrentParent = false;
 		this._nextSiblingCurrent = false;
 	}
@@ -112,9 +95,6 @@ export const ListItemNavMixin = superclass => class extends ListItemLinkMixin(su
 		if (this.current) {
 			this.dispatchSetChildCurrentEvent(true);
 		}
-
-		this.addEventListener('focusin', this.#handleFocusIn);
-		this.addEventListener('focusout', this.#handleFocusOut);
 	}
 
 	updated(changedProperties) {
@@ -173,16 +153,6 @@ export const ListItemNavMixin = superclass => class extends ListItemLinkMixin(su
 		super._handleLinkClick(e);
 	}
 
-	/* clean up (including _focusingElem) with GAUD-7495-list-item-new-styles flag */
-	#handleFocusIn(e) {
-		e.stopPropagation(); // prevent _focusing from being set on the parent
-		this._focusingElem = true;
-	}
-
-	#handleFocusOut() {
-		this._focusingElem = false;
-	}
-
 	#setAriaCurrent(val) {
 		this._ariaCurrent = val;
 	}

package/package.json

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