Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-07-27 18:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(code/find): crashes at dialog shown

Browse Source
This commit is contained in:
Elian Doran 2025-05-12 18:24:36 +03:00
parent ac49c0f59b
commit f20232c077
No known key found for this signature in database
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/client/src/components/note_context.ts
View File

@ -11,6 +11,7 @@ import type { ViewScope } from "../services/link.js";
import type FNote from "../entities/fnote.js"; import type FNote from "../entities/fnote.js";
import type TypeWidget from "../widgets/type_widgets/type_widget.js"; import type TypeWidget from "../widgets/type_widgets/type_widget.js";
import type { CKTextEditor } from "@triliumnext/ckeditor5"; import type { CKTextEditor } from "@triliumnext/ckeditor5";
import type CodeMirror from "@triliumnext/codemirror";
export interface SetNoteOpts { export interface SetNoteOpts {
triggerSwitchEvent?: unknown; triggerSwitchEvent?: unknown;
@ -312,7 +313,7 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
async getCodeEditor() { async getCodeEditor() {
return this.timeout( return this.timeout(
new Promise<CodeMirrorInstance>((resolve) => new Promise<CodeMirror>((resolve) =>
appContext.triggerCommand("executeWithCodeEditor", { appContext.triggerCommand("executeWithCodeEditor", {
resolve, resolve,
ntxId: this.ntxId ntxId: this.ntxId

2
apps/client/src/widgets/find.ts
View File

@ -203,7 +203,7 @@ export default class FindWidget extends NoteContextAwareWidget {
selectedText = $content.find('.cm-matchhighlight').first().text(); selectedText = $content.find('.cm-matchhighlight').first().text();
} else { } else {
const codeEditor = await this.noteContext.getCodeEditor(); const codeEditor = await this.noteContext.getCodeEditor();
selectedText = codeEditor.getSelection(); selectedText = codeEditor.getSelectedText();
} }
} else { } else {
selectedText = window.getSelection()?.toString() || ""; selectedText = window.getSelection()?.toString() || "";

11
packages/codemirror/src/index.ts
View File

@ -104,6 +104,17 @@ export default class CodeMirror extends EditorView {
return this.state.doc.toString(); return this.state.doc.toString();
} }
/**
* Returns the currently selected text.
*
* If there are multiple selections, all of them will be concatenated.
*/
getSelectedText() {
return this.state.selection.ranges
.map((range) => this.state.sliceDoc(range.from, range.to))
.join("");
}
setText(content: string) { setText(content: string) {
this.dispatch({ this.dispatch({
changes: { changes: {