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.

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

[Port dspace-7_x] Live region #3371

Merged
merged 6 commits into from
Sep 30, 2024
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
14 changes: 14 additions & 0 deletions config/config.example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -396,3 +396,17 @@ vocabularies:
comcolSelectionSort:
sortField: 'dc.title'
sortDirection: 'ASC'

# Live Region configuration
# Live Region as defined by w3c, https://www.w3.org/TR/wai-aria-1.1/#terms:
# Live regions are perceivable regions of a web page that are typically updated as a
# result of an external event when user focus may be elsewhere.
#
# The DSpace live region is a component present at the bottom of all pages that is invisible by default, but is useful
# for screen readers. Any message pushed to the live region will be announced by the screen reader. These messages
# usually contain information about changes on the page that might not be in focus.
liveRegion:
# The duration after which messages disappear from the live region in milliseconds
messageTimeOutDurationMs: 30000
# The visibility of the live region. Setting this to true is only useful for debugging purposes.
isVisible: false
2 changes: 2 additions & 0 deletions src/app/root/root.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@
<div class="ds-full-screen-loader" *ngIf="shouldShowFullscreenLoader">
<ds-themed-loading [showMessage]="false"></ds-themed-loading>
</div>

<ds-live-region></ds-live-region>
3 changes: 3 additions & 0 deletions src/app/shared/live-region/live-region.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div class="live-region" [ngClass]="{'visually-hidden': !isVisible }" aria-live="assertive" role="log" aria-relevant="additions" aria-atomic="true">
<div class="live-region-message" *ngFor="let message of (messages$ | async)">{{ message }}</div>
</div>
13 changes: 13 additions & 0 deletions src/app/shared/live-region/live-region.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.live-region {
position: fixed;
bottom: 0;
left: 0;
right: 0;
padding-left: 60px;
height: 90px;
line-height: 18px;
color: var(--bs-white);
background-color: var(--bs-dark);
opacity: 0.94;
z-index: var(--ds-live-region-z-index);
}
57 changes: 57 additions & 0 deletions src/app/shared/live-region/live-region.component.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import { LiveRegionComponent } from './live-region.component';
import { ComponentFixture, waitForAsync, TestBed } from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core';
import { LiveRegionService } from './live-region.service';
import { of } from 'rxjs';
import { By } from '@angular/platform-browser';

describe('liveRegionComponent', () => {
let fixture: ComponentFixture<LiveRegionComponent>;
let liveRegionService: LiveRegionService;

beforeEach(waitForAsync(() => {
liveRegionService = jasmine.createSpyObj('liveRegionService', {
getMessages$: of(['message1', 'message2']),
getLiveRegionVisibility: false,
setLiveRegionVisibility: undefined,
});

void TestBed.configureTestingModule({
imports: [
TranslateModule.forRoot(),
],
declarations: [LiveRegionComponent],
providers: [
{ provide: LiveRegionService, useValue: liveRegionService },
],
}).compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(LiveRegionComponent);
fixture.detectChanges();
});

it('should contain the current live region messages', () => {
const messages = fixture.debugElement.queryAll(By.css('.live-region-message'));

expect(messages.length).toEqual(2);
expect(messages[0].nativeElement.textContent).toEqual('message1');
expect(messages[1].nativeElement.textContent).toEqual('message2');
});

it('should respect the live region visibility', () => {
const liveRegion = fixture.debugElement.query(By.css('.live-region'));
expect(liveRegion).toBeDefined();

const liveRegionHidden = fixture.debugElement.query(By.css('.visually-hidden'));
expect(liveRegionHidden).toBeDefined();

liveRegionService.getLiveRegionVisibility = jasmine.createSpy('getLiveRegionVisibility').and.returnValue(true);
fixture = TestBed.createComponent(LiveRegionComponent);
fixture.detectChanges();

const liveRegionVisible = fixture.debugElement.query(By.css('.visually-hidden'));
expect(liveRegionVisible).toBeNull();
});
});
31 changes: 31 additions & 0 deletions src/app/shared/live-region/live-region.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import { Component, OnInit } from '@angular/core';
import { LiveRegionService } from './live-region.service';
import { Observable } from 'rxjs';

/**
* The Live Region Component is an accessibility tool for screenreaders. When a change occurs on a page when the changed
* section is not in focus, a message should be displayed by this component so it can be announced by a screen reader.
*
* This component should not be used directly. Use the {@link LiveRegionService} to add messages.
*/
@Component({
selector: `ds-live-region`,
templateUrl: './live-region.component.html',
styleUrls: ['./live-region.component.scss'],
})
export class LiveRegionComponent implements OnInit {

protected isVisible: boolean;

protected messages$: Observable<string[]>;

constructor(
protected liveRegionService: LiveRegionService,
) {
}

ngOnInit() {
this.isVisible = this.liveRegionService.getLiveRegionVisibility();
this.messages$ = this.liveRegionService.getMessages$();
}
}
9 changes: 9 additions & 0 deletions src/app/shared/live-region/live-region.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Config } from '../../../config/config.interface';

