@brightspace-ui/core 3.312.0 → 3.314.0

package/components/backdrop/backdrop.js

@@ -1,6 +1,6 @@
 import '../colors/colors.js';
 import { css, html, LitElement } from 'lit';
-import { cssEscape, getComposedChildren, getComposedParent, isComposedAncestor, isVisible } from '../../helpers/dom.js';
+import { getComposedChildren, getComposedParent, isComposedAncestor, isVisible } from '../../helpers/dom.js';
 import { getComposedActiveElement } from '../../helpers/focus.js';
 
 const BACKDROP_HIDDEN = 'data-d2l-backdrop-hidden';
@@ -103,7 +103,7 @@ class Backdrop extends LitElement {
 
 			if (this._state === null) {
 				preventBodyScroll(this);
-				const target = this.parentNode.querySelector(`#${cssEscape(this.forTarget)}`);
+				const target = this.parentNode.querySelector(`#${CSS.escape(this.forTarget)}`);
 				// aria-hidden elements cannot have focus, so wait for focus to be within target
 				waitForFocusWithinTarget(target, Date.now() + 200).then(() => {
 					if (!this.shown || this._state !== 'showing') return;

package/components/dialog/dialog.js

@@ -6,6 +6,7 @@ import { css, html, LitElement, nothing } from 'lit';
 import { classMap } from 'lit/directives/class-map.js';
 import { DialogMixin } from './dialog-mixin.js';
 import { dialogStyles } from './dialog-styles.js';
+import { getFlag } from '../../helpers/flags.js';
 import { getUniqueId } from '../../helpers/uniqueId.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { LocalizeCoreElement } from '../../helpers/localize-core-element.js';
@@ -62,6 +63,11 @@ class Dialog extends PropertyRequiredMixin(LocalizeCoreElement(AsyncContainerMix
 			padding-bottom: 15px;
 		}
 
+		.d2l-dialog-header > div {
+			display: flex;
+			flex-direction: row-reverse;
+		}
+
 		.d2l-dialog-header > div > d2l-button-icon {
 			flex: none;
 			margin-block: -4px 0;
@@ -99,7 +105,7 @@ class Dialog extends PropertyRequiredMixin(LocalizeCoreElement(AsyncContainerMix
 		this.critical = false;
 		this.describeContent = false;
 		this.fullHeight = false;
-		this.preferNative = false;
+		this.preferNative = getFlag('GAUD-10409-prefer-native-general-dialogs', true);
 		this.width = 600;
 		this._criticalLabelId = getUniqueId();
 		this._titleId = getUniqueId();
@@ -162,18 +168,17 @@ class Dialog extends PropertyRequiredMixin(LocalizeCoreElement(AsyncContainerMix
 			<div id="${ifDefined(this._textId)}" style=${styleMap(slotStyles)}><slot @slotchange="${this._handleSlotChange}"></slot></div>
 		`;
 
-		const contentTabIndex = !this.focusableContentElemPresent ? '0' : undefined;
 		const labelId = this.critical ? `${this._criticalLabelId} ${this._titleId}` : this._titleId;
 		const inner = html`
 			${this.critical ? html`<div id="${this._criticalLabelId}" hidden>${this.localize('components.dialog.critical')}</div>` : nothing}
 			<div class="d2l-dialog-inner" style=${styleMap(heightOverride)}>
 				<div class="d2l-dialog-header">
 					<div>
-						<h2 id="${this._titleId}" class="d2l-heading-3">${this.titleText}</h2>
 						<d2l-button-icon icon="tier1:close-small" text="${this.localize('components.dialog.close')}" @click="${this._abort}"></d2l-button-icon>
+						${this._renderHeading(this.titleText, { id: this._titleId, class: 'd2l-heading-3' })}
 					</div>
 				</div>
-				<div class="d2l-dialog-content" @pending-state="${this._handleAsyncItemState}" tabindex="${ifDefined(contentTabIndex)}">${content}</div>
+				${this._renderContent(content, { handleAsyncItemState: this._handleAsyncItemState, hasTitleText: !!this.titleText })}
 				<div class="${classMap(footerClasses)}">
 					<slot name="footer" @slotchange="${this._handleFooterSlotChange}"></slot>
 				</div>
@@ -210,6 +215,11 @@ class Dialog extends PropertyRequiredMixin(LocalizeCoreElement(AsyncContainerMix
 		this._close('abort');
 	}
 
+	_focusInitial() {
+		if (!this.shadowRoot || this._useNative) return;
+		else super._focusInitial();
+	}
+
 	_handleFooterSlotChange(e) {
 		const footerContent = e.target.assignedNodes({ flatten: true });
 		this._hasFooterContent = (footerContent && footerContent.length > 0);

package/components/form/form-helper.js

@@ -1,6 +1,4 @@
 
-import { cssEscape } from '../../helpers/dom.js';
-
 const formElements = {
 	button: true,
 	fieldset: true,
@@ -67,7 +65,7 @@ const _tryGetLabelElement = ele => {
 	}
 	if (ele.id) {
 		const rootNode = ele.getRootNode();
-		return rootNode.querySelector(`label[for="${cssEscape(ele.id)}"]`);
+		return rootNode.querySelector(`label[for="${CSS.escape(ele.id)}"]`);
 	}
 	return null;
 };

package/components/selection/selection-observer-mixin.js

@@ -1,4 +1,3 @@
-import { cssEscape } from '../../helpers/dom.js';
 import { SelectionInfo } from './selection-mixin.js';
 
 export const SelectionObserverMixin = superclass => class extends superclass {
@@ -103,7 +102,7 @@ export const SelectionObserverMixin = superclass => class extends superclass {
 	}
 
 	_updateProvider() {
-		const selectionComponent = this.selectionFor ? this.getRootNode().querySelector(`#${cssEscape(this.selectionFor)}`) : undefined;
+		const selectionComponent = this.selectionFor ? this.getRootNode().querySelector(`#${CSS.escape(this.selectionFor)}`) : undefined;
 		if (this._provider === selectionComponent) return;
 
 		this._disconnectProvider();

package/components/tabs/tabs.js

@@ -2,7 +2,7 @@ import '../colors/colors.js';
 import '../icons/icon.js';
 import './tab-internal.js';
 import { css, html, LitElement, nothing, unsafeCSS } from 'lit';
-import { cssEscape, findComposedAncestor, getOffsetParent, isVisible } from '../../helpers/dom.js';
+import { findComposedAncestor, getOffsetParent, isVisible } from '../../helpers/dom.js';
 import { getFocusPseudoClass, getFocusRingStyles } from '../../helpers/focus.js';
 import { ArrowKeysMixin } from '../../mixins/arrow-keys/arrow-keys-mixin.js';
 import { bodyCompactStyles } from '../typography/styles.js';
@@ -455,7 +455,7 @@ class Tabs extends LocalizeCoreElement(ArrowKeysMixin(SkeletonMixin(LitElement))
 	// remove with GAUD-8299-core-tabs-use-new-structure flag clean up
 	_animateTabAdditionDefaultSlotBehavior(tabInfo) {
 		const tab = this.shadowRoot
-			&& this.shadowRoot.querySelector(`d2l-tab-internal[controls-panel="${cssEscape(tabInfo.id)}"]`);
+			&& this.shadowRoot.querySelector(`d2l-tab-internal[controls-panel="${CSS.escape(tabInfo.id)}"]`);
 		if (!tab) Promise.resolve();
 
 		return new Promise((resolve) => {
@@ -487,7 +487,7 @@ class Tabs extends LocalizeCoreElement(ArrowKeysMixin(SkeletonMixin(LitElement))
 	// remove with GAUD-8299-core-tabs-use-new-structure flag clean up
 	_animateTabRemovalDefaultSlotBehavior(tabInfo) {
 		const tab = this.shadowRoot &&
-			this.shadowRoot.querySelector(`d2l-tab-internal[controls-panel="${cssEscape(tabInfo.id)}"]`);
+			this.shadowRoot.querySelector(`d2l-tab-internal[controls-panel="${CSS.escape(tabInfo.id)}"]`);
 		if (!tab) Promise.resolve();
 
 		return new Promise((resolve) => {

package/components/tooltip/tooltip.js

@@ -1,5 +1,5 @@
 import { css, html, LitElement } from 'lit';
-import { cssEscape, elemIdListAdd, elemIdListRemove, isComposedAncestor } from '../../helpers/dom.js';
+import { elemIdListAdd, elemIdListRemove, isComposedAncestor } from '../../helpers/dom.js';
 import { getComposedActiveElement, isFocusable } from '../../helpers/focus.js';
 import { interactiveElements, interactiveRoles, isInteractive } from '../../helpers/interactive.js';
 import { announce } from '../../helpers/announce.js';
@@ -398,7 +398,7 @@ class Tooltip extends PopoverMixin(LitElement) {
 
 		let target;
 		if (this.for) {
-			const targetSelector = `#${cssEscape(this.for)}`;
+			const targetSelector = `#${CSS.escape(this.for)}`;
 			target = ownerRoot.querySelector(targetSelector);
 			target = (target || ownerRoot?.host?.querySelector(targetSelector)) ?? null;
 		} else {

package/controllers/subscriber/subscriberControllers.js

@@ -1,5 +1,3 @@
-import { cssEscape } from '../../helpers/dom.js';
-
 class BaseController {
 	constructor(host, name, options = {}) {
 		if (!host || !name) throw new TypeError('SubscriberController: missing host or subscription name');
@@ -211,7 +209,7 @@ export class IdSubscriberController extends BaseSubscriber {
 	}
 
 	_updateRegistry(registryId) {
-		const registryComponent = this._host.getRootNode().querySelector(`#${cssEscape(registryId)}`) || undefined;
+		const registryComponent = this._host.getRootNode().querySelector(`#${CSS.escape(registryId)}`) || undefined;
 
 		if (this._registries.get(registryId) === registryComponent) return registryComponent;
 

package/custom-elements.json

@@ -3134,7 +3134,6 @@
         },
         {
           "name": "preferNative",
-          "type": "boolean",
           "default": "false"
         }
       ],

package/helpers/dom.js

@@ -1,14 +1,5 @@
 import { getFlag } from './flags.js';
 
-// needed for legacy-Edge, after it's removed use CSS.escape directly
-export function cssEscape(val) {
-	if (window.CSS && window.CSS.escape) {
-		return window.CSS.escape(val);
-	}
-	val = val.replace(/\$/g, '\\$');
-	return val;
-}
-
 export function elemIdListAdd(elem, attrName, value) {
 
 	if (elem === undefined || elem === null || !elem.getAttribute || !elem.setAttribute) {

package/mixins/labelled/labelled-mixin.js

@@ -1,5 +1,4 @@
 
-import { cssEscape } from '../../helpers/dom.js';
 import { PropertyRequiredMixin } from '../property-required/property-required-mixin.js';
 
 const getCommonAncestor = (elem1, elem2) => {
@@ -117,7 +116,7 @@ export const LabelledMixin = superclass => class extends PropertyRequiredMixin(s
 		if (!this.labelledBy) {
 			this._updateLabelElem(null);
 		} else {
-			const labelElem = await waitForElement(this.getRootNode(), `#${cssEscape(this.labelledBy)}`, 3000);
+			const labelElem = await waitForElement(this.getRootNode(), `#${CSS.escape(this.labelledBy)}`, 3000);
 			if (!labelElem) {
 				this._throwError(
 					new Error(`LabelledMixin: "${this.tagName.toLowerCase()}" is labelled-by="${this.labelledBy}", but no such element exists`)
@@ -166,7 +165,7 @@ export const LabelledMixin = superclass => class extends PropertyRequiredMixin(s
 		}
 
 		this._labelObserver = new MutationObserver(() => {
-			const newElem = this.getRootNode().querySelector(`#${cssEscape(this.labelledBy)}`);
+			const newElem = this.getRootNode().querySelector(`#${CSS.escape(this.labelledBy)}`);
 			if (isCustomElement(newElem)) {
 				requestAnimationFrame(() => {
 					// element often sets its label in its own updated(), so we need to wait

package/package.json

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