Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packages/learningmap/src/EditorCanvas.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, memo } from "react";
import { ReactFlow, Controls, Background, ControlButton, OnSelectionChangeFunc, Node, Edge } from "@xyflow/react";
import { useCallback, memo, useEffect } from "react";
import { ReactFlow, Controls, Background, ControlButton, OnSelectionChangeFunc, Node, Edge, useReactFlow } from "@xyflow/react";
import { Info, Redo, Undo } from "lucide-react";
import { useEditorStore, useTemporalStore } from "./editorStore";
import { TaskNode } from "./nodes/TaskNode";
Expand Down Expand Up @@ -45,9 +45,22 @@ export const EditorCanvas = memo(({ defaultLanguage = "en" }: EditorCanvasProps)
const setEdgeDrawerOpen = useEditorStore(state => state.setEdgeDrawerOpen);
const setHelpOpen = useEditorStore(state => state.setHelpOpen);

const { setViewport } = useReactFlow();

const language = settings?.language || defaultLanguage;
const t = getTranslations(language);

// Apply viewport from settings on mount or when settings change
useEffect(() => {
if (settings?.viewport) {
setViewport({
x: settings.viewport.x,
y: settings.viewport.y,
zoom: settings.viewport.zoom,
});
}
}, [settings?.viewport, setViewport]);

// Temporal store for undo/redo
const { undo, redo, canUndo, canRedo } = useTemporalStore((state) => ({
undo: state.undo,
Expand Down Expand Up @@ -105,7 +118,6 @@ export const EditorCanvas = memo(({ defaultLanguage = "en" }: EditorCanvasProps)
nodeTypes={nodeTypes}
selectionOnDrag={false}
edgeTypes={edgeTypes}
fitView
proOptions={{ hideAttribution: true }}
defaultEdgeOptions={defaultEdgeOptions}
nodesDraggable={true}
Expand Down
6 changes: 3 additions & 3 deletions packages/learningmap/src/LearningMap.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ export function LearningMap({
useEffect(() => {
loadRoadmapData(parsedRoadmap, initialState);
setViewport({
x: initialState?.x || 0,
y: initialState?.y || 0,
zoom: initialState?.zoom || 1,
x: initialState?.x || settings?.viewport?.x || 0,
y: initialState?.y || settings?.viewport?.y || 0,
zoom: initialState?.zoom || settings?.viewport?.zoom || 1,
});
}, [roadmapData, initialState]);

Expand Down
65 changes: 65 additions & 0 deletions packages/learningmap/src/SettingsDrawer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,18 @@ export const SettingsDrawer: React.FC<SettingsDrawerProps> = ({
onClose();
};

const handleUseCurrentViewport = () => {
const viewport = getViewport();
setLocalSettings(settings => ({
...settings,
viewport: {
x: Math.round(viewport.x),
y: Math.round(viewport.y),
zoom: parseFloat(viewport.zoom.toFixed(2)),
}
}));
};

return (
<>
<div className="drawer-overlay" onClick={onClose} />
Expand Down Expand Up @@ -82,6 +94,59 @@ export const SettingsDrawer: React.FC<SettingsDrawerProps> = ({
onChange={color => setLocalSettings(settings => ({ ...settings, background: { ...settings.background, color } }))}
/>
</div>

<div className="form-group">
<label>{t.initialViewport}</label>
<div style={{ display: 'flex', gap: '8px', alignItems: 'center', marginTop: '8px' }}>
<div style={{ flex: 1 }}>
<label style={{ fontSize: '0.875rem', color: '#666' }}>{t.viewportX}</label>
<input
type="number"
value={localSettings?.viewport?.x ?? 0}
onChange={(e) => setLocalSettings(settings => ({
...settings,
viewport: { ...settings.viewport, x: parseFloat(e.target.value) || 0, y: settings.viewport?.y ?? 0, zoom: settings.viewport?.zoom ?? 1 }
}))}
style={{ width: '100%' }}
/>
</div>
<div style={{ flex: 1 }}>
<label style={{ fontSize: '0.875rem', color: '#666' }}>{t.viewportY}</label>
<input
type="number"
value={localSettings?.viewport?.y ?? 0}
onChange={(e) => setLocalSettings(settings => ({
...settings,
viewport: { ...settings.viewport, y: parseFloat(e.target.value) || 0, x: settings.viewport?.x ?? 0, zoom: settings.viewport?.zoom ?? 1 }
}))}
style={{ width: '100%' }}
/>
</div>
<div style={{ flex: 1 }}>
<label style={{ fontSize: '0.875rem', color: '#666' }}>{t.viewportZoom}</label>
<input
type="number"
step="0.1"
min="0.1"
max="10"
value={localSettings?.viewport?.zoom ?? 1}
onChange={(e) => setLocalSettings(settings => ({
...settings,
viewport: { ...settings.viewport, zoom: parseFloat(e.target.value) || 1, x: settings.viewport?.x ?? 0, y: settings.viewport?.y ?? 0 }
}))}
style={{ width: '100%' }}
/>
</div>
</div>
<button
onClick={handleUseCurrentViewport}
className="secondary-button"
style={{ marginTop: '8px', width: '100%' }}
type="button"
>
{t.useCurrentViewport}
</button>
</div>
</div>

<div className="drawer-footer">
Expand Down
21 changes: 21 additions & 0 deletions packages/learningmap/src/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,13 @@ export interface Translations {
languageEnglish: string;
languageGerman: string;

// Viewport settings
initialViewport: string;
viewportX: string;
viewportY: string;
viewportZoom: string;
useCurrentViewport: string;

// Welcome message
welcomeTitle: string;
welcomeSubtitle: string;
Expand Down Expand Up @@ -380,6 +387,13 @@ const en: Translations = {
languageEnglish: "English",
languageGerman: "German",

// Viewport settings
initialViewport: "Initial Viewport",
viewportX: "X Position",
viewportY: "Y Position",
viewportZoom: "Zoom",
useCurrentViewport: "Use Current Viewport",

// Welcome message
welcomeTitle: "Learningmap",
welcomeSubtitle: "All data is stored locally in your browser",
Expand Down Expand Up @@ -578,6 +592,13 @@ const de: Translations = {
languageEnglish: "Englisch",
languageGerman: "Deutsch",

// Viewport settings
initialViewport: "Initialer Ansichtsbereich",
viewportX: "X-Position",
viewportY: "Y-Position",
viewportZoom: "Zoom",
useCurrentViewport: "Aktuellen Ansichtsbereich verwenden",

// Welcome message
welcomeTitle: "Learningmap",
welcomeSubtitle: "Alle Daten werden lokal in Ihrem Browser gespeichert",
Expand Down