@brightspace-ui/core 3.333.3 → 3.333.5

package/components/menu/menu.js

@@ -165,8 +165,8 @@ class Menu extends PropertyRequiredMixin(ThemeMixin(HierarchicalViewMixin(LitEle
 
 	resetFocusables(isActiveView) {
 		const focusable = this._getTabFocusable();
-		if (isActiveView && focusable.getRootNode().activeElement === focusable) return;
-		this._getTabFocusable()?.setAttribute('tabindex', '-1');
+		if (!focusable || (isActiveView && focusable.getRootNode().activeElement === focusable)) return;
+		focusable?.setAttribute('tabindex', '-1');
 	}
 
 	_createReturnItem() {

package/helpers/dom.js

@@ -1,5 +1,3 @@
-import { getFlag } from './flags.js';
-
 export function elemIdListAdd(elem, attrName, value) {
 
 	if (elem === undefined || elem === null || !elem.getAttribute || !elem.setAttribute) {
@@ -156,13 +154,10 @@ function getComposedElementSibling(node, { direction = 'next', predicate } = {})
 
 export function getComposedNextAncestorElementSibling(node, { predicate } = {}) {
 
-	const focusableFixFlag = getFlag('GAUD-10260-get-focusable-fix', true);
-
 	let parentNode = getComposedParent(node);
 
 	while (parentNode) {
-		// Clean-up this next line when cleaning up GAUD-10260-get-focusable-fix
-		const nextParentSibling = focusableFixFlag ? getComposedNextElementSibling(parentNode, { predicate }) : parentNode.nextElementSibling;
+		const nextParentSibling = getComposedNextElementSibling(parentNode, { predicate });
 		if (nextParentSibling) return nextParentSibling;
 		parentNode = getComposedParent(parentNode);
 	}
@@ -199,13 +194,10 @@ export function getComposedParent(node) {
 
 export function getComposedPreviousAncestorElementSibling(node, { predicate } = {}) {
 
-	const focusableFixFlag = getFlag('GAUD-10260-get-focusable-fix', true);
-
 	let parentNode = getComposedParent(node);
 
 	while (parentNode) {
-		// Clean-up this next line when cleaning up GAUD-10260-get-focusable-fix
-		const previousParentSibling = focusableFixFlag ? getComposedPreviousElementSibling(parentNode, { predicate }) : parentNode.previousElementSibling;
+		const previousParentSibling = getComposedPreviousElementSibling(parentNode, { predicate });
 		if (previousParentSibling) return previousParentSibling;
 		parentNode = getComposedParent(parentNode);
 	}

package/helpers/focus.js

@@ -9,7 +9,6 @@ import {
 	getFirstVisibleAncestor,
 	isVisible
 } from './dom.js';
-import { getFlag } from './flags.js';
 
 const focusableElements = {
 	a: true,
@@ -134,8 +133,6 @@ export function getLastFocusableDescendant(node, includeHidden) {
 
 export function getPreviousFocusable(node, includeHidden) {
 
-	const focusableFixFlag = getFlag('GAUD-10260-get-focusable-fix', true);
-
 	if (!node) return null;
 
 	if (includeHidden === undefined) includeHidden = false;
@@ -148,8 +145,7 @@ export function getPreviousFocusable(node, includeHidden) {
 			if (focusable) return focusable;
 		}
 
-		// Clean-up this next line when cleaning up GAUD-10260-get-focusable-fix
-		const previousSibling = focusableFixFlag ? getComposedPreviousElementSibling(node) : node.previousElementSibling;
+		const previousSibling = getComposedPreviousElementSibling(node);
 		if (previousSibling) {
 			const siblingFocusable = _getPreviousFocusable(previousSibling, false, false);
 			if (siblingFocusable) return siblingFocusable;
@@ -171,8 +167,6 @@ export function getPreviousFocusable(node, includeHidden) {
 
 export function getNextFocusable(node, includeHidden, ignore, ignoreChildren) {
 
-	const focusableFixFlag = getFlag('GAUD-10260-get-focusable-fix', true);
-
 	if (!node) return null;
 
 	if (includeHidden === undefined) includeHidden = false;
@@ -187,8 +181,7 @@ export function getNextFocusable(node, includeHidden, ignore, ignoreChildren) {
 			if (focusable) return focusable;
 		}
 
-		// Clean-up this next line when cleaning up GAUD-10260-get-focusable-fix
-		const nextSibling = focusableFixFlag ? getComposedNextElementSibling(node) : node.nextElementSibling;
+		const nextSibling = getComposedNextElementSibling(node);
 		if (nextSibling) {
 			const siblingFocusable = _getNextFocusable(nextSibling, false, false);
 			if (siblingFocusable) return siblingFocusable;

package/package.json

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