/**
* Configuration interface used by the LiveRegionService
*/
export class LiveRegionConfig implements Config {
messageTimeOutDurationMs: number;
isVisible: boolean;
}
170 changes: 170 additions & 0 deletions src/app/shared/live-region/live-region.service.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
import { LiveRegionService } from './live-region.service';
import { fakeAsync, tick, flush } from '@angular/core/testing';
import { UUIDService } from '../../core/shared/uuid.service';

describe('liveRegionService', () => {
let service: LiveRegionService;

beforeEach(() => {
service = new LiveRegionService(
new UUIDService(),
);
});

describe('addMessage', () => {
it('should correctly add messages', () => {
expect(service.getMessages().length).toEqual(0);

service.addMessage('Message One');
expect(service.getMessages().length).toEqual(1);
expect(service.getMessages()[0]).toEqual('Message One');

service.addMessage('Message Two');
expect(service.getMessages().length).toEqual(2);
expect(service.getMessages()[1]).toEqual('Message Two');
});
});

describe('clearMessages', () => {
it('should clear the messages', () => {
expect(service.getMessages().length).toEqual(0);

service.addMessage('Message One');
service.addMessage('Message Two');
expect(service.getMessages().length).toEqual(2);

service.clear();
expect(service.getMessages().length).toEqual(0);
});
});

describe('messages$', () => {
it('should emit when a message is added and when a message is removed after the timeOut', fakeAsync(() => {
const results: string[][] = [];

service.getMessages$().subscribe((messages) => {
results.push(messages);
});

expect(results.length).toEqual(1);
expect(results[0]).toEqual([]);

service.addMessage('message');

tick();

expect(results.length).toEqual(2);
expect(results[1]).toEqual(['message']);

tick(service.getMessageTimeOutMs());

expect(results.length).toEqual(3);
expect(results[2]).toEqual([]);
}));

it('should only emit once when the messages are cleared', fakeAsync(() => {
const results: string[][] = [];

service.getMessages$().subscribe((messages) => {
results.push(messages);
});

expect(results.length).toEqual(1);
expect(results[0]).toEqual([]);

service.addMessage('Message One');
service.addMessage('Message Two');

tick();

expect(results.length).toEqual(3);
expect(results[2]).toEqual(['Message One', 'Message Two']);

service.clear();
flush();

expect(results.length).toEqual(4);
expect(results[3]).toEqual([]);
}));

it('should not pop messages added after clearing within timeOut period', fakeAsync(() => {
const results: string[][] = [];

service.getMessages$().subscribe((messages) => {
results.push(messages);
});

expect(results.length).toEqual(1);
expect(results[0]).toEqual([]);

service.addMessage('Message One');
tick(10000);
service.clear();
tick(15000);
service.addMessage('Message Two');

// Message Two should not be cleared after 5 more seconds
tick(5000);

expect(results.length).toEqual(4);
expect(results[3]).toEqual(['Message Two']);

// But should be cleared 30 seconds after it was added
tick(25000);
expect(results.length).toEqual(5);
expect(results[4]).toEqual([]);
}));

it('should respect configured timeOut', fakeAsync(() => {
const results: string[][] = [];

service.getMessages$().subscribe((messages) => {
results.push(messages);
});

expect(results.length).toEqual(1);
expect(results[0]).toEqual([]);

const timeOutMs = 500;
service.setMessageTimeOutMs(timeOutMs);

service.addMessage('Message One');
tick(timeOutMs - 1);

expect(results.length).toEqual(2);
expect(results[1]).toEqual(['Message One']);

tick(1);

expect(results.length).toEqual(3);
expect(results[2]).toEqual([]);

const timeOutMsTwo = 50000;
service.setMessageTimeOutMs(timeOutMsTwo);

service.addMessage('Message Two');
tick(timeOutMsTwo - 1);

expect(results.length).toEqual(4);
expect(results[3]).toEqual(['Message Two']);

tick(1);

expect(results.length).toEqual(5);
expect(results[4]).toEqual([]);
}));
});

describe('liveRegionVisibility', () => {
it('should be false by default', () => {
expect(service.getLiveRegionVisibility()).toBeFalse();
});

it('should correctly update', () => {
service.setLiveRegionVisibility(true);
expect(service.getLiveRegionVisibility()).toBeTrue();
service.setLiveRegionVisibility(false);
expect(service.getLiveRegionVisibility()).toBeFalse();
});
});
});
Loading
Loading