From 6d6272e5b6373dd9703782d6b3d4ea57e9d29730 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 16:14:49 +0200 Subject: [PATCH 01/59] desktop app(export pdf): refactor --- src/services/window.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/services/window.ts b/src/services/window.ts index 01047a628..d8f86379f 100644 --- a/src/services/window.ts +++ b/src/services/window.ts @@ -79,8 +79,7 @@ ipcMain.on("export-as-pdf", async (e, opts: ExportAsPdfOpts) => { displayHeaderFooter: true, headerTemplate: `
`, footerTemplate: ` -
- +
` }); From dd12d7f314d5ae800ca29b9c7812cfe671401629 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 16:23:28 +0200 Subject: [PATCH 02/59] chore(client/ts): port export --- src/public/app/components/app_context.ts | 2 +- .../widgets/dialogs/{export.js => export.ts} | 54 +++++++++++++------ 2 files changed, 40 insertions(+), 16 deletions(-) rename src/public/app/widgets/dialogs/{export.js => export.ts} (84%) diff --git a/src/public/app/components/app_context.ts b/src/public/app/components/app_context.ts index dbfe78cd0..2be0d986b 100644 --- a/src/public/app/components/app_context.ts +++ b/src/public/app/components/app_context.ts @@ -83,7 +83,7 @@ export type CommandMappings = { }; showExportDialog: CommandData & { notePath: string; - defaultType: "single"; + defaultType: "single" | "subtree"; }; showDeleteNotesDialog: CommandData & { branchIdsToDelete: string[]; diff --git a/src/public/app/widgets/dialogs/export.js b/src/public/app/widgets/dialogs/export.ts similarity index 84% rename from src/public/app/widgets/dialogs/export.js rename to src/public/app/widgets/dialogs/export.ts index 5bc9b3707..b8b51d80f 100644 --- a/src/public/app/widgets/dialogs/export.js +++ b/src/public/app/widgets/dialogs/export.ts @@ -1,11 +1,12 @@ import treeService from "../../services/tree.js"; import utils from "../../services/utils.js"; import ws from "../../services/ws.js"; -import toastService from "../../services/toast.js"; +import toastService, { type ToastOptions } from "../../services/toast.js"; import froca from "../../services/froca.js"; import openService from "../../services/open.js"; import BasicWidget from "../basic_widget.js"; import { t } from "../../services/i18n.js"; +import type { EventData } from "../../components/app_context.js"; const TPL = ` `; export default class ExportDialog extends BasicWidget { + + private taskId: string; + private branchId: string | null; + private modal?: bootstrap.Modal; + private $form!: JQuery; + private $noteTitle!: JQuery; + private $subtreeFormats!: JQuery; + private $singleFormats!: JQuery; + private $subtreeType!: JQuery; + private $singleType!: JQuery; + private $exportButton!: JQuery; + private $opmlVersions!: JQuery; + constructor() { super(); @@ -125,6 +139,8 @@ export default class ExportDialog extends BasicWidget { doRender() { this.$widget = $(TPL); + // Remove once bootstrap is fixed. + // @ts-ignore this.modal = bootstrap.Modal.getOrCreateInstance(this.$widget); this.$form = this.$widget.find(".export-form"); this.$noteTitle = this.$widget.find(".export-note-title"); @@ -136,7 +152,7 @@ export default class ExportDialog extends BasicWidget { this.$opmlVersions = this.$widget.find(".opml-versions"); this.$form.on("submit", () => { - this.modal.hide(); + this.modal?.hide(); const exportType = this.$widget.find("input[name='export-type']:checked").val(); @@ -149,13 +165,15 @@ export default class ExportDialog extends BasicWidget { const exportVersion = exportFormat === "opml" ? this.$widget.find("input[name='opml-version']:checked").val() : "1.0"; - this.exportBranch(this.branchId, exportType, exportFormat, exportVersion); + if (this.branchId) { + this.exportBranch(this.branchId, String(exportType), String(exportFormat), String(exportVersion)); + } return false; }); this.$widget.find("input[name=export-type]").on("change", (e) => { - if (e.currentTarget.value === "subtree") { + if ((e.currentTarget as HTMLInputElement).value === "subtree") { if (this.$widget.find("input[name=export-subtree-format]:checked").length === 0) { this.$widget.find("input[name=export-subtree-format]:first").prop("checked", true); } @@ -173,7 +191,7 @@ export default class ExportDialog extends BasicWidget { }); this.$widget.find("input[name=export-subtree-format]").on("change", (e) => { - if (e.currentTarget.value === "opml") { + if ((e.currentTarget as HTMLInputElement).value === "opml") { this.$opmlVersions.slideDown(); } else { this.$opmlVersions.slideUp(); @@ -181,7 +199,7 @@ export default class ExportDialog extends BasicWidget { }); } - async showExportDialogEvent({ notePath, defaultType }) { + async showExportDialogEvent({ notePath, defaultType }: EventData<"showExportDialog">) { this.taskId = ""; this.$exportButton.removeAttr("disabled"); @@ -201,11 +219,15 @@ export default class ExportDialog extends BasicWidget { const { noteId, parentNoteId } = treeService.getNoteIdAndParentIdFromUrl(notePath); - this.branchId = await froca.getBranchId(parentNoteId, noteId); - this.$noteTitle.text(await treeService.getNoteTitle(noteId)); + if (parentNoteId) { + this.branchId = await froca.getBranchId(parentNoteId, noteId); + } + if (noteId) { + this.$noteTitle.text(await treeService.getNoteTitle(noteId)); + } } - exportBranch(branchId, type, format, version) { + exportBranch(branchId: string, type: string, format: string, version: string) { this.taskId = utils.randomString(10); const url = openService.getUrlForDownload(`api/branches/${branchId}/export/${type}/${format}/${version}/${this.taskId}`); @@ -215,12 +237,14 @@ export default class ExportDialog extends BasicWidget { } ws.subscribeToMessages(async (message) => { - const makeToast = (id, message) => ({ - id: id, - title: t("export.export_status"), - message: message, - icon: "arrow-square-up-right" - }); + function makeToast(id: string, message: string): ToastOptions { + return { + id: id, + title: t("export.export_status"), + message: message, + icon: "arrow-square-up-right" + }; + }; if (message.taskType !== "export") { return; From 9c4535badea54d06f2dc08d3f065a0249ad54a94 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 16:31:25 +0200 Subject: [PATCH 03/59] desktop app(export pdf): enable document outline and PDF tags generation --- src/services/window.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/services/window.ts b/src/services/window.ts index d8f86379f..ff391875b 100644 --- a/src/services/window.ts +++ b/src/services/window.ts @@ -76,6 +76,8 @@ ipcMain.on("export-as-pdf", async (e, opts: ExportAsPdfOpts) => { try { buffer = await browserWindow.webContents.printToPDF({ landscape: opts.landscape, + generateDocumentOutline: true, + generateTaggedPDF: true, displayHeaderFooter: true, headerTemplate: `
`, footerTemplate: ` From 8b8f0c289e9a1a71cd197f1686efbeee500c5bc9 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 16:51:04 +0200 Subject: [PATCH 04/59] client(print): use a different base font size --- src/public/stylesheets/print.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index 34521d733..1f6fdc287 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -4,6 +4,12 @@ --launcher-pane-background-color: var(--main-background-color); --main-text-color: black; --input-text-color: var(--main-text-color); + + --print-font-size: 11pt; +} + +.ck-content { + font-size: var(--print-font-size); } .no-print, From f2cc98eeec8d611fdf4150364ddb4e0f397f0edc Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 16:58:52 +0200 Subject: [PATCH 05/59] client(print): fix the content having a left margin when the note is read-only --- src/public/stylesheets/print.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index 1f6fdc287..74153b94c 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -12,6 +12,10 @@ font-size: var(--print-font-size); } +.note-detail-readonly-text { + padding: 0 !important; +} + .no-print, .no-print *, .tab-row-container, From 9a3a6f90ea62369707b4836b27ba1e0ef690128f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 16:55:50 +0200 Subject: [PATCH 06/59] Add option to export --- src/public/app/widgets/dialogs/export.ts | 7 +++++++ src/public/translations/en/translation.json | 3 ++- src/services/export/pdf.ts | 0 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/services/export/pdf.ts diff --git a/src/public/app/widgets/dialogs/export.ts b/src/public/app/widgets/dialogs/export.ts index b8b51d80f..8f1fe5306 100644 --- a/src/public/app/widgets/dialogs/export.ts +++ b/src/public/app/widgets/dialogs/export.ts @@ -106,6 +106,13 @@ const TPL = ` ${t("export.format_markdown")}
+ +
+ +
diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json index c0d7d0eb1..e29c258f0 100644 --- a/src/public/translations/en/translation.json +++ b/src/public/translations/en/translation.json @@ -109,7 +109,8 @@ "choose_export_type": "Choose export type first please", "export_status": "Export status", "export_in_progress": "Export in progress: {{progressCount}}", - "export_finished_successfully": "Export finished successfully." + "export_finished_successfully": "Export finished successfully.", + "format_pdf": "PDF - for printing or sharing purposes." }, "help": { "fullDocumentation": "Help (full documentation is available online)", diff --git a/src/services/export/pdf.ts b/src/services/export/pdf.ts new file mode 100644 index 000000000..e69de29bb From f41138800f6fb425c88fd22fd9ab21a7f6878cda Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 17:10:49 +0200 Subject: [PATCH 07/59] feat(pdf): allow changing page size via attribute --- src/public/app/widgets/note_detail.js | 1 + src/services/window.ts | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/public/app/widgets/note_detail.js b/src/public/app/widgets/note_detail.js index 21f84dbc1..11cc6f71d 100644 --- a/src/public/app/widgets/note_detail.js +++ b/src/public/app/widgets/note_detail.js @@ -261,6 +261,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget { const { ipcRenderer } = utils.dynamicRequire("electron"); ipcRenderer.send("export-as-pdf", { title: this.note.title, + pageSize: this.note.getAttributeValue("label", "pageSize") ?? "Letter", landscape: this.note.hasAttribute("label", "printLandscape") }); } diff --git a/src/services/window.ts b/src/services/window.ts index ff391875b..8c3fd9118 100644 --- a/src/services/window.ts +++ b/src/services/window.ts @@ -51,6 +51,7 @@ ipcMain.on("create-extra-window", (event, arg) => { interface ExportAsPdfOpts { title: string; landscape: boolean; + pageSize: "A0" | "A1" | "A2" | "A3" | "A4" | "A5" | "A6" | "Legal" | "Letter" | "Tabloid" | "Ledger"; } ipcMain.on("export-as-pdf", async (e, opts: ExportAsPdfOpts) => { @@ -76,6 +77,7 @@ ipcMain.on("export-as-pdf", async (e, opts: ExportAsPdfOpts) => { try { buffer = await browserWindow.webContents.printToPDF({ landscape: opts.landscape, + pageSize: opts.pageSize, generateDocumentOutline: true, generateTaggedPDF: true, displayHeaderFooter: true, From 3cd02f6ceb59ae0b24a20b20f76f41f1b1206716 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 17:17:49 +0200 Subject: [PATCH 08/59] client(print): use a larger page margins --- src/public/stylesheets/print.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index 74153b94c..9f7166092 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -8,6 +8,10 @@ --print-font-size: 11pt; } +@page { + margin: 2cm; +} + .ck-content { font-size: var(--print-font-size); } From fa655ea45e7e073e0b30b440ffb4cdef356de28e Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 17:34:36 +0200 Subject: [PATCH 09/59] feat(pdf): describe the attributes & fix conflict in name --- src/public/app/widgets/attribute_widgets/attribute_detail.ts | 4 +++- src/public/app/widgets/note_detail.js | 2 +- src/public/translations/en/translation.json | 4 +++- src/services/builtin_attributes.ts | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/public/app/widgets/attribute_widgets/attribute_detail.ts b/src/public/app/widgets/attribute_widgets/attribute_detail.ts index 7ea7061a9..cccb70075 100644 --- a/src/public/app/widgets/attribute_widgets/attribute_detail.ts +++ b/src/public/app/widgets/attribute_widgets/attribute_detail.ts @@ -242,7 +242,9 @@ const ATTR_HELP: Record> = { executeDescription: t("attribute_detail.execute_description"), excludeFromNoteMap: t("attribute_detail.exclude_from_note_map"), newNotesOnTop: t("attribute_detail.new_notes_on_top"), - hideHighlightWidget: t("attribute_detail.hide_highlight_widget") + hideHighlightWidget: t("attribute_detail.hide_highlight_widget"), + printLandscape: t("attribute_detail.print_landscape"), + printPageSize: t("attribute_detail.print_page_size") }, relation: { runOnNoteCreation: t("attribute_detail.run_on_note_creation"), diff --git a/src/public/app/widgets/note_detail.js b/src/public/app/widgets/note_detail.js index 11cc6f71d..7c1e4f1d9 100644 --- a/src/public/app/widgets/note_detail.js +++ b/src/public/app/widgets/note_detail.js @@ -261,7 +261,7 @@ export default class NoteDetailWidget extends NoteContextAwareWidget { const { ipcRenderer } = utils.dynamicRequire("electron"); ipcRenderer.send("export-as-pdf", { title: this.note.title, - pageSize: this.note.getAttributeValue("label", "pageSize") ?? "Letter", + pageSize: this.note.getAttributeValue("label", "printPageSize") ?? "Letter", landscape: this.note.hasAttribute("label", "printLandscape") }); } diff --git a/src/public/translations/en/translation.json b/src/public/translations/en/translation.json index e29c258f0..958df556b 100644 --- a/src/public/translations/en/translation.json +++ b/src/public/translations/en/translation.json @@ -438,7 +438,9 @@ "share_favicon": "Favicon note to be set in the shared page. Typically you want to set it to share root and make it inheritable. Favicon note must be in the shared sub-tree as well. Consider using 'share_hidden_from_tree'.", "is_owned_by_note": "is owned by note", "other_notes_with_name": "Other notes with {{attributeType}} name \"{{attributeName}}\"", - "and_more": "... and {{count}} more." + "and_more": "... and {{count}} more.", + "print_landscape": "When exporting to PDF, changes the orientation of the page to landscape instead of portrait.", + "print_page_size": "When exporting to PDF, changes the size of the page. Supported values: A0, A1, A2, A3, A4, A5, A6, Legal, Letter, Tabloid, Ledger." }, "attribute_editor": { "help_text_body1": "To add label, just type e.g. #rock or if you want to add also value then e.g. #year = 2020", diff --git a/src/services/builtin_attributes.ts b/src/services/builtin_attributes.ts index 30c0b6ce5..1caaecd63 100644 --- a/src/services/builtin_attributes.ts +++ b/src/services/builtin_attributes.ts @@ -72,6 +72,9 @@ export default [ { type: "label", name: "webViewSrc", isDangerous: true }, { type: "label", name: "hideHighlightWidget" }, + { type: "label", name: "printLandscape" }, + { type: "label", name: "printPageSize" }, + // relation names { type: "relation", name: "internalLink" }, { type: "relation", name: "imageLink" }, From 16f62bdde96e922cc2d50132f4b64d05ba8e1683 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 18:41:43 +0200 Subject: [PATCH 10/59] style(print): tweak links --- src/public/stylesheets/print.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index 9f7166092..bd3994810 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -173,4 +173,17 @@ span[style] { .note-detail-code pre { border: unset !important; border-radius: unset !important; +} + +/* + * Links + */ + +.note-detail-printable a { + color: #374a75; +} + +.note-detail-printable a::after { + /* Hide the external link trailing arrow */ + display: none !important; } \ No newline at end of file From b5ee642c2d3808a300f8bb626e8283c0e1af34a5 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 18:58:50 +0200 Subject: [PATCH 11/59] style(print): tweak footnotes --- src/public/stylesheets/print.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index bd3994810..c2a4237b9 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -186,4 +186,13 @@ span[style] { .note-detail-printable a::after { /* Hide the external link trailing arrow */ display: none !important; -} \ No newline at end of file +} + +/* + * Footnotes + */ + +.note-detail-printable .footnote-reference a, +.footnote-back-link a { + text-decoration: none; + } \ No newline at end of file From 170bba1a89cdb6a18e4ce8f835121071b10345b4 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 19:02:53 +0200 Subject: [PATCH 12/59] style(print): tweak blockquotes --- src/public/stylesheets/print.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index c2a4237b9..bb5ec59d0 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -188,6 +188,14 @@ span[style] { display: none !important; } +/* + * Blockquotes + */ + +.note-detail-printable blockquote { + box-shadow: unset; +} + /* * Footnotes */ From e3816c30c00c12bf0e4055a899268801460b6e0a Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 19:07:51 +0200 Subject: [PATCH 13/59] style(print): tweak figure captions --- src/public/stylesheets/print.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index bb5ec59d0..2ff884440 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -196,6 +196,16 @@ span[style] { box-shadow: unset; } +/* + * Figures + */ + +.note-detail-printable figcaption { + --accented-background-color: transparent; + + font-style: italic; +} + /* * Footnotes */ From 2bb006d80efc1d4d7e584498b5b49095e4cc5c8b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 19:11:44 +0200 Subject: [PATCH 14/59] feat(print): better widows & orphans support --- src/public/stylesheets/print.css | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index 2ff884440..3667e2c60 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -213,4 +213,18 @@ span[style] { .note-detail-printable .footnote-reference a, .footnote-back-link a { text-decoration: none; - } \ No newline at end of file + } + +/* + * Widows and orphans + */ +p, +blockquote { + widows: 4; + orphans: 4; +} + +pre > code { + widows: 6; + orphans: 6; +} \ No newline at end of file From 6ac868555f353483c7e8ea2a2c754c5a52a43554 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 19:16:22 +0200 Subject: [PATCH 15/59] feat(print): fix widowed headings --- src/public/stylesheets/print.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index 3667e2c60..6e0591be6 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -227,4 +227,9 @@ blockquote { pre > code { widows: 6; orphans: 6; +} + +h1, h2, h3, h4, h5, h6 { + page-break-after: avoid; + break-after: avoid; } \ No newline at end of file From ca496e1d1293deea74717922f1c300294a064f7c Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 19:16:47 +0200 Subject: [PATCH 16/59] desktop app/export pdf: enable background colors --- src/services/window.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/window.ts b/src/services/window.ts index 8c3fd9118..30781a416 100644 --- a/src/services/window.ts +++ b/src/services/window.ts @@ -80,6 +80,7 @@ ipcMain.on("export-as-pdf", async (e, opts: ExportAsPdfOpts) => { pageSize: opts.pageSize, generateDocumentOutline: true, generateTaggedPDF: true, + printBackground: true, displayHeaderFooter: true, headerTemplate: `
`, footerTemplate: ` From 3eccdd5cffb2081741d9d2965e1e5c8c5b7d69ce Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 19:41:33 +0200 Subject: [PATCH 17/59] style(print): justify the note's text --- src/public/stylesheets/print.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index 6e0591be6..d412198fc 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -14,6 +14,7 @@ .ck-content { font-size: var(--print-font-size); + text-align: justify; } .note-detail-readonly-text { @@ -202,7 +203,7 @@ span[style] { .note-detail-printable figcaption { --accented-background-color: transparent; - + font-style: italic; } From bd638b689f6bfa17fab932e6fc9dde88fba7e3ae Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 19:33:45 +0200 Subject: [PATCH 18/59] feat(print): improve todo list rendering --- src/public/stylesheets/print.css | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index d412198fc..aa2339b94 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -158,9 +158,15 @@ span[style] { /* Fix visibility of checkbox checkmarks see https://github.com/TriliumNext/Notes/issues/901 */ -.ck-editor__editable.ck-content .todo-list .todo-list__label > span[contenteditable="false"] > input[checked]::after { +.ck-content .todo-list .todo-list__label > input { + opacity: 1; + print-color-adjust: exact; + -webkit-print-color-adjust: exact; +} + +.ck-content .todo-list .todo-list__label > span[contenteditable="false"] > input[checked]::after { /* fallback to default ck-editor green */ - border-color: hsl(126, 64%, 41%); + border-color: hsl(126, 64%, 41%) !important; } .include-note .include-note-content { From 211b5579203d93ee4a259a1c9373bfdc9628dd03 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 21:46:11 +0200 Subject: [PATCH 19/59] refactor(geo_map): move marker processing to dedicated method --- .../app/widgets/type_widgets/geo_map.ts | 75 ++++++++++--------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/src/public/app/widgets/type_widgets/geo_map.ts b/src/public/app/widgets/type_widgets/geo_map.ts index 60166cd41..6a80ca0a5 100644 --- a/src/public/app/widgets/type_widgets/geo_map.ts +++ b/src/public/app/widgets/type_widgets/geo_map.ts @@ -159,9 +159,7 @@ export default class GeoMapTypeWidget extends TypeWidget { } async #reloadMarkers() { - const map = this.geoMapWidget.map; - - if (!this.note || !map) { + if (!this.note) { return; } @@ -173,48 +171,55 @@ export default class GeoMapTypeWidget extends TypeWidget { // Add the new markers. this.currentMarkerData = {}; const childNotes = await this.note.getChildNotes(); - const L = this.L; for (const childNote of childNotes) { const latLng = childNote.getAttributeValue("label", LOCATION_ATTRIBUTE); - if (!latLng) { - continue; + if (latLng) { + this.#processNoteWithMarker(childNote, latLng); } + } + } - const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el)); - const icon = L.divIcon({ - html: `\ - - - - ${childNote.title}`, - iconSize: [ 25, 41 ], - iconAnchor: [ 12, 41 ] - }) + #processNoteWithMarker(note: FNote, latLng: string) { + const map = this.geoMapWidget.map; + if (!map) { + return; + } - const marker = L.marker(L.latLng(lat, lng), { - icon, - draggable: true, - autoPan: true, - autoPanSpeed: 5, - }) - .addTo(map) - .on("moveend", e => { - this.moveMarker(childNote.noteId, (e.target as Marker).getLatLng()); - }); + const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el)); + const L = this.L; + const icon = L.divIcon({ + html: `\ + + + + ${note.title}`, + iconSize: [ 25, 41 ], + iconAnchor: [ 12, 41 ] + }) - marker.on("contextmenu", (e) => { - openContextMenu(childNote.noteId, e.originalEvent); + const marker = L.marker(L.latLng(lat, lng), { + icon, + draggable: true, + autoPan: true, + autoPanSpeed: 5, + }) + .addTo(map) + .on("moveend", e => { + this.moveMarker(note.noteId, (e.target as Marker).getLatLng()); }); - const el = marker.getElement(); - if (el) { - const $el = $(el); - $el.attr("data-href", `#${childNote.noteId}`); - note_tooltip.setupElementTooltip($($el)); - } + marker.on("contextmenu", (e) => { + openContextMenu(note.noteId, e.originalEvent); + }); - this.currentMarkerData[childNote.noteId] = marker; + const el = marker.getElement(); + if (el) { + const $el = $(el); + $el.attr("data-href", `#${note.noteId}`); + note_tooltip.setupElementTooltip($($el)); } + + this.currentMarkerData[note.noteId] = marker; } #changeState(newState: State) { From 15881dfb6b1130fd8355f8cde0d3a3f957f71723 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 22:13:47 +0200 Subject: [PATCH 20/59] feat(geo_map): add basic support for gpx files --- package-lock.json | 18 +++++++++++++ package.json | 2 ++ .../app/widgets/type_widgets/geo_map.ts | 26 +++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/package-lock.json b/package-lock.json index 49e028734..3aac1a975 100644 --- a/package-lock.json +++ b/package-lock.json @@ -69,6 +69,7 @@ "katex": "0.16.21", "knockout": "3.5.1", "leaflet": "1.9.4", + "leaflet-gpx": "2.1.2", "mark.js": "8.11.1", "marked": "15.0.6", "mermaid": "11.4.1", @@ -132,6 +133,7 @@ "@types/jasmine": "5.1.5", "@types/jquery": "3.5.32", "@types/jsdom": "21.1.7", + "@types/leaflet-gpx": "1.3.7", "@types/mime-types": "2.1.4", "@types/multer": "1.4.12", "@types/node": "22.12.0", @@ -3839,6 +3841,16 @@ "@types/geojson": "*" } }, + "node_modules/@types/leaflet-gpx": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/@types/leaflet-gpx/-/leaflet-gpx-1.3.7.tgz", + "integrity": "sha512-IDshIOLZ7dUUjRiCE3DuJcAGavgUCw0xQ93dc/3YvsA6jrFc+nx8eXr0tqZIf2SaWMgqiDj/n7N24WWNh/898g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/leaflet": "*" + } + }, "node_modules/@types/linkify-it": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz", @@ -11431,6 +11443,12 @@ "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==", "license": "BSD-2-Clause" }, + "node_modules/leaflet-gpx": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/leaflet-gpx/-/leaflet-gpx-2.1.2.tgz", + "integrity": "sha512-lKoEPlAWel9KXn9keg6Dmyt7gmj5IYyD8CKuxivN+77GpZr2bpKliwFvZJxLUHmNu4fICmCySyxhm5qjZuvvQg==", + "license": "BSD-2-Clause" + }, "node_modules/limiter": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz", diff --git a/package.json b/package.json index 4216a3d26..fa88fd4fd 100644 --- a/package.json +++ b/package.json @@ -114,6 +114,7 @@ "katex": "0.16.21", "knockout": "3.5.1", "leaflet": "1.9.4", + "leaflet-gpx": "2.1.2", "mark.js": "8.11.1", "marked": "15.0.6", "mermaid": "11.4.1", @@ -174,6 +175,7 @@ "@types/jasmine": "5.1.5", "@types/jquery": "3.5.32", "@types/jsdom": "21.1.7", + "@types/leaflet-gpx": "1.3.7", "@types/mime-types": "2.1.4", "@types/multer": "1.4.12", "@types/node": "22.12.0", diff --git a/src/public/app/widgets/type_widgets/geo_map.ts b/src/public/app/widgets/type_widgets/geo_map.ts index 6a80ca0a5..a4b7d5707 100644 --- a/src/public/app/widgets/type_widgets/geo_map.ts +++ b/src/public/app/widgets/type_widgets/geo_map.ts @@ -104,6 +104,7 @@ export default class GeoMapTypeWidget extends TypeWidget { private _state: State; private L!: Leaflet; private currentMarkerData: MarkerData; + private gpxLoaded?: boolean; static getType() { return "geoMap"; @@ -172,6 +173,11 @@ export default class GeoMapTypeWidget extends TypeWidget { this.currentMarkerData = {}; const childNotes = await this.note.getChildNotes(); for (const childNote of childNotes) { + if (childNote.mime === "application/gpx+xml") { + this.#processNoteWithGpxTrack(childNote); + continue; + } + const latLng = childNote.getAttributeValue("label", LOCATION_ATTRIBUTE); if (latLng) { this.#processNoteWithMarker(childNote, latLng); @@ -179,6 +185,26 @@ export default class GeoMapTypeWidget extends TypeWidget { } } + async #processNoteWithGpxTrack(note: FNote) { + if (!this.L || !this.geoMapWidget.map) { + return; + } + + if (!this.gpxLoaded) { + await import("leaflet-gpx"); + this.gpxLoaded = true; + } + + // TODO: This is not very efficient as it's probably a string response that is parsed and then converted back to string and parsed again. + const xmlResponse = await server.get(`notes/${note.noteId}/open`); + const stringResponse = new XMLSerializer().serializeToString(xmlResponse); + + const track = new this.L.GPX(stringResponse, { + + }); + track.addTo(this.geoMapWidget.map); + } + #processNoteWithMarker(note: FNote, latLng: string) { const map = this.geoMapWidget.map; if (!map) { From 7a0199595d783ca71db268d5e5c33ddcea3f72d8 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 22:22:19 +0200 Subject: [PATCH 21/59] feat(geo_map): react to changes in hierarchy --- src/public/app/widgets/type_widgets/geo_map.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/public/app/widgets/type_widgets/geo_map.ts b/src/public/app/widgets/type_widgets/geo_map.ts index a4b7d5707..5bb060ce9 100644 --- a/src/public/app/widgets/type_widgets/geo_map.ts +++ b/src/public/app/widgets/type_widgets/geo_map.ts @@ -330,6 +330,14 @@ export default class GeoMapTypeWidget extends TypeWidget { } entitiesReloadedEvent({ loadResults }: EventData<"entitiesReloaded">) { + // If any of the children branches are altered. + if (loadResults.getBranchRows().find((branch) => branch.parentNoteId === this.noteId)) { + this.#reloadMarkers(); + return; + } + + // If any of note has its location attribute changed. + // TODO: Should probably filter by parent here as well. const attributeRows = loadResults.getAttributeRows(); if (attributeRows.find((at) => at.name === LOCATION_ATTRIBUTE)) { this.#reloadMarkers(); From 72a900464301d4c99412f00a850b8568737c4b6c Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sat, 1 Feb 2025 22:52:45 +0200 Subject: [PATCH 22/59] style(print): restyle the TODO list check boxes --- src/public/stylesheets/print.css | 39 +++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index aa2339b94..c2ac17370 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -156,19 +156,6 @@ span[style] { outline: unset !important; } -/* Fix visibility of checkbox checkmarks - see https://github.com/TriliumNext/Notes/issues/901 */ -.ck-content .todo-list .todo-list__label > input { - opacity: 1; - print-color-adjust: exact; - -webkit-print-color-adjust: exact; -} - -.ck-content .todo-list .todo-list__label > span[contenteditable="false"] > input[checked]::after { - /* fallback to default ck-editor green */ - border-color: hsl(126, 64%, 41%) !important; -} - .include-note .include-note-content { max-height: unset !important; overflow: unset !important; @@ -195,6 +182,32 @@ span[style] { display: none !important; } +/* + * TODO list check boxes + */ + +.note-detail-printable .todo-list__label { + --box-size: 1.3em; + --box-vert-offset: 0.17em; + --box-text-gap: 0.25em; + + padding-left: calc(var(--box-size) + var(--box-text-gap)); + /* Source: https://pictogrammers.com/library/mdi/icon/checkbox-blank-outline/ */ + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='currentColor'%3e%3cpath d='M19%2c3H5C3.89%2c3 3%2c3.89 3%2c5V19A2%2c2 0 0%2c0 5%2c21H19A2%2c2 0 0%2c0 21%2c19V5C21%2c3.89 20.1%2c3 19%2c3M19%2c5V19H5V5H19Z' /%3e%3c/svg%3e"); + background-position: 0 var(--box-vert-offset); + background-size: var(--box-size); + background-repeat: no-repeat; +} + +.note-detail-printable .todo-list__label:has(>input[type="checkbox"]:checked) { + /* Source: https://pictogrammers.com/library/mdi/icon/checkbox-outline/ */ + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='currentColor'%3e%3cpath d='M19%2c3H5A2%2c2 0 0%2c0 3%2c5V19A2%2c2 0 0%2c0 5%2c21H19A2%2c2 0 0%2c0 21%2c19V5A2%2c2 0 0%2c0 19%2c3M19%2c5V19H5V5H19M10%2c17L6%2c13L7.41%2c11.58L10%2c14.17L16.59%2c7.58L18%2c9' /%3e%3c/svg%3e"); +} + +.note-detail-printable .todo-list__label > input[type="checkbox"] { + display: none; +} + /* * Blockquotes */ From 65e593f3ff8ae17d8c204699647ea7af70c7817f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 1 Feb 2025 23:35:34 +0200 Subject: [PATCH 23/59] fix(geo-map): duplicate tracks after refresh --- src/public/app/widgets/type_widgets/geo_map.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/public/app/widgets/type_widgets/geo_map.ts b/src/public/app/widgets/type_widgets/geo_map.ts index 5bb060ce9..ee0f95b76 100644 --- a/src/public/app/widgets/type_widgets/geo_map.ts +++ b/src/public/app/widgets/type_widgets/geo_map.ts @@ -1,4 +1,4 @@ -import { Marker, type LatLng, type LeafletMouseEvent } from "leaflet"; +import { GPX, Marker, type LatLng, type LeafletMouseEvent } from "leaflet"; import type FNote from "../../entities/fnote.js"; import GeoMapWidget, { type InitCallback, type Leaflet } from "../geo_map.js"; import TypeWidget from "./type_widget.js" @@ -91,8 +91,6 @@ interface CreateChildResponse { } } -type MarkerData = Record; - enum State { Normal, NewNote @@ -103,7 +101,8 @@ export default class GeoMapTypeWidget extends TypeWidget { private geoMapWidget: GeoMapWidget; private _state: State; private L!: Leaflet; - private currentMarkerData: MarkerData; + private currentMarkerData: Record; + private currentTrackData: Record; private gpxLoaded?: boolean; static getType() { @@ -115,6 +114,7 @@ export default class GeoMapTypeWidget extends TypeWidget { this.geoMapWidget = new GeoMapWidget("type", (L: Leaflet) => this.#onMapInitialized(L)); this.currentMarkerData = {}; + this.currentTrackData = {}; this._state = State.Normal; this.child(this.geoMapWidget); @@ -169,6 +169,11 @@ export default class GeoMapTypeWidget extends TypeWidget { marker.remove(); } + // Delete all existing tracks + for (const track of Object.values(this.currentTrackData)) { + track.remove(); + } + // Add the new markers. this.currentMarkerData = {}; const childNotes = await this.note.getChildNotes(); @@ -203,6 +208,7 @@ export default class GeoMapTypeWidget extends TypeWidget { }); track.addTo(this.geoMapWidget.map); + this.currentTrackData[note.noteId] = track; } #processNoteWithMarker(note: FNote, latLng: string) { From 120b8466ac83e152d3434ecf0e329061aa9888a6 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 2 Feb 2025 02:04:25 +0200 Subject: [PATCH 24/59] style(print): improve the TODO list check boxes --- src/public/stylesheets/print.css | 47 ++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index c2ac17370..55c69ebc3 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -186,26 +186,39 @@ span[style] { * TODO list check boxes */ -.note-detail-printable .todo-list__label { - --box-size: 1.3em; - --box-vert-offset: 0.17em; - --box-text-gap: 0.25em; - - padding-left: calc(var(--box-size) + var(--box-text-gap)); - /* Source: https://pictogrammers.com/library/mdi/icon/checkbox-blank-outline/ */ - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='currentColor'%3e%3cpath d='M19%2c3H5C3.89%2c3 3%2c3.89 3%2c5V19A2%2c2 0 0%2c0 5%2c21H19A2%2c2 0 0%2c0 21%2c19V5C21%2c3.89 20.1%2c3 19%2c3M19%2c5V19H5V5H19Z' /%3e%3c/svg%3e"); - background-position: 0 var(--box-vert-offset); - background-size: var(--box-size); - background-repeat: no-repeat; +.note-detail-printable .todo-list__label * { + -webkit-print-color-adjust: exact; + print-color-adjust: exact; } -.note-detail-printable .todo-list__label:has(>input[type="checkbox"]:checked) { - /* Source: https://pictogrammers.com/library/mdi/icon/checkbox-outline/ */ - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='currentColor'%3e%3cpath d='M19%2c3H5A2%2c2 0 0%2c0 3%2c5V19A2%2c2 0 0%2c0 5%2c21H19A2%2c2 0 0%2c0 21%2c19V5A2%2c2 0 0%2c0 19%2c3M19%2c5V19H5V5H19M10%2c17L6%2c13L7.41%2c11.58L10%2c14.17L16.59%2c7.58L18%2c9' /%3e%3c/svg%3e"); -} +@supports selector(.todo-list__label__description:has(*)) and (height: 1lh) { + .note-detail-printable .todo-list__label__description { -.note-detail-printable .todo-list__label > input[type="checkbox"] { - display: none; + /* The percentage of the line height that the check box occupies */ + --box-ratio: .75; + /* The size of the gap between the check box and the caption */ + --box-text-gap: 0.25em; + + --box-size: calc(1lh * var(--box-ratio)); + --box-vert-offset: calc((1lh - var(--box-size)) / 2); + + display: inline-block; + padding-left: calc(var(--box-size) + var(--box-text-gap)); + /* Source: https://pictogrammers.com/library/mdi/icon/checkbox-blank-outline/ */ + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='currentColor'%3e%3cpath d='M19%2c3H5C3.89%2c3 3%2c3.89 3%2c5V19A2%2c2 0 0%2c0 5%2c21H19A2%2c2 0 0%2c0 21%2c19V5C21%2c3.89 20.1%2c3 19%2c3M19%2c5V19H5V5H19Z' /%3e%3c/svg%3e"); + background-position: 0 var(--box-vert-offset); + background-size: var(--box-size); + background-repeat: no-repeat; + } + + .note-detail-printable .todo-list__label:has(input[type="checkbox"]:checked) .todo-list__label__description { + /* Source: https://pictogrammers.com/library/mdi/icon/checkbox-outline/ */ + background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='currentColor'%3e%3cpath d='M19%2c3H5A2%2c2 0 0%2c0 3%2c5V19A2%2c2 0 0%2c0 5%2c21H19A2%2c2 0 0%2c0 21%2c19V5A2%2c2 0 0%2c0 19%2c3M19%2c5V19H5V5H19M10%2c17L6%2c13L7.41%2c11.58L10%2c14.17L16.59%2c7.58L18%2c9' /%3e%3c/svg%3e"); + } + + .note-detail-printable .todo-list__label input[type="checkbox"] { + display: none !important; + } } /* From 9b775a142d6d3601970b7fae674dfd3b514ba4a4 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 2 Feb 2025 02:37:39 +0200 Subject: [PATCH 25/59] style(print): improve footnotes --- src/public/stylesheets/print.css | 34 +++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index 55c69ebc3..3946d5f95 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -246,7 +246,39 @@ span[style] { .note-detail-printable .footnote-reference a, .footnote-back-link a { text-decoration: none; - } +} + +/* Make the "^" link cover the whole area of the footnote item */ + +.footnote-section { + clear: both; +} + +.note-detail-printable li.footnote-item { + position: relative; + width: fit-content; +} + +.note-detail-printable .footnote-back-link, +.note-detail-printable .footnote-back-link *, +.note-detail-printable .footnote-back-link a { + display: block; + position: absolute; + + top: 0; + left: 0; + width: 100%; + height: 100%; +} + +.note-detail-printable .footnote-back-link a { + color: transparent; +} + +.note-detail-printable .footnote-content { + display: inline-block; + width: unset; +} /* * Widows and orphans From 6cd2a161557c2eb870bc4ad57db7012fb05b559e Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Sun, 2 Feb 2025 02:51:46 +0200 Subject: [PATCH 26/59] style(print): skip highlighting Trilium internal links --- src/public/stylesheets/print.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/public/stylesheets/print.css b/src/public/stylesheets/print.css index 3946d5f95..e172ece25 100644 --- a/src/public/stylesheets/print.css +++ b/src/public/stylesheets/print.css @@ -174,6 +174,11 @@ span[style] { */ .note-detail-printable a { + text-decoration: none; +} + +.note-detail-printable a:not([href^="#root/"]) { + text-decoration: underline; color: #374a75; } From 3911c0c22b49c5dcc1e2e5fce2d3c89475906e1f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 2 Feb 2025 11:07:28 +0200 Subject: [PATCH 27/59] refactor(geo_map): extract build icon into method --- .../app/widgets/type_widgets/geo_map.ts | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/public/app/widgets/type_widgets/geo_map.ts b/src/public/app/widgets/type_widgets/geo_map.ts index ee0f95b76..fdca64cbc 100644 --- a/src/public/app/widgets/type_widgets/geo_map.ts +++ b/src/public/app/widgets/type_widgets/geo_map.ts @@ -204,9 +204,7 @@ export default class GeoMapTypeWidget extends TypeWidget { const xmlResponse = await server.get(`notes/${note.noteId}/open`); const stringResponse = new XMLSerializer().serializeToString(xmlResponse); - const track = new this.L.GPX(stringResponse, { - - }); + const track = new this.L.GPX(stringResponse, {}); track.addTo(this.geoMapWidget.map); this.currentTrackData[note.noteId] = track; } @@ -219,15 +217,7 @@ export default class GeoMapTypeWidget extends TypeWidget { const [ lat, lng ] = latLng.split(",", 2).map((el) => parseFloat(el)); const L = this.L; - const icon = L.divIcon({ - html: `\ - - - - ${note.title}`, - iconSize: [ 25, 41 ], - iconAnchor: [ 12, 41 ] - }) + const icon = this.#buildIcon(note.getIcon(), note.title); const marker = L.marker(L.latLng(lat, lng), { icon, @@ -254,6 +244,18 @@ export default class GeoMapTypeWidget extends TypeWidget { this.currentMarkerData[note.noteId] = marker; } + #buildIcon(bxIconClass: string, title: string) { + return this.L.divIcon({ + html: `\ + + + + ${title}`, + iconSize: [ 25, 41 ], + iconAnchor: [ 12, 41 ] + }) + } + #changeState(newState: State) { this._state = newState; this.geoMapWidget.$container.toggleClass("placing-note", newState === State.NewNote); From ec95f62cd24a3489325b327b280779678214e8bb Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 2 Feb 2025 12:47:41 +0200 Subject: [PATCH 28/59] fix(server): doc notes not being served in dev mode --- src/routes/assets.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/routes/assets.ts b/src/routes/assets.ts index 959de788b..e76f0fc88 100644 --- a/src/routes/assets.ts +++ b/src/routes/assets.ts @@ -31,6 +31,7 @@ async function register(app: express.Application) { target: productionConfig.target }); + app.use(`/${assetPath}/app/doc_notes`, persistentCacheStatic(path.join(srcRoot, "public/app/doc_notes"))); app.use(`/${assetPath}/app`, webpackMiddleware(frontendCompiler)); } else { app.use(`/${assetPath}/app`, persistentCacheStatic(path.join(srcRoot, "public/app"))); From 71cd35c25d6fe28dddfd6e46ebd7c7d4a13b68aa Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 2 Feb 2025 12:50:57 +0200 Subject: [PATCH 29/59] style(next): fix italic text for buttons --- src/public/stylesheets/theme-next/forms.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css index 9e5702514..f6d8b47e8 100644 --- a/src/public/stylesheets/theme-next/forms.css +++ b/src/public/stylesheets/theme-next/forms.css @@ -247,7 +247,7 @@ input::selection, background: transparent !important; } -.input-group .input-group-text { +.input-group .input-group-text:not(button):not(a) { /* Background color hijack */ --accented-background-color: transparent; From 2fdac9b438b06af9d15fe67509159e98a3d24e72 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 2 Feb 2025 12:52:50 +0200 Subject: [PATCH 30/59] style(next): small margin to promoted attribute cells --- src/public/stylesheets/theme-next/shell.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 1f80fcb0f..1e735b7bf 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -1655,4 +1655,9 @@ body .calendar-dropdown-widget .calendar-body a:hover { border-radius: 8px; padding-left: 12px; +} + +/* Promoted attributes */ +.promoted-attribute-cell div.input-group { + margin: 1px 0; } \ No newline at end of file From 00bb7af5bdeb281103a08c355731c1928b980530 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 2 Feb 2025 12:59:00 +0200 Subject: [PATCH 31/59] chore(client/ts): port doc --- src/public/app/types.d.ts | 1 + src/public/app/widgets/type_widgets/{doc.js => doc.ts} | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) rename src/public/app/widgets/type_widgets/{doc.js => doc.ts} (90%) diff --git a/src/public/app/types.d.ts b/src/public/app/types.d.ts index b1750afb4..2af1e098d 100644 --- a/src/public/app/types.d.ts +++ b/src/public/app/types.d.ts @@ -39,6 +39,7 @@ interface CustomGlobals { maxEntityChangeIdAtLoad: number; maxEntityChangeSyncIdAtLoad: number; assetPath: string; + appPath: string; instanceName: string; appCssNoteIds: string[]; triliumVersion: string; diff --git a/src/public/app/widgets/type_widgets/doc.js b/src/public/app/widgets/type_widgets/doc.ts similarity index 90% rename from src/public/app/widgets/type_widgets/doc.js rename to src/public/app/widgets/type_widgets/doc.ts index 4fd2d76f0..433abccda 100644 --- a/src/public/app/widgets/type_widgets/doc.js +++ b/src/public/app/widgets/type_widgets/doc.ts @@ -1,3 +1,4 @@ +import type FNote from "../../entities/fnote.js"; import TypeWidget from "./type_widget.js"; const TPL = `
@@ -5,7 +6,7 @@ const TPL = `
.note-detail-doc-content { padding: 15px; } - + .note-detail-doc-content pre { background-color: var(--accented-background-color); border: 1px solid var(--main-border-color); @@ -13,11 +14,14 @@ const TPL = `
border-radius: 5px; } - +
`; export default class DocTypeWidget extends TypeWidget { + + private $content!: JQuery; + static getType() { return "doc"; } @@ -29,7 +33,7 @@ export default class DocTypeWidget extends TypeWidget { super.doRender(); } - async doRefresh(note) { + async doRefresh(note: FNote) { const docName = note.getLabelValue("docName"); if (docName) { From 512440684e379cc8fc6cba56f453a5920bfe3584 Mon Sep 17 00:00:00 2001 From: perfectra1n Date: Sun, 2 Feb 2025 10:19:21 -0800 Subject: [PATCH 32/59] remove `mac_init` functionality as it was overriding paste (and other) functionality, and is no longer needed --- src/public/app/desktop.ts | 3 --- src/public/app/services/mac_init.ts | 14 -------------- src/public/app/setup.ts | 3 --- 3 files changed, 20 deletions(-) diff --git a/src/public/app/desktop.ts b/src/public/app/desktop.ts index 4e9930d34..b78074126 100644 --- a/src/public/app/desktop.ts +++ b/src/public/app/desktop.ts @@ -4,7 +4,6 @@ import noteTooltipService from "./services/note_tooltip.js"; import bundleService from "./services/bundle.js"; import toastService from "./services/toast.js"; import noteAutocompleteService from "./services/note_autocomplete.js"; -import macInit from "./services/mac_init.js"; import electronContextMenu from "./menus/electron_context_menu.js"; import glob from "./services/glob.js"; import { t } from "./services/i18n.js"; @@ -35,8 +34,6 @@ if (utils.isElectron()) { initOnElectron(); } -macInit.init(); - noteTooltipService.setupGlobalTooltip(); noteAutocompleteService.init(); diff --git a/src/public/app/services/mac_init.ts b/src/public/app/services/mac_init.ts index c864b3cad..46a59aeea 100644 --- a/src/public/app/services/mac_init.ts +++ b/src/public/app/services/mac_init.ts @@ -5,20 +5,6 @@ import utils from "./utils.js"; import shortcutService from "./shortcuts.js"; function init() { - if (utils.isElectron() && utils.isMac()) { - shortcutService.bindGlobalShortcut("meta+c", () => exec("copy")); - shortcutService.bindGlobalShortcut("meta+v", () => exec("paste")); - shortcutService.bindGlobalShortcut("meta+x", () => exec("cut")); - shortcutService.bindGlobalShortcut("meta+a", () => exec("selectAll")); - shortcutService.bindGlobalShortcut("meta+z", () => exec("undo")); - shortcutService.bindGlobalShortcut("meta+y", () => exec("redo")); - } -} - -function exec(cmd: string) { - document.execCommand(cmd); - - return false; } export default { diff --git a/src/public/app/setup.ts b/src/public/app/setup.ts index ec389c793..1970c110a 100644 --- a/src/public/app/setup.ts +++ b/src/public/app/setup.ts @@ -1,9 +1,6 @@ import utils from "./services/utils.js"; -import macInit from "./services/mac_init.js"; import ko from "knockout"; -macInit.init(); - // TriliumNextTODO: properly make use of below types // type SetupModelSetupType = "new-document" | "sync-from-desktop" | "sync-from-server" | ""; // type SetupModelStep = "sync-in-progress" | "setup-type" | "new-document-in-progress" | "sync-from-desktop"; From 363360f0d555ad8a94d0fd2887deca30c24287a0 Mon Sep 17 00:00:00 2001 From: perfectra1n Date: Sun, 2 Feb 2025 10:21:59 -0800 Subject: [PATCH 33/59] we can just remove mac_init now since we're not using it --- src/public/app/services/mac_init.ts | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 src/public/app/services/mac_init.ts diff --git a/src/public/app/services/mac_init.ts b/src/public/app/services/mac_init.ts deleted file mode 100644 index 46a59aeea..000000000 --- a/src/public/app/services/mac_init.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Mac specific initialization - */ -import utils from "./utils.js"; -import shortcutService from "./shortcuts.js"; - -function init() { -} - -export default { - init -}; From 61e56023d42dcb92ae0742ea973dca307a2a6c6f Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Sun, 2 Feb 2025 12:47:27 +0100 Subject: [PATCH 34/59] refactor(electron-forge/deb): make desktop.ejs easier to read MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit in theory we could use variables in ejs, but unfortunately electron uses lodash template to create the file, which itself DOES NOT like any let/const/var assignments – wasted a bit of time finding this out, before coming up with this solution --- bin/electron-forge/desktop.ejs | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/bin/electron-forge/desktop.ejs b/bin/electron-forge/desktop.ejs index f803f37b2..32430cd2a 100644 --- a/bin/electron-forge/desktop.ejs +++ b/bin/electron-forge/desktop.ejs @@ -1,12 +1,17 @@ [Desktop Entry] -<% if (productName) { %>Name=<%= productName %> -<% } %><% if (description) { %>Comment=<%= description %> -<% } %><% if (genericName) { %>GenericName=<%= genericName %> -<% } %><% if (name) { %>Exec=<%= name %> %U -Icon=<%= name %> -<% } %>Type=Application -StartupNotify=true -<% if (productName) { %>StartupWMClass=<%= productName %> -<% } if (categories && categories.length) { %>Categories=<%= categories.join(';') %>; -<% } %><% if (mimeType && mimeType.length) { %>MimeType=<%= mimeType.join(';') %>; -<% } %> \ No newline at end of file +<%= +Object.entries({ + "Name": productName, + "Comment": description, + "GenericName": genericName, + "Exec": name ? `${name} %U` : undefined, + "Icon": name, + "Type": "Application", + "StartupNotify": "true", + "StartupWMClass": productName, + "Categories": categories?.length ? `${categories.join(";")};` : undefined, + "MimeType": mimeType?.length ? `${mimeType.join(";")};` : undefined +}) +.map(line => line[1] ? line.join("=") : undefined) +.filter(line => !!line) +.join("\n")%> \ No newline at end of file From ccbd47e03df415608f71431bef01024132109a64 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 01:09:01 +0200 Subject: [PATCH 35/59] desktop app: use a custom user agent string --- electron.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/electron.ts b/electron.ts index 154ec38d4..dc93e6688 100644 --- a/electron.ts +++ b/electron.ts @@ -26,6 +26,8 @@ electronDl({ saveAs: true }); // needed for excalidraw export https://github.com/zadam/trilium/issues/4271 electron.app.commandLine.appendSwitch("enable-experimental-web-platform-features"); +electron.app.userAgentFallback = `${electron.app.getName()} ${electron.app.getVersion()}`; + // Quit when all windows are closed, except on macOS. There, it's common // for applications and their menu bar to stay active until the user quits // explicitly with Cmd + Q. From 528fe1904cabdb73bdfd046e3343515dee22582f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 01:09:17 +0000 Subject: [PATCH 36/59] chore(deps): update dependency @playwright/test to v1.50.1 --- package-lock.json | 24 ++++++++++++------------ package.json | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3aac1a975..bc3f77601 100644 --- a/package-lock.json +++ b/package-lock.json @@ -113,7 +113,7 @@ "@electron-forge/maker-zip": "7.6.1", "@electron-forge/plugin-auto-unpack-natives": "7.6.1", "@electron/rebuild": "3.7.1", - "@playwright/test": "1.50.0", + "@playwright/test": "1.50.1", "@types/archiver": "6.0.3", "@types/better-sqlite3": "7.6.12", "@types/bootstrap": "5.2.10", @@ -2880,13 +2880,13 @@ } }, "node_modules/@playwright/test": { - "version": "1.50.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.0.tgz", - "integrity": "sha512-ZGNXbt+d65EGjBORQHuYKj+XhCewlwpnSd/EDuLPZGSiEWmgOJB5RmMCCYGy5aMfTs9wx61RivfDKi8H/hcMvw==", + "version": "1.50.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.1.tgz", + "integrity": "sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.50.0" + "playwright": "1.50.1" }, "bin": { "playwright": "cli.js" @@ -13320,13 +13320,13 @@ } }, "node_modules/playwright": { - "version": "1.50.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.0.tgz", - "integrity": "sha512-+GinGfGTrd2IfX1TA4N2gNmeIksSb+IAe589ZH+FlmpV3MYTx6+buChGIuDLQwrGNCw2lWibqV50fU510N7S+w==", + "version": "1.50.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.1.tgz", + "integrity": "sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.50.0" + "playwright-core": "1.50.1" }, "bin": { "playwright": "cli.js" @@ -13339,9 +13339,9 @@ } }, "node_modules/playwright-core": { - "version": "1.50.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.0.tgz", - "integrity": "sha512-CXkSSlr4JaZs2tZHI40DsZUN/NIwgaUPsyLuOAaIZp2CyF2sN5MM5NJsyB188lFSSozFxQ5fPT4qM+f0tH/6wQ==", + "version": "1.50.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.1.tgz", + "integrity": "sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/package.json b/package.json index fa88fd4fd..6ec4319d9 100644 --- a/package.json +++ b/package.json @@ -155,7 +155,7 @@ "@electron-forge/maker-zip": "7.6.1", "@electron-forge/plugin-auto-unpack-natives": "7.6.1", "@electron/rebuild": "3.7.1", - "@playwright/test": "1.50.0", + "@playwright/test": "1.50.1", "@types/archiver": "6.0.3", "@types/better-sqlite3": "7.6.12", "@types/bootstrap": "5.2.10", From c832eed0d7a16195d64522ff9147abf1f8a6d54e Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 16:37:27 +0200 Subject: [PATCH 37/59] style(next): fix the combo box style being overridden in some particular cases --- src/public/stylesheets/theme-next/forms.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css index f6d8b47e8..5c92497f2 100644 --- a/src/public/stylesheets/theme-next/forms.css +++ b/src/public/stylesheets/theme-next/forms.css @@ -273,6 +273,7 @@ input::selection, select, select.form-select, +select.form-control, .select-button.dropdown-toggle.btn { outline: 3px solid transparent; outline-offset: 6px; @@ -285,6 +286,7 @@ select.form-select, select:hover, select.form-select:hover, +select.form-control:hover, .select-button.dropdown-toggle.btn:hover { background-color: var(--input-hover-background); color: var(--input-hover-color); @@ -297,6 +299,7 @@ button.select-button.dropdown-toggle.btn:active { select:focus, select.form-select:focus, +select.form-control:focus, .select-button.dropdown-toggle.btn:focus { box-shadow: unset; outline: 3px solid var(--input-focus-outline-color); From 9a84dec222c106ca59e105add350feb02ab3ae35 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 16:44:22 +0200 Subject: [PATCH 38/59] client: "Label detail" dialog: use a consistent checkbox format --- .../app/widgets/attribute_widgets/attribute_detail.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/public/app/widgets/attribute_widgets/attribute_detail.ts b/src/public/app/widgets/attribute_widgets/attribute_detail.ts index cccb70075..69c518768 100644 --- a/src/public/app/widgets/attribute_widgets/attribute_detail.ts +++ b/src/public/app/widgets/attribute_widgets/attribute_detail.ts @@ -149,8 +149,13 @@ const TPL = ` - ${t("attribute_detail.inheritable")} - + + + + From 8a51f05bf4ef0f85273a9d35afb582d885a64cba Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 16:52:15 +0200 Subject: [PATCH 39/59] client: mark some links to use the new style --- src/public/app/widgets/type_widgets/attachment_detail.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/public/app/widgets/type_widgets/attachment_detail.js b/src/public/app/widgets/type_widgets/attachment_detail.js index 2a797fba5..15932d63b 100644 --- a/src/public/app/widgets/type_widgets/attachment_detail.js +++ b/src/public/app/widgets/type_widgets/attachment_detail.js @@ -15,18 +15,18 @@ const TPL = ` display: flex; flex-direction: column; } - + .attachment-detail .links-wrapper { font-size: larger; padding: 0 0 16px 0; } - + .attachment-detail .attachment-wrapper { flex-grow: 1; } -
+
`; @@ -57,7 +57,7 @@ export default class AttachmentDetailTypeWidget extends TypeWidget { this.$linksWrapper.empty().append( t("attachment_detail.owning_note"), - await linkService.createLink(this.noteId), + (await linkService.createLink(this.noteId)), t("attachment_detail.you_can_also_open"), await linkService.createLink(this.noteId, { title: t("attachment_detail.list_of_all_attachments"), From 4dafb47a36d4d4ae70a048541fc3d32de0dccccb Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 17:00:01 +0200 Subject: [PATCH 40/59] client: add some gap between protected session password prompt form elements --- src/public/app/widgets/type_widgets/protected_session.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/public/app/widgets/type_widgets/protected_session.js b/src/public/app/widgets/type_widgets/protected_session.js index 620946012..3caafb1b7 100644 --- a/src/public/app/widgets/type_widgets/protected_session.js +++ b/src/public/app/widgets/type_widgets/protected_session.js @@ -9,6 +9,11 @@ const TPL = ` width: 300px; margin: 30px auto auto; } + + input, button { + margin-top: 12px; + } +
From 3ec24231f2173c9dfdb2d1714c048333e9c44a6b Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 17:06:04 +0200 Subject: [PATCH 41/59] client: "Include note" dialog: use a consistent format for radio buttons --- src/public/app/widgets/dialogs/include_note.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/public/app/widgets/dialogs/include_note.js b/src/public/app/widgets/dialogs/include_note.js index 5778306eb..f3ff29714 100644 --- a/src/public/app/widgets/dialogs/include_note.js +++ b/src/public/app/widgets/dialogs/include_note.js @@ -25,16 +25,22 @@ const TPL = ` ${t("include_note.box_size_prompt")}
- - +
- - +
- - +
From 6f1f728c1bfee582569cdbf1114738ad4c5ad889 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 17:17:39 +0200 Subject: [PATCH 42/59] client: "Setup" dialog: use a consistent format for radio buttons --- src/views/setup.ejs | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/views/setup.ejs b/src/views/setup.ejs index 13c01a1bf..1f010d990 100644 --- a/src/views/setup.ejs +++ b/src/views/setup.ejs @@ -56,18 +56,26 @@
-
- -
-
- -
-
- -
+
+ +
+ +
+ +
+ +
+ +
From 664b1e32a646c9a89192d77f58e17a014d51c5d9 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 17:29:10 +0200 Subject: [PATCH 43/59] style(next): create a CSS file for the empty note (shown when opening a blank tab) --- src/public/stylesheets/theme-next/base.css | 1 + src/public/stylesheets/theme-next/notes/empty.css | 0 2 files changed, 1 insertion(+) create mode 100644 src/public/stylesheets/theme-next/notes/empty.css diff --git a/src/public/stylesheets/theme-next/base.css b/src/public/stylesheets/theme-next/base.css index 7d030b320..e32fba274 100644 --- a/src/public/stylesheets/theme-next/base.css +++ b/src/public/stylesheets/theme-next/base.css @@ -1,6 +1,7 @@ @import url(./forms.css); @import url(./shell.css); @import url(./settings.css); +@import url(./notes/empty.css); @import url(./notes/text.css); @font-face { diff --git a/src/public/stylesheets/theme-next/notes/empty.css b/src/public/stylesheets/theme-next/notes/empty.css new file mode 100644 index 000000000..e69de29bb From c9bfd077224598ee2d4de54a1fc4092242484b8e Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 17:49:07 +0200 Subject: [PATCH 44/59] style(next): tweak the new tab page --- src/public/stylesheets/theme-next/base.css | 26 +++++++++++++++++++ .../stylesheets/theme-next/notes/empty.css | 11 ++++++++ src/public/stylesheets/theme-next/shell.css | 19 -------------- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/public/stylesheets/theme-next/base.css b/src/public/stylesheets/theme-next/base.css index e32fba274..99b1263f7 100644 --- a/src/public/stylesheets/theme-next/base.css +++ b/src/public/stylesheets/theme-next/base.css @@ -65,3 +65,29 @@ /* Theme capabilities */ --tab-note-icons: true; } + +/* + * Note search suggestions + */ + +/* List body */ +.jump-to-note-dialog .jump-to-note-results .aa-suggestions, +.note-detail-empty .aa-suggestions { + padding: 0; +} + +/* List item */ +.jump-to-note-dialog .aa-suggestions div, +.note-detail-empty .aa-suggestions div { + border-radius: 6px; + padding: 6px 12px; + color: var(--menu-text-color); + cursor: default; +} + +/* Selected list item */ +.jump-to-note-dialog .aa-suggestions div.aa-cursor, +.note-detail-empty .aa-suggestions div.aa-cursor { + background: var(--hover-item-background-color); + color: var(--hover-item-text-color); +} \ No newline at end of file diff --git a/src/public/stylesheets/theme-next/notes/empty.css b/src/public/stylesheets/theme-next/notes/empty.css index e69de29bb..fcdf07198 100644 --- a/src/public/stylesheets/theme-next/notes/empty.css +++ b/src/public/stylesheets/theme-next/notes/empty.css @@ -0,0 +1,11 @@ +/* The container */ +div.note-detail-empty { + max-width: 70%; + margin: 50px auto; +} + +/* The search results list */ +.note-detail-empty span.aa-dropdown-menu { + margin-top: 1em; + border: unset; +} \ No newline at end of file diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index 1e735b7bf..dd1494a09 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -1237,25 +1237,6 @@ body .calendar-dropdown-widget .calendar-body a:hover { background: transparent !important; } -/* List body */ -.jump-to-note-dialog .jump-to-note-results .aa-suggestions { - padding: 0; -} - -/* List item */ -.jump-to-note-dialog .aa-suggestions div { - border-radius: 6px; - padding: 6px 12px; - color: var(--menu-text-color); - cursor: default; -} - -/* Selected list item */ -.jump-to-note-dialog .aa-suggestions div.aa-cursor { - background: var(--hover-item-background-color); - color: var(--hover-item-text-color); -} - /* * Recent changes list */ From 766473c291be78854eeb3646a802df79dc4b8e8b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Mon, 3 Feb 2025 18:59:56 +0200 Subject: [PATCH 45/59] fix(search): empty mindmap note breaking search (closes #1107) --- .../expressions/note_content_fulltext.spec.ts | 13 +++ .../expressions/note_content_fulltext.ts | 106 ++++++++++-------- 2 files changed, 73 insertions(+), 46 deletions(-) create mode 100644 src/services/search/expressions/note_content_fulltext.spec.ts diff --git a/src/services/search/expressions/note_content_fulltext.spec.ts b/src/services/search/expressions/note_content_fulltext.spec.ts new file mode 100644 index 000000000..9ef4a7d78 --- /dev/null +++ b/src/services/search/expressions/note_content_fulltext.spec.ts @@ -0,0 +1,13 @@ +import { describe, it, expect } from "vitest"; +import { processMindmapContent } from "./note_content_fulltext.js"; + +describe("processMindmapContent", () => { + it("supports empty JSON", () => { + expect(processMindmapContent("{}")).toEqual(""); + }); + + it("supports blank text / invalid JSON", () => { + expect(processMindmapContent("")).toEqual(""); + expect(processMindmapContent(`{ "node": " }`)).toEqual(""); + }); +}); diff --git a/src/services/search/expressions/note_content_fulltext.ts b/src/services/search/expressions/note_content_fulltext.ts index 083fd3d0e..b0a97da76 100644 --- a/src/services/search/expressions/note_content_fulltext.ts +++ b/src/services/search/expressions/note_content_fulltext.ts @@ -131,52 +131,7 @@ class NoteContentFulltextExp extends Expression { content = content.replace(/ /g, " "); } else if (type === "mindMap" && mime === "application/json") { - let mindMapcontent = JSON.parse(content); - - // Define interfaces for the JSON structure - interface MindmapNode { - id: string; - topic: string; - children: MindmapNode[]; // Recursive structure - direction?: number; - expanded?: boolean; - } - - interface MindmapData { - nodedata: MindmapNode; - arrows: any[]; // If you know the structure, replace `any` with the correct type - summaries: any[]; - direction: number; - theme: { - name: string; - type: string; - palette: string[]; - cssvar: Record; // Object with string keys and string values - }; - } - - // Recursive function to collect all topics - function collectTopics(node: MindmapNode): string[] { - // Collect the current node's topic - let topics = [node.topic]; - - // If the node has children, collect topics recursively - if (node.children && node.children.length > 0) { - for (const child of node.children) { - topics = topics.concat(collectTopics(child)); - } - } - - return topics; - } - - // Start extracting from the root node - const topicsArray = collectTopics(mindMapcontent.nodedata); - - // Combine topics into a single string - const topicsString = topicsArray.join(", "); - - content = normalize(topicsString.toString()); + content = processMindmapContent(content); } else if (type === "canvas" && mime === "application/json") { interface Element { type: string; @@ -215,4 +170,63 @@ class NoteContentFulltextExp extends Expression { } } +export function processMindmapContent(content: string) { + let mindMapcontent; + + try { + mindMapcontent = JSON.parse(content); + } catch (e) { + return ""; + } + + // Define interfaces for the JSON structure + interface MindmapNode { + id: string; + topic: string; + children: MindmapNode[]; // Recursive structure + direction?: number; + expanded?: boolean; + } + + interface MindmapData { + nodedata: MindmapNode; + arrows: any[]; // If you know the structure, replace `any` with the correct type + summaries: any[]; + direction: number; + theme: { + name: string; + type: string; + palette: string[]; + cssvar: Record; // Object with string keys and string values + }; + } + + // Recursive function to collect all topics + function collectTopics(node?: MindmapNode): string[] { + if (!node) { + return []; + } + + // Collect the current node's topic + let topics = [node.topic]; + + // If the node has children, collect topics recursively + if (node.children && node.children.length > 0) { + for (const child of node.children) { + topics = topics.concat(collectTopics(child)); + } + } + + return topics; + } + + // Start extracting from the root node + const topicsArray = collectTopics(mindMapcontent.nodedata); + + // Combine topics into a single string + const topicsString = topicsArray.join(", "); + + return normalize(topicsString.toString()); +} + export default NoteContentFulltextExp; From 631d46028ca60fabf04a2203dd5e34f72860ada5 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 20:25:43 +0200 Subject: [PATCH 46/59] client: tweak the label definition / relation definition dialog --- .../widgets/attribute_widgets/attribute_detail.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/public/app/widgets/attribute_widgets/attribute_detail.ts b/src/public/app/widgets/attribute_widgets/attribute_detail.ts index 69c518768..c5c56102e 100644 --- a/src/public/app/widgets/attribute_widgets/attribute_detail.ts +++ b/src/public/app/widgets/attribute_widgets/attribute_detail.ts @@ -67,6 +67,10 @@ const TPL = ` .attr-detail input[readonly] { background-color: var(--accented-background-color) !important; } + + .attr-edit-table td { + padding: 4px 0; + }
@@ -97,8 +101,13 @@ const TPL = ` - ${t("attribute_detail.promoted")} - + + + + ${t("attribute_detail.promoted_alias")} From 59fdc7d04897f99c8c9ba608f8bba5f64cbf77ac Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 20:52:48 +0200 Subject: [PATCH 47/59] client: fix broken selector --- src/public/app/widgets/type_widgets/protected_session.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/public/app/widgets/type_widgets/protected_session.js b/src/public/app/widgets/type_widgets/protected_session.js index 3caafb1b7..a8726de74 100644 --- a/src/public/app/widgets/type_widgets/protected_session.js +++ b/src/public/app/widgets/type_widgets/protected_session.js @@ -10,7 +10,8 @@ const TPL = ` margin: 30px auto auto; } - input, button { + .protected-session-password-component input, + .protected-session-password-component button { margin-top: 12px; } From 4efc86b9a3fc50bf6af8197ac6ca13065a91802a Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 22:15:53 +0200 Subject: [PATCH 48/59] style(next): fix the up / down buttons of the "Find in text" input box --- src/public/stylesheets/theme-next/forms.css | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css index 5c92497f2..e2e5c71e1 100644 --- a/src/public/stylesheets/theme-next/forms.css +++ b/src/public/stylesheets/theme-next/forms.css @@ -216,6 +216,7 @@ input::selection, .input-group button, .input-group a { display: flex; + align-items: center; --bs-border-width: 0; --accented-background-color: transparent; background: transparent; @@ -228,15 +229,21 @@ input::selection, .input-group button:hover, .input-group a:hover { --muted-text-color: var(--input-action-button-hover); + color: var(--input-action-button-hover); } .input-group button:focus-visible, .input-group a:focus-visible { + box-shadow: unset; outline: transparent; border: transparent; text-shadow: 0 0 3px var(--input-action-button-hover); } +.input-group button:active { + background: transparent !important; +} + .input-group a.disabled { opacity: .5; /* Workaround to set the "background" property. */ From 2b5f37e19d92b1f6d6ad058ff39cc0f9735dac30 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Mon, 3 Feb 2025 22:27:41 +0200 Subject: [PATCH 49/59] style(next): improve global menu update badge on horizontal layout --- src/public/stylesheets/theme-next/shell.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css index dd1494a09..0bb24d775 100644 --- a/src/public/stylesheets/theme-next/shell.css +++ b/src/public/stylesheets/theme-next/shell.css @@ -227,6 +227,12 @@ body.layout-horizontal > .horizontal { --hover-item-background-color: transparent; } +#launcher-pane.horizontal .global-menu-button .global-menu-button-update-available { + right: -23px; + bottom: -22px; + transform: scale(0.85); +} + .tooltip .tooltip-arrow { display: none; } From 4631298ad058ccc7f71b0da09d661d2c329c8108 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 23:11:37 +0200 Subject: [PATCH 50/59] style(next): improve the layout of the find and replace panel --- .../stylesheets/theme-next/notes/text.css | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/public/stylesheets/theme-next/notes/text.css b/src/public/stylesheets/theme-next/notes/text.css index 56a12e1c4..57646b200 100644 --- a/src/public/stylesheets/theme-next/notes/text.css +++ b/src/public/stylesheets/theme-next/notes/text.css @@ -126,3 +126,28 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child { border: 0 !important; border-top: 1px solid var(--main-border-color) !important; } + +/* + * Search in text panel + */ + +.find-replace-widget > div { + padding: 8px; +} + +.find-replace-widget > div + div { + padding-top: 0; +} + + /* The up / down buttons of the "Find in text" input */ +.find-replace-widget .input-group button { + font-size: 1.3em; +} + +.find-replace-widget .form-check { + padding-left: 0; +} + +.find-replace-widget .form-check .form-check-input { + margin-left: 0; +} \ No newline at end of file From caf613a4ef4f0e8abcf8558aed29fecdc7af6ba6 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 23:47:42 +0200 Subject: [PATCH 51/59] client: find & replace: move the current index and total results counters inside the "Find in text" input field --- src/public/app/widgets/find.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/public/app/widgets/find.js b/src/public/app/widgets/find.js index ec7bd0da9..c85d0f5f7 100644 --- a/src/public/app/widgets/find.js +++ b/src/public/app/widgets/find.js @@ -33,11 +33,15 @@ const TPL = ` } .find-widget-found-wrapper { - font-weight: bold; + justify-content: center; + min-width: 60px; + padding: 0 4px; + font-size: .85em; + text-align: center; } .find-widget-search-term-input-group, .replace-widget-replacetext-input { - max-width: 300px; + max-width: 350px; } .find-widget-spacer { @@ -49,6 +53,13 @@ const TPL = `
+
+ + 0 + / + 0 + +
@@ -66,11 +77,7 @@ const TPL = `
-
- 0 - / - 0 -
+
From 5376abac0b80a1c58981ad828b3ec53e4eb8e88e Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Mon, 3 Feb 2025 23:48:37 +0200 Subject: [PATCH 52/59] style(next): find & replace: tweak appearance --- src/public/stylesheets/theme-next/notes/text.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/public/stylesheets/theme-next/notes/text.css b/src/public/stylesheets/theme-next/notes/text.css index 57646b200..76cc6e395 100644 --- a/src/public/stylesheets/theme-next/notes/text.css +++ b/src/public/stylesheets/theme-next/notes/text.css @@ -139,6 +139,12 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child { padding-top: 0; } +div.find-replace-widget div.find-widget-found-wrapper { + min-width: 50px; + font-style: normal; + font-weight: normal; +} + /* The up / down buttons of the "Find in text" input */ .find-replace-widget .input-group button { font-size: 1.3em; From 90732a5324d23ebb39f523094d575b9c7bd43912 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Tue, 4 Feb 2025 00:08:43 +0200 Subject: [PATCH 53/59] style(next): add an alias CSS class (tn-tool-button) for icon buttons --- src/public/stylesheets/theme-next/forms.css | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/public/stylesheets/theme-next/forms.css b/src/public/stylesheets/theme-next/forms.css index e2e5c71e1..87e793e37 100644 --- a/src/public/stylesheets/theme-next/forms.css +++ b/src/public/stylesheets/theme-next/forms.css @@ -78,10 +78,11 @@ button.btn.btn-success kbd { * Icon buttons */ -:root .icon-action:not(.global-menu-button) { +:root .icon-action:not(.global-menu-button), +:root .tn-tool-button { width: var(--icon-button-size); height: var(--icon-button-size); - border: unset; + border: unset !important; border-radius: 8px; padding: 0; text-align: center; @@ -89,7 +90,8 @@ button.btn.btn-success kbd { } /* The "x" icon button */ -:root .icon-action.bx-x { +:root .icon-action.bx-x, +:root .tn-tool-button.bx-x { --icon-button-hover-background: var(--tab-close-button-hover-background); --icon-button-hover-color: var(--tab-close-button-hover-color); --icon-button-size: 24px; @@ -99,23 +101,28 @@ button.btn.btn-success kbd { } /* The icon */ -:root .icon-action:not(.global-menu-button)::before { +:root .icon-action:not(.global-menu-button)::before, +:root .tn-tool-button::before { display: block; line-height: var(--icon-button-size); font-size: calc(var(--icon-button-size) * var(--icon-button-icon-ratio)); } :root .icon-action:not(.global-menu-button):hover, -:root .icon-action:not(.global-menu-button).show { +:root .icon-action:not(.global-menu-button).show, +:root .tn-tool-button:hover, +:root .tn-tool-button.show { background: var(--icon-button-hover-background); color: var(--icon-button-hover-color); } -:root .icon-action:not(.global-menu-button):active::before { +:root .icon-action:not(.global-menu-button):active::before, +:root .tn-tool-button:active::before { transform: scale(.85); } -:root .icon-action:not(.global-menu-button):focus-visible { +:root .icon-action:not(.global-menu-button):focus-visible, +:root .tn-tool-button:focus-visible { outline: 2px solid var(--input-focus-outline-color); } From 805405484e5f1ce939e5ac86fa31b6a691d3b918 Mon Sep 17 00:00:00 2001 From: Adorian Doran Date: Tue, 4 Feb 2025 00:10:38 +0200 Subject: [PATCH 54/59] client: mark the add and save buttons from the "Owned Attributes" tab to use the icon button style --- src/public/app/widgets/attribute_widgets/attribute_editor.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/public/app/widgets/attribute_widgets/attribute_editor.ts b/src/public/app/widgets/attribute_widgets/attribute_editor.ts index 1547de085..e7df24327 100644 --- a/src/public/app/widgets/attribute_widgets/attribute_editor.ts +++ b/src/public/app/widgets/attribute_widgets/attribute_editor.ts @@ -77,8 +77,8 @@ const TPL = `
-
-
+
+
From 6facc3d05ce8c3f58483ca1b10fb51205e23ad9f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 01:45:13 +0000 Subject: [PATCH 55/59] chore(deps): update vitest monorepo to v3.0.5 --- package-lock.json | 100 +++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3aac1a975..6ca644c9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -151,7 +151,7 @@ "@types/ws": "8.5.14", "@types/xml2js": "0.4.14", "@types/yargs": "17.0.33", - "@vitest/coverage-v8": "3.0.4", + "@vitest/coverage-v8": "3.0.5", "cross-env": "7.0.3", "electron": "34.0.2", "esm": "3.2.25", @@ -166,7 +166,7 @@ "tsx": "4.19.2", "typedoc": "0.27.6", "typescript": "5.7.3", - "vitest": "3.0.4", + "vitest": "3.0.5", "webpack": "5.97.1", "webpack-cli": "6.0.1", "webpack-dev-middleware": "7.4.2" @@ -4163,9 +4163,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.4.tgz", - "integrity": "sha512-f0twgRCHgbs24Dp8cLWagzcObXMcuKtAwgxjJV/nnysPAJJk1JiKu/W0gIehZLmkljhJXU/E0/dmuQzsA/4jhA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-3.0.5.tgz", + "integrity": "sha512-zOOWIsj5fHh3jjGwQg+P+J1FW3s4jBu1Zqga0qW60yutsBtqEqNEJKWYh7cYn1yGD+1bdPsPdC/eL4eVK56xMg==", "dev": true, "license": "MIT", "dependencies": { @@ -4186,8 +4186,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "3.0.4", - "vitest": "3.0.4" + "@vitest/browser": "3.0.5", + "vitest": "3.0.5" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -4196,14 +4196,14 @@ } }, "node_modules/@vitest/expect": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.4.tgz", - "integrity": "sha512-Nm5kJmYw6P2BxhJPkO3eKKhGYKRsnqJqf+r0yOGRKpEP+bSCBDsjXgiu1/5QFrnPMEgzfC38ZEjvCFgaNBC0Eg==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.5.tgz", + "integrity": "sha512-nNIOqupgZ4v5jWuQx2DSlHLEs7Q4Oh/7AYwNyE+k0UQzG7tSmjPXShUikn1mpNGzYEN2jJbTvLejwShMitovBA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.4", - "@vitest/utils": "3.0.4", + "@vitest/spy": "3.0.5", + "@vitest/utils": "3.0.5", "chai": "^5.1.2", "tinyrainbow": "^2.0.0" }, @@ -4212,13 +4212,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.4.tgz", - "integrity": "sha512-gEef35vKafJlfQbnyOXZ0Gcr9IBUsMTyTLXsEQwuyYAerpHqvXhzdBnDFuHLpFqth3F7b6BaFr4qV/Cs1ULx5A==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.5.tgz", + "integrity": "sha512-CLPNBFBIE7x6aEGbIjaQAX03ZZlBMaWwAjBdMkIf/cAn6xzLTiM3zYqO/WAbieEjsAZir6tO71mzeHZoodThvw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "3.0.4", + "@vitest/spy": "3.0.5", "estree-walker": "^3.0.3", "magic-string": "^0.30.17" }, @@ -4239,9 +4239,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.4.tgz", - "integrity": "sha512-ts0fba+dEhK2aC9PFuZ9LTpULHpY/nd6jhAQ5IMU7Gaj7crPCTdCFfgvXxruRBLFS+MLraicCuFXxISEq8C93g==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.5.tgz", + "integrity": "sha512-CjUtdmpOcm4RVtB+up8r2vVDLR16Mgm/bYdkGFe3Yj/scRfCpbSi2W/BDSDcFK7ohw8UXvjMbOp9H4fByd/cOA==", "dev": true, "license": "MIT", "dependencies": { @@ -4252,13 +4252,13 @@ } }, "node_modules/@vitest/runner": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.4.tgz", - "integrity": "sha512-dKHzTQ7n9sExAcWH/0sh1elVgwc7OJ2lMOBrAm73J7AH6Pf9T12Zh3lNE1TETZaqrWFXtLlx3NVrLRb5hCK+iw==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.5.tgz", + "integrity": "sha512-BAiZFityFexZQi2yN4OX3OkJC6scwRo8EhRB0Z5HIGGgd2q+Nq29LgHU/+ovCtd0fOfXj5ZI6pwdlUmC5bpi8A==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "3.0.4", + "@vitest/utils": "3.0.5", "pathe": "^2.0.2" }, "funding": { @@ -4273,13 +4273,13 @@ "license": "MIT" }, "node_modules/@vitest/snapshot": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.4.tgz", - "integrity": "sha512-+p5knMLwIk7lTQkM3NonZ9zBewzVp9EVkVpvNta0/PlFWpiqLaRcF4+33L1it3uRUCh0BGLOaXPPGEjNKfWb4w==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.5.tgz", + "integrity": "sha512-GJPZYcd7v8QNUJ7vRvLDmRwl+a1fGg4T/54lZXe+UOGy47F9yUfE18hRCtXL5aHN/AONu29NGzIXSVFh9K0feA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.4", + "@vitest/pretty-format": "3.0.5", "magic-string": "^0.30.17", "pathe": "^2.0.2" }, @@ -4295,9 +4295,9 @@ "license": "MIT" }, "node_modules/@vitest/spy": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.4.tgz", - "integrity": "sha512-sXIMF0oauYyUy2hN49VFTYodzEAu744MmGcPR3ZBsPM20G+1/cSW/n1U+3Yu/zHxX2bIDe1oJASOkml+osTU6Q==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.5.tgz", + "integrity": "sha512-5fOzHj0WbUNqPK6blI/8VzZdkBlQLnT25knX0r4dbZI9qoZDf3qAdjoMmDcLG5A83W6oUUFJgUd0EYBc2P5xqg==", "dev": true, "license": "MIT", "dependencies": { @@ -4308,13 +4308,13 @@ } }, "node_modules/@vitest/utils": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.4.tgz", - "integrity": "sha512-8BqC1ksYsHtbWH+DfpOAKrFw3jl3Uf9J7yeFh85Pz52IWuh1hBBtyfEbRNNZNjl8H8A5yMLH9/t+k7HIKzQcZQ==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.5.tgz", + "integrity": "sha512-N9AX0NUoUtVwKwy21JtwzaqR5L5R5A99GAbrHfCCXK1lp593i/3AZAXhSP43wRQuxYsflrdzEfXZFo1reR1Nkg==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "3.0.4", + "@vitest/pretty-format": "3.0.5", "loupe": "^3.1.2", "tinyrainbow": "^2.0.0" }, @@ -16856,9 +16856,9 @@ } }, "node_modules/vite-node": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.4.tgz", - "integrity": "sha512-7JZKEzcYV2Nx3u6rlvN8qdo3QV7Fxyt6hx+CCKz9fbWxdX5IvUOmTWEAxMrWxaiSf7CKGLJQ5rFu8prb/jBjOA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.5.tgz", + "integrity": "sha512-02JEJl7SbtwSDJdYS537nU6l+ktdvcREfLksk/NDAqtdKWGqHl+joXzEubHROmS3E6pip+Xgu2tFezMu75jH7A==", "dev": true, "license": "MIT", "dependencies": { @@ -17350,19 +17350,19 @@ } }, "node_modules/vitest": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.4.tgz", - "integrity": "sha512-6XG8oTKy2gnJIFTHP6LD7ExFeNLxiTkK3CfMvT7IfR8IN+BYICCf0lXUQmX7i7JoxUP8QmeP4mTnWXgflu4yjw==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.5.tgz", + "integrity": "sha512-4dof+HvqONw9bvsYxtkfUp2uHsTN9bV2CZIi1pWgoFpL1Lld8LA1ka9q/ONSsoScAKG7NVGf2stJTI7XRkXb2Q==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "3.0.4", - "@vitest/mocker": "3.0.4", - "@vitest/pretty-format": "^3.0.4", - "@vitest/runner": "3.0.4", - "@vitest/snapshot": "3.0.4", - "@vitest/spy": "3.0.4", - "@vitest/utils": "3.0.4", + "@vitest/expect": "3.0.5", + "@vitest/mocker": "3.0.5", + "@vitest/pretty-format": "^3.0.5", + "@vitest/runner": "3.0.5", + "@vitest/snapshot": "3.0.5", + "@vitest/spy": "3.0.5", + "@vitest/utils": "3.0.5", "chai": "^5.1.2", "debug": "^4.4.0", "expect-type": "^1.1.0", @@ -17374,7 +17374,7 @@ "tinypool": "^1.0.2", "tinyrainbow": "^2.0.0", "vite": "^5.0.0 || ^6.0.0", - "vite-node": "3.0.4", + "vite-node": "3.0.5", "why-is-node-running": "^2.3.0" }, "bin": { @@ -17390,8 +17390,8 @@ "@edge-runtime/vm": "*", "@types/debug": "^4.1.12", "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "@vitest/browser": "3.0.4", - "@vitest/ui": "3.0.4", + "@vitest/browser": "3.0.5", + "@vitest/ui": "3.0.5", "happy-dom": "*", "jsdom": "*" }, diff --git a/package.json b/package.json index fa88fd4fd..d92ce0dad 100644 --- a/package.json +++ b/package.json @@ -193,7 +193,7 @@ "@types/ws": "8.5.14", "@types/xml2js": "0.4.14", "@types/yargs": "17.0.33", - "@vitest/coverage-v8": "3.0.4", + "@vitest/coverage-v8": "3.0.5", "cross-env": "7.0.3", "electron": "34.0.2", "esm": "3.2.25", @@ -208,7 +208,7 @@ "tsx": "4.19.2", "typedoc": "0.27.6", "typescript": "5.7.3", - "vitest": "3.0.4", + "vitest": "3.0.5", "webpack": "5.97.1", "webpack-cli": "6.0.1", "webpack-dev-middleware": "7.4.2" From d908c9044b63468d9b93e3b6618b079475180fea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 01:45:21 +0000 Subject: [PATCH 56/59] fix(deps): update dependency semver to v7.7.1 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3aac1a975..a62688b2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,7 +86,7 @@ "sanitize-filename": "1.6.3", "sanitize-html": "2.14.0", "sax": "1.4.1", - "semver": "7.7.0", + "semver": "7.7.1", "serve-favicon": "2.5.0", "session-file-store": "1.5.0", "source-map-support": "0.5.21", @@ -14721,9 +14721,9 @@ } }, "node_modules/semver": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz", - "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", "license": "ISC", "bin": { "semver": "bin/semver.js" diff --git a/package.json b/package.json index fa88fd4fd..01cd709bd 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "sanitize-filename": "1.6.3", "sanitize-html": "2.14.0", "sax": "1.4.1", - "semver": "7.7.0", + "semver": "7.7.1", "serve-favicon": "2.5.0", "session-file-store": "1.5.0", "source-map-support": "0.5.21", From e126d7be34daf0efa0b33085d07bad300381ec8f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 01:45:31 +0000 Subject: [PATCH 57/59] chore(deps): update dependency @types/node to v22.13.1 --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3aac1a975..4753df223 100644 --- a/package-lock.json +++ b/package-lock.json @@ -136,7 +136,7 @@ "@types/leaflet-gpx": "1.3.7", "@types/mime-types": "2.1.4", "@types/multer": "1.4.12", - "@types/node": "22.12.0", + "@types/node": "22.13.1", "@types/react": "18.3.18", "@types/safe-compare": "1.1.2", "@types/sanitize-html": "2.13.0", @@ -3909,9 +3909,9 @@ } }, "node_modules/@types/node": { - "version": "22.12.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.12.0.tgz", - "integrity": "sha512-Fll2FZ1riMjNmlmJOdAyY5pUbkftXslB5DgEzlIuNaiWhXd00FhWxVC/r4yV/4wBb9JfImTu+jiSvXTkJ7F/gA==", + "version": "22.13.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz", + "integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==", "license": "MIT", "dependencies": { "undici-types": "~6.20.0" diff --git a/package.json b/package.json index fa88fd4fd..119781197 100644 --- a/package.json +++ b/package.json @@ -178,7 +178,7 @@ "@types/leaflet-gpx": "1.3.7", "@types/mime-types": "2.1.4", "@types/multer": "1.4.12", - "@types/node": "22.12.0", + "@types/node": "22.13.1", "@types/react": "18.3.18", "@types/safe-compare": "1.1.2", "@types/sanitize-html": "2.13.0", From 0af08c2a7bcd36081320492d88e9c06c2090dcc7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 18:56:44 +0000 Subject: [PATCH 58/59] chore(deps): update dependency vitest to v3.0.5 [security] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fa88fd4fd..ad59d0051 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,7 @@ "tsx": "4.19.2", "typedoc": "0.27.6", "typescript": "5.7.3", - "vitest": "3.0.4", + "vitest": "3.0.5", "webpack": "5.97.1", "webpack-cli": "6.0.1", "webpack-dev-middleware": "7.4.2" From ce453098189f700e64a6be582f69f955e22332dc Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 4 Feb 2025 21:15:47 +0200 Subject: [PATCH 59/59] feat(deps): remove dependency on semver --- package-lock.json | 9 --------- package.json | 2 -- src/services/utils.ts | 45 ++++++++++++++++++++++++++++++++++++++++++- src/www.ts | 7 ++++--- 4 files changed, 48 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index a62688b2e..382a2088a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -86,7 +86,6 @@ "sanitize-filename": "1.6.3", "sanitize-html": "2.14.0", "sax": "1.4.1", - "semver": "7.7.1", "serve-favicon": "2.5.0", "session-file-store": "1.5.0", "source-map-support": "0.5.21", @@ -141,7 +140,6 @@ "@types/safe-compare": "1.1.2", "@types/sanitize-html": "2.13.0", "@types/sax": "1.2.7", - "@types/semver": "7.5.8", "@types/serve-favicon": "2.5.7", "@types/session-file-store": "1.2.5", "@types/source-map-support": "0.5.10", @@ -4002,13 +4000,6 @@ "@types/node": "*" } }, - "node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", diff --git a/package.json b/package.json index 01cd709bd..edbe5beb3 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,6 @@ "sanitize-filename": "1.6.3", "sanitize-html": "2.14.0", "sax": "1.4.1", - "semver": "7.7.1", "serve-favicon": "2.5.0", "session-file-store": "1.5.0", "source-map-support": "0.5.21", @@ -183,7 +182,6 @@ "@types/safe-compare": "1.1.2", "@types/sanitize-html": "2.13.0", "@types/sax": "1.2.7", - "@types/semver": "7.5.8", "@types/serve-favicon": "2.5.7", "@types/session-file-store": "1.2.5", "@types/source-map-support": "0.5.10", diff --git a/src/services/utils.ts b/src/services/utils.ts index b00c1e488..b4d7ad67c 100644 --- a/src/services/utils.ts +++ b/src/services/utils.ts @@ -324,6 +324,48 @@ export function getResourceDir() { } } +// TODO: Deduplicate with src/public/app/services/utils.ts +/** + * Compares two semantic version strings. + * Returns: + * 1 if v1 is greater than v2 + * 0 if v1 is equal to v2 + * -1 if v1 is less than v2 + * + * @param v1 First version string + * @param v2 Second version string + * @returns + */ +function compareVersions(v1: string, v2: string): number { + // Remove 'v' prefix and everything after dash if present + v1 = v1.replace(/^v/, "").split("-")[0]; + v2 = v2.replace(/^v/, "").split("-")[0]; + + const v1parts = v1.split(".").map(Number); + const v2parts = v2.split(".").map(Number); + + // Pad shorter version with zeros + while (v1parts.length < 3) v1parts.push(0); + while (v2parts.length < 3) v2parts.push(0); + + // Compare major version + if (v1parts[0] !== v2parts[0]) { + return v1parts[0] > v2parts[0] ? 1 : -1; + } + + // Compare minor version + if (v1parts[1] !== v2parts[1]) { + return v1parts[1] > v2parts[1] ? 1 : -1; + } + + // Compare patch version + if (v1parts[2] !== v2parts[2]) { + return v1parts[2] > v2parts[2] ? 1 : -1; + } + + return 0; +} + export default { randomSecureToken, randomString, @@ -360,5 +402,6 @@ export default { getResourceDir, isMac, isWindows, - envToBoolean + envToBoolean, + compareVersions }; diff --git a/src/www.ts b/src/www.ts index 258f0f272..d442ba35f 100644 --- a/src/www.ts +++ b/src/www.ts @@ -12,7 +12,8 @@ import ws from "./services/ws.js"; import utils from "./services/utils.js"; import port from "./services/port.js"; import host from "./services/host.js"; -import semver from "semver"; + +const MINIMUM_NODE_VERSION = "22.0.0"; // setup basic error handling even before requiring dependencies, since those can produce errors as well @@ -32,8 +33,8 @@ function exit() { process.on("SIGINT", exit); process.on("SIGTERM", exit); -if (!semver.satisfies(process.version, ">=10.5.0")) { - console.error("Trilium only supports node.js 10.5 and later"); +if (utils.compareVersions(process.version, MINIMUM_NODE_VERSION) < 0) { + console.error(`\nTrilium requires Node.js ${MINIMUM_NODE_VERSION} and later.\n`); process.exit(1); }