@brightspace-ui/core 2.159.2 → 2.160.0

package/components/focus-trap/focus-trap.js

@@ -4,6 +4,8 @@ import { FocusMixin } from '../../mixins/focus/focus-mixin.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { isComposedAncestor } from '../../helpers/dom.js';
 
+const traps = [];
+
 /**
  * A generic container component to trap user focus.
  * @fires d2l-focus-trap-enter - Dispatched when focus enters the trap. May be used to override initial focus placement when focus enters the trap.
@@ -68,6 +70,17 @@ class FocusTrap extends FocusMixin(LitElement) {
 		`;
 	}
 
+	willUpdate(changedProperties) {
+		if (!changedProperties.has('trap')) return;
+		if (this.trap) {
+			traps.push(this);
+		} else {
+			const trapIndex = traps.findIndex(trap => trap === this);
+			if (trapIndex === -1) return;
+			traps.splice(trapIndex, 1);
+		}
+	}
+
 	_focusFirst() {
 		const focusable = this.shadowRoot &&
 			getNextFocusable(this.shadowRoot.querySelector('.d2l-focus-trap-start'));
@@ -80,7 +93,8 @@ class FocusTrap extends FocusMixin(LitElement) {
 	}
 
 	_handleBodyFocus(e) {
-		if (!this.trap || this._legacyPromptIds.size > 0) return;
+		const lastTrap = traps[traps.length - 1];
+		if (!this.trap || this._legacyPromptIds.size > 0 || lastTrap !== this) return;
 		const container = this._getContainer();
 		const target = e.composedPath()[0];
 		if (isComposedAncestor(container, target)) return;

package/components/switch/README.md

@@ -21,7 +21,7 @@ A switch is used to toggle between two states, on and off, just like a light swi
 <!-- docs: end dos -->
 
 <!-- docs: start donts -->
-* Don't toggle the language in the label, it should remain stati
+* Don't toggle the language in the label, it should remain static
 * Don't use a switch in a form, use a checkbox or radio options in stead
 <!-- docs: end donts -->
 <!-- docs: end best practices -->
@@ -89,7 +89,7 @@ See also [Visibility Switch with Conditions](https://daylight.d2l.dev/components
 ### Slots
 
 - Optional default slot content - Content that will be displayed within the "conditions" opener tooltip when the switch is on.
-  
+
 <!-- docs: end hidden content -->
 
 ### Visibility Switch with Conditions

package/package.json

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