From b876f98d697a76b5fcb9d6792245e88c392e359a Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Fri, 21 Mar 2025 17:39:18 +0200 Subject: [PATCH] fix(client/ts): fix rest of build errors --- src/public/app/types.d.ts | 2 +- src/public/app/widgets/dialogs/add_link.ts | 4 ++-- src/public/app/widgets/dialogs/include_note.ts | 2 +- src/public/app/widgets/type_widgets/editable_text.ts | 4 ++-- src/public/app/widgets/type_widgets/read_only_text.ts | 4 +++- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/public/app/types.d.ts b/src/public/app/types.d.ts index 01b5c6812..3c672e7a3 100644 --- a/src/public/app/types.d.ts +++ b/src/public/app/types.d.ts @@ -301,7 +301,7 @@ declare global { }); removeMarker(name: string); createRange(start: number, end: number): Range; - createElement(type: string, opts: Record); + createElement(type: string, opts: Record); } interface TextNode { previousSibling?: TextNode; diff --git a/src/public/app/widgets/dialogs/add_link.ts b/src/public/app/widgets/dialogs/add_link.ts index 2a987d3ff..79d0fc74a 100644 --- a/src/public/app/widgets/dialogs/add_link.ts +++ b/src/public/app/widgets/dialogs/add_link.ts @@ -80,13 +80,13 @@ export default class AddLinkDialog extends BasicWidget { if (this.$autoComplete.getSelectedNotePath()) { this.$widget.modal("hide"); - const linkTitle = this.getLinkType() === "reference-link" ? null : this.$linkTitle.val(); + const linkTitle = this.getLinkType() === "reference-link" ? null : this.$linkTitle.val() as string; this.textTypeWidget?.addLink(this.$autoComplete.getSelectedNotePath()!, linkTitle); } else if (this.$autoComplete.getSelectedExternalLink()) { this.$widget.modal("hide"); - this.textTypeWidget?.addLink(this.$autoComplete.getSelectedExternalLink()!, this.$linkTitle.val(), true); + this.textTypeWidget?.addLink(this.$autoComplete.getSelectedExternalLink()!, this.$linkTitle.val() as string, true); } else { logError("No link to add."); } diff --git a/src/public/app/widgets/dialogs/include_note.ts b/src/public/app/widgets/dialogs/include_note.ts index 839d068dd..45d4a0f8a 100644 --- a/src/public/app/widgets/dialogs/include_note.ts +++ b/src/public/app/widgets/dialogs/include_note.ts @@ -103,7 +103,7 @@ export default class IncludeNoteDialog extends BasicWidget { return; } const note = await froca.getNote(noteId); - const boxSize = $("input[name='include-note-box-size']:checked").val(); + const boxSize = $("input[name='include-note-box-size']:checked").val() as string; if (["image", "canvas", "mermaid"].includes(note?.type ?? "")) { // there's no benefit to use insert note functionlity for images, diff --git a/src/public/app/widgets/type_widgets/editable_text.ts b/src/public/app/widgets/type_widgets/editable_text.ts index 9f4278197..28eccfdbf 100644 --- a/src/public/app/widgets/type_widgets/editable_text.ts +++ b/src/public/app/widgets/type_widgets/editable_text.ts @@ -368,7 +368,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget { this.addTextToEditor(text); } - async addLink(notePath: string, linkTitle: string, externalLink: boolean = false) { + async addLink(notePath: string, linkTitle: string | null, externalLink: boolean = false) { await this.initialized; if (linkTitle) { @@ -459,7 +459,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget { this.triggerCommand("showIncludeNoteDialog", { textTypeWidget: this }); } - addIncludeNote(noteId: string, boxSize: string) { + addIncludeNote(noteId: string, boxSize?: string) { this.watchdog.editor.model.change((writer) => { // Insert * at the current selection position // in a way that will result in creating a valid model structure diff --git a/src/public/app/widgets/type_widgets/read_only_text.ts b/src/public/app/widgets/type_widgets/read_only_text.ts index 8d788d6bd..8791f8f27 100644 --- a/src/public/app/widgets/type_widgets/read_only_text.ts +++ b/src/public/app/widgets/type_widgets/read_only_text.ts @@ -114,7 +114,9 @@ export default class ReadOnlyTextTypeWidget extends AbstractTextTypeWidget { this.$content.find("section").each((_, el) => { const noteId = $(el).attr("data-note-id"); - this.loadIncludedNote(noteId, $(el)); + if (noteId) { + this.loadIncludedNote(noteId, $(el)); + } }); if (this.$content.find("span.math-tex").length > 0) {