gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-16 21:44:31 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

fix(text): insert link sometimes occurs in the wrong tab

Browse Source
This commit is contained in:
Elian Doran 2025-11-15 17:32:06 +02:00
parent 754a06343f
commit 398329a219
No known key found for this signature in database
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/services/keyboard_actions.ts
View File

@ -29,6 +29,8 @@ async function getActionsForScope(scope: string) {
} }
async function setupActionsForElement(scope: string, $el: JQuery<HTMLElement>, component: Component) { async function setupActionsForElement(scope: string, $el: JQuery<HTMLElement>, component: Component) {
if (!$el[0]) return;
const actions = await getActionsForScope(scope); const actions = await getActionsForScope(scope);
const bindings: ShortcutBinding[] = []; const bindings: ShortcutBinding[] = [];

5
apps/client/src/widgets/type_widgets/text/CKEditorWithWatchdog.tsx
View File

@ -1,7 +1,7 @@
import { HTMLProps, RefObject, useEffect, useImperativeHandle, useRef, useState } from "preact/compat"; import { HTMLProps, RefObject, useEffect, useImperativeHandle, useRef, useState } from "preact/compat";
import { PopupEditor, ClassicEditor, EditorWatchdog, type WatchdogConfig, CKTextEditor, TemplateDefinition } from "@triliumnext/ckeditor5"; import { PopupEditor, ClassicEditor, EditorWatchdog, type WatchdogConfig, CKTextEditor, TemplateDefinition } from "@triliumnext/ckeditor5";
import { buildConfig, BuildEditorOptions } from "./config"; import { buildConfig, BuildEditorOptions } from "./config";
import { useLegacyImperativeHandlers, useSyncedRef } from "../../react/hooks"; import { useKeyboardShortcuts, useLegacyImperativeHandlers, useNoteContext, useSyncedRef } from "../../react/hooks";
import link from "../../../services/link"; import link from "../../../services/link";
import froca from "../../../services/froca"; import froca from "../../../services/froca";
@ -38,6 +38,9 @@ export default function CKEditorWithWatchdog({ containerRef: externalContainerRe
const containerRef = useSyncedRef<HTMLDivElement>(externalContainerRef, null); const containerRef = useSyncedRef<HTMLDivElement>(externalContainerRef, null);
const watchdogRef = useRef<EditorWatchdog>(null); const watchdogRef = useRef<EditorWatchdog>(null);
const [ editor, setEditor ] = useState<CKTextEditor>(); const [ editor, setEditor ] = useState<CKTextEditor>();
const { parentComponent } = useNoteContext();
useKeyboardShortcuts("text-detail", containerRef, parentComponent);
useImperativeHandle(editorApi, () => ({ useImperativeHandle(editorApi, () => ({
hasSelection() { hasSelection() {

1
apps/client/src/widgets/type_widgets/text/EditableText.tsx
View File

@ -196,7 +196,6 @@ export default function EditableText({ note, parentComponent, ntxId, noteContext
}); });
} }
useKeyboardShortcuts("text-detail", containerRef, parentComponent);
useTriliumEvent("insertDateTimeToText", ({ ntxId: eventNtxId }) => { useTriliumEvent("insertDateTimeToText", ({ ntxId: eventNtxId }) => {
if (eventNtxId !== ntxId) return; if (eventNtxId !== ntxId) return;
const date = new Date(); const date = new Date();