@brightspace-ui/core 3.99.0 → 3.99.1

package/components/switch/switch-mixin.js

@@ -198,34 +198,33 @@ export const SwitchMixin = superclass => class extends FocusMixin(RtlMixin(super
 
 		// Note: we render the switchLabel in the case of textPosition === 'hidden' so that any slot handlers can pick up on content being passed in
 		return html`
-			${textPosition === 'start' ? switchLabel : ''}
 			<div
-				aria-checked="${this.on ? 'true' : 'false'}"
-				aria-label="${ifDefined(textPosition === 'hidden' ? this.text : undefined)}"
-				aria-labelledby="${ifDefined(textPosition !== 'hidden' ? this._textId : undefined)}"
-				class="d2l-switch-container"
 				@click="${this._handleClick}"
-				@keydown="${this._handleKeyDown}"
-				@keyup="${this._handleKeyUp}"
-				role="switch"
-				tabindex="${ifDefined(tabindex)}">
-				<div class="${classMap(innerSwitchClasses)}">
-					<div class="d2l-switch-icon-on">${this.onIcon}</div>
-					<div class="d2l-switch-icon-off">${this.offIcon}</div>
-					<div class="d2l-switch-toggle"><div></div></div>
+				@mouseenter="${this._handleSwitchHover}"
+				@mouseleave="${this._handleSwitchHoverLeave}">
+				${textPosition === 'start' ? switchLabel : ''}
+				<div
+					aria-checked="${this.on ? 'true' : 'false'}"
+					aria-label="${ifDefined(textPosition === 'hidden' ? this.text : undefined)}"
+					aria-labelledby="${ifDefined(textPosition !== 'hidden' ? this._textId : undefined)}"
+					class="d2l-switch-container"
+					@keydown="${this._handleKeyDown}"
+					@keyup="${this._handleKeyUp}"
+					role="switch"
+					tabindex="${ifDefined(tabindex)}">
+					<div class="${classMap(innerSwitchClasses)}">
+						<div class="d2l-switch-icon-on">${this.onIcon}</div>
+						<div class="d2l-switch-icon-off">${this.offIcon}</div>
+						<div class="d2l-switch-toggle"><div></div></div>
+					</div>
 				</div>
+				${textPosition === 'end' || textPosition === 'hidden' ? switchLabel : ''}
 			</div>
-			${textPosition === 'end' || textPosition === 'hidden' ? switchLabel : ''}
 		`;
 	}
 
 	get _labelContent() {
-		return html`<span
-			@click='${this._handleClick}'
-			@mouseenter='${this._handleSwitchHover}'
-			@mouseleave='${this._handleSwitchHoverLeave}'>
-			${this.text}
-		</span>`;
+		return this.text;
 	}
 
 	_handleClick() {

package/components/switch/switch-visibility.js

@@ -81,7 +81,8 @@ class VisibilitySwitch extends LocalizeCoreElement(SwitchMixin(LitElement)) {
 				class="${classMap(tooltipHelpClasses)}" 
 				id="conditions-help" 
 				inherit-font-style
-				text="${this.localize('components.switch.conditions')}">
+				text="${this.localize('components.switch.conditions')}"
+				@click="${this._handleTooltipClick}">
 				<slot @slotchange="${this._handleConditionsSlotChange}"></slot>
 			</d2l-tooltip-help>
 			`;
@@ -93,6 +94,10 @@ class VisibilitySwitch extends LocalizeCoreElement(SwitchMixin(LitElement)) {
 		const nodes = e.target.assignedNodes({ flatten: true });
 		this._hasConditions = !!nodes[0]?.textContent?.trim();
 	}
+
+	_handleTooltipClick(e) {
+		e.stopPropagation();
+	}
 }
 
 customElements.define('d2l-switch-visibility', VisibilitySwitch);

package/package.json

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