Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion packages/fiori/src/DynamicSideContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type DynamicSideContentLayoutChangeEventDetail = {
sideContentVisible: boolean,
}

type DynamicSideContentAriaAccessibilityAttributes = Pick<AccessibilityAttributes, "ariaLabel">;
type DynamicSideContentAriaAccessibilityAttributes = Pick<AccessibilityAttributes, "ariaLabel" | "role">;
type DynamicSideContentAccessibilityAttributes = {
mainContent?: DynamicSideContentAriaAccessibilityAttributes,
sideContent?: DynamicSideContentAriaAccessibilityAttributes,
Expand Down Expand Up @@ -370,12 +370,17 @@ class DynamicSideContent extends UI5Element {
}

get accInfo(): DynamicSideContentAccessibilityAttributes {
const hasMainRole = Object.prototype.hasOwnProperty.call(this.accessibilityAttributes.mainContent || {}, "role");
const hasSideRole = Object.prototype.hasOwnProperty.call(this.accessibilityAttributes.sideContent || {}, "role");

return {
mainContent: {
ariaLabel: this.accessibilityAttributes.mainContent?.ariaLabel || DynamicSideContent.i18nBundle.getText(DSC_MAIN_ARIA_LABEL),
role: hasMainRole ? this.accessibilityAttributes.mainContent?.role : "main",
},
sideContent: {
ariaLabel: this.accessibilityAttributes.sideContent?.ariaLabel || DynamicSideContent.i18nBundle.getText(DSC_SIDE_ARIA_LABEL),
role: hasSideRole ? this.accessibilityAttributes.sideContent?.role : "complementary",
},
};
}
Expand Down
4 changes: 2 additions & 2 deletions packages/fiori/src/DynamicSideContentTemplate.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default function DynamicSideContentTemplate(this: DynamicSideContent) {
function mainContent(this: DynamicSideContent) {
return (
<div
role="main"
role={this.accInfo.mainContent?.role}
aria-label={this.accInfo.mainContent?.ariaLabel}
class={this.classes.main}
style={this.styles.main}
Expand All @@ -37,7 +37,7 @@ function mainContent(this: DynamicSideContent) {
function sideContent(this: DynamicSideContent) {
return (
<aside
role="complementary"
role={this.accInfo.sideContent?.role}
aria-label={this.accInfo.sideContent?.ariaLabel}
class={this.classes.side}
style={this.styles.side}
Expand Down
2 changes: 2 additions & 0 deletions packages/fiori/test/pages/DynamicSideContent.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,11 @@ <h1>Side Content</h1>
dynamicSideContent.accessibilityAttributes = {
mainContent: {
ariaLabel: "Main Content Area",
role: "region",
},
sideContent: {
ariaLabel: "Side Content Area",
role: "note",
}
};
</script>
Expand Down
Loading