Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
</ion-avatar>
<ion-label class="chat-item-label" [attr.aria-describedby]="'chatroom-name-' + i">
<div class="chat-name-container caption" [attr.id]="'chatroom-name-' + i"
[attr.aria-label]="'chatroom: ' + chat.name">
[attr.aria-label]="'chatroom: ' + plainText(chat.name)">
<p class="chat-name subtitle-1" [ngClass]="{'bold': chat.unreadMessageCount > 0}" [innerHTML]="chat.name"></p>
@if ((chat.roles.length === 1) && (chat.roles.includes('mentor'))) {
<span>{{ utils.getUserRolesForUI('mentor') }}</span>
}
</div>
@if (chat.lastMessage) {
<p class="body-2 last-message" [attr.aria-label]="'last message: ' + chat.lastMessage" [innerHTML]="chat.lastMessage"></p>
<p class="body-2 last-message" [attr.aria-label]="'last message: ' + plainText(chat.lastMessage)" [innerHTML]="chat.lastMessage"></p>
} @else {
<p class="body-2 gray-2" i18n>No messages.</p>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,27 @@ describe('ChatListComponent', () => {
});
});

describe('accessible chat text', () => {
beforeEach(() => {
(utils.decodeHtmlEntities as jasmine.Spy).and.callFake((value: string) =>
UtilsService.prototype.decodeHtmlEntities.call({ document }, value));
});

it('decodes entities and separates HTML blocks', () => {
expect(component.plainText('<p>A &amp; B</p><div>Next<br>line</div>')).toBe('A & B Next line');
expect(component.plainText('')).toBe('');
});

it('keeps HTML event handlers inert when extracting a message label', async () => {
const marker = '__pr2808MessageExecuted';
(window as any)[marker] = false;
try {
expect(component.plainText(`<p>Hello</p><img src="data:image/png;base64,invalid" onerror="window.${marker}=true">`)).toBe('Hello');
await new Promise(resolve => setTimeout(resolve, 100));
expect((window as any)[marker]).toBeFalse();
} finally {
delete (window as any)[marker];
}
});
});
});
22 changes: 20 additions & 2 deletions projects/v3/src/app/pages/chat/chat-list/chat-list.component.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ChangeDetectorRef, Component, Output, EventEmitter, NgZone, Input, OnDestroy } from '@angular/core';
import { DOCUMENT } from '@angular/common';
import { Inject, ChangeDetectorRef, Component, Output, EventEmitter, NgZone, Input, OnDestroy } from '@angular/core';
import { Router, NavigationExtras } from '@angular/router';
import { BrowserStorageService } from '@v3/services/storage.service';
import { UtilsService } from '@v3/services/utils.service';
Expand Down Expand Up @@ -32,7 +33,8 @@ export class ChatListComponent implements OnDestroy {
private storage: BrowserStorageService,
private ngZone: NgZone,
private cdr: ChangeDetectorRef,
private pusherService: PusherService
private pusherService: PusherService,
@Inject(DOCUMENT) private document: Document
) {
this.isMobile = this.utils.isMobile();
this.utils.getEvent('chat:new-message')
Expand Down Expand Up @@ -148,4 +150,20 @@ export class ChatListComponent implements OnDestroy {
return this.utils.timeFormatter(date);
}

/**
* Accessible names must be text. Last messages and channel names are stored as HTML.
*/
plainText(value: string): string {
if (!value) {
return '';
}
const withBreaks = value
.replace(/<br\s*\/?>/gi, ' ')
.replace(/<\/(p|div|li|h[1-6])>/gi, ' ');
// Template contents are inert: message images and event handlers never activate.
const template = this.document.createElement('template');
template.innerHTML = withBreaks;
return (template.content.textContent || '').replace(/\s+/g, ' ').trim();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
<ion-grid class="white-bg">
<ion-row nowrap class="ion-no-padding">
<ion-col [size]="12" class="ion-align-self-center ion-no-padding">
<quill-editor aria-label="chat message input"
<quill-editor
customToolbarPosition="top"
[modules]="editorModules"
[classes]="isMobile ? 'editor-class' : 'editor-class desktop'"
Expand All @@ -192,6 +192,7 @@
placeholder="Enter your message"
[(ngModel)]="typingMessage"
(ngModelChange)="typing()"
(onEditorCreated)="labelMessageEditor($event)"
i18n-placeholder
></quill-editor>
</ion-col>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -791,4 +791,16 @@ describe('ChatRoomComponent', () => {
});
});

