fix(ui5-calendar): adjust aria-disabled attribute (#9732) (#9734)

Fixes: #9719
SAP · Aug 27, 2024 · 8cea6e8 · 8cea6e8
1 parent 86e8152
commit 8cea6e8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/packages/main/src/DayPicker.ts b/packages/main/src/DayPicker.ts
@@ -270,7 +270,7 @@ class DayPicker extends CalendarPart implements ICalendarPicker {
 				classes: `ui5-dp-item ui5-dp-wday${dayOfTheWeek}`,
 				ariaLabel,
 				ariaSelected: String(isSelected || isSelectedBetween),
-				ariaDisabled: isOtherMonth ? "true" : undefined,
+				ariaDisabled: isDisabled || isOtherMonth ? "true" : undefined,
 				disabled: isDisabled,
 				type: specialDayType,
 			};

diff --git a/packages/main/src/MonthPicker.hbs b/packages/main/src/MonthPicker.hbs
@@ -19,6 +19,7 @@
 					class="{{this.classes}}"
 					role="gridcell"
 					aria-selected="{{this.ariaSelected}}"
+					aria-disabled="{{this.ariaDisabled}}"
 				>
 					<span class="ui5-dp-monthtext">
 						{{this.name}}

diff --git a/packages/main/src/MonthPicker.ts b/packages/main/src/MonthPicker.ts
@@ -47,6 +47,7 @@ type Month = {
 	name: string,
 	nameInSecType: string,
 	disabled: boolean,
+	ariaDisabled: string | undefined,
 	classes: string,
 }
 
@@ -166,6 +167,7 @@ class MonthPicker extends CalendarPart implements ICalendarPicker {
 				name: monthsNames[i],
 				nameInSecType: this.hasSecondaryCalendarType && this._getDisplayedSecondaryMonthText(timestamp).text,
 				disabled: isDisabled,
+				ariaDisabled: isDisabled ? "true" : undefined,
 				classes: "ui5-mp-item",
 			};
 

diff --git a/packages/main/src/YearPicker.hbs b/packages/main/src/YearPicker.hbs
@@ -18,6 +18,7 @@
 					class="{{this.classes}}"
 					role="gridcell"
 					aria-selected="{{this.ariaSelected}}"
+					aria-disabled="{{this.ariaDisabled}}"
 				>
 					<span>
 						{{this.year}}

diff --git a/packages/main/src/YearPicker.ts b/packages/main/src/YearPicker.ts
@@ -43,6 +43,7 @@ type Year = {
 	year: string;
 	yearInSecType: string | undefined;
 	disabled: boolean;
+	ariaDisabled: string | undefined;
 	classes: string;
 }
 
@@ -176,6 +177,7 @@ class YearPicker extends CalendarPart implements ICalendarPicker {
 				year: oYearFormat.format(tempDate.toLocalJSDate()),
 				yearInSecType: textInSecType,
 				disabled: isDisabled,
+				ariaDisabled: isDisabled ? "true" : undefined,
 				classes: "ui5-yp-item",
 			};