@brightspace-ui/core 3.159.7 → 3.160.1

package/helpers/demo/template-tags.html

@@ -67,11 +67,13 @@
 								one {There is # person}
 								other {There are # people}
 							}`;
+						/* eslint-disable @stylistic/indent */
 						document.querySelector('#complex-no-tag2').value =
 `{peopleCount, plural,
 	one {There is # person}
 	other {There are # people}
 }`;
+						/* eslint-enable @stylistic/indent */
 					</script>
 				</template>
 			</d2l-demo-snippet>

package/helpers/focus.js

@@ -1,5 +1,6 @@
 import { css, unsafeCSS } from 'lit';
 import { getComposedChildren, getComposedParent, getFirstVisibleAncestor, getNextAncestorSibling, getPreviousAncestorSibling, isVisible } from './dom.js';
+import { getFlag } from './flags.js';
 
 const focusableElements = {
 	a: true,
@@ -14,6 +15,8 @@ const focusableElements = {
 	textarea: true
 };
 
+const focusVisibleSupportChangesEnabled = getFlag('focus-visible-support-changes-for-focus-rings', true);
+
 export function getComposedActiveElement() {
 	let node = document.activeElement;
 
@@ -75,19 +78,50 @@ export function getFocusableDescendants(node, options) {
 export function getFocusPseudoClass() {
 	return isFocusVisibleSupported() ? 'focus-visible' : 'focus';
 }
-export function getFocusRingStyles(selector, { applyOnHover = false, extraStyles = null } = {}) {
-	const selectorDelegate = typeof selector === 'string' ? pseudoClass => `${selector}:${pseudoClass}` : selector;
-	const cssSelector = unsafeCSS(`${selectorDelegate(getFocusPseudoClass())}${applyOnHover ? `, ${selectorDelegate('hover')}` : ''}`);
-	return css`${cssSelector} {
-		${extraStyles ?? css``}
-		outline: 2px solid var(--d2l-focus-ring-color, var(--d2l-color-celestine));
-		outline-offset: var(--d2l-focus-ring-offset, 2px);
+export function getFocusRingStyles(selector, { extraStyles = null } = {}) {
+	// Remove when cleaning up focus-visible-support-changes-for-focus-rings
+	if (!focusVisibleSupportChangesEnabled) {
+		const selectorDelegate = typeof selector === 'string' ? pseudoClass => `${selector}:${pseudoClass}` : selector;
+		const cssSelector = unsafeCSS(selectorDelegate(getFocusPseudoClass()));
+		return css`${cssSelector} {
+			${extraStyles ?? css``}
+			outline: 2px solid var(--d2l-focus-ring-color, var(--d2l-color-celestine));
+			outline-offset: var(--d2l-focus-ring-offset, 2px);
+		}
+		@media (prefers-contrast: more) {
+			${cssSelector} {
+				outline-color: Highlight;
+			}
+		}`;
 	}
-	@media (prefers-contrast: more) {
-		${cssSelector} {
-			outline-color: Highlight;
+
+	const stylesDelegate = selector => css`
+		${selector} {
+			${extraStyles ?? css``}
+			outline: 2px solid var(--d2l-focus-ring-color, var(--d2l-color-celestine));
+			outline-offset: var(--d2l-focus-ring-offset, 2px);
+		}
+		@media (prefers-contrast: more) {
+			${selector} {
+				outline-color: Highlight;
+			}
+		}
+	`;
+	return getFocusVisibleStyles(selector, stylesDelegate);
+}
+
+export function getFocusVisibleStyles(selector, stylesDelegate) {
+	const selectorDelegate = typeof selector === 'string' ? pseudoClass => `${selector}:${pseudoClass}` : selector;
+	const focusSelector = unsafeCSS(selectorDelegate('focus'));
+	const focusVisibleSelector = unsafeCSS(selectorDelegate('focus-visible'));
+	return unsafeCSS(css`
+		@supports not selector(:focus-visible) {
+			${stylesDelegate(focusSelector)}
+		}
+		@supports selector(:focus-visible) {
+			${stylesDelegate(focusVisibleSelector)}
 		}
-	}`;
+	`);
 }
 
 export function getLastFocusableDescendant(node, includeHidden) {

package/package.json

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

package/templates/primary-secondary/README.md

@@ -1,7 +1,7 @@
 # Templates
 Page templates are used to provide generic ways to arrange content on a page
 
-## Primary-Secondary [d2l-primary-secondary]
+## Primary-Secondary [d2l-template-primary-secondary]
 Two Panel (primary and secondary) page template with header and optional footer
 
 Use this template when:

package/templates/primary-secondary/demo/form.html

@@ -47,7 +47,7 @@
 			document
 				.querySelector('d2l-button')
 				.addEventListener('click', () => form.submitForm());
-			form.addEventListener('d2l-form-submit', (e) => {
+			form.addEventListener('d2l-template-primary-secondary-form-submit', (e) => {
 				console.log('Form submitted!', e.detail.formData);
 			});
 		</script>