@brightspace-ui/core 3.49.0 → 3.50.0

package/README.md

@@ -19,7 +19,7 @@ npm install @brightspace-ui/core
   * [Alert](components/alert/): alert components for displaying important information
   * [Breadcrumbs](components/breadcrumbs/): component to help users understand where they are within an application
   * [Backdrop](components/backdrop/): component for displaying backdrop behind a target element
-  * [Buttons](components/button/): normal, primary, icon and subtle buttons
+  * [Buttons](components/button/): normal, primary, icon, subtle, and toggle buttons
   * [Calendar](components/calendar/): calendar component
   * [Card](components/card/): card components
   * [Colors](components/colors/): color palette

package/components/button/README.md

@@ -143,6 +143,34 @@ The `d2l-button-icon` element can be used just like the native `button`, for ins
 </d2l-button-icon>
 ```
 
+## Toggle Button [d2l-button-toggle]
+
+The `d2l-button-toggle` element is a container for buttons that toggle a `pressed` state. The component will automatically show or hide the buttons and manage focus based on the `pressed` state. Simply place a `d2l-button-icon` or `d2l-button-subtle` element in each of the `not-pressed` and `pressed` slots. Each button should describe the state and action the user can take.
+
+<!-- docs: demo code properties name:d2l-button-toggle sandboxTitle:'Toggle Button' -->
+```html
+<script type="module">
+  import '@brightspace-ui/core/components/button/button-subtle.js';
+  import '@brightspace-ui/core/components/button/button-toggle.js';
+</script>
+<d2l-button-toggle pressed>
+  <d2l-button-subtle slot="not-pressed" icon="tier1:lock-unlock" text="Unlocked" description="Click to lock."></d2l-button-subtle>
+  <d2l-button-subtle slot="pressed" icon="tier1:lock-locked" text="Locked" description="Click to unlock."></d2l-button-subtle>
+</d2l-button-toggle>
+```
+
+<!-- docs: start hidden content -->
+### Properties
+
+| Property | Type | Description |
+|--|--|--|
+| `pressed` | Boolean | Pressed state |
+
+### Events
+
+- `d2l-button-toggle-change`: dispatched when the `pressed` state changes
+<!-- docs: end hidden content -->
+
 ## Add Button [d2l-button-add]
 
 The `d2l-button-add` is for quickly adding new items at a specific location, such as when adding items to a curated list. Since the Add button is meant to be subtle, it should always be used in combination with more obvious methods to add items (like a menu or primary button).
@@ -220,6 +248,9 @@ Daylight buttons rely on standard button semantics to ensure a smooth experience
 * For [Icon Buttons](#d2l-button-icon) where there is no visible label, `text` will be displayed in a tooltip
   * If both `text` and `aria-label` are used, then `aria-label` will be used as the primary label while `text` will be used in a [tooltip](../../components/tooltip)
 
+* [Toggle buttons](#d2l-button-toggle) should describe the current state and the action the user can perform. As such, `aria-pressed` should not be used on the buttons as per [W3C's Button Pattern](https://www.w3.org/WAI/ARIA/apg/patterns/button/#:~:text=Alternatively%2C%20if%20the%20design%20were%20to%20call%20for%20the%20button%20label%20to%20change%20from%20%22Mute%22%20to%20%22Unmute%2C%22%20the%20aria%2Dpressed%20attribute%20would%20not%20be%20needed.).
+  * Example: "Unpinned, click to pin" and "Pinned, click to unpin"
+
 * [Floating Buttons](#d2l-floating-buttons) maintain their position in the document's structure, despite sticking to the bottom of the viewport, so the tab order is unaffected and the effect is imperceptible to screen reader users
   * Be cautious when using `always-float`, since screen magnifier users may find it difficult to locate the buttons at the bottom of a large viewport
 

package/components/button/button-toggle.js

@@ -0,0 +1,97 @@
+import { css, html, LitElement } from 'lit';
+
+/**
+ * A button container component for button toggles.
+ */
+class ButtonToggle extends LitElement {
+
+	static get properties() {
+		return {
+			/**
+			 * Pressed state
+			 * @type {boolean}
+			 */
+			pressed: { type: Boolean, reflect: true }
+		};
+	}
+
+	static get styles() {
+		return css`
+			:host {
+				display: inline-block;
+			}
+			:host([hidden]) {
+				display: none;
+			}
+			::slotted(:not(d2l-button-icon, d2l-button-subtle)),
+			:host slot[name="pressed"],
+			:host([pressed]) slot[name="not-pressed"] {
+				display: none;
+			}
+			:host slot[name="not-pressed"],
+			:host([pressed]) slot[name="pressed"] {
+				display: contents;
+			}
+		`;
+	}
+
+	constructor() {
+		super();
+		this.pressed = false;
+	}
+
+	firstUpdated(changedProperties) {
+		super.firstUpdated(changedProperties);
+		if (this._focusOnFirstRender) {
+			this._focusOnFirstRender = false;
+			this.focus();
+		}
+	}
+
+	render() {
+		return html`
+			<slot @click="${this._handleNotPressedClick}" name="not-pressed"></slot>
+			<slot @click="${this._handlePressedClick}" name="pressed"></slot>
+		`;
+	}
+
+	updated(changedProperties) {
+		super.updated(changedProperties);
+
+		if (changedProperties.get('pressed') === undefined) return;
+
+		/** Dispatched when the pressed state changes */
+		this.dispatchEvent(new CustomEvent('d2l-button-toggle-change'));
+	}
+
+	focus() {
+		if (!this.hasUpdated) {
+			this._focusOnFirstRender = true;
+			return;
+		}
+
+		const elem = this.shadowRoot.querySelector(this.pressed ? 'slot[name="pressed"]' : 'slot[name="not-pressed"]').assignedNodes()[0];
+		if (!elem) {
+			throw new Error('d2l-button-toggle: no button to focus');
+		}
+
+		elem.focus();
+	}
+
+	async _handleClick(pressed) {
+		this.pressed = pressed;
+		await this.updateComplete;
+		this.focus();
+	}
+
+	_handleNotPressedClick() {
+		this._handleClick(true);
+	}
+
+	_handlePressedClick() {
+		this._handleClick(false);
+	}
+
+}
+
+customElements.define('d2l-button-toggle', ButtonToggle);

package/components/button/demo/button-toggle.html

@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<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 '../../demo/demo-page.js';
+			import '../button-icon.js';
+			import '../button-subtle.js';
+			import '../button-toggle.js';
+		</script>
+	</head>
+	<body unresolved>
+
+		<d2l-demo-page page-title="d2l-button-toggle">
+
+			<h2>Toggle Button (using d2l-button-icon)</h2>
+
+			<d2l-demo-snippet>
+				<template>
+					<d2l-button-toggle id="toggle-button-icon">
+						<d2l-button-icon slot="not-pressed" icon="tier1:pin-hollow" text="Unpinned, click to pin."></d2l-button-icon>
+						<d2l-button-icon slot="pressed" icon="tier1:pin-filled" text="Pinned, click to unpin."></d2l-button-icon>
+					</d2l-button-toggle>
+					<script>
+						document.querySelector('#toggle-button-icon').addEventListener('d2l-button-toggle-change', e => console.log(e));
+					</script>
+				</template>
+			</d2l-demo-snippet>
+
+			<h2>Toggle Button (using d2l-button-subtle)</h2>
+
+			<d2l-demo-snippet>
+				<template>
+					<d2l-button-toggle id="toggle-button-subtle" pressed>
+						<d2l-button-subtle slot="not-pressed" icon="tier1:lock-unlock" text="Unlocked" description="Click to lock."></d2l-button-subtle>
+						<d2l-button-subtle slot="pressed" icon="tier1:lock-locked" text="Locked" description="Click to unlock."></d2l-button-subtle>
+					</d2l-button-toggle>
+					<script>
+						document.querySelector('#toggle-button-subtle').addEventListener('d2l-button-toggle-change', e => console.log(e));
+					</script>
+				</template>
+			</d2l-demo-snippet>
+
+			<h2>Toggle Button (disabled)</h2>
+
+			<d2l-demo-snippet>
+				<template>
+					<d2l-button-toggle pressed>
+						<d2l-button-subtle slot="not-pressed" disabled icon="tier1:subscribe-hollow" text="Not Subscribed" description="Click to subscribe."></d2l-button-subtle>
+						<d2l-button-subtle slot="pressed" disabled icon="tier1:subscribe-filled" text="Subscribed" description="Click to unsubscribe."></d2l-button-subtle>
+					</d2l-button-toggle>
+				</template>
+			</d2l-demo-snippet>
+
+		</d2l-demo-page>
+
+	</body>
+</html>

package/components/html-block/html-block.js

@@ -1,6 +1,5 @@
 import '../colors/colors.js';
 import { codeStyles, createHtmlBlockRenderer as createCodeRenderer } from '../../helpers/prism.js';
-import { createRef, ref } from 'lit/directives/ref.js';
 import { css, html, LitElement, unsafeCSS } from 'lit';
 import { classMap } from 'lit/directives/class-map.js';
 import { createHtmlBlockRenderer as createMathRenderer } from '../../helpers/mathjax.js';
@@ -207,8 +206,6 @@ class HtmlBlock extends LoadingCompleteMixin(LitElement) {
 		this._initialContextResolve = undefined;
 		this._initialContextPromise = new Promise(resolve => this._initialContextResolve = resolve);
 
-		this._renderContainerRef = createRef();
-
 		const contextKeysPromise = getRenderers().then(renderers => renderers.reduce((keys, currentRenderer) => {
 			if (currentRenderer.contextKeys) currentRenderer.contextKeys.forEach(key => keys.push(key));
 			return keys;
@@ -235,7 +232,7 @@ class HtmlBlock extends LoadingCompleteMixin(LitElement) {
 		};
 
 		return html`
