From 6d713aa8e0480cdcb4308b22f5586806a61e951a Mon Sep 17 00:00:00 2001
From: Diana Petcheva <diana.petcheva@sap.com>
Date: Mon, 27 Oct 2025 20:04:39 +0200
Subject: [PATCH 1/2] feat(ui5-color-picker): update accessibility

---
 packages/main/src/ColorPicker.ts                | 10 ++++++++++
 packages/main/src/ColorPickerTemplate.tsx       | 12 ++++++++++--
 packages/main/src/i18n/messagebundle.properties |  6 ++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/main/src/ColorPicker.ts b/packages/main/src/ColorPicker.ts
index e863af070be8..c0d28ee5e943 100644
--- a/packages/main/src/ColorPicker.ts
+++ b/packages/main/src/ColorPicker.ts
@@ -24,6 +24,8 @@ import type Input from "./Input.js";
 import type Slider from "./Slider.js";
 
 import {
+	COLORPICKER_LABEL,
+	COLORPICKER_SLIDER_GROUP,
 	COLORPICKER_ALPHA_SLIDER,
 	COLORPICKER_HUE_SLIDER,
 	COLORPICKER_HEX,
@@ -531,6 +533,14 @@ class ColorPicker extends UI5Element implements IFormInputElement {
 			&& this._colorValue.B === value.b;
 	}
 
+	get colorPickerLabel() {
+		return ColorPicker.i18nBundle.getText(COLORPICKER_LABEL);
+	}
+
+	get sliderGroupLabel() {
+		return ColorPicker.i18nBundle.getText(COLORPICKER_SLIDER_GROUP);
+	}
+
 	get hueSliderLabel() {
 		return ColorPicker.i18nBundle.getText(COLORPICKER_HUE_SLIDER);
 	}
diff --git a/packages/main/src/ColorPickerTemplate.tsx b/packages/main/src/ColorPickerTemplate.tsx
index e7f7fd2e2637..5825777f2350 100644
--- a/packages/main/src/ColorPickerTemplate.tsx
+++ b/packages/main/src/ColorPickerTemplate.tsx
@@ -6,7 +6,11 @@ import Button from "./Button.js";
 
 export default function ColorPickerTemplate(this: ColorPicker) {
 	return (
-		<section class="ui5-color-picker-root">
+		<section
+			class="ui5-color-picker-root"
+			role="group"
+			aria-label={this.colorPickerLabel}
+		>
 			<div
 				class="ui5-color-picker-main-color"
 				style={{ "background-color": `rgb(${this._mainValue.r}, ${this._mainValue.g}, ${this._mainValue.b})` }}
@@ -24,7 +28,11 @@ export default function ColorPickerTemplate(this: ColorPicker) {
 				></div>
 			</div>
 
-			<div class="ui5-color-picker-sliders-wrapper">
+			<div
+				class="ui5-color-picker-sliders-wrapper"
+				role="group"
+				aria-label={this.sliderGroupLabel}
+			>
 				<Slider
 					disabled={this.inputsDisabled}
 					class="ui5-color-picker-hue-slider"
diff --git a/packages/main/src/i18n/messagebundle.properties b/packages/main/src/i18n/messagebundle.properties
index 91e1e9198f9b..889b2a56d006 100644
--- a/packages/main/src/i18n/messagebundle.properties
+++ b/packages/main/src/i18n/messagebundle.properties
@@ -139,6 +139,12 @@ COLOR_PALETTE_MORE_COLORS_TEXT=More Colors...
 #XTIT: Color Palette dialog button text to set the default color
 COLOR_PALETTE_DEFAULT_COLOR_TEXT=Default Color
 
+#XACT: ARIA information for the ColorPicker slider group
+COLORPICKER_LABEL= Color Picker
+
+#XACT: ARIA information for the ColorPicker slider group
+COLORPICKER_SLIDER_GROUP=Color Sliders
+
 #XACT: ARIA information for the ColorPicker Alpha slider
 COLORPICKER_ALPHA_SLIDER=Alpha control
 

From b1439c40453503ce7dc506db62a66e171daf7b1b Mon Sep 17 00:00:00 2001
From: Diana Petcheva <diana.petcheva@sap.com>
Date: Wed, 29 Oct 2025 14:55:01 +0200
Subject: [PATCH 2/2] chore: change slider name

---
 packages/main/src/i18n/messagebundle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/main/src/i18n/messagebundle.properties b/packages/main/src/i18n/messagebundle.properties
index 889b2a56d006..23bba463931d 100644
--- a/packages/main/src/i18n/messagebundle.properties
+++ b/packages/main/src/i18n/messagebundle.properties
@@ -146,10 +146,10 @@ COLORPICKER_LABEL= Color Picker
 COLORPICKER_SLIDER_GROUP=Color Sliders
 
 #XACT: ARIA information for the ColorPicker Alpha slider
-COLORPICKER_ALPHA_SLIDER=Alpha control
+COLORPICKER_ALPHA_SLIDER=Alpha slider
 
 #XACT: ARIA information for the ColorPicker Hue slider
-COLORPICKER_HUE_SLIDER=Hue control
+COLORPICKER_HUE_SLIDER=Hue slider
 
 #XTOL: Six symbol hexadecimal group representing CSS color hex string
 COLORPICKER_HEX=Hexadecimal