Merge remote-tracking branch 'origin/develop' into chore_port-to-ts_attach

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "trilium",
-  "version": "0.92.1-beta",
+  "version": "0.92.2-beta",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "trilium",
-      "version": "0.92.1-beta",
+      "version": "0.92.2-beta",
       "license": "AGPL-3.0-only",
       "dependencies": {
         "@braintree/sanitize-url": "7.1.1",
@@ -20,10 +20,6 @@
         "@mermaid-js/layout-elk": "0.1.7",
         "@mind-elixir/node-menu": "1.0.4",
         "@triliumnext/express-partial-content": "1.0.1",
-        "@types/js-yaml": "4.0.9",
-        "@types/leaflet": "1.9.16",
-        "@types/react-dom": "18.3.5",
-        "@types/swagger-ui-express": "4.1.8",
         "archiver": "7.0.1",
         "async-mutex": "0.5.0",
         "autocomplete.js": "0.38.1",
@@ -141,12 +137,15 @@
         "@types/html": "1.0.4",
         "@types/ini": "4.1.1",
         "@types/jquery": "3.5.32",
+        "@types/js-yaml": "4.0.9",
         "@types/jsdom": "21.1.7",
+        "@types/leaflet": "1.9.16",
         "@types/leaflet-gpx": "1.3.7",
         "@types/mime-types": "2.1.4",
         "@types/multer": "1.4.12",
         "@types/node": "22.13.5",
         "@types/react": "18.3.18",
+        "@types/react-dom": "18.3.5",
         "@types/safe-compare": "1.1.2",
         "@types/sanitize-html": "2.13.0",
         "@types/sax": "1.2.7",
@@ -154,6 +153,7 @@
         "@types/session-file-store": "1.2.5",
         "@types/source-map-support": "0.5.10",
         "@types/stream-throttle": "0.1.4",
+        "@types/swagger-ui-express": "4.1.8",
         "@types/tmp": "0.2.6",
         "@types/turndown": "5.0.5",
         "@types/ws": "8.5.14",
@@ -171,7 +171,7 @@
         "mini-css-extract-plugin": "2.9.2",
         "nodemon": "3.1.9",
         "postcss-loader": "8.1.1",
-        "prettier": "3.5.1",
+        "prettier": "3.5.2",
         "rcedit": "4.0.1",
         "rimraf": "6.0.1",
         "sass": "1.85.0",
@@ -4009,6 +4009,7 @@
       "version": "1.19.5",
       "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
       "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/connect": "*",
@@ -4071,6 +4072,7 @@
       "version": "3.4.38",
       "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
       "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*"
@@ -4397,6 +4399,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-5.0.0.tgz",
       "integrity": "sha512-DvZriSMehGHL1ZNLzi6MidnsDhUZM/x2pRdDIKdwbUNqqwHxMlRdkxtn6/EPKyqKpHqTl/4nRZsRNLpZxZRpPQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/body-parser": "*",
@@ -4409,6 +4412,7 @@
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.2.tgz",
       "integrity": "sha512-vluaspfvWEtE4vcSDlKRNer52DvOGrB2xv6diXy6UKyKW0lqZiWHGNApSyxOv+8DE5Z27IzVvE7hNkxg7EXIcg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
@@ -4483,6 +4487,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
       "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/ini": {
@@ -4505,7 +4510,9 @@
     "node_modules/@types/js-yaml": {
       "version": "4.0.9",
       "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
-      "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg=="
+      "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/jsdom": {
       "version": "21.1.7",
@@ -4548,6 +4555,7 @@
       "version": "1.9.16",
       "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.16.tgz",
       "integrity": "sha512-wzZoyySUxkgMZ0ihJ7IaUIblG8Rdc8AbbZKLneyn+QjYsj5q1QU7TEKYqwTr10BGSzY5LI7tJk9Ifo+mEjdFRw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
@@ -4592,6 +4600,7 @@
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/mime-types": {
@@ -4632,24 +4641,28 @@
       "version": "15.7.14",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
       "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/qs": {
       "version": "6.9.17",
       "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
       "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
       "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/react": {
       "version": "18.3.18",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
       "integrity": "sha512-t4yC+vtgnkYjNSKlFx1jkAhH8LgTo2N/7Qvi83kdEaUtMDiwpbLAktKDaAMlRcJ5eSxZkH74eEGt1ky31d7kfQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/prop-types": "*",
@@ -4660,6 +4673,7 @@
       "version": "18.3.5",
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.5.tgz",
       "integrity": "sha512-P4t6saawp+b/dFrUr2cvkVsfvPguwsxtH6dNIYRllMsefqFzkZk5UIjzyDOv5g1dXIPdG4Sp1yCR4Z6RCUsG/Q==",
+      "dev": true,
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "^18.0.0"
@@ -4715,6 +4729,7 @@
       "version": "0.17.4",
       "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
       "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/mime": "^1",
@@ -4735,6 +4750,7 @@
       "version": "1.15.7",
       "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
       "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/http-errors": "*",
@@ -4784,6 +4800,7 @@
       "version": "4.1.8",
       "resolved": "https://registry.npmjs.org/@types/swagger-ui-express/-/swagger-ui-express-4.1.8.tgz",
       "integrity": "sha512-AhZV8/EIreHFmBV5wAs0gzJUNq9JbbSXgJLQubCC0jtIo6prnI9MIRRxnU4MZX9RB9yXxF1V4R7jtLl/Wcj31g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/express": "*",
@@ -7501,6 +7518,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/cytoscape": {
@@ -8367,9 +8385,9 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "3.2.3",
+      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.2.4.tgz",
-      "integrity": "sha512-U1U5Hzc2MO0oW3DF+G9qYN0aT7atAou4AgI0XjWz061nyBPbdxkfdhfy5uMgGn6+oLFCfn44ZGbdDqCzVmlOWA==",
+      "integrity": "sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==",
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
         "@types/trusted-types": "^2.0.7"
@@ -14432,9 +14450,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.49",
+      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
       "funding": [
         {
           "type": "opencollective",
@@ -14451,7 +14469,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.7",
+        "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -14638,9 +14656,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.5.1",
+      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz",
-      "integrity": "sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==",
+      "integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -18017,15 +18035,15 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.11",
+      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.11.tgz",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.1.tgz",
-      "integrity": "sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==",
+      "integrity": "sha512-4GgM54XrwRfrOp297aIYspIti66k56v16ZnqHvrIM7mG+HjDlAwS7p+Srr7J6fGvEdOJ5JcQ/D9T7HhtdXDTzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.24.2",
-        "postcss": "^8.4.49",
+        "postcss": "^8.5.2",
-        "rollup": "^4.23.0"
+        "rollup": "^4.30.1"
       },
       "bin": {
         "vite": "bin/vite.js"

package.json

@@ -28,7 +28,7 @@
     "server:switch": "rimraf ./node_modules/better-sqlite3 && npm install",
     "electron:start": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./electron-main.ts --inspect=5858 .",
     "electron:start-no-dir": "cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_ENV=dev electron --inspect=5858 .",
-    "electron:start-nix": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./electron-main.ts --inspect=5858 .\"",
+    "electron:start-nix": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev nix-shell -p electron_34 --run \"electron ./electron-main.ts --inspect=5858 .\"",
     "electron:start-nix-no-dir": "electron-rebuild --version 33.3.1 && cross-env NODE_OPTIONS=\"--import tsx\" TRILIUM_ENV=dev nix-shell -p electron_33 --run \"electron ./electron-main.ts --inspect=5858 .\"",
     "electron:start-prod": "npm run build:prepare-dist && cross-env TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron-main.js --inspect=5858 .",
     "electron:start-prod-no-dir": "npm run build:prepare-dist && cross-env TRILIUM_ENV=dev electron --inspect=5858 .",
@@ -70,10 +70,6 @@
     "@mermaid-js/layout-elk": "0.1.7",
     "@mind-elixir/node-menu": "1.0.4",
     "@triliumnext/express-partial-content": "1.0.1",
-    "@types/js-yaml": "4.0.9",
-    "@types/leaflet": "1.9.16",
-    "@types/react-dom": "18.3.5",
-    "@types/swagger-ui-express": "4.1.8",
     "archiver": "7.0.1",
     "async-mutex": "0.5.0",
     "autocomplete.js": "0.38.1",
@@ -188,12 +184,15 @@
     "@types/html": "1.0.4",
     "@types/ini": "4.1.1",
     "@types/jquery": "3.5.32",
+    "@types/js-yaml": "4.0.9",
     "@types/jsdom": "21.1.7",
+    "@types/leaflet": "1.9.16",
     "@types/leaflet-gpx": "1.3.7",
     "@types/mime-types": "2.1.4",
     "@types/multer": "1.4.12",
     "@types/node": "22.13.5",
     "@types/react": "18.3.18",
+    "@types/react-dom": "18.3.5",
     "@types/safe-compare": "1.1.2",
     "@types/sanitize-html": "2.13.0",
     "@types/sax": "1.2.7",
@@ -201,6 +200,7 @@
     "@types/session-file-store": "1.2.5",
     "@types/source-map-support": "0.5.10",
     "@types/stream-throttle": "0.1.4",
+    "@types/swagger-ui-express": "4.1.8",
     "@types/tmp": "0.2.6",
     "@types/turndown": "5.0.5",
     "@types/ws": "8.5.14",
@@ -218,7 +218,7 @@
     "mini-css-extract-plugin": "2.9.2",
     "nodemon": "3.1.9",
     "postcss-loader": "8.1.1",
-    "prettier": "3.5.1",
+    "prettier": "3.5.2",
     "rcedit": "4.0.1",
     "rimraf": "6.0.1",
     "sass": "1.85.0",

src/public/app/widgets/buttons/global_menu.ts

@@ -137,6 +137,7 @@ const TPL = `
         <li class="dropdown-item" data-trigger-command="toggleZenMode">
             <span class="bx bxs-yin-yang"></span>
             ${t("global_menu.toggle-zen-mode")}
+            <kbd data-command="toggleZenMode"></kbd>
         </li>
 
         <div class="dropdown-divider"></div>

src/public/app/widgets/close_zen_button.ts

@@ -1,9 +1,12 @@
 import BasicWidget from "./basic_widget.js";
+import { t } from "../services/i18n.js";
 
 const TPL = `\
 <div class="close-zen-container">
     <button class="button-widget bx icon-action bxs-yin-yang"
-        data-trigger-command="toggleZenMode" />
+        data-trigger-command="toggleZenMode"
+        title="${t("zen_mode.button_exit")}"
+    />
 
     <style>
     :root {

src/public/app/widgets/sync_status.ts

@@ -72,6 +72,15 @@ const TPL = `
 `;
 
 export default class SyncStatusWidget extends BasicWidget {
+
+    syncState: "unknown" | "in-progress" | "connected" | "disconnected";
+    allChangesPushed: boolean;
+    lastSyncedPush!: number;
+    settings: {
+        // TriliumNextTODO: narrow types and use TitlePlacement Type
+        titlePlacement: string; 
+    }
+
     constructor() {
         super();
 
@@ -91,13 +100,14 @@ export default class SyncStatusWidget extends BasicWidget {
         ws.subscribeToMessages((message) => this.processMessage(message));
     }
 
-    showIcon(className) {
+    showIcon(className: string) {
         if (!options.get("syncServerHost")) {
             this.toggleInt(false);
             return;
         }
 
-        Tooltip.getOrCreateInstance(this.$widget.find(`.sync-status-${className}`), {
+
+        Tooltip.getOrCreateInstance(this.$widget.find(`.sync-status-${className}`)[0], {
             html: true,
             placement: this.settings.titlePlacement,
             fallbackPlacements: [this.settings.titlePlacement]
@@ -108,7 +118,8 @@ export default class SyncStatusWidget extends BasicWidget {
         this.$widget.find(`.sync-status-${className}`).show();
     }
 
-    processMessage(message) {
+    // TriliumNextTODO: Use Type Message from "services/ws.ts"
+    processMessage(message: { type: string; lastSyncedPush: number; data: { lastSyncedPush: number } }) {
         if (message.type === "sync-pull-in-progress") {
             this.syncState = "in-progress";
             this.lastSyncedPush = message.lastSyncedPush;

src/public/stylesheets/theme-next/forms.css

@@ -79,7 +79,9 @@ button.btn.btn-success kbd {
  */
 
 :root .icon-action:not(.global-menu-button),
-:root .tn-tool-button {
+:root .tn-tool-button,
+:root .btn-group .tn-tool-button:not(:last-child),
+:root .btn-group .tn-tool-button:last-child {
     width: var(--icon-button-size);
     height: var(--icon-button-size);
     border: unset !important;
@@ -89,6 +91,10 @@ button.btn.btn-success kbd {
     color: var(--icon-button-color);
 }
 
+.btn-group .tn-tool-button + .tn-tool-button {
+    margin-left: 4px !important;
+}
+
 /* The "x" icon button */
 :root .icon-action.bx-x,
 :root .tn-tool-button.bx-x {
@@ -621,3 +627,11 @@ a.tn-link:hover[href^="https://"]:not(.no-arrow)::after,
 .use-tn-links a:hover[href^="https://"]:not(.no-arrow)::after {
     animation: link-arrow-blink 500ms linear alternate infinite;
 }
+
+/*
+ * Range inputs (sliders)
+ */
+
+input[type="range"] {
+    background: transparent;
+}

src/public/stylesheets/theme-next/shell.css

@@ -1319,6 +1319,14 @@ body .calendar-dropdown-widget .calendar-body a:hover {
     background: transparent !important;
 }
 
+/*
+ * Note Map
+ */
+
+.note-detail-note-map .fixnodes-type-switcher .tn-tool-button.toggled {
+    color: var(--tab-close-button-hover-background);
+}
+
 /*
  * Recent changes list
  */

src/public/translations/en/translation.json

@@ -645,6 +645,9 @@
     "show-cheatsheet": "Show Cheatsheet",
     "toggle-zen-mode": "Zen Mode"
   },
+  "zen_mode": {
+    "button_exit": "Exit Zen Mode"
+  },
   "sync_status": {
     "unknown": "<p>Sync status will be known once the next sync attempt starts.</p><p>Click to trigger sync now.</p>",
     "connected_with_changes": "<p>Connected to the sync server. <br>There are some outstanding changes yet to be synced.</p><p>Click to trigger sync.</p>",