Merge branch 'main' of https://github.com/TriliumNext/Trilium into feat/ui-improvements

2025-12-22 08:09:55 +01:00 · 2025-10-28 23:43:55 +02:00
parent ea45024559 5b7e9d4c12
commit ae544a80c2
82 changed files with 1894 additions and 799 deletions
--- a/apps/client/src/components/app_context.ts
+++ b/apps/client/src/components/app_context.ts
@@ -218,12 +218,12 @@ export type CommandMappings = {
    /** Works only in the electron context menu. */
    replaceMisspelling: CommandData;

-    importMarkdownInline: CommandData;
    showPasswordNotSet: CommandData;
    showProtectedSessionPasswordDialog: CommandData;
    showUploadAttachmentsDialog: CommandData & { noteId: string };
    showIncludeNoteDialog: CommandData & { textTypeWidget: EditableTextTypeWidget };
    showAddLinkDialog: CommandData & { textTypeWidget: EditableTextTypeWidget, text: string };
+    showPasteMarkdownDialog: CommandData & { textTypeWidget: EditableTextTypeWidget };
    closeProtectedSessionPasswordDialog: CommandData;
    copyImageReferenceToClipboard: CommandData;
    copyImageToClipboard: CommandData;
--- a/apps/client/src/services/glob.ts
+++ b/apps/client/src/services/glob.ts
@@ -20,9 +20,6 @@ function setupGlobs() {
    window.glob.froca = froca;
    window.glob.treeCache = froca; // compatibility for CKEditor builds for a while

-    // for CKEditor integration (button on block toolbar)
-    window.glob.importMarkdownInline = async () => appContext.triggerCommand("importMarkdownInline");
-
    window.onerror = function (msg, url, lineNo, columnNo, error) {
        const string = String(msg).toLowerCase();

--- a/apps/client/src/share.ts
+++ b/apps/client/src/share.ts
@@ -9,16 +9,6 @@ async function ensureJQuery() {
    (window as any).$ = $;
 }

-async function applyMath() {
-    const anyMathBlock = document.querySelector("#content .math-tex");
-    if (!anyMathBlock) {
-        return;
-    }
-
-    const renderMathInElement = (await import("./services/math.js")).renderMathInElement;
-    renderMathInElement(document.getElementById("content"));
-}
-
 async function formatCodeBlocks() {
    const anyCodeBlock = document.querySelector("#content pre");
    if (!anyCodeBlock) {
@@ -31,54 +21,4 @@ async function formatCodeBlocks() {

 async function setupTextNote() {
    formatCodeBlocks();
-    applyMath();
-
-    const setupMermaid = (await import("./share/mermaid.js")).default;
-    setupMermaid();
 }
-
-/**
- * Fetch note with given ID from backend
- *
- * @param noteId of the given note to be fetched. If false, fetches current note.
- */
-async function fetchNote(noteId: string | null = null) {
-    if (!noteId) {
-        noteId = document.body.getAttribute("data-note-id");
-    }
-
-    const resp = await fetch(`api/notes/${noteId}`);
-
-    return await resp.json();
-}
-
-document.addEventListener(
-    "DOMContentLoaded",
-    () => {
-        const noteType = determineNoteType();
-
-        if (noteType === "text") {
-            setupTextNote();
-        }
-
-        const toggleMenuButton = document.getElementById("toggleMenuButton");
-        const layout = document.getElementById("layout");
-
-        if (toggleMenuButton && layout) {
-            toggleMenuButton.addEventListener("click", () => layout.classList.toggle("showMenu"));
-        }
-    },
-    false
-);
-
-function determineNoteType() {
-    const bodyClass = document.body.className;
-    const match = bodyClass.match(/type-([^\s]+)/);
-    return match ? match[1] : null;
-}
-
-// workaround to prevent webpack from removing "fetchNote" as dead code:
-// add fetchNote as property to the window object
-Object.defineProperty(window, "fetchNote", {
-    value: fetchNote
-});
--- a/apps/client/src/share/mermaid.ts
+++ b/apps/client/src/share/mermaid.ts
@@ -1,17 +0,0 @@
-import mermaid from "mermaid";
-
-export default function setupMermaid() {
-    for (const codeBlock of document.querySelectorAll("#content pre code.language-mermaid")) {
-        const parentPre = codeBlock.parentElement;
-        if (!parentPre) {
-            continue;
-        }
-
-        const mermaidDiv = document.createElement("div");
-        mermaidDiv.classList.add("mermaid");
-        mermaidDiv.innerHTML = codeBlock.innerHTML;
-        parentPre.replaceWith(mermaidDiv);
-    }
-
-    mermaid.init();
-}
--- a/apps/client/src/stylesheets/style.css
+++ b/apps/client/src/stylesheets/style.css
@@ -2034,9 +2034,9 @@ body.zen #right-pane,
 body.zen #mobile-sidebar-wrapper,
 body.zen .tab-row-container,
 body.zen .tab-row-widget,
-body.zen .ribbon-container:not(:has(.classic-toolbar-widget.visible)),
-body.zen .ribbon-container:has(.classic-toolbar-widget.visible) .ribbon-top-row,
-body.zen .ribbon-container .ribbon-body:not(:has(.classic-toolbar-widget.visible)),
+body.zen .ribbon-container:not(:has(.classic-toolbar-widget)),
+body.zen .ribbon-container:has(.classic-toolbar-widget) .ribbon-top-row,
+body.zen .ribbon-container .ribbon-body:not(:has(.classic-toolbar-widget)),
 body.zen .note-icon-widget,
 body.zen .title-row .icon-action,
 body.zen .floating-buttons-children > *:not(.bx-edit-alt),
--- a/apps/client/src/translations/cn/translation.json
+++ b/apps/client/src/translations/cn/translation.json
@@ -259,7 +259,6 @@
    "delete_all_revisions": "删除此笔记的所有修订版本",
    "delete_all_button": "删除所有修订版本",
    "help_title": "关于笔记修订版本的帮助",
-    "revision_last_edited": "此修订版本上次编辑于 {{date}}",
    "confirm_delete_all": "您是否要删除此笔记的所有修订版本？",
    "no_revisions": "此笔记暂无修订版本...",
    "restore_button": "恢复",
--- a/apps/client/src/translations/de/translation.json
+++ b/apps/client/src/translations/de/translation.json
@@ -4,7 +4,7 @@
    "homepage": "Startseite:",
    "app_version": "App-Version:",
    "db_version": "DB-Version:",
-    "sync_version": "Synch-version:",
+    "sync_version": "Sync-Version:",
    "build_date": "Build-Datum:",
    "build_revision": "Build-Revision:",
    "data_directory": "Datenverzeichnis:"
@@ -260,7 +260,6 @@
    "delete_all_revisions": "Lösche alle Revisionen dieser Notiz",
    "delete_all_button": "Alle Revisionen löschen",
    "help_title": "Hilfe zu Notizrevisionen",
-    "revision_last_edited": "Diese Revision wurde zuletzt am {{date}} bearbeitet",
    "confirm_delete_all": "Möchtest du alle Revisionen dieser Notiz löschen?",
    "no_revisions": "Für diese Notiz gibt es noch keine Revisionen...",
    "confirm_restore": "Möchtest du diese Revision wiederherstellen? Dadurch werden der aktuelle Titel und Inhalt der Notiz mit dieser Revision überschrieben.",
@@ -991,7 +990,7 @@
    "enter_password_instruction": "Um die geschützte Notiz anzuzeigen, musst du dein Passwort eingeben:",
    "start_session_button": "Starte eine geschützte Sitzung <kbd>Eingabetaste</kbd>",
    "started": "Geschützte Sitzung gestartet.",
-    "wrong_password": "Passwort flasch.",
+    "wrong_password": "Passwort falsch.",
    "protecting-finished-successfully": "Geschützt erfolgreich beendet.",
    "unprotecting-finished-successfully": "Ungeschützt erfolgreich beendet.",
    "protecting-in-progress": "Schützen läuft: {{count}}",
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@@ -104,7 +104,8 @@
    "export_status": "Export status",
    "export_in_progress": "Export in progress: {{progressCount}}",
    "export_finished_successfully": "Export finished successfully.",
-    "format_pdf": "PDF - for printing or sharing purposes."
+    "format_pdf": "PDF - for printing or sharing purposes.",
+    "share-format": "HTML for web publishing - uses the same theme that is used shared notes, but can be published as a static website."
  },
  "help": {
    "title": "Cheatsheet",
@@ -260,7 +261,6 @@
    "delete_all_revisions": "Delete all revisions of this note",
    "delete_all_button": "Delete all revisions",
    "help_title": "Help on Note Revisions",
-    "revision_last_edited": "This revision was last edited on {{date}}",
    "confirm_delete_all": "Do you want to delete all revisions of this note?",
    "no_revisions": "No revisions for this note yet...",
    "restore_button": "Restore",
--- a/apps/client/src/translations/es/translation.json
+++ b/apps/client/src/translations/es/translation.json
@@ -259,7 +259,6 @@
    "delete_all_revisions": "Eliminar todas las revisiones de esta nota",
    "delete_all_button": "Eliminar todas las revisiones",
    "help_title": "Ayuda sobre revisiones de notas",
-    "revision_last_edited": "Esta revisión se editó por última vez en {{date}}",
    "confirm_delete_all": "¿Quiere eliminar todas las revisiones de esta nota?",
    "no_revisions": "Aún no hay revisiones para esta nota...",
    "restore_button": "Restaurar",
--- a/apps/client/src/translations/fr/translation.json
+++ b/apps/client/src/translations/fr/translation.json
@@ -260,7 +260,6 @@
    "delete_all_revisions": "Supprimer toutes les versions de cette note",
    "delete_all_button": "Supprimer toutes les versions",
    "help_title": "Aide sur les versions de notes",
-    "revision_last_edited": "Cette version a été modifiée pour la dernière fois le {{date}}",
    "confirm_delete_all": "Voulez-vous supprimer toutes les versions de cette note ?",
    "no_revisions": "Aucune version pour cette note pour l'instant...",
    "confirm_restore": "Voulez-vous restaurer cette version ? Le titre et le contenu actuels de la note seront écrasés par cette version.",
--- a/apps/client/src/translations/hi/translation.json
+++ b/apps/client/src/translations/hi/translation.json
@@ -0,0 +1,5 @@
+{
+  "about": {
+    "title": "ट्रिलियम नोट्स के बारें में"
+  }
+}
--- a/apps/client/src/translations/it/translation.json
+++ b/apps/client/src/translations/it/translation.json
@@ -867,7 +867,6 @@
    "delete_all_revisions": "Elimina tutte le revisioni di questa nota",
    "delete_all_button": "Elimina tutte le revisioni",
    "help_title": "Aiuto sulle revisioni delle note",
-    "revision_last_edited": "Questa revisione è stata modificata l'ultima volta il {{date}}",
    "confirm_delete_all": "Vuoi eliminare tutte le revisioni di questa nota?",
    "no_revisions": "Ancora nessuna revisione per questa nota...",
    "restore_button": "Ripristina",
--- a/apps/client/src/translations/ja/translation.json
+++ b/apps/client/src/translations/ja/translation.json
@@ -610,7 +610,6 @@
    "delete_all_revisions": "このノートの変更履歴をすべて削除",
    "delete_all_button": "変更履歴をすべて削除",
    "help_title": "変更履歴のヘルプ",
-    "revision_last_edited": "この変更は{{date}}に行われました",
    "confirm_delete_all": "このノートのすべての変更履歴を削除しますか？",
    "no_revisions": "このノートに変更履歴はまだありません...",
    "restore_button": "復元",
--- a/apps/client/src/translations/mr/translation.json
+++ b/apps/client/src/translations/mr/translation.json
@@ -0,0 +1 @@
+{}
--- a/apps/client/src/translations/pl/translation.json
+++ b/apps/client/src/translations/pl/translation.json
@@ -912,7 +912,6 @@
    "delete_all_revisions": "Usuń wszystkie wersje tej notatki",
    "delete_all_button": "Usuń wszystkie wersje",
    "help_title": "Pomoc dotycząca wersji notatki",
-    "revision_last_edited": "Ta wersja była ostatnio edytowana {{date}}",
    "confirm_delete_all": "Czy chcesz usunąć wszystkie wersje tej notatki?",
    "no_revisions": "Brak wersji dla tej notatki...",
    "restore_button": "Przywróć",
--- a/apps/client/src/translations/pt/translation.json
+++ b/apps/client/src/translations/pt/translation.json
@@ -259,7 +259,6 @@
    "delete_all_revisions": "Apagar todas as versões desta nota",
    "delete_all_button": "Apagar todas as versões",
    "help_title": "Ajuda sobre as versões da nota",
-    "revision_last_edited": "Esta versão foi editada pela última vez em {{date}}",
    "confirm_delete_all": "Quer apagar todas as versões desta nota?",
    "no_revisions": "Ainda não há versões para esta nota...",
    "restore_button": "Recuperar",
--- a/apps/client/src/translations/pt_br/translation.json
+++ b/apps/client/src/translations/pt_br/translation.json
@@ -415,7 +415,6 @@
    "delete_all_revisions": "Excluir todas as versões desta nota",
    "delete_all_button": "Excluir todas as versões",
    "help_title": "Ajuda sobre as versões da nota",
-    "revision_last_edited": "Esta versão foi editada pela última vez em {{date}}",
    "confirm_delete_all": "Você quer excluir todas as versões desta nota?",
    "no_revisions": "Ainda não há versões para esta nota...",
    "restore_button": "Recuperar",
--- a/apps/client/src/translations/ro/translation.json
+++ b/apps/client/src/translations/ro/translation.json
@@ -1090,7 +1090,6 @@
    "preview_not_available": "Nu este disponibilă o previzualizare pentru acest tip de notiță.",
    "restore_button": "Restaurează",
    "revision_deleted": "Revizia notiței a fost ștearsă.",
-    "revision_last_edited": "Revizia a fost ultima oară modificată pe {{date}}",
    "revision_restored": "Revizia notiței a fost restaurată.",
    "revisions_deleted": "Notița reviziei a fost ștearsă.",
    "maximum_revisions": "Numărul maxim de revizii pentru notița curentă: {{number}}.",
--- a/apps/client/src/translations/ru/translation.json
+++ b/apps/client/src/translations/ru/translation.json
@@ -366,7 +366,6 @@
    "delete_all_button": "Удалить все версии",
    "help_title": "Помощь по версиям заметок",
    "confirm_delete_all": "Вы хотите удалить все версии этой заметки?",
-    "revision_last_edited": "Эта версия последний раз редактировалась {{date}}",
    "confirm_restore": "Хотите восстановить эту версию? Текущее название и содержание заметки будут перезаписаны этой версией.",
    "confirm_delete": "Вы хотите удалить эту версию?",
    "revisions_deleted": "Версии заметки были удалены.",
--- a/apps/client/src/translations/sr/translation.json
+++ b/apps/client/src/translations/sr/translation.json
@@ -256,7 +256,6 @@
        "delete_all_revisions": "Obriši sve revizije ove beleške",
        "delete_all_button": "Obriši sve revizije",
        "help_title": "Pomoć za Revizije beleški",
-        "revision_last_edited": "Ova revizija je poslednji put izmenjena {{date}}",
        "confirm_delete_all": "Da li želite da obrišete sve revizije ove beleške?",
        "no_revisions": "Još uvek nema revizija za ovu belešku...",
        "restore_button": "Vrati",
--- a/apps/client/src/translations/tw/translation.json
+++ b/apps/client/src/translations/tw/translation.json
@@ -260,7 +260,6 @@
    "delete_all_revisions": "刪除此筆記的所有歷史版本",
    "delete_all_button": "刪除所有歷史版本",
    "help_title": "關於筆記歷史版本的說明",
-    "revision_last_edited": "此歷史版本上次於 {{date}} 編輯",
    "confirm_delete_all": "您是否要刪除此筆記的所有歷史版本？",
    "no_revisions": "此筆記暫無歷史版本…",
    "confirm_restore": "您是否要還原此歷史版本？這將使用此歷史版本覆寫筆記的目前標題和內容。",
--- a/apps/client/src/translations/uk/translation.json
+++ b/apps/client/src/translations/uk/translation.json
@@ -309,7 +309,6 @@
    "delete_all_revisions": "Видалити всі версії цієї нотатки",
    "delete_all_button": "Видалити всі версії",
    "help_title": "Довідка щодо Версій нотаток",
-    "revision_last_edited": "Цю версію востаннє редагували {{date}}",
    "confirm_delete_all": "Ви хочете видалити всі версії цієї нотатки?",
    "no_revisions": "Поки що немає версій цієї нотатки...",
    "restore_button": "Відновити",
--- a/apps/client/src/types.d.ts
+++ b/apps/client/src/types.d.ts
@@ -26,7 +26,6 @@ interface CustomGlobals {
    appContext: AppContext;
    froca: Froca;
    treeCache: Froca;
-    importMarkdownInline: () => Promise<unknown>;
    SEARCH_HELP_TEXT: string;
    activeDialog: JQuery<HTMLElement> | null;
    componentId: string;
--- a/apps/client/src/widgets/dialogs/export.tsx
+++ b/apps/client/src/widgets/dialogs/export.tsx
@@ -79,7 +79,8 @@ export default function ExportDialog() {
                        values={[
                            { value: "html", label: t("export.format_html_zip") },
                            { value: "markdown", label: t("export.format_markdown") },
-                            { value: "opml", label: t("export.format_opml") }
+                            { value: "opml", label: t("export.format_opml") },
+                            { value: "share", label: t("export.share-format") }
                        ]}
                    />

--- a/apps/client/src/widgets/dialogs/markdown_import.tsx
+++ b/apps/client/src/widgets/dialogs/markdown_import.tsx
@@ -7,6 +7,7 @@ import utils from "../../services/utils";
 import Modal from "../react/Modal";
 import Button from "../react/Button";
 import { useTriliumEvent } from "../react/hooks";
+import EditableTextTypeWidget from "../type_widgets/editable_text";

 interface RenderMarkdownResponse {
    htmlContent: string;
@@ -14,39 +15,34 @@ interface RenderMarkdownResponse {

 export default function MarkdownImportDialog() {
    const markdownImportTextArea = useRef<HTMLTextAreaElement>(null);
+    const [textTypeWidget, setTextTypeWidget] = useState<EditableTextTypeWidget>();
    const [ text, setText ] = useState("");
    const [ shown, setShown ] = useState(false);

-    const triggerImport = useCallback(() => {
-        if (appContext.tabManager.getActiveContextNoteType() !== "text") {
-            return;
-        }
-    
+    useTriliumEvent("showPasteMarkdownDialog", ({ textTypeWidget }) => {
+        setTextTypeWidget(textTypeWidget);
        if (utils.isElectron()) {
            const { clipboard } = utils.dynamicRequire("electron");
            const text = clipboard.readText();
    
-            convertMarkdownToHtml(text);
+            convertMarkdownToHtml(text, textTypeWidget);
        } else {
            setShown(true);
        }
-    }, []);
-
-    useTriliumEvent("importMarkdownInline", triggerImport);
-    useTriliumEvent("pasteMarkdownIntoText", triggerImport);
-
-    async function sendForm() {
-        await convertMarkdownToHtml(text);
-        setText("");
-        setShown(false);
-    }
+    });

    return (
        <Modal
            className="markdown-import-dialog" title={t("markdown_import.dialog_title")} size="lg"
-            footer={<Button className="markdown-import-button" text={t("markdown_import.import_button")} onClick={sendForm} keyboardShortcut="Ctrl+Space" />}
+            footer={<Button className="markdown-import-button" text={t("markdown_import.import_button")} onClick={() => setShown(false)} keyboardShortcut="Ctrl+Enter" />}
            onShown={() => markdownImportTextArea.current?.focus()}
-            onHidden={() => setShown(false) }
+            onHidden={async () => {
+                if (textTypeWidget) {
+                    await convertMarkdownToHtml(text, textTypeWidget);
+                }
+                setShown(false);
+                setText("");
+            }}
            show={shown}
        >
            <p>{t("markdown_import.modal_body_text")}</p>
@@ -56,26 +52,17 @@ export default function MarkdownImportDialog() {
                onKeyDown={(e) => {
                    if (e.key === "Enter" && e.ctrlKey) {
                        e.preventDefault();
-                        sendForm();
+                        setShown(false);
                    }
                }}></textarea>
        </Modal>
    )
 }

-async function convertMarkdownToHtml(markdownContent: string) {
+async function convertMarkdownToHtml(markdownContent: string, textTypeWidget: EditableTextTypeWidget) {
    const { htmlContent } = await server.post<RenderMarkdownResponse>("other/render-markdown", { markdownContent });

-    const textEditor = await appContext.tabManager.getActiveContext()?.getTextEditor();
-    if (!textEditor) {
-        return;
-    }
-
-    const viewFragment = textEditor.data.processor.toView(htmlContent);
-    const modelFragment = textEditor.data.toModel(viewFragment);
-
-    textEditor.model.insertContent(modelFragment, textEditor.model.document.selection);
-    textEditor.editing.view.focus();
-
+    await textTypeWidget.addHtmlToEditor(htmlContent);
+    
    toast.showMessage(t("markdown_import.import_success"));
 }
--- a/apps/client/src/widgets/dialogs/revisions.tsx
+++ b/apps/client/src/widgets/dialogs/revisions.tsx
@@ -140,11 +140,10 @@ function RevisionsList({ revisions, onSelect, currentRevision }: { revisions: Re
        <FormList onSelect={onSelect} fullHeight>
            {revisions.map((item) =>
                <FormListItem
-                    title={t("revisions.revision_last_edited", { date: item.dateLastEdited })}
                    value={item.revisionId}
                    active={currentRevision && item.revisionId === currentRevision.revisionId}
                >
-                    {item.dateLastEdited && item.dateLastEdited.substr(0, 16)} ({item.contentLength && utils.formatSize(item.contentLength)})
+                    {item.dateCreated && item.dateCreated.substr(0, 16)} ({item.contentLength && utils.formatSize(item.contentLength)})
                </FormListItem>
            )}
        </FormList>);
--- a/apps/client/src/widgets/ribbon/style.css
+++ b/apps/client/src/widgets/ribbon/style.css
@@ -264,7 +264,6 @@
    position: absolute;
    inset-inline-end: 5px;
    bottom: 5px;
-    z-index: 1000;
 }

 .style-resolver {
--- a/apps/client/src/widgets/type_widgets/editable_text.ts
+++ b/apps/client/src/widgets/type_widgets/editable_text.ts
@@ -329,6 +329,30 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
        });
    }

+    async addHtmlToEditor(html: string) {
+        await this.initialized;
+
+        const editor = this.watchdog.editor;
+        if (!editor) return;
+
+        editor.model.change((writer) => {
+            const viewFragment = editor.data.processor.toView(html); 
+            const modelFragment = editor.data.toModel(viewFragment); 
+            const insertPosition = editor.model.document.selection.getLastPosition();
+
+            if (insertPosition) {
+                const range = editor.model.insertContent(modelFragment, insertPosition);
+
+                if (range) {
+                    writer.setSelection(range.end);
+                }
+            }
+            
+        });
+        
+        editor.editing.view.focus();
+    }
+
    addTextToActiveEditorEvent({ text }: EventData<"addTextToActiveEditor">) {
        if (!this.isActive()) {
            return;
@@ -385,6 +409,10 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
        this.triggerCommand("showAddLinkDialog", { textTypeWidget: this, text: selectedText });
    }

+    pasteMarkdownIntoTextCommand() {
+        this.triggerCommand("showPasteMarkdownDialog", { textTypeWidget: this });
+    }
+
    getSelectedText() {
        const range = this.watchdog.editor?.model.document.selection.getFirstRange();
        let text = "";