it('labels the created editable root rather than a message preview', () => {
const preview = document.createElement('div');
preview.className = 'ql-editor';
fixture.nativeElement.prepend(preview);
const root = document.createElement('div');
root.contentEditable = 'true';
(component.labelMessageEditor as any)({ root });
expect(root.getAttribute('role')).toBe('textbox');
expect(root.getAttribute('aria-multiline')).toBe('true');
expect(root.getAttribute('aria-label')).toBe('Enter your message');
expect(preview.hasAttribute('role')).toBeFalse();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { EditMessagePopupComponent } from '../edit-message-popup/edit-message-po
import { Subject, Subscription, timer } from 'rxjs';
import { debounceTime, switchMap, takeUntil, tap } from 'rxjs/operators';
import { QuillModules } from 'ngx-quill';
import type Quill from 'quill';
import { UppyFileData, UppyUploaderResponse, UppyUploaderService } from '../../../components/uppy-uploader/uppy-uploader.service';

enum ScrollPosition {
Expand Down Expand Up @@ -361,6 +362,13 @@ export class ChatRoomComponent implements OnInit, OnDestroy, AfterViewInit {
}, 500);
}

labelMessageEditor(editor: Quill): void {
editor.root.setAttribute('role', 'textbox');
editor.root.setAttribute('aria-multiline', 'true');
editor.root.setAttribute('aria-label', $localize`Enter your message`);
this._setQuillToolbarAriaLabels();
}

/**
* Set aria-labels for Quill editor toolbar elements for accessibility
*/
Expand Down
19 changes: 17 additions & 2 deletions projects/v3/src/app/pages/chat/chat.page.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
import { Component } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { UtilsService } from '@v3/services/utils.service';

@Component({
standalone: false,
template: '<ion-router-outlet></ion-router-outlet>',
})
export class ChatPage {}
export class ChatPage implements OnInit {
constructor(private utils: UtilsService) {}

ngOnInit() {
this.setMessagesTitle();
}

ionViewDidEnter() {
this.setMessagesTitle();
}

private setMessagesTitle() {
this.utils.setPageTitle('Messages - Practera');
}
}
90 changes: 46 additions & 44 deletions projects/v3/src/app/pages/home/home.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -134,48 +134,46 @@
[value]="display"
role="tablist"
aria-label="Content navigation tabs" i18n-aria-label>
<ion-segment-button value="activities"
<ion-segment-button id="activities-tab"
value="activities"
mode="ios"
role="tab"
[attr.aria-selected]="display === 'activities'"
[attr.aria-controls]="'activities-panel'">
<ion-label i18n>Activities</ion-label>
</ion-segment-button>
<ion-segment-button value="badges"
<ion-segment-button id="badges-tab"
value="badges"
mode="ios"
role="tab"
[attr.aria-selected]="display === 'badges'"
[attr.aria-controls]="'badges-panel'">
<ion-label i18n>{ getIsPointsConfigured, select, true {Badges & Points} false {Badges} }</ion-label>
</ion-segment-button>
@if (pulseCheckIndicatorEnabled === true && !isExpertWithoutTeam) {
<ion-segment-button value="pulse-checks"
<ion-segment-button id="pulse-checks-tab"
value="pulse-checks"
mode="ios"
role="tab"
[attr.aria-selected]="display === 'pulse-checks'"
[attr.aria-controls]="'pulse-checks-panel'">
<ion-label i18n>Skill & Progress Surveys</ion-label>
</ion-segment-button>
}
</ion-segment>

@switch (display) {
@case ('activities') {
<div role="tabpanel" id="activities-panel" [attr.aria-labelledby]="'activities-tab'">
<ng-container *ngTemplateOutlet="activityList"></ng-container>
</div>
<div role="tabpanel" id="activities-panel" aria-labelledby="activities-tab" [hidden]="display !== 'activities'">
@if (display === 'activities') {
<ng-container *ngTemplateOutlet="activityList"></ng-container>
}
@case ('badges') {
<div role="tabpanel" id="badges-panel" [attr.aria-labelledby]="'badges-tab'">
<ng-container *ngTemplateOutlet="badgePoints"></ng-container>
</div>
</div>
<div role="tabpanel" id="badges-panel" aria-labelledby="badges-tab" [hidden]="display !== 'badges'">
@if (display === 'badges') {
<ng-container *ngTemplateOutlet="badgePoints"></ng-container>
}
@case ('pulse-checks') {
<div role="tabpanel" id="pulse-checks-panel" [attr.aria-labelledby]="'pulse-checks-tab'">
</div>
@if (pulseCheckIndicatorEnabled === true && !isExpertWithoutTeam) {
<div role="tabpanel" id="pulse-checks-panel" aria-labelledby="pulse-checks-tab" [hidden]="display !== 'pulse-checks'">
@if (display === 'pulse-checks') {
<ng-container *ngTemplateOutlet="pulseChecks"></ng-container>
</div>
}
}
</div>
}

</ion-col>

</ion-row>
Expand All @@ -190,14 +188,15 @@
i18n>Activity list</h3>

<div class="activity-search-container">
<ion-searchbar [(ngModel)]="activitySearchText"
<ion-searchbar #activityFilter
[(ngModel)]="activitySearchText"
(ionInput)="filterActivities()"
(ionClear)="clearSearch()"
placeholder="Filter by activity title or description"
i18n-placeholder
mode="md"
animated="true"
aria-label="Filter activities by title or description"
aria-label="Filter by activity title or description"
i18n-aria-label>
</ion-searchbar>
@if (activitySearchText && filteredMilestones) {
Expand All @@ -219,27 +218,30 @@
i18n-aria-label>
@if ((activitySearchText ? filteredMilestones : milestones)?.length > 0) {
@for (milestone of (activitySearchText ? filteredMilestones : milestones)!; track milestone) {
<ion-item class="headline-4 milestone-name"
[ngClass]="{'locked': milestone.isLocked}"
lines="none"
(click)="showGuideline(milestone)"
(keydown.enter)="showGuideline(milestone)"
(keydown.space)="showGuideline(milestone); $event.preventDefault()"
tabindex="0"
role="button"
[attr.aria-label]="milestone.name + (milestone.isLocked ? ' (locked)' : '')"
aria-describedby="milestone-description">
<div [innerHTML]="milestone.name"></div>
@if (milestone.isLocked) {
<ion-icon
color="medium"
name="lock-closed"
slot="end"
aria-hidden="true"></ion-icon>
}
</ion-item>
<h3 class="milestone-heading">
<ion-item class="headline-4 milestone-name"
[ngClass]="{'locked': milestone.isLocked}"
lines="none"
(click)="showGuideline(milestone)"
(keydown.enter)="showGuideline(milestone)"
(keydown.space)="showGuideline(milestone); $event.preventDefault()"
tabindex="0"
role="button"
[attr.aria-label]="milestone.name + (milestone.isLocked ? ' (locked)' : '')"
[attr.aria-describedby]="milestone.description ? 'milestone-description-' + milestone.id : null">
<div [innerHTML]="milestone.name"></div>
@if (milestone.isLocked) {
<ion-icon
color="medium"
name="lock-closed"
slot="end"
aria-hidden="true"></ion-icon>
}
</ion-item>
</h3>
@if (milestone?.description) {
<ion-item id="milestone-description"
<ion-item
[id]="'milestone-description-' + milestone.id"
class="body-3"
lines="none"
color="light">
Expand Down
7 changes: 7 additions & 0 deletions projects/v3/src/app/pages/home/home.page.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
.milestone-heading {
margin: 0;
font-size: inherit;
font-weight: inherit;
line-height: inherit;
}

.milestone-name {
&.locked {
cursor: pointer;
Expand Down
Loading
Loading