Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Merge branch 'RED-7605' into 'master'

Browse Source 
RED-7605: Fixed search.

See merge request redactmanager/red-ui!94
This commit is contained in:
Dan Percic 2023-09-20 10:55:30 +02:00
commit d7b2943ecf
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/red-ui/src/app/modules/file-preview/file-preview-screen.component.ts
View File

@ -382,7 +382,7 @@ export class FilePreviewScreenComponent
} }
} }
@HostListener('window:keyup', ['$event']) @HostListener('document:keyup', ['$event'])
handleKeyEvent($event: KeyboardEvent) { handleKeyEvent($event: KeyboardEvent) {
if (this._router.url.indexOf('/file/') < 0) { if (this._router.url.indexOf('/file/') < 0) {
return; return;
@ -396,6 +396,7 @@ export class FilePreviewScreenComponent
this.fullScreen = false; this.fullScreen = false;
this.closeFullScreen(); this.closeFullScreen();
this.pdf.deactivateSearch(); this.pdf.deactivateSearch();
window.focus();
this._changeRef.markForCheck(); this._changeRef.markForCheck();
} }

13
apps/red-ui/src/app/modules/pdf-viewer/services/pdf-viewer.service.ts
View File

@ -102,6 +102,10 @@ export class PdfViewer {
return page$.pipe(map(page => this.#adjustPage(page))); return page$.pipe(map(page => this.#adjustPage(page)));
} }
get searchActive() {
return this.instance.UI.isElementOpen('searchPanel');
}
focusSearch() { focusSearch() {
const iframeWindow = this.#instance.UI.iframeWindow; const iframeWindow = this.#instance.UI.iframeWindow;
const input = iframeWindow.document.getElementById('SearchPanel__input') as HTMLInputElement; const input = iframeWindow.document.getElementById('SearchPanel__input') as HTMLInputElement;
@ -260,8 +264,13 @@ export class PdfViewer {
#listenForCommandF() { #listenForCommandF() {
this.#instance.UI.hotkeys.on('command+f, ctrl+f', e => { this.#instance.UI.hotkeys.on('command+f, ctrl+f', e => {
e.preventDefault(); e.preventDefault();
this.activateSearch(); if (!this.searchActive) {
this.focusSearch(); this.activateSearch();
this.focusSearch();
}
if (this.documentViewer.getSelectedText()) {
this.#searchForSelectedText();
}
}); });
} }