Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-16 13:19:54 +01:00
Code Issues Packages Projects Releases Activity

feat(layout/note_actions): integrate zoom buttons into relation map

Browse Source
This commit is contained in:
Elian Doran
2025-12-15 08:59:01 +02:00
parent 192190d685
commit 35cfcc59f6
3 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/client/src/stylesheets/style.css
View File

@@ -2474,6 +2474,11 @@ footer.webview-footer button {
inset-inline-start: 10px; inset-inline-start: 10px;
} }
.content-floating-buttons.top-right {
top: 10px;
inset-inline-end: 10px;
}
.content-floating-buttons.bottom-left { .content-floating-buttons.bottom-left {
bottom: 10px; bottom: 10px;
inset-inline-start: 10px; inset-inline-start: 10px;

2
apps/client/src/widgets/FloatingButtonsDefinitions.tsx
View File

@@ -213,7 +213,7 @@ export function buildSaveSqlToNoteHandler(note: FNote) {
} }
function RelationMapButtons({ note, isDefaultViewMode, triggerEvent }: FloatingButtonContext) { function RelationMapButtons({ note, isDefaultViewMode, triggerEvent }: FloatingButtonContext) {
const isEnabled = (note.type === "relationMap" && isDefaultViewMode); const isEnabled = (!isNewLayout && note.type === "relationMap" && isDefaultViewMode);
return isEnabled && ( return isEnabled && (
<> <>
<FloatingButton <FloatingButton

72
apps/client/src/widgets/type_widgets/relation_map/RelationMap.tsx
View File

@@ -1,25 +1,31 @@
import { useCallback, useEffect, useMemo, useRef, useState } from "preact/hooks";
import { TypeWidgetProps } from "../type_widget";
import { jsPlumbInstance, OnConnectionBindInfo } from "jsplumb";
import { useEditorSpacedUpdate, useTriliumEvent, useTriliumEvents } from "../../react/hooks";
import FNote from "../../../entities/fnote";
import { RefObject } from "preact";
import "./RelationMap.css"; import "./RelationMap.css";
import { t } from "../../../services/i18n";
import { CreateChildrenResponse, RelationMapPostResponse } from "@triliumnext/commons";
import { jsPlumbInstance, OnConnectionBindInfo } from "jsplumb";
import panzoom, { PanZoomOptions } from "panzoom"; import panzoom, { PanZoomOptions } from "panzoom";
import { RefObject } from "preact";
import { HTMLProps } from "preact/compat";
import { useCallback, useEffect, useMemo, useRef, useState } from "preact/hooks";
import FNote from "../../../entities/fnote";
import attribute_autocomplete from "../../../services/attribute_autocomplete";
import dialog from "../../../services/dialog"; import dialog from "../../../services/dialog";
import { isExperimentalFeatureEnabled } from "../../../services/experimental_features";
import { t } from "../../../services/i18n";
import server from "../../../services/server"; import server from "../../../services/server";
import toast from "../../../services/toast"; import toast from "../../../services/toast";
import { CreateChildrenResponse, RelationMapPostResponse } from "@triliumnext/commons";
import RelationMapApi, { ClientRelation, MapData, MapDataNoteEntry, RelationType } from "./api";
import setupOverlays, { uniDirectionalOverlays } from "./overlays";
import { JsPlumb } from "./jsplumb";
import { getMousePosition, getZoom, idToNoteId, noteIdToId } from "./utils";
import { NoteBox } from "./NoteBox";
import utils from "../../../services/utils"; import utils from "../../../services/utils";
import attribute_autocomplete from "../../../services/attribute_autocomplete"; import ActionButton from "../../react/ActionButton";
import { useEditorSpacedUpdate, useTriliumEvent, useTriliumEvents } from "../../react/hooks";
import { TypeWidgetProps } from "../type_widget";
import RelationMapApi, { ClientRelation, MapData, MapDataNoteEntry, RelationType } from "./api";
import { buildRelationContextMenuHandler } from "./context_menu"; import { buildRelationContextMenuHandler } from "./context_menu";
import { HTMLProps } from "preact/compat"; import { JsPlumb } from "./jsplumb";
import { NoteBox } from "./NoteBox";
import setupOverlays, { uniDirectionalOverlays } from "./overlays";
import { getMousePosition, getZoom, idToNoteId, noteIdToId } from "./utils";
const isNewLayout = isExperimentalFeatureEnabled("new-layout");
interface Clipboard { interface Clipboard {
noteId: string; noteId: string;
@@ -43,7 +49,7 @@ declare module "jsplumb" {
} }
} }
export default function RelationMap({ note, noteContext, ntxId }: TypeWidgetProps) { export default function RelationMap({ note, noteContext, ntxId, parentComponent }: TypeWidgetProps) {
const [ data, setData ] = useState<MapData>(); const [ data, setData ] = useState<MapData>();
const containerRef = useRef<HTMLDivElement>(null); const containerRef = useRef<HTMLDivElement>(null);
const mapApiRef = useRef<RelationMapApi>(null); const mapApiRef = useRef<RelationMapApi>(null);
@@ -119,9 +125,9 @@ export default function RelationMap({ note, noteContext, ntxId }: TypeWidgetProp
options: { options: {
maxZoom: 2, maxZoom: 2,
minZoom: 0.3, minZoom: 0.3,
smoothScroll: false, smoothScroll: false,
//@ts-expect-error Upstream incorrectly mentions no arguments. //@ts-expect-error Upstream incorrectly mentions no arguments.
filterKey: function (e: KeyboardEvent) { filterKey (e: KeyboardEvent) {
// if ALT is pressed, then panzoom should bubble the event up // if ALT is pressed, then panzoom should bubble the event up
// this is to preserve ALT-LEFT, ALT-RIGHT navigation working // this is to preserve ALT-LEFT, ALT-RIGHT navigation working
return e.altKey; return e.altKey;
@@ -156,6 +162,34 @@ export default function RelationMap({ note, noteContext, ntxId }: TypeWidgetProp
<NoteBox {...note} mapApiRef={mapApiRef} /> <NoteBox {...note} mapApiRef={mapApiRef} />
))} ))}
</JsPlumb> </JsPlumb>
{isNewLayout && (
<div className="btn-group btn-group-sm content-floating-buttons bottom-right">
<ActionButton
icon="bx bx-zoom-in"
text={t("relation_map_buttons.zoom_in_title")}
onClick={() => parentComponent?.triggerEvent("relationMapResetZoomIn", { ntxId })}
className="tn-tool-button"
noIconActionClass
/>
<ActionButton
icon="bx bx-zoom-out"
text={t("relation_map_buttons.zoom_out_title")}
onClick={() => parentComponent?.triggerEvent("relationMapResetZoomOut", { ntxId })}
className="tn-tool-button"
noIconActionClass
/>
<ActionButton
icon="bx bx-crop"
text={t("relation_map_buttons.reset_pan_zoom_title")}
onClick={() => parentComponent?.triggerEvent("relationMapResetPanZoom", { ntxId })}
className="tn-tool-button"
noIconActionClass
/>
</div>
)}
</div> </div>
); );
} }
@@ -380,7 +414,7 @@ function useRelationCreation({ mapApiRef, jsPlumbApiRef }: { mapApiRef: RefObjec
// if there's no event, then this has been triggered programmatically // if there's no event, then this has been triggered programmatically
if (!originalEvent || !mapApiRef.current) return; if (!originalEvent || !mapApiRef.current) return;
let name = await dialog.prompt({ const name = await dialog.prompt({
message: t("relation_map.specify_new_relation_name"), message: t("relation_map.specify_new_relation_name"),
shown: ({ $answer }) => { shown: ({ $answer }) => {
if (!$answer) { if (!$answer) {