fix(ui5-button): remove tabindex from disabled button (#8957)

Fixes: #8852
SAP · May 23, 2024 · 041f573 · 041f573
1 parent 08b81c7
commit 041f573
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/main/src/Button.ts b/packages/main/src/Button.ts
@@ -507,6 +507,10 @@ class Button extends UI5Element implements IButton, IFormElement {
 	}
 
 	get tabIndexValue() {
+		if (this.disabled) {
+			return;
+		}
+
 		const tabindex = this.getAttribute("tabindex");
 
 		if (tabindex) {

diff --git a/packages/main/test/specs/Button.spec.js b/packages/main/test/specs/Button.spec.js
@@ -68,7 +68,8 @@ describe("Button general interaction", () => {
 
 		const field = await browser.$("#click-counter");
 		assert.strictEqual(await field.getProperty("value"), "3", "Click should be called 3 times");
-		assert.ok(await nativeButton.hasAttribute("disabled"), )
+		assert.ok(await nativeButton.hasAttribute("disabled"), );
+		assert.notOk(await nativeButton.hasAttribute("tabindex"), "Disabled button doesn't have tabindex attribute");
 	});
 
 	it("tests clicking on disabled button whith Icon", async () => {