-			<div class="${classMap(renderContainerClasses)}" ${ref(this._renderContainerRef)}></div>
+			<div class="${classMap(renderContainerClasses)}"></div>
 			${this.noDeferredRendering ? html`<slot @slotchange="${this._handleSlotChange}"></slot>` : ''}
 		`;
 	}
@@ -297,10 +294,11 @@ class HtmlBlock extends LoadingCompleteMixin(LitElement) {
 	}
 
 	async _updateRenderContainer() {
-		if (!this._renderContainerRef.value) return;
-		this._renderContainerRef.value.innerHTML = '';
-		this._renderContainerRef.value.append(await this._processEmbeds());
-		await this._processRenderers(this._renderContainerRef.value);
+		const renderContainer = this.shadowRoot?.querySelector('.d2l-html-block-rendered');
+		if (!renderContainer) return;
+		renderContainer.innerHTML = '';
+		renderContainer.append(await this._processEmbeds());
+		await this._processRenderers(renderContainer);
 	}
 
 	_validateHtml() {

package/custom-elements.json

@@ -717,6 +717,34 @@
         }
       ]
     },
+    {
+      "name": "d2l-button-toggle",
+      "path": "./components/button/button-toggle.js",
+      "description": "A button container component for button toggles.",
+      "attributes": [
+        {
+          "name": "pressed",
+          "description": "Pressed state",
+          "type": "boolean",
+          "default": "false"
+        }
+      ],
+      "properties": [
+        {
+          "name": "pressed",
+          "attribute": "pressed",
+          "description": "Pressed state",
+          "type": "boolean",
+          "default": "false"
+        }
+      ],
+      "events": [
+        {
+          "name": "d2l-button-toggle-change",
+          "description": "Dispatched when the pressed state changes"
+        }
+      ]
+    },
     {
       "name": "d2l-button",
       "path": "./components/button/button.js",

package/package.json

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