@brightspace-ui/core 3.135.0 → 3.135.1

package/components/form/form.js

@@ -5,10 +5,13 @@ import { css, html, LitElement } from 'lit';
 import { findFormElements, flattenMap, getFormElementData, isCustomFormElement, isNativeFormElement } from './form-helper.js';
 import { findComposedAncestor } from '../../helpers/dom.js';
 import { getComposedActiveElement } from '../../helpers/focus.js';
+import { getFlag } from '../../helpers/flags.js';
 import { getUniqueId } from '../../helpers/uniqueId.js';
 import { LocalizeCoreElement } from '../../helpers/localize-core-element.js';
 import { localizeFormElement } from './form-element-localize-helper.js';
 
+const formElementMixinWithNestedFormsParticipates = getFlag('form-element-mixin-nested-forms', true);
+
 /**
  * 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.
@@ -165,7 +168,13 @@ class Form extends LocalizeCoreElement(LitElement) {
 						}
 					}
 				}
-			} else {
+			} else if (!formElementMixinWithNestedFormsParticipates) {
+				const eleErrors = await this._validateFormElement(ele, true);
+				if (eleErrors.length > 0) {
+					errorMap.set(ele, eleErrors);
+				}
+			}
+			if (formElementMixinWithNestedFormsParticipates) {
 				const eleErrors = await this._validateFormElement(ele, true);
 				if (eleErrors.length > 0) {
 					errorMap.set(ele, eleErrors);
@@ -354,13 +363,16 @@ class Form extends LocalizeCoreElement(LitElement) {
 	}
 
 	async _validateFormElement(ele, showNewErrors) {
+		const isCustom = isCustomFormElement(ele);
+		const isNative = isNativeFormElement(ele);
+		if (!isCustom && !isNative) return [];
 		// if validation occurs before we've rendered,
 		// localization may not have loaded yet
 		await this._firstUpdatePromise;
 		ele.id = ele.id || getUniqueId();
-		if (isCustomFormElement(ele)) {
+		if (isCustom) {
 			return ele.validate(showNewErrors);
-		} else if (isNativeFormElement(ele)) {
+		} else if (isNative) {
 			const customs = [...this._validationCustoms].filter(custom => custom.forElement === ele);
 			const results = await Promise.all(customs.map(custom => custom.validate()));
 			const errors = customs.map(custom => custom.failureText).filter((_, i) => !results[i]);

package/package.json

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