@hmcts/media-viewer 4.1.9-exui-2821-1 → 4.1.10-exui-3053

package/lib/media-viewer.component.d.ts

@@ -51,6 +51,7 @@ export declare class MediaViewerComponent implements OnChanges, OnDestroy, After
     documentId: string;
     private $subscriptions;
     private prevOffset;
+    private currentRegionIndex;
     constructor(store: Store<fromStore.AnnotationSetState>, toolbarButtons: ToolbarButtonVisibilityService, toolbarEvents: ToolbarEventService, api: AnnotationApiService, commentService: CommentService, elRef: ElementRef, cdr: ChangeDetectorRef, icpEventService: IcpEventService);
     ngAfterContentInit(): void;
     ngAfterViewChecked(): void;
@@ -66,6 +67,13 @@ export declare class MediaViewerComponent implements OnChanges, OnDestroy, After
     onDocumentTitleChange(title: string): void;
     private extractDMStoreDocId;
     detectOs(): void;
+    skipToSidebar(event: Event): void;
+    private openSidebarAndWait;
+    skipToViewer(event: Event): void;
+    handleF6Forward(event: KeyboardEvent): void;
+    handleF6Backward(event: KeyboardEvent): void;
+    private cycleRegion;
+    private focusRegion;
     static ɵfac: i0.ɵɵFactoryDeclaration<MediaViewerComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<MediaViewerComponent, "mv-media-viewer", never, { "url": { "alias": "url"; "required": false; }; "downloadFileName": { "alias": "downloadFileName"; "required": false; }; "contentType": { "alias": "contentType"; "required": false; }; "showToolbar": { "alias": "showToolbar"; "required": false; }; "toolbarButtonOverrides": { "alias": "toolbarButtonOverrides"; "required": false; }; "height": { "alias": "height"; "required": false; }; "width": { "alias": "width"; "required": false; }; "enableAnnotations": { "alias": "enableAnnotations"; "required": false; }; "annotationApiUrl": { "alias": "annotationApiUrl"; "required": false; }; "enableRedactions": { "alias": "enableRedactions"; "required": false; }; "enableICP": { "alias": "enableICP"; "required": false; }; "multimediaPlayerEnabled": { "alias": "multimediaPlayerEnabled"; "required": false; }; "enableRedactSearch": { "alias": "enableRedactSearch"; "required": false; }; "caseId": { "alias": "caseId"; "required": false; }; }, { "mediaLoadStatus": "mediaLoadStatus"; "viewerException": "viewerException"; "toolbarEventsOutput": "toolbarEventsOutput"; "unsavedChanges": "unsavedChanges"; }, never, never, false, never>;
 }

package/lib/media-viewer.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media-viewer.component.d.ts","sourceRoot":"","sources":["../../../projects/media-viewer/src/lib/media-viewer.component.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"media-viewer.component.d.ts","sourceRoot":"","sources":["../../../projects/media-viewer/src/lib/media-viewer.component.ts"],"names":[],"mappings":"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"}

package/lib/shared/directives/keyboard-nav.directive.d.ts

