Merge branch 'main' into feat/multi-user-support

Author: Somoru

apps/client/package.json

@@ -32,6 +32,7 @@
     "@triliumnext/commons": "workspace:*",
     "@triliumnext/highlightjs": "workspace:*",
     "@triliumnext/share-theme": "workspace:*",
+    "@triliumnext/split.js": "workspace:*",
     "autocomplete.js": "0.38.1",
     "bootstrap": "5.3.8",
     "boxicons": "2.1.4",
@@ -60,7 +61,6 @@
     "preact": "10.27.2",
     "react-i18next": "16.1.2",
     "reveal.js": "5.2.1",
-    "split.js": "1.6.5",
     "svg-pan-zoom": "3.6.2",
     "tabulator-tables": "6.3.1",
     "vanilla-js-wheel-zoom": "9.0.4"

apps/client/src/services/resizer.ts

@@ -1,5 +1,5 @@
 import options from "./options.js";
-import Split from "split.js"
+import Split from "@triliumnext/split.js";
 
 export const DEFAULT_GUTTER_SIZE = 5;
 
@@ -46,6 +46,7 @@ function setupLeftPaneResizer(leftPaneVisible: boolean) {
                 sizes: [leftPaneWidth, restPaneWidth],
                 gutterSize: DEFAULT_GUTTER_SIZE,
                 minSize: [150, 300],
+                rtl: glob.isRtl,
                 onDragEnd: (sizes) => {
                     leftPaneWidth = Math.round(sizes[0]);
                     options.save("leftPaneWidth", Math.round(sizes[0]));
@@ -79,6 +80,7 @@ function setupRightPaneResizer() {
             sizes: [100 - rightPaneWidth, rightPaneWidth],
             gutterSize: DEFAULT_GUTTER_SIZE,
             minSize: [300, 180],
+            rtl: glob.isRtl,
             onDragEnd: (sizes) => {
                 rightPaneWidth = Math.round(sizes[1]);
                 options.save("rightPaneWidth", Math.round(sizes[1]));
@@ -99,7 +101,7 @@ function setupNoteSplitResizer(ntxIds: string[]) {
     let targetNtxIds: string[] | undefined;
     for (const ntxId of ntxIds) {
         targetNtxIds = findKeyByNtxId(ntxId);
-        if (targetNtxIds) break; 
+        if (targetNtxIds) break;
     }
 
     if (targetNtxIds) {
@@ -154,6 +156,7 @@ function createSplitInstance(targetNtxIds: string[]) {
         const splitPanels = [...splitNoteContainer.querySelectorAll<HTMLElement>(':scope > .note-split')]
             .filter(el => targetNtxIds.includes(el.getAttribute('data-ntx-id') ?? ""));
         const splitInstance = Split(splitPanels, {
+            rtl: glob.isRtl,
             gutterSize: DEFAULT_GUTTER_SIZE,
             minSize: 150,
         });

apps/client/src/services/tree.ts

@@ -4,9 +4,6 @@ import froca from "./froca.js";
 import hoistedNoteService from "./hoisted_note.js";
 import appContext from "../components/app_context.js";
 
-/**
- * @returns {string|null}
- */
 async function resolveNotePath(notePath: string, hoistedNoteId = "root") {
     const runPath = await resolveNotePathToSegments(notePath, hoistedNoteId);
 

apps/client/src/stylesheets/theme-dark.css

@@ -86,6 +86,11 @@ body ::-webkit-calendar-picker-indicator {
     --custom-color: var(--dark-theme-custom-color);
 }
 
+.reference-link,
+.ck-content a.reference-link > span {
+    color: var(--dark-theme-custom-color, inherit);
+}
+
 .excalidraw.theme--dark {
     --theme-filter: invert(80%) hue-rotate(180deg) !important;
 }
@@ -101,3 +106,4 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 .ck-content pre {
     box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.6) !important;
 }
+

apps/client/src/stylesheets/theme-light.css

@@ -84,4 +84,9 @@ html {
 
 #left-pane .fancytree-node.tinted {
     --custom-color: var(--light-theme-custom-color);
+}
+
+.reference-link,
+.ck-content a.reference-link > span {
+    color: var(--light-theme-custom-color, inherit);
 }

apps/client/src/stylesheets/theme-next-dark.css

@@ -277,6 +277,11 @@
     --custom-bg-color: hsl(var(--custom-color-hue), 20%, 33%, 0.4);
 }
 
+.reference-link,
+.ck-content a.reference-link > span {
+    color: var(--dark-theme-custom-color, inherit);
+}
+
 body ::-webkit-calendar-picker-indicator {
     filter: invert(1);
 }

apps/client/src/stylesheets/theme-next/dialogs.css

@@ -392,7 +392,8 @@ div.tn-tool-dialog {
 }
 
 .delete-notes-list .note-path {
-    padding-inline-end: 8px;
+    padding-inline-start: 8px;
+    color: var(--muted-text-color)
 }
 
 /*

apps/client/src/stylesheets/theme-next/notes/text.css

@@ -666,4 +666,17 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
 .ck-content .table > figcaption {
     background: var(--accented-background-color);
     color: var(--main-text-color);
+}
+
+/* Reference link */
+
+.ck-content a.reference-link,
+.ck-content a.reference-link:hover {
+    /* Apply underline only to the span inside the link so it can follow the
+     * target note's user defined color */
+    text-decoration: none;
+}
+
+.ck-content a.reference-link > span {
+    text-decoration: underline;
 }