From a6bb85021da896ffdbbd7bffed41251abd80ef11 Mon Sep 17 00:00:00 2001
From: tsanislavgatev <tseko95@gmail.com>
Date: Thu, 20 Nov 2025 17:27:03 +0200
Subject: [PATCH 1/4] feat(ui5-button): add  getter

---
 packages/main/src/Button.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/main/src/Button.ts b/packages/main/src/Button.ts
index 065fd36eb9e4..bba014ba89f1 100644
--- a/packages/main/src/Button.ts
+++ b/packages/main/src/Button.ts
@@ -658,6 +658,20 @@ class Button extends UI5Element implements IButton {
 		};
 	}
 
+	get accessibilityInfo() {
+		return {
+			ariaExpanded: this.accessibilityAttributes.expanded,
+			ariaHasPopup: this.accessibilityAttributes.hasPopup,
+			ariaControls: this.accessibilityAttributes.controls,
+			ariaKeyShortcuts: this.accessibilityAttributes.ariaKeyShortcuts,
+			ariaLabel: this.accessibilityAttributes.ariaLabel || this.ariaLabelText,
+			ariaDescription: this.ariaDescriptionText,
+			role: this.effectiveAccRole,
+			disabled: this.disabled,
+			tabIndex: this.tabIndexValue,
+		};
+	}
+
 	get effectiveBadgeDescriptionText() {
 		if (!this.shouldRenderBadge) {
 			return "";

From 9e1854aa2296a8ec1f3b8decb1e9cf38dab9eb7e Mon Sep 17 00:00:00 2001
From: tsanislavgatev <tseko95@gmail.com>
Date: Fri, 21 Nov 2025 14:43:05 +0200
Subject: [PATCH 2/4] fix(ui5-button): use correct format

---
 packages/main/src/Button.ts | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/main/src/Button.ts b/packages/main/src/Button.ts
index bba014ba89f1..ffd3b3dcff7d 100644
--- a/packages/main/src/Button.ts
+++ b/packages/main/src/Button.ts
@@ -660,15 +660,9 @@ class Button extends UI5Element implements IButton {
 
 	get accessibilityInfo() {
 		return {
-			ariaExpanded: this.accessibilityAttributes.expanded,
-			ariaHasPopup: this.accessibilityAttributes.hasPopup,
-			ariaControls: this.accessibilityAttributes.controls,
-			ariaKeyShortcuts: this.accessibilityAttributes.ariaKeyShortcuts,
-			ariaLabel: this.accessibilityAttributes.ariaLabel || this.ariaLabelText,
-			ariaDescription: this.ariaDescriptionText,
+			description: this.ariaDescriptionText,
 			role: this.effectiveAccRole,
 			disabled: this.disabled,
-			tabIndex: this.tabIndexValue,
 		};
 	}
 

From 30e24e0a44319bffcec77a2bad85eff63d64bc60 Mon Sep 17 00:00:00 2001
From: tsanislavgatev <tseko95@gmail.com>
Date: Tue, 25 Nov 2025 13:14:59 +0200
Subject: [PATCH 3/4] feat(ui5-button): add test

---
 packages/main/cypress/specs/Button.cy.tsx | 57 +++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/packages/main/cypress/specs/Button.cy.tsx b/packages/main/cypress/specs/Button.cy.tsx
index 2587893a438b..b0dc10aa84eb 100644
--- a/packages/main/cypress/specs/Button.cy.tsx
+++ b/packages/main/cypress/specs/Button.cy.tsx
@@ -577,4 +577,61 @@ describe("Accessibility", () => {
 		cy.get("@tag")
 			.should("have.text", "999+");
 	});
+
+	it("accessibilityInfo returns correct properties for different button states", () => {
+		cy.mount(<Button design="Emphasized" accessibleDescription="Submit form">Submit</Button>);
+
+		cy.get<Button>("[ui5-button]")
+			.then($button => {
+				const button = $button.get(0);
+				const info = button.accessibilityInfo;
+
+				expect(info.description).to.include("Submit form");
+				expect(info.description).to.include(Button.i18nBundle.getText(BUTTON_ARIA_TYPE_EMPHASIZED));
+				expect(info.role).to.equal("button");
+				expect(info.disabled).to.be.false;
+			});
+	});
+
+	it("accessibilityInfo reflects custom role and disabled state", () => {
+		cy.mount(<Button accessibleRole="Link" disabled>Navigate</Button>);
+
+		cy.get<Button>("[ui5-button]")
+			.then($button => {
+				const button = $button.get(0);
+				const info = button.accessibilityInfo;
+
+				expect(info.role).to.equal("link");
+				expect(info.disabled).to.be.true;
+				expect(info.description).to.be.undefined;
+			});
+	});
+
+	it("accessibilityInfo updates when properties change", () => {
+		cy.mount(<Button>Click me</Button>);
+
+		cy.get<Button>("[ui5-button]")
+			.as("button");
+
+		cy.get<Button>("@button")
+			.then($button => {
+				const button = $button.get(0);
+				expect(button.accessibilityInfo.disabled).to.be.false;
+				expect(button.accessibilityInfo.role).to.equal("button");
+
+				button.disabled = true;
+				button.accessibleRole = "Link";
+				button.design = "Negative";
+			});
+
+		cy.get<Button>("@button")
+			.then($button => {
+				const button = $button.get(0);
+				const info = button.accessibilityInfo;
+
+				expect(info.disabled).to.be.true;
+				expect(info.role).to.equal("link");
+				expect(info.description).to.include("Negative Action");
+			});
+	});
 });
\ No newline at end of file

From 0776c66ed90450de228f99f639bb013379376592 Mon Sep 17 00:00:00 2001
From: tsanislavgatev <tseko95@gmail.com>
Date: Wed, 26 Nov 2025 16:39:58 +0200
Subject: [PATCH 4/4] fix(ui5-button): fix comments

---
 packages/main/src/Button.ts                    | 18 +++++++++++++++++-
 .../main/src/i18n/messagebundle.properties     |  6 ++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/main/src/Button.ts b/packages/main/src/Button.ts
index ffd3b3dcff7d..4a771405a940 100644
--- a/packages/main/src/Button.ts
+++ b/packages/main/src/Button.ts
@@ -29,7 +29,7 @@ import toLowercaseEnumValue from "@ui5/webcomponents-base/dist/util/toLowercaseE
 import ButtonDesign from "./types/ButtonDesign.js";
 import ButtonType from "./types/ButtonType.js";
 import ButtonBadgeDesign from "./types/ButtonBadgeDesign.js";
-import type ButtonAccessibleRole from "./types/ButtonAccessibleRole.js";
+import ButtonAccessibleRole from "./types/ButtonAccessibleRole.js";
 import type ButtonBadge from "./ButtonBadge.js";
 import ButtonTemplate from "./ButtonTemplate.js";
 import {
@@ -39,6 +39,8 @@ import {
 	BUTTON_ARIA_TYPE_ATTENTION,
 	BUTTON_BADGE_ONE_ITEM,
 	BUTTON_BADGE_MANY_ITEMS,
+	BUTTON_ROLE_DESCRIPTION,
+	LINK_ROLE_DESCRIPTION,
 } from "./generated/i18n/i18n-defaults.js";
 
 // Styles
@@ -663,9 +665,23 @@ class Button extends UI5Element implements IButton {
 			description: this.ariaDescriptionText,
 			role: this.effectiveAccRole,
 			disabled: this.disabled,
+			children: this.text,
+			type: this.effectiveAccRoleTranslation,
 		};
 	}
 
+	get effectiveAccRoleTranslation(): string {
+		if (this.role === ButtonAccessibleRole.Button) {
+			return Button.i18nBundle.getText(BUTTON_ROLE_DESCRIPTION);
+		}
+
+		if (this.role === ButtonAccessibleRole.Link) {
+			return Button.i18nBundle.getText(LINK_ROLE_DESCRIPTION);
+		}
+
+		return "";
+	}
+
 	get effectiveBadgeDescriptionText() {
 		if (!this.shouldRenderBadge) {
 			return "";
diff --git a/packages/main/src/i18n/messagebundle.properties b/packages/main/src/i18n/messagebundle.properties
index f5779d84beb6..6860498c3354 100644
--- a/packages/main/src/i18n/messagebundle.properties
+++ b/packages/main/src/i18n/messagebundle.properties
@@ -85,6 +85,12 @@ BUTTON_BADGE_ONE_ITEM={0} item
 #XACT: ARIA announcement for the Button Badge with value more than 1 - "{0} items"
 BUTTON_BADGE_MANY_ITEMS={0} items
 
+#ACC: ARIA announcement for the Button role attribute
+BUTTON_ROLE_DESCRIPTION=Button
+
+#ACC: ARIA announcement for the Link role attribute
+LINK_ROLE_DESCRIPTION=Link
+
 #XACT: Text for Today item in CalendarLegend
 CAL_LEGEND_TODAY_TEXT=Today