Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: select button accessibility workaround #500

Merged
merged 3 commits into from
Sep 27, 2024
+54 −20
Merged

feat: select button accessibility workaround #500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f77cb6e
feat: select button accessibility workaround
markuczy Sep 25, 2024
a57facb
fix: fix test
markuczy Sep 25, 2024
ef63c99
Merge branch 'main' into feat/diagram-selectbutton-accessibility
markuczy Sep 27, 2024
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
5 changes: 3 additions & 2 deletions libs/angular-accelerator/src/lib/components/diagram/diagram.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
<p-selectButton
[options]="shownDiagramTypes"
[(ngModel)]="selectedDiagramType"
optionLabel="icon"
optionLabel="id"
(onChange)="onDiagramTypeChanged($event)"
name="diagram-type-select-button"
>
<ng-template let-item pTemplate>
<i
[class]="item.icon"
[pTooltip]="item.title || (item.titleKey | translate)"
[pTooltip]="item.tooltip || (item.tooltipKey | translate)"
tooltipPosition="top"
tooltipEvent="hover"
></i>
<label style="display: none" id="{{item.id}}"> {{item.label ? item.label : item.labelKey | translate}} </label>
</ng-template>
</p-selectButton>
</div>
Expand Down
46 changes: 33 additions & 13 deletions libs/angular-accelerator/src/lib/components/diagram/diagram.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { SelectButtonModule } from 'primeng/selectbutton'
import { DiagramHarness, TestbedHarnessEnvironment } from '../../../../testing'
import { DiagramType } from '../../model/diagram-type'
import { DiagramComponent, DiagramLayouts } from './diagram.component'
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'

describe('DiagramComponent', () => {
let translateService: TranslateService
Expand All @@ -35,18 +35,20 @@ describe('DiagramComponent', () => {

beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [DiagramComponent],
imports: [NoopAnimationsModule,
declarations: [DiagramComponent],
imports: [
NoopAnimationsModule,
ChartModule,
MessageModule,
SelectButtonModule,
FormsModule,
TranslateTestingModule.withTranslations({
en: require('./../../../../assets/i18n/en.json'),
de: require('./../../../../assets/i18n/de.json'),
})],
providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()]
}).compileComponents()
en: require('./../../../../assets/i18n/en.json'),
de: require('./../../../../assets/i18n/de.json'),
}),
],
providers: [provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting()],
}).compileComponents()

fixture = TestBed.createComponent(DiagramComponent)
component = fixture.componentInstance
Expand Down Expand Up @@ -118,11 +120,19 @@ describe('DiagramComponent', () => {

it('should render a diagramType select button if supportedDiagramTypes is specified', async () => {
const expectedDiagramLayouts: DiagramLayouts[] = [
{ icon: PrimeIcons.CHART_PIE, layout: DiagramType.PIE, titleKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.PIE' },
{
id: 'diagram-pie',
icon: PrimeIcons.CHART_PIE,
layout: DiagramType.PIE,
tooltipKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.PIE',
labelKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.PIE',
},
{
id: 'diagram-horizontal-bar',
icon: PrimeIcons.BARS,
layout: DiagramType.HORIZONTAL_BAR,
titleKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.HORIZONTAL_BAR',
tooltipKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.HORIZONTAL_BAR',
labelKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.HORIZONTAL_BAR',
},
]

Expand Down Expand Up @@ -169,16 +179,26 @@ describe('DiagramComponent', () => {

it('should dynamically add/remove options to/from the diagramType select button', async () => {
const allDiagramLayouts: DiagramLayouts[] = [
{ icon: PrimeIcons.CHART_PIE, layout: DiagramType.PIE, titleKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.PIE' },
{
id: 'diagram-pie',
icon: PrimeIcons.CHART_PIE,
layout: DiagramType.PIE,
tooltipKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.PIE',
labelKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.PIE',
},
{
id: 'diagram-horizontal-bar',
icon: PrimeIcons.BARS,
layout: DiagramType.HORIZONTAL_BAR,
titleKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.HORIZONTAL_BAR',
tooltipKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.HORIZONTAL_BAR',
labelKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.HORIZONTAL_BAR',
},
{
id: 'diagram-vertical-bar',
icon: PrimeIcons.CHART_BAR,
layout: DiagramType.VERTICAL_BAR,
titleKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.VERTICAL_BAR',
tooltipKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.VERTICAL_BAR',
labelKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.VERTICAL_BAR',
},
]

Expand Down
23 changes: 18 additions & 5 deletions libs/angular-accelerator/src/lib/components/diagram/diagram.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,40 @@ import { ColorUtils } from '../../utils/colorutils'
import { PrimeIcon } from '../../utils/primeicon.utils'

export interface DiagramLayouts {
id: string
icon: PrimeIcon
layout: DiagramType
title?: string
titleKey: string
tooltip?: string
tooltipKey: string
label?: string
labelKey: string
}

export interface DiagramComponentState {
activeDiagramType?: DiagramType
}

const allDiagramTypes: DiagramLayouts[] = [
{ icon: PrimeIcons.CHART_PIE, layout: DiagramType.PIE, titleKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.PIE' },
{
id: 'diagram-pie',
icon: PrimeIcons.CHART_PIE,
layout: DiagramType.PIE,
tooltipKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.PIE',
labelKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.PIE',
},
{
id: 'diagram-horizontal-bar',
icon: PrimeIcons.BARS,
layout: DiagramType.HORIZONTAL_BAR,
titleKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.HORIZONTAL_BAR',
tooltipKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.HORIZONTAL_BAR',
labelKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.HORIZONTAL_BAR',
},
{
id: 'diagram-vertical-bar',
icon: PrimeIcons.CHART_BAR,
layout: DiagramType.VERTICAL_BAR,
titleKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.VERTICAL_BAR',
tooltipKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.VERTICAL_BAR',
labelKey: 'OCX_DIAGRAM.SWITCH_DIAGRAM_TYPE.VERTICAL_BAR',
},
]

Expand Down
Loading