@brightspace-ui/core 2.159.1 → 2.159.3

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/form/form.js

@@ -6,6 +6,7 @@ import { FormMixin } from './form-mixin.js';
  * A component that can be used to build sections containing interactive controls that are validated and submitted as a group.
  * Values of these interactive controls are aggregated but the user is responsible for handling submission via the @d2l-form-submit event.
  * @slot - The native and custom form elements that participate in validation and submission
+ * @fires d2l-form-connect - Internal event
  */
 class Form extends FormMixin(LitElement) {
 

package/custom-elements.json

@@ -4342,7 +4342,8 @@
       ],
       "events": [
         {
-          "name": "d2l-form-connect"
+          "name": "d2l-form-connect",
+          "description": "Internal event"
         },
         {
           "name": "d2l-form-invalid",

package/package.json

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