@@ -0,0 +1,30 @@
+import { ElementRef, EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import * as i0 from "@angular/core";
+export type KeyboardNavOrientation = 'horizontal' | 'vertical';
+export declare class KeyboardNavDirective implements OnInit, OnDestroy {
+    private elementRef;
+    orientation: KeyboardNavOrientation;
+    itemFocused: EventEmitter<HTMLElement>;
+    itemActivated: EventEmitter<HTMLElement>;
+    private focusableItems;
+    private currentFocusIndex;
+    private mutationObserver;
+    private isUsingArrowKeys;
+    constructor(elementRef: ElementRef<HTMLElement>);
+    ngOnInit(): void;
+    ngOnDestroy(): void;
+    private setupMutationObserver;
+    private updateFocusableItems;
+    private isVisible;
+    private applyArrowKeyTabindex;
+    onKeyDown(event: KeyboardEvent): void;
+    private focusNext;
+    private focusPrevious;
+    private focusFirst;
+    private focusLast;
+    private focusItemAtIndex;
+    private activateItem;
+    static ɵfac: i0.ɵɵFactoryDeclaration<KeyboardNavDirective, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<KeyboardNavDirective, "[mvKeyboardNav]", never, { "orientation": { "alias": "mvKeyboardNav"; "required": false; }; }, { "itemFocused": "itemFocused"; "itemActivated": "itemActivated"; }, never, never, false, never>;
+}
+//# sourceMappingURL=keyboard-nav.directive.d.ts.map

package/lib/shared/directives/keyboard-nav.directive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyboard-nav.directive.d.ts","sourceRoot":"","sources":["../../../../../projects/media-viewer/src/lib/shared/directives/keyboard-nav.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,YAAY,EAGZ,SAAS,EACT,MAAM,EAEP,MAAM,eAAe,CAAC;;AAEvB,MAAM,MAAM,sBAAsB,GAAG,YAAY,GAAG,UAAU,CAAC;AAE/D,qBAGa,oBAAqB,YAAW,MAAM,EAAE,SAAS;IAUhD,OAAO,CAAC,UAAU;IATN,WAAW,EAAE,sBAAsB,CAAgB;IACjE,WAAW,4BAAmC;IAC9C,aAAa,4BAAmC;IAE1D,OAAO,CAAC,cAAc,CAAqB;IAC3C,OAAO,CAAC,iBAAiB,CAAM;IAC/B,OAAO,CAAC,gBAAgB,CAAmB;IAC3C,OAAO,CAAC,gBAAgB,CAAS;gBAEb,UAAU,EAAE,UAAU,CAAC,WAAW,CAAC;IAEvD,QAAQ,IAAI,IAAI;IAKhB,WAAW,IAAI,IAAI;IAMnB,OAAO,CAAC,qBAAqB;IAa7B,OAAO,CAAC,oBAAoB;IAkB5B,OAAO,CAAC,SAAS;IA2BjB,OAAO,CAAC,qBAAqB;IAwB7B,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,IAAI;IAqGrC,OAAO,CAAC,SAAS;IAcjB,OAAO,CAAC,aAAa;IAcrB,OAAO,CAAC,UAAU;IAMlB,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,gBAAgB;IAexB,OAAO,CAAC,YAAY;yCArQT,oBAAoB;2CAApB,oBAAoB;CAyQhC"}

package/lib/shared/shared.module.d.ts

@@ -3,12 +3,13 @@ import * as i1 from "./gov-uk-date/gov-uk-date.component";
 import * as i2 from "./gov-uk-error-message/gov-uk-error-message.component";
 import * as i3 from "./gov-uk-fieldset/gov-uk-fieldset.component";
 import * as i4 from "./gov-uk-label/gov-uk-label.component";
-import * as i5 from "@angular/common";
-import * as i6 from "@angular/forms";
-import * as i7 from "@angular/router";
+import * as i5 from "./directives/keyboard-nav.directive";
+import * as i6 from "@angular/common";
+import * as i7 from "@angular/forms";
+import * as i8 from "@angular/router";
 export declare class SharedModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<SharedModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<SharedModule, [typeof i1.GovUkDateComponent, typeof i2.GovUkErrorMessageComponent, typeof i3.GovUkFieldsetComponent, typeof i4.GovUkLabelComponent], [typeof i5.CommonModule, typeof i6.FormsModule, typeof i6.ReactiveFormsModule, typeof i5.CommonModule, typeof i7.RouterModule], [typeof i1.GovUkDateComponent, typeof i2.GovUkErrorMessageComponent, typeof i3.GovUkFieldsetComponent, typeof i4.GovUkLabelComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<SharedModule, [typeof i1.GovUkDateComponent, typeof i2.GovUkErrorMessageComponent, typeof i3.GovUkFieldsetComponent, typeof i4.GovUkLabelComponent, typeof i5.KeyboardNavDirective], [typeof i6.CommonModule, typeof i7.FormsModule, typeof i7.ReactiveFormsModule, typeof i6.CommonModule, typeof i8.RouterModule], [typeof i1.GovUkDateComponent, typeof i2.GovUkErrorMessageComponent, typeof i3.GovUkFieldsetComponent, typeof i4.GovUkLabelComponent, typeof i5.KeyboardNavDirective]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<SharedModule>;
 }
 //# sourceMappingURL=shared.module.d.ts.map

package/lib/shared/shared.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.module.d.ts","sourceRoot":"","sources":["../../../../projects/media-viewer/src/lib/shared/shared.module.ts"],"names":[],"mappings":";;;;;;;;AAWA,qBAsBa,YAAY;yCAAZ,YAAY;0CAAZ,YAAY;0CAAZ,YAAY;CAAG"}
+{"version":3,"file":"shared.module.d.ts","sourceRoot":"","sources":["../../../../projects/media-viewer/src/lib/shared/shared.module.ts"],"names":[],"mappings":";;;;;;;;;AAUA,qBAuBa,YAAY;yCAAZ,YAAY;0CAAZ,YAAY;0CAAZ,YAAY;CAAG"}

package/lib/toolbar/highlight-toolbar/highlight-toolbar.component.d.ts

@@ -1,18 +1,24 @@
 import { OnDestroy, OnInit } from '@angular/core';
 import { ToolbarEventService } from '../toolbar-event.service';
 import { ToolbarButtonVisibilityService } from '../toolbar-button-visibility.service';
+import { ToolbarFocusService } from '../toolbar-focus.service';
 import * as i0 from "@angular/core";
 export declare class HighlightToolbarComponent implements OnInit, OnDestroy {
     readonly toolbarEventService: ToolbarEventService;
     readonly toolbarButtons: ToolbarButtonVisibilityService;
+    private readonly toolbarFocusService;
     private subscriptions;
     redactionAllInProgress: boolean;
-    constructor(toolbarEventService: ToolbarEventService, toolbarButtons: ToolbarButtonVisibilityService);
+    constructor(toolbarEventService: ToolbarEventService, toolbarButtons: ToolbarButtonVisibilityService, toolbarFocusService: ToolbarFocusService);
     ngOnInit(): void;
     onAllSearch(): void;
     onHighlight(): void;
     onClickDrawToggle(): void;
     onClose(): void;
+    onEscapeKey(event: KeyboardEvent): void;
+    onArrowUp(event: KeyboardEvent): void;
+    private closeAndReturnFocus;
+    private returnFocusToMainToolbar;
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<HighlightToolbarComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<HighlightToolbarComponent, "mv-highlight-toolbar", never, {}, {}, never, never, false, never>;

package/lib/toolbar/highlight-toolbar/highlight-toolbar.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"highlight-toolbar.component.d.ts","sourceRoot":"","sources":["../../../../../projects/media-viewer/src/lib/toolbar/highlight-toolbar/highlight-toolbar.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAA0B,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;;AAMtF,qBAKa,yBAA0B,YAAW,MAAM,EAAE,SAAS;aAKrC,mBAAmB,EAAE,mBAAmB;aAClD,cAAc,EAAE,8BAA8B;IAJhE,OAAO,CAAC,aAAa,CAAsB;IAC3C,sBAAsB,EAAE,OAAO,CAAC;gBAEJ,mBAAmB,EAAE,mBAAmB,EAClD,cAAc,EAAE,8BAA8B;IAEhE,QAAQ,IAAI,IAAI;IAMhB,WAAW;IAIX,WAAW;IAIX,iBAAiB;IAIjB,OAAO;IAMP,WAAW,IAAI,IAAI;yCAhCR,yBAAyB;2CAAzB,yBAAyB;CAsCrC"}
+{"version":3,"file":"highlight-toolbar.component.d.ts","sourceRoot":"","sources":["../../../../../projects/media-viewer/src/lib/toolbar/highlight-toolbar/highlight-toolbar.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAC3E,OAAO,EAA0B,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;;AAM/D,qBAKa,yBAA0B,YAAW,MAAM,EAAE,SAAS;aAKrC,mBAAmB,EAAE,mBAAmB;aAClD,cAAc,EAAE,8BAA8B;IAC9D,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IALtC,OAAO,CAAC,aAAa,CAAsB;IAC3C,sBAAsB,EAAE,OAAO,CAAC;gBAEJ,mBAAmB,EAAE,mBAAmB,EAClD,cAAc,EAAE,8BAA8B,EAC7C,mBAAmB,EAAE,mBAAmB;IAG3D,QAAQ,IAAI,IAAI;IAMhB,WAAW;IAIX,WAAW;IAIX,iBAAiB;IAIjB,OAAO;IAOP,WAAW,CAAC,KAAK,EAAE,aAAa;IAOhC,SAAS,CAAC,KAAK,EAAE,aAAa;IAQ9B,OAAO,CAAC,mBAAmB;IAK3B,OAAO,CAAC,wBAAwB;IAIhC,WAAW,IAAI,IAAI;yCA3DR,yBAAyB;2CAAzB,yBAAyB;CAiErC"}

package/lib/toolbar/main-toolbar/main-toolbar.component.d.ts

@@ -4,6 +4,7 @@ import { ToolbarEventService } from '../toolbar-event.service';
 import { ToolbarButtonVisibilityService } from '../toolbar-button-visibility.service';
 import { NumberHelperService } from '../../../lib/shared/util/services/number.helper.service';
 import { IcpEventService } from '../icp-event.service';
+import { ToolbarFocusService } from '../toolbar-focus.service';
 import * as i0 from "@angular/core";
 export declare class MainToolbarComponent implements OnInit, OnDestroy, AfterViewInit {
     readonly toolbarEvents: ToolbarEventService;
@@ -11,6 +12,7 @@ export declare class MainToolbarComponent implements OnInit, OnDestroy, AfterVie
     private readonly cdr;
     private readonly numberHelper;
     private readonly icpEventService;
+    private readonly toolbarFocusService;
     enableAnnotations: boolean;
     enableRedactions: boolean;
     enableICP: boolean;
@@ -30,19 +32,25 @@ export declare class MainToolbarComponent implements OnInit, OnDestroy, AfterVie
     isIndexOpen: boolean;
     isRedactOpen: boolean;
     isCommentsOpen: boolean;
+    isHighlightOpen: boolean;
     dropdownMenuPositions: ConnectionPositionPair[];
     zoomScales: number[];
     allButtonsWidth: number;
     widthRequiredForBtn: {
         [id: string]: number;
     };
-    constructor(toolbarEvents: ToolbarEventService, toolbarButtons: ToolbarButtonVisibilityService, cdr: ChangeDetectorRef, numberHelper: NumberHelperService, icpEventService: IcpEventService);
+    constructor(toolbarEvents: ToolbarEventService, toolbarButtons: ToolbarButtonVisibilityService, cdr: ChangeDetectorRef, numberHelper: NumberHelperService, icpEventService: IcpEventService, toolbarFocusService: ToolbarFocusService);
     ngOnInit(): void;
     ngOnDestroy(): void;
     ngAfterViewInit(): void;
     onResize(): void;
     onControlPrint(event: KeyboardEvent): void;
+    onEscapeKey(event: KeyboardEvent): void;
+    onMoreOptionsKeyDown(event: KeyboardEvent): void;
+    onHighlightKeyDown(event: KeyboardEvent): void;
     onClickHighlightToggle(): void;
+    private openHighlightToolbarAndFocus;
+    private focusHighlightButton;
     onClickDrawToggle(): void;
     toggleIndexSideBar(): void;
     onToolBarOffSetChange(buttonId: string): "button-hidden-on-toolbar" | "button-hidden-on-dropdown";
@@ -59,6 +67,9 @@ export declare class MainToolbarComponent implements OnInit, OnDestroy, AfterVie
     stepZoom(zoomFactor: number): void;
     toggleCommentsPanel(): void;
     toggleRedactBar(): void;
+    onRedactKeyDown(event: KeyboardEvent): void;
+    private openRedactToolbarAndFocus;
+    private focusRedactButton;
     toggleGrabNDrag(): void;
     isPdf(): boolean;
     toggleSearchBar(): void;

package/lib/toolbar/main-toolbar/main-toolbar.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main-toolbar.component.d.ts","sourceRoot":"","sources":["../../../../../projects/media-viewer/src/lib/toolbar/main-toolbar/main-toolbar.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,aAAa,EACb,iBAAiB,EAEjB,UAAU,EAGV,SAAS,EACT,MAAM,EAEP,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC9F,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;;AAGvD,qBAIa,oBAAqB,YAAW,MAAM,EAAE,SAAS,EAAE,aAAa;aA6CzD,aAAa,EAAE,mBAAmB;aAClC,cAAc,EAAE,8BAA8B;IAC9D,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe;IA/CzB,iBAAiB,UAAS;IAC1B,gBAAgB,UAAS;IACzB,SAAS,UAAS;IAClB,WAAW,MAAQ;IAEuB,UAAU,EAAE,UAAU,CAAC;IACpB,aAAa,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IACxC,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IAE1F,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IAE7C,UAAU,UAAS;IACnB,gBAAgB,UAAS;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;IAE7B,UAAU,SAAK;IACf,SAAS,SAAK;IACd,kBAAkB,UAAS;IAC3B,eAAe,UAAS;IACxB,WAAW,UAAS;IACpB,YAAY,UAAS;IACrB,cAAc,UAAS;IACvB,qBAAqB,2BAY1B;IAEK,UAAU,WAAmD;IAEpE,eAAe,SAAK;IACpB,mBAAmB,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAM;gBAGjC,aAAa,EAAE,mBAAmB,EAClC,cAAc,EAAE,8BAA8B,EAC7C,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,mBAAmB,EACjC,eAAe,EAAE,eAAe;IAI5C,QAAQ;IAqBR,WAAW,IAAI,IAAI;IAMnB,eAAe;IASf,QAAQ;IAMR,cAAc,CAAC,KAAK,EAAE,aAAa;IAKnC,sBAAsB;IAGtB,iBAAiB;IAIjB,kBAAkB;IAUlB,qBAAqB,CAAC,QAAQ,EAAE,MAAM;IAQtC,sBAAsB;IAUtB,gBAAgB;IAKhB,kBAAkB;IAIlB,kBAAkB;IAIlB,uBAAuB,CAAC,UAAU,EAAE,MAAM;IAWjD,OAAO,CAAC,cAAc;IAIf,MAAM,CAAC,QAAQ,EAAE,MAAM;IAIvB,SAAS;IAIT,YAAY;IAIZ,IAAI,CAAC,UAAU,EAAE,MAAM;IAIvB,QAAQ,CAAC,UAAU,EAAE,MAAM;IAK3B,mBAAmB;IAKnB,eAAe;IAKf,eAAe;IAIf,KAAK;IAIL,eAAe;IAIf,iBAAiB;yCA9Mb,oBAAoB;2CAApB,oBAAoB;CAsNhC"}
+{"version":3,"file":"main-toolbar.component.d.ts","sourceRoot":"","sources":["../../../../../projects/media-viewer/src/lib/toolbar/main-toolbar/main-toolbar.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,aAAa,EACb,iBAAiB,EAEjB,UAAU,EAGV,SAAS,EACT,MAAM,EAEP,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yDAAyD,CAAC;AAC9F,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;;AAG/D,qBAIa,oBAAqB,YAAW,MAAM,EAAE,SAAS,EAAE,aAAa;aA8CzD,aAAa,EAAE,mBAAmB;aAClC,cAAc,EAAE,8BAA8B;IAC9D,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAjD7B,iBAAiB,UAAS;IAC1B,gBAAgB,UAAS;IACzB,SAAS,UAAS;IAClB,WAAW,MAAQ;IAEuB,UAAU,EAAE,UAAU,CAAC;IACpB,aAAa,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IACxC,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;IAE1F,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsB;IAE7C,UAAU,UAAS;IACnB,gBAAgB,UAAS;IACzB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,mBAAmB,EAAE,OAAO,CAAC;IAE7B,UAAU,SAAK;IACf,SAAS,SAAK;IACd,kBAAkB,UAAS;IAC3B,eAAe,UAAS;IACxB,WAAW,UAAS;IACpB,YAAY,UAAS;IACrB,cAAc,UAAS;IACvB,eAAe,UAAS;IACxB,qBAAqB,2BAY1B;IAEK,UAAU,WAAmD;IAEpE,eAAe,SAAK;IACpB,mBAAmB,EAAE;QAAE,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAM;gBAGjC,aAAa,EAAE,mBAAmB,EAClC,cAAc,EAAE,8BAA8B,EAC7C,GAAG,EAAE,iBAAiB,EACtB,YAAY,EAAE,mBAAmB,EACjC,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,mBAAmB;IAIpD,QAAQ;IAyBR,WAAW,IAAI,IAAI;IAMnB,eAAe;IASf,QAAQ;IAMR,cAAc,CAAC,KAAK,EAAE,aAAa;IAMnC,WAAW,CAAC,KAAK,EAAE,aAAa;IAShC,oBAAoB,CAAC,KAAK,EAAE,aAAa;IAQzC,kBAAkB,CAAC,KAAK,EAAE,aAAa;IAYvC,sBAAsB;IAI7B,OAAO,CAAC,4BAA4B;IAOpC,OAAO,CAAC,oBAAoB;IAIrB,iBAAiB;IAIjB,kBAAkB;IAUlB,qBAAqB,CAAC,QAAQ,EAAE,MAAM;IAQtC,sBAAsB;IAUtB,gBAAgB;IAKhB,kBAAkB;IAIlB,kBAAkB;IAIlB,uBAAuB,CAAC,UAAU,EAAE,MAAM;IAWjD,OAAO,CAAC,cAAc;IAIf,MAAM,CAAC,QAAQ,EAAE,MAAM;IAIvB,SAAS;IAIT,YAAY;IAIZ,IAAI,CAAC,UAAU,EAAE,MAAM;IAIvB,QAAQ,CAAC,UAAU,EAAE,MAAM;IAK3B,mBAAmB;IAKnB,eAAe;IAIf,eAAe,CAAC,KAAK,EAAE,aAAa;IAY3C,OAAO,CAAC,yBAAyB;IAOjC,OAAO,CAAC,iBAAiB;IAIlB,eAAe;IAIf,KAAK;IAIL,eAAe;IAIf,iBAAiB;yCApRb,oBAAoB;2CAApB,oBAAoB;CA0RhC"}

package/lib/toolbar/redaction-toolbar/redaction-toolbar.component.d.ts

@@ -3,17 +3,19 @@ import { ToolbarEventService } from '../toolbar-event.service';
 import { Store } from '@ngrx/store';
 import * as fromStore from '../../store/reducers/reducers';
 import { ToolbarButtonVisibilityService } from '../toolbar-button-visibility.service';
+import { ToolbarFocusService } from '../toolbar-focus.service';
 import * as i0 from "@angular/core";
 export declare class RedactionToolbarComponent implements OnInit, OnDestroy {
     readonly toolbarEventService: ToolbarEventService;
     readonly toolbarButtons: ToolbarButtonVisibilityService;
     private store;
+    private readonly toolbarFocusService;
     showRedactSearch: boolean;
     preview: boolean;
     hasRedactions: boolean;
     private subscriptions;
     redactionAllInProgress: boolean;
-    constructor(toolbarEventService: ToolbarEventService, toolbarButtons: ToolbarButtonVisibilityService, store: Store<fromStore.AnnotationSetState>);
+    constructor(toolbarEventService: ToolbarEventService, toolbarButtons: ToolbarButtonVisibilityService, store: Store<fromStore.AnnotationSetState>, toolbarFocusService: ToolbarFocusService);
     ngOnInit(): void;
     onRedactAllSearch(): void;
     toggleTextRedactionMode(): void;
@@ -23,6 +25,9 @@ export declare class RedactionToolbarComponent implements OnInit, OnDestroy {
     redact(): void;
     toggleRedactBar(): void;
     redactPage(): void;
+    onEscapeKey(event: KeyboardEvent): void;
+    onArrowUp(event: KeyboardEvent): void;
+    private returnFocusToMainToolbar;
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<RedactionToolbarComponent, never>;
     static ɵcmp: i0.ɵɵComponentDeclaration<RedactionToolbarComponent, "mv-redaction-toolbar", never, { "showRedactSearch": { "alias": "showRedactSearch"; "required": false; }; }, {}, never, never, false, never>;

package/lib/toolbar/redaction-toolbar/redaction-toolbar.component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redaction-toolbar.component.d.ts","sourceRoot":"","sources":["../../../../../projects/media-viewer/src/lib/toolbar/redaction-toolbar/redaction-toolbar.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACpE,OAAO,EAAc,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAU,KAAK,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;;AAGtF,qBAIa,yBAA0B,YAAW,MAAM,EAAE,SAAS;aAUrC,mBAAmB,EAAE,mBAAmB;aAClD,cAAc,EAAE,8BAA8B;IAC9D,OAAO,CAAC,KAAK;IAVN,gBAAgB,EAAE,OAAO,CAAC;IAEnC,OAAO,UAAS;IAChB,aAAa,UAAS;IAEtB,OAAO,CAAC,aAAa,CAAsB;IAC3C,sBAAsB,EAAE,OAAO,CAAC;gBAEJ,mBAAmB,EAAE,mBAAmB,EAClD,cAAc,EAAE,8BAA8B,EACtD,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC;IAEpD,QAAQ,IAAI,IAAI;IAShB,iBAAiB;IAIjB,uBAAuB;IAIvB,cAAc;IAId,aAAa;IAKb,SAAS;IAIT,MAAM;IAIN,eAAe;IAIf,UAAU;IAKV,WAAW,IAAI,IAAI;yCAzDR,yBAAyB;2CAAzB,yBAAyB;CA8DrC"}
+{"version":3,"file":"redaction-toolbar.component.d.ts","sourceRoot":"","sources":["../../../../../projects/media-viewer/src/lib/toolbar/redaction-toolbar/redaction-toolbar.component.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkC,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,EAAc,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAU,KAAK,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,KAAK,SAAS,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,8BAA8B,EAAE,MAAM,sCAAsC,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;;AAG/D,qBAIa,yBAA0B,YAAW,MAAM,EAAE,SAAS;aAUrC,mBAAmB,EAAE,mBAAmB;aAClD,cAAc,EAAE,8BAA8B;IAC9D,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAX7B,gBAAgB,EAAE,OAAO,CAAC;IAEnC,OAAO,UAAS;IAChB,aAAa,UAAS;IAEtB,OAAO,CAAC,aAAa,CAAsB;IAC3C,sBAAsB,EAAE,OAAO,CAAC;gBAEJ,mBAAmB,EAAE,mBAAmB,EAClD,cAAc,EAAE,8BAA8B,EACtD,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,EACjC,mBAAmB,EAAE,mBAAmB;IAG3D,QAAQ,IAAI,IAAI;IAShB,iBAAiB;IAIjB,uBAAuB;IAIvB,cAAc;IAId,aAAa;IAKb,SAAS;IAIT,MAAM;IAIN,eAAe;IAIf,UAAU;IAMV,WAAW,CAAC,KAAK,EAAE,aAAa;IAQhC,SAAS,CAAC,KAAK,EAAE,aAAa;IAQ9B,OAAO,CAAC,wBAAwB;IAIhC,WAAW,IAAI,IAAI;yCAhFR,yBAAyB;2CAAzB,yBAAyB;CAqFrC"}

package/lib/toolbar/toolbar-focus.service.d.ts

@@ -0,0 +1,7 @@
+import * as i0 from "@angular/core";
+export declare class ToolbarFocusService {
+    focusToolbarButton(toolbarSelector: string, buttonId?: string, delay?: number): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ToolbarFocusService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<ToolbarFocusService>;
+}
+//# sourceMappingURL=toolbar-focus.service.d.ts.map

package/lib/toolbar/toolbar-focus.service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toolbar-focus.service.d.ts","sourceRoot":"","sources":["../../../../projects/media-viewer/src/lib/toolbar/toolbar-focus.service.ts"],"names":[],"mappings":";AAEA,qBACa,mBAAmB;IAC9B,kBAAkB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,IAAI;yCADpE,mBAAmB;6CAAnB,mBAAmB;CA2B/B"}

package/lib/toolbar/toolbar.module.d.ts

@@ -11,10 +11,11 @@ import * as i9 from "@angular/forms";
 import * as i10 from "@angular/cdk/overlay";
 import * as i11 from "@angular/router";
 import * as i12 from "rpx-xui-translation";
+import * as i13 from "../shared/shared.module";
 export { ToolbarButtonVisibilityService } from './toolbar-button-visibility.service';
 export declare class ToolbarModule {
     static ɵfac: i0.ɵɵFactoryDeclaration<ToolbarModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<ToolbarModule, [typeof i1.SearchBarComponent, typeof i2.MainToolbarComponent, typeof i3.RedactionToolbarComponent, typeof i4.IcpToolbarComponent, typeof i5.RedactionSearchBarComponent, typeof i6.HighlightToolbarComponent, typeof i7.TooltipDismissDirective], [typeof i8.CommonModule, typeof i9.FormsModule, typeof i10.OverlayModule, typeof i11.RouterModule, typeof i12.RpxTranslationModule], [typeof i2.MainToolbarComponent, typeof i1.SearchBarComponent, typeof i3.RedactionToolbarComponent, typeof i4.IcpToolbarComponent, typeof i5.RedactionSearchBarComponent, typeof i6.HighlightToolbarComponent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<ToolbarModule, [typeof i1.SearchBarComponent, typeof i2.MainToolbarComponent, typeof i3.RedactionToolbarComponent, typeof i4.IcpToolbarComponent, typeof i5.RedactionSearchBarComponent, typeof i6.HighlightToolbarComponent, typeof i7.TooltipDismissDirective], [typeof i8.CommonModule, typeof i9.FormsModule, typeof i10.OverlayModule, typeof i11.RouterModule, typeof i12.RpxTranslationModule, typeof i13.SharedModule], [typeof i2.MainToolbarComponent, typeof i1.SearchBarComponent, typeof i3.RedactionToolbarComponent, typeof i4.IcpToolbarComponent, typeof i5.RedactionSearchBarComponent, typeof i6.HighlightToolbarComponent]>;
     static ɵinj: i0.ɵɵInjectorDeclaration<ToolbarModule>;
 }
 //# sourceMappingURL=toolbar.module.d.ts.map

package/lib/toolbar/toolbar.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolbar.module.d.ts","sourceRoot":"","sources":["../../../../projects/media-viewer/src/lib/toolbar/toolbar.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AASA,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AAQrF,qBA6Ba,aAAa;yCAAb,aAAa;0CAAb,aAAa;0CAAb,aAAa;CAAI"}
+{"version":3,"file":"toolbar.module.d.ts","sourceRoot":"","sources":["../../../../projects/media-viewer/src/lib/toolbar/toolbar.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAUA,OAAO,EAAE,8BAA8B,EAAE,MAAM,qCAAqC,CAAC;AASrF,qBA+Ba,aAAa;yCAAb,aAAa;0CAAb,aAAa;0CAAb,aAAa;CAAI"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/media-viewer",
-  "version": "4.1.9-exui-2821-1",
+  "version": "4.1.10-exui-3053",
   "description": "Media Viewer",
   "keywords": [
     "Angular",