Merge pull request #999 from OutSystems/ROU-11287

ROU-11287: [OSUI] - Defect with Skip to Content link
OutSystems · Oct 18, 2024 · 13d3585 · 13d3585
2 parents 572f143 + 3a72361
commit 13d3585
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/scripts/OutSystems/OSUI/Utils/Accessibility.ts b/src/scripts/OutSystems/OSUI/Utils/Accessibility.ts
@@ -99,6 +99,18 @@ namespace OutSystems.OSUI.Utils.Accessibility {
 	 * @param targetId
 	 */
 	export function SkipToContent(targetId: string): string {
+		// Method to remove tabindex from skipToContent at onBlur
+		function _skipToContentOnBlur(e: FocusEvent): void {
+			OSFramework.OSUI.Helper.AsyncInvocation(() => {
+				const target = e.target as HTMLElement;
+
+				if (target) {
+					OSFramework.OSUI.Helper.Dom.Attribute.Remove(target, 'tabindex');
+					target.removeEventListener(OSFramework.OSUI.GlobalEnum.HTMLEvent.Blur, _skipToContentOnBlur);
+				}
+			});
+		}
+
 		const result = OutSystems.OSUI.Utils.CreateApiResponse({
 			errorCode: ErrorCodes.Utilities.FailSkipToContent,
 			callback: () => {
@@ -110,7 +122,7 @@ namespace OutSystems.OSUI.Utils.Accessibility {
 					if (isFocusable === undefined) {
 						OSFramework.OSUI.Helper.Dom.Attribute.Set(target, 'tabindex', '0');
 						target.focus();
-						OSFramework.OSUI.Helper.Dom.Attribute.Remove(target, 'tabindex');
+						target.addEventListener(OSFramework.OSUI.GlobalEnum.HTMLEvent.Blur, _skipToContentOnBlur);
 					} else {
 						target.focus();
 					}