Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
feat(frontend:files): implement common file viewer search
johavenae3866ebcc75
diff --git a/frontend/src/app/applications/files/components/viewers/components/files-viewer-search-adapter.ts b/frontend/src/app/applications/files/components/viewers/components/files-viewer-search-adapter.tsnew file mode 100644index 00000000..c97c7fe9--- /dev/null+++ b/frontend/src/app/applications/files/components/viewers/components/files-viewer-search-adapter.ts@@ -0,0 +1,373 @@+import { signal, type Signal } from '@angular/core'+import { type Extension as CodeMirrorExtension, Prec } from '@codemirror/state'+import {+ closeSearchPanel,+ findNext,+ findPrevious,+ getSearchQuery,+ openSearchPanel,+ search,+ searchPanelOpen,+ SearchQuery,+ setSearchQuery+} from '@codemirror/search'+import { EditorView } from '@codemirror/view'+import { type Editor as TipTapEditor, Extension as TipTapExtension } from '@tiptap/core'+import type { Node as ProseMirrorNode } from '@tiptap/pm/model'+import { Plugin, PluginKey, TextSelection } from '@tiptap/pm/state'+import { Decoration, DecorationSet } from '@tiptap/pm/view'++export interface FileViewerSearchAdapter {+ readonly currentIndex: Signal<number>+ readonly isOpen: Signal<boolean>+ readonly matchCount: Signal<number>++ close(): void+ next(): void+ open(): void+ previous(): void+ setQuery(query: string): void+ sync(): void+ toggle(): void+}++interface SearchMatch {+ from: number+ to: number+}++interface TipTapSearchPluginState {+ decorations: DecorationSet+ matches: SearchMatch[]+ query: string+}++abstract class BaseFileViewerSearchAdapter implements FileViewerSearchAdapter {+ private readonly currentIndexSignal = signal(0)+ readonly currentIndex = this.currentIndexSignal.asReadonly()+ private readonly isOpenSignal = signal(false)+ readonly isOpen = this.isOpenSignal.asReadonly()+ private readonly matchCountSignal = signal(0)+ readonly matchCount = this.matchCountSignal.asReadonly()++ abstract close(): void+ abstract next(): void+ abstract open(): void+ abstract previous(): void+ abstract setQuery(query: string): void+ abstract sync(): void++ toggle() {+ if (this.isOpen()) {+ this.close()+ return+ }+ this.open()+ }++ protected resetMatches() {+ this.setMatches(0, 0)+ }++ protected resetState() {+ this.setOpen(false)+ this.resetMatches()+ }++ protected setMatches(currentIndex: number, matchCount: number) {+ this.currentIndexSignal.set(currentIndex)+ this.matchCountSignal.set(matchCount)+ }++ protected setOpen(isOpen: boolean) {+ this.isOpenSignal.set(isOpen)+ }+}++export class CodeMirrorFileViewerSearchAdapter extends BaseFileViewerSearchAdapter {+ readonly extensions: CodeMirrorExtension[] = [+ Prec.highest(+ EditorView.domEventHandlers({+ keydown: (event) => {+ if (!this.isSearchShortcut(event)) return false+ event.preventDefault()+ event.stopPropagation()+ this.toggle()+ return true+ }+ })+ ),+ search({+ createPanel: () => {+ const dom = document.createElement('div')+ dom.className = 'files-viewer-search-hidden-panel'+ dom.hidden = true+ return { dom }+ }+ }),+ EditorView.updateListener.of((update) => {+ if (update.docChanged || update.selectionSet) {+ this.syncView(update.view)+ }+ })+ ]+ private query = ''++ constructor(private readonly getView: () => EditorView | null | undefined) {+ super()+ }++ override close() {+ const view = this.getView()+ if (view) closeSearchPanel(view)+ this.setOpen(false)+ this.resetMatches()+ }++ override next() {+ const view = this.getView()+ if (!view) return+ findNext(view)+ this.syncView(view)+ }++ override open() {+ const view = this.getView()+ if (!view) return+ openSearchPanel(view)+ this.dispatchQuery(view, this.query)+ this.syncView(view)+ }++ override previous() {+ const view = this.getView()+ if (!view) return+ findPrevious(view)+ this.syncView(view)+ }++ override setQuery(query: string) {+ const view = this.getView()+ this.query = query+ if (!view) {+ this.resetState()+ return+ }+ this.dispatchQuery(view, query)+ this.syncView(view)+ }++ override sync() {+ const view = this.getView()+ if (!view) {+ this.resetState()+ return+ }+ this.syncView(view)+ }++ override toggle() {+ this.sync()+ super.toggle()+ }++ private isSearchShortcut(event: KeyboardEvent): boolean {+ return (event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 'f'+ }++ private syncView(view: EditorView) {+ const isOpen = searchPanelOpen(view.state)+ this.setOpen(isOpen)+ if (!isOpen) {+ this.resetMatches()+ return+ }+ const query = getSearchQuery(view.state)+ if (!query.search || !query.valid) {+ this.resetMatches()+ return+ }++ const selection = view.state.selection.main+ let currentIndex = 0+ let matchCount = 0+ const cursor = query.getCursor(view.state)++ for (let match = cursor.next(); !match.done; match = cursor.next()) {+ matchCount+++ if (match.value.from === selection.from && match.value.to === selection.to) {+ currentIndex = matchCount+ }+ }++ this.setMatches(currentIndex, matchCount)+ }++ private dispatchQuery(view: EditorView, query: string) {+ view.dispatch({ effects: setSearchQuery.of(new SearchQuery({ search: query })) })+ }+}++export class TipTapFileViewerSearchAdapter extends BaseFileViewerSearchAdapter {+ private readonly pluginKey = new PluginKey<TipTapSearchPluginState>('fileViewerSearch')+ private readonly plugin = this.createPlugin()+ readonly extension = TipTapExtension.create({+ name: 'fileViewerSearch',+ addProseMirrorPlugins: () => [this.plugin]+ })+ private query = ''++ constructor(private readonly getEditor: () => TipTapEditor | null | undefined) {+ super()+ }++ override close() {+ this.setOpen(false)+ this.dispatchSearch('')+ this.resetMatches()+ }++ override next() {+ this.selectMatch(this.currentIndex() >= this.matchCount() ? 1 : this.currentIndex() + 1)+ }++ override open() {+ this.setOpen(true)+ this.dispatchSearch(this.query)+ this.sync()+ }++ override previous() {+ this.selectMatch(this.currentIndex() <= 1 ? this.matchCount() : this.currentIndex() - 1)+ }++ override setQuery(query: string) {+ this.query = query+ this.dispatchSearch(query)+ this.sync()+ }++ override sync() {+ const editor = this.getEditor()+ if (!editor || editor.isDestroyed) {+ this.resetMatches()+ return+ }+ const searchState = this.pluginKey.getState(editor.state)+ if (!searchState) {+ this.resetMatches()+ return+ }+ const selection = editor.state.selection+ const currentIndex = searchState.matches.findIndex((match) => match.from === selection.from && match.to === selection.to)+ this.setMatches(currentIndex === -1 ? 0 : currentIndex + 1, searchState.matches.length)+ }++ private createPlugin(): Plugin<TipTapSearchPluginState> {+ return new Plugin<TipTapSearchPluginState>({+ key: this.pluginKey,+ state: {+ init: (_config, state) => this.createPluginState(state.doc, '', state.selection),+ apply: (transaction, previous, _oldState, newState) => {+ const query = transaction.getMeta(this.pluginKey) as string | undefined+ if (query !== undefined) {+ return this.createPluginState(newState.doc, query, newState.selection)+ }+ if (transaction.docChanged || transaction.selectionSet) {+ return this.createPluginState(newState.doc, previous.query, newState.selection)+ }+ return previous+ }+ },+ props: {+ decorations: (state) => this.pluginKey.getState(state)?.decorations+ }+ })+ }++ private createPluginState(doc: ProseMirrorNode, query: string, selection: { from: number; to: number }): TipTapSearchPluginState {+ const matches = this.findMatches(doc, query)+ const decorations = DecorationSet.create(+ doc,+ matches.map((match) =>+ Decoration.inline(match.from, match.to, {+ class: match.from === selection.from && match.to === selection.to ? 'files-viewer-search-match is-current' : 'files-viewer-search-match'+ })+ )+ )+ return { decorations, matches, query }+ }++ private dispatchSearch(query: string) {+ const editor = this.getEditor()+ if (!editor || editor.isDestroyed) return+ editor.view.dispatch(editor.state.tr.setMeta(this.pluginKey, query))+ }++ private findMatches(doc: ProseMirrorNode, query: string): SearchMatch[] {+ const needle = query.toLocaleLowerCase()+ if (!needle) return []++ const matches: SearchMatch[] = []+ doc.descendants((node, position) => {+ if (!node.isText || !node.text) return+ matches.push(...this.findTextMatches(node.text, needle, position))+ })+ return matches+ }++ private findTextMatches(text: string, needle: string, position: number): SearchMatch[] {+ const matches: SearchMatch[] = []+ const haystack = text.toLocaleLowerCase()+ let index = haystack.indexOf(needle)++ while (index !== -1) {+ const end = index + needle.length+ matches.push({ from: position + index, to: position + end })+ index = haystack.indexOf(needle, index + needle.length)+ }++ return matches+ }++ private selectMatch(index: number) {+ const editor = this.getEditor()+ if (!editor || editor.isDestroyed || index < 1) return+ const searchState = this.pluginKey.getState(editor.state)+ const match = searchState?.matches[index - 1]+ if (!match) return++ editor.view.dispatch(editor.state.tr.setSelection(TextSelection.create(editor.state.doc, match.from, match.to)).scrollIntoView())+ this.scrollMatchIntoView(editor, match)+ this.sync()+ }++ private scrollMatchIntoView(editor: TipTapEditor, match: SearchMatch) {+ setTimeout(() => {+ if (editor.isDestroyed) return+ const scrollContainer = this.findScrollContainer(editor.view.dom)+ if (!scrollContainer) return++ const matchTop = editor.view.coordsAtPos(match.from).top+ const containerRect = scrollContainer.getBoundingClientRect()+ const offsetTop = matchTop - containerRect.top+ const scrollMargin = Math.min(120, containerRect.height / 3)++ if (offsetTop < scrollMargin) {+ scrollContainer.scrollTop += offsetTop - scrollMargin+ } else if (offsetTop > containerRect.height - scrollMargin) {+ scrollContainer.scrollTop += offsetTop - containerRect.height + scrollMargin+ }+ })+ }++ private findScrollContainer(element: HTMLElement): HTMLElement | null {+ for (let parent = element.parentElement; parent; parent = parent.parentElement) {+ const style = getComputedStyle(parent)+ if (/(auto|scroll)/.test(style.overflowY) && parent.scrollHeight > parent.clientHeight) {+ return parent+ }+ }+ return null+ }+}diff --git a/frontend/src/app/applications/files/components/viewers/components/files-viewer-search.component.html b/frontend/src/app/applications/files/components/viewers/components/files-viewer-search.component.htmlnew file mode 100644index 00000000..127472ce--- /dev/null+++ b/frontend/src/app/applications/files/components/viewers/components/files-viewer-search.component.html@@ -0,0 +1,34 @@+@if (adapter().isOpen()) {+ <div class="files-viewer-search">+ <fa-icon class="files-viewer-search-icon" [icon]="icons.faMagnifyingGlass"></fa-icon>+ <input+ #searchInput+ (keydown)="searchKeyDown($event)"+ (ngModelChange)="queryChange($event)"+ [ngModel]="query()"+ autocomplete="off"+ class="files-viewer-search-input"+ type="search" />+ <span class="files-viewer-search-count">{{ adapter().currentIndex() }} / {{ adapter().matchCount() }}</span>+ <button+ (click)="adapter().previous()"+ [disabled]="!adapter().matchCount()"+ class="btn btn-sm btn-custom files-viewer-search-button"+ type="button">+ <fa-icon [icon]="icons.faChevronUp"></fa-icon>+ </button>+ <button+ (click)="adapter().next()"+ [disabled]="!adapter().matchCount()"+ class="btn btn-sm btn-custom files-viewer-search-button"+ type="button">+ <fa-icon [icon]="icons.faChevronDown"></fa-icon>+ </button>+ <button+ (click)="adapter().close()"+ class="btn btn-sm btn-custom files-viewer-search-button"+ type="button">+ <fa-icon [icon]="icons.faXmark"></fa-icon>+ </button>+ </div>+}diff --git a/frontend/src/app/applications/files/components/viewers/components/files-viewer-search.component.scss b/frontend/src/app/applications/files/components/viewers/components/files-viewer-search.component.scssnew file mode 100644index 00000000..6c5c6e0b--- /dev/null+++ b/frontend/src/app/applications/files/components/viewers/components/files-viewer-search.component.scss@@ -0,0 +1,86 @@+:host {+ position: absolute;+ right: 0;+ bottom: 0;+ left: 0;+ z-index: 4;+ display: block;+}++.files-viewer-search {+ display: flex;+ align-items: center;+ width: 100%;+ min-height: 36px;+ padding: 0 0.35rem 0 0;+ overflow: hidden;+ border-top: 1px solid rgba(128, 128, 128, 0.28);+ background: #fff;+ color: #1f2933;+}++.files-viewer-search-icon {+ flex: 0 0 auto;+ padding: 0 0.55rem;+ opacity: 0.7;+}++.files-viewer-search-input {+ flex: 1 1 auto;+ min-width: 4rem;+ height: 30px;+ border: 0;+ outline: 0;+ background: transparent;+ color: inherit;+}++.files-viewer-search-count {+ flex: 0 0 auto;+ min-width: 3.5rem;+ padding: 0 0.6rem 0 0.45rem;+ color: inherit;+ font-size: 0.78rem;+ text-align: right;+ opacity: 0.72;+}++.files-viewer-search-button {+ position: relative;+ flex: 0 0 auto;+ width: 28px;+ height: 26px;+ margin: 2px 1px;+ padding: 0;+ border: 0;++ &:first-of-type {+ margin-left: 5px;++ &::before {+ position: absolute;+ top: 6px;+ bottom: 6px;+ left: -4px;+ width: 1px;+ content: '';+ background: rgba(128, 128, 128, 0.2);+ }+ }+}++:host-context(body.theme-dark) {+ .files-viewer-search {+ border-top-color: rgba(132, 157, 185, 0.28);+ background: #202a2f;+ color: #d7dde8;+ }++ .files-viewer-search-input::placeholder {+ color: rgba(215, 221, 232, 0.55);+ }++ .files-viewer-search-button:first-of-type::before {+ background: rgba(132, 157, 185, 0.28);+ }+}diff --git a/frontend/src/app/applications/files/components/viewers/components/files-viewer-search.component.ts b/frontend/src/app/applications/files/components/viewers/components/files-viewer-search.component.tsnew file mode 100644index 00000000..3841996a--- /dev/null+++ b/frontend/src/app/applications/files/components/viewers/components/files-viewer-search.component.ts@@ -0,0 +1,69 @@+import { Component, effect, ElementRef, input, signal, untracked, viewChild } from '@angular/core'+import { FormsModule } from '@angular/forms'+import { FaIconComponent } from '@fortawesome/angular-fontawesome'+import { faChevronDown, faChevronUp, faMagnifyingGlass, faXmark } from '@fortawesome/free-solid-svg-icons'+import type { FileViewerSearchAdapter } from './files-viewer-search-adapter'++@Component({+ selector: 'app-files-viewer-search',+ imports: [FormsModule, FaIconComponent],+ styleUrl: 'files-viewer-search.component.scss',+ templateUrl: 'files-viewer-search.component.html'+})+export class FilesViewerSearchComponent {+ adapter = input.required<FileViewerSearchAdapter>()+ private readonly searchInput = viewChild<ElementRef<HTMLInputElement>>('searchInput')+ protected readonly icons = { faChevronDown, faChevronUp, faMagnifyingGlass, faXmark }+ protected readonly query = signal('')+ private currentAdapter: FileViewerSearchAdapter | null = null++ constructor() {+ effect(() => {+ const adapter = this.adapter()+ const isOpen = adapter.isOpen()+ if (adapter !== this.currentAdapter) {+ this.switchAdapter(adapter)+ }+ if (isOpen) {+ setTimeout(() => this.searchInput()?.nativeElement.focus())+ }+ })+ }++ protected queryChange(query: string) {+ this.query.set(query)+ this.adapter().setQuery(query)+ }++ protected searchKeyDown(event: KeyboardEvent) {+ event.stopPropagation()++ if (event.key === 'Enter') {+ event.preventDefault()+ const adapter = this.adapter()+ if (event.shiftKey) {+ adapter.previous()+ } else {+ adapter.next()+ }+ return+ }++ if (event.key === 'Escape' || event.key === 'Esc') {+ event.preventDefault()+ this.adapter().close()+ }+ }++ private switchAdapter(adapter: FileViewerSearchAdapter) {+ const previousAdapter = this.currentAdapter+ const wasOpen = previousAdapter?.isOpen() ?? false+ previousAdapter?.close()+ this.currentAdapter = adapter++ if (wasOpen) {+ adapter.open()+ adapter.setQuery(untracked(() => this.query()))+ }+ }+}diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.html b/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.htmlindex d6c1cf4d..2e6057b2 100644--- a/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.html+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.html@@ -46,13 +46,13 @@[tooltip]="(isSourceMode() ? 'Visual Mode' : 'Code Mode') | translate:locale.language"class="btn btn-custom mx-0"type="button">- <fa-icon [icon]="isSourceMode() ? icons.faKeyboard : icons.faEye"></fa-icon>+ <fa-icon [icon]="isSourceMode() ? icons.faEye : icons.faKeyboard"></fa-icon></button><div class="vr files-markdown-mode-separator files-markdown-mode-separator-end"></div></div>@if (!isSourceMode()) {- <div class="files-markdown-toolbar-group me-1">+ <div class="files-markdown-toolbar-group"><div class="btn-group" dropdown><button[disabled]="!canEditVisual()"@@ -193,7 +193,7 @@</button></div>- <div class="files-markdown-toolbar-group me-1">+ <div class="files-markdown-toolbar-group"><div class="d-none d-lg-block btn-group" dropdown><button[disabled]="!canEditVisual()"@@ -309,20 +309,21 @@[ngModel]="lineWrapping()"(ngModelChange)="lineWrapping.set($event)"[tooltip]="'Line Wrap' | translate:locale.language"- class="btn btn-custom me-1"+ class="btn btn-custom"type="button"><fa-icon [icon]="icons.faArrowsLeftRightToLine"></fa-icon></button>- <button- btnCheckbox- [ngModel]="isSearchPanelOpen()"- (ngModelChange)="toggleSearch()"- [tooltip]="'Search' | translate:locale.language"- class="d-none d-sm-block btn btn-custom me-1"- type="button">- <fa-icon [icon]="icons.faMagnifyingGlass"></fa-icon>- </button>}+ <div class="d-none d-sm-block vr files-markdown-toolbar-separator"></div>+ <button+ btnCheckbox+ [ngModel]="isSearchPanelOpen()"+ (ngModelChange)="toggleSearch()"+ [tooltip]="'Search' | translate:locale.language"+ class="d-none d-sm-block btn btn-custom me-1"+ type="button">+ <fa-icon [icon]="icons.faMagnifyingGlass"></fa-icon>+ </button>@if (warnOnUnsavedChanges()) {<button (click)="save(true)"@@ -362,7 +363,9 @@[theme]="currentTheme"[readonly]="!canEditContent()"[disabled]="!canEditContent()"+ [extensions]="sourceSearchAdapter.extensions"[lineWrapping]="lineWrapping()" /></div></div>+ <app-files-viewer-search [adapter]="activeSearchAdapter()"></app-files-viewer-search></div>diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.scss b/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.scssindex 823e0866..f5754a19 100644--- a/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.scss+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.scss@@ -1,4 +1,5 @@.files-viewer-markdown {+ position: relative;display: flex;flex-direction: column;min-height: 0;@@ -26,11 +27,11 @@}.files-markdown-toolbar-separator {- margin: 0 0.5rem;+ margin: 0 0.5rem 0 0.3rem;}.files-markdown-mode-separator-start {- margin-left: 0.25rem;+ margin-left: 0.1rem;margin-right: 0.5rem;}@@ -94,7 +95,6 @@height: 100%;overflow: auto;background: #fff;-}.ProseMirror {@@ -262,6 +262,14 @@color: #2563eb;}+ .files-viewer-search-match {+ background: rgba(255, 214, 10, 0.42);++ &.is-current {+ background: rgba(255, 149, 0, 0.5);+ }+ }+hr {margin: 1.5rem 0;border: 0;@@ -330,24 +338,12 @@}.cm-panel.cm-search {- display: flex;- align-items: center;- text-wrap: nowrap;-- label {- display: flex;- align-items: center;- }-- button[aria-label='close'] {- display: none;- }+ display: none;}}body.theme-dark {.files-viewer-markdown {-.files-markdown-visual-editor {background: #161b22;color: #d7dde8;@@ -373,6 +369,14 @@ body.theme-dark {color: #60a5fa;}+ .files-viewer-search-match {+ background: rgba(255, 214, 10, 0.32);++ &.is-current {+ background: rgba(255, 159, 10, 0.45);+ }+ }+table {th,td {diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.ts b/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.tsindex 0b0232de..bb1c4e7f 100644--- a/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.ts+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-markdown.component.ts@@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms'import { redo, redoDepth, undo, undoDepth } from '@codemirror/commands'import { LanguageDescription } from '@codemirror/language'import { languages } from '@codemirror/language-data'-import { closeSearchPanel, openSearchPanel } from '@codemirror/search'import { FaIconComponent } from '@fortawesome/angular-fontawesome'import { faSquareMinus, faSquarePlus } from '@fortawesome/free-regular-svg-icons'import {@@ -24,7 +23,6 @@ import {faLockOpen,faMagnifyingGlass,faMinus,- faPlus,faQuoteLeft,faReply,faShare,@@ -48,6 +46,12 @@ import { BsDropdownModule } from 'ngx-bootstrap/dropdown'import { TooltipModule } from 'ngx-bootstrap/tooltip'import { TiptapEditorDirective } from 'ngx-tiptap'import { FilesViewerEditableBase } from './files-viewer-editable-base'+import {+ CodeMirrorFileViewerSearchAdapter,+ type FileViewerSearchAdapter,+ TipTapFileViewerSearchAdapter+} from './components/files-viewer-search-adapter'+import { FilesViewerSearchComponent } from './components/files-viewer-search.component'type MarkdownHeadingLevel = 1 | 2 | 3 | 4type MarkdownInlineMark = 'bold' | 'code' | 'italic' | 'strike' | 'underline'@@ -77,20 +81,20 @@ const ExitInlineCodeOnEnter = Extension.create({BsDropdownModule,FaIconComponent,L10nTranslatePipe,- L10nTranslateDirective+ L10nTranslateDirective,+ FilesViewerSearchComponent],styleUrl: 'files-viewer-markdown.component.scss',templateUrl: 'files-viewer-markdown.component.html'})export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implements OnInit, OnDestroy {- private readonly sourceEditor = viewChild<CodeEditor>('sourceEditor')- private readonly imageFileInput = viewChild<ElementRef<HTMLInputElement>>('imageFileInput')protected isSourceMode = signal(false)protected lineWrapping = signal(false)- protected isSearchPanelOpen = signal(false)protected sourceContent = ''protected currentLanguage: string | undefined = undefinedprotected readonly languages: LanguageDescription[] = languages+ protected readonly sourceSearchAdapter = new CodeMirrorFileViewerSearchAdapter(() => this.sourceView)+ protected readonly visualSearchAdapter = new TipTapFileViewerSearchAdapter(() => this.editor)protected readonly editor = new Editor({extensions: [StarterKit.configure({@@ -111,12 +115,17 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implemImage.configure({allowBase64: true}),- Markdown+ Markdown,+ this.visualSearchAdapter.extension],editable: false,content: '',contentType: 'markdown',- onUpdate: () => this.markModifiedIfNeeded()+ onUpdate: () => {+ this.markModifiedIfNeeded()+ this.visualSearchAdapter.sync()+ },+ onSelectionUpdate: () => this.visualSearchAdapter.sync()})protected readonly icons = {faArrowsLeftRightToLine,@@ -135,7 +144,6 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implemfaLockOpen,faMagnifyingGlass,faMinus,- faPlus,faQuoteLeft,faReply,faShare,@@ -149,6 +157,8 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implemfaSquarePlus}protected readonly headingLevels: MarkdownHeadingLevel[] = [1, 2, 3, 4]+ private readonly sourceEditor = viewChild<CodeEditor>('sourceEditor')+ private readonly imageFileInput = viewChild<ElementRef<HTMLInputElement>>('imageFileInput')private savedContent = ''constructor() {@@ -161,12 +171,16 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implem})}+ private get sourceView() {+ return this.sourceEditor()?.view || null+ }+@HostListener('document:keydown', ['$event'])onKeyDown(event: KeyboardEvent) {if (event.key === 'Escape' || event.key === 'Esc') {event.preventDefault()event.stopPropagation()- if (this.isSourceMode() && this.isSearchPanelOpen()) {+ if (this.isSearchPanelOpen()) {this.toggleSearch()} else if (this.warnOnUnsavedChanges()) {this.warnOnUnsavedChanges.set(false)@@ -184,7 +198,7 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implemreturn}- if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 'f' && this.isSourceMode()) {+ if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 'f') {event.preventDefault()event.stopPropagation()this.toggleSearch()@@ -243,9 +257,6 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implemthis.sourceContent = this.editor.getMarkdown()}if (!sourceMode) {- if (this.isSearchPanelOpen()) {- this.toggleSearch()- }this.setMarkdownContent(this.sourceContent)}this.isSourceMode.set(sourceMode)@@ -264,14 +275,15 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implem}protected toggleSearch() {- const view = this.sourceView- if (!this.isSourceMode() || !view) return- this.isSearchPanelOpen.update((value) => !value)- if (this.isSearchPanelOpen()) {- openSearchPanel(view)- } else {- closeSearchPanel(view)- }+ this.activeSearchAdapter().toggle()+ }++ protected activeSearchAdapter(): FileViewerSearchAdapter {+ return this.isSourceMode() ? this.sourceSearchAdapter : this.visualSearchAdapter+ }++ protected isSearchPanelOpen(): boolean {+ return this.activeSearchAdapter().isOpen()}protected toggleHeading(level: MarkdownHeadingLevel) {@@ -417,6 +429,26 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implemreturn this.editor.isFocused && this.editor.isActive(name, attributes)}+ protected canEditVisual(): boolean {+ return !this.isSourceMode() && this.canEditContent()+ }++ protected currentFileContent(): string {+ return this.currentMarkdown()+ }++ protected onContentLoaded(content: string) {+ this.savedContent = content+ this.sourceContent = content+ this.setMarkdownContent(content)+ this.isModified.set(false)+ }++ protected override onContentSaved(content: string) {+ this.sourceContent = content+ this.savedContent = content+ }+private runEditorCommand(command: () => boolean) {if (this.canEditVisual() && !this.editor.isDestroyed) {command()@@ -475,14 +507,6 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implemreturn !!character && /[\p{L}\p{N}_]/u.test(character)}- protected canEditVisual(): boolean {- return !this.isSourceMode() && this.canEditContent()- }-- private get sourceView() {- return this.sourceEditor()?.view || null- }-private runSourceHistory(command: typeof undo) {const view = this.sourceViewif (view && this.canEditContent()) {@@ -503,22 +527,6 @@ export class FilesViewerMarkdownComponent extends FilesViewerEditableBase implemreturn this.sourceContent}- protected currentFileContent(): string {- return this.currentMarkdown()- }-- protected onContentLoaded(content: string) {- this.savedContent = content- this.sourceContent = content- this.setMarkdownContent(content)- this.isModified.set(false)- }-- protected override onContentSaved(content: string) {- this.sourceContent = content- this.savedContent = content- }-private markModifiedIfNeeded() {const content = this.isSourceMode() ? this.sourceContent : this.editor.getMarkdown()this.isModified.set(content !== this.savedContent)diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.html b/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.htmlindex 78dbba9b..ce32cf7f 100644--- a/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.html+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.html@@ -1,4 +1,4 @@-<div [style.height.px]="currentHeight()">+<div class="files-viewer-text" [style.height.px]="currentHeight()"><div class="app-top-menu"><button(click)="toggleReadonly()"@@ -84,5 +84,7 @@[theme]="currentTheme"[readonly]="isReadonly()"[disabled]="isReadonly()"+ [extensions]="searchAdapter.extensions"[lineWrapping]="lineWrapping()" />+ <app-files-viewer-search [adapter]="searchAdapter"></app-files-viewer-search></div>diff --git a/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.ts b/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.tsindex fd360a3f..8a75298e 100644--- a/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.ts+++ b/frontend/src/app/applications/files/components/viewers/files-viewer-text.component.ts@@ -1,10 +1,9 @@import { CodeEditor } from '@acrodata/code-editor'-import { Component, effect, HostListener, OnInit, signal, untracked, viewChild, ViewEncapsulation } from '@angular/core'+import { Component, HostListener, OnInit, signal, viewChild, ViewEncapsulation } from '@angular/core'import { FormsModule } from '@angular/forms'import { redo, redoDepth, undo, undoDepth } from '@codemirror/commands'import { LanguageDescription } from '@codemirror/language'import { languages } from '@codemirror/language-data'-import { closeSearchPanel, openSearchPanel } from '@codemirror/search'import { FaIconComponent } from '@fortawesome/angular-fontawesome'import {faArrowsLeftRightToLine,@@ -20,13 +19,28 @@ import { L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'import { ButtonCheckboxDirective } from 'ngx-bootstrap/buttons'import { TooltipModule } from 'ngx-bootstrap/tooltip'import { FilesViewerEditableBase } from './files-viewer-editable-base'+import { CodeMirrorFileViewerSearchAdapter } from './components/files-viewer-search-adapter'+import { FilesViewerSearchComponent } from './components/files-viewer-search.component'@Component({selector: 'app-files-viewer-text',encapsulation: ViewEncapsulation.None,- imports: [CodeEditor, TooltipModule, FormsModule, FaIconComponent, L10nTranslatePipe, ButtonCheckboxDirective, L10nTranslateDirective],+ imports: [+ CodeEditor,+ TooltipModule,+ FormsModule,+ FaIconComponent,+ L10nTranslatePipe,+ ButtonCheckboxDirective,+ L10nTranslateDirective,+ FilesViewerSearchComponent+ ],styles: [`+ .files-viewer-text {+ position: relative;+ }+.code-editor {height: calc(100% - 40px);}@@ -36,18 +50,7 @@ import { FilesViewerEditableBase } from './files-viewer-editable-base'}.cm-panel.cm-search {- display: flex;- align-items: center;- text-wrap: nowrap;-- label {- display: flex;- align-items: center;- }-- button[aria-label='close'] {- display: none;- }+ display: none;}`],@@ -60,24 +63,10 @@ export class FilesViewerTextComponent extends FilesViewerEditableBase implementsprotected currentLanguage = undefinedprotected readonly languages: LanguageDescription[] = languagesprotected readonly icons = { faFloppyDisk, faLock, faLockOpen, faMagnifyingGlass, faSpinner, faArrowsLeftRightToLine, faReply, faShare }- protected isSearchPanelOpen = signal(false)+ protected readonly searchAdapter = new CodeMirrorFileViewerSearchAdapter(() => this.editor()?.view)+ protected readonly isSearchPanelOpen = this.searchAdapter.isOpenprivate isContentReady = false- constructor() {- super()- effect(() => {- this.isReadonly()- // Reset search state when open to enable/disable the replace function- const isSearchPanelIsOpen = untracked(() => this.isSearchPanelOpen())- if (isSearchPanelIsOpen) {- setTimeout(() => {- this.toggleSearch()- this.toggleSearch()- }, 100)- }- })- }-@HostListener('document:keydown', ['$event'])onKeyDown(event: KeyboardEvent) {// ESC@@ -122,12 +111,7 @@ export class FilesViewerTextComponent extends FilesViewerEditableBase implements}toggleSearch() {- this.isSearchPanelOpen.update((value) => !value)- if (this.isSearchPanelOpen()) {- openSearchPanel(this.editor().view)- } else {- closeSearchPanel(this.editor().view)- }+ this.searchAdapter.toggle()}contentChange() {