Skip to content

Commit 88cca0c

Browse files
authored
Merge pull request #58 from evillollive/copilot/recenter-map-on-note-selection
Recenter map on note when selected from panel
2 parents 88afb3b + 7a402e7 commit 88cca0c

2 files changed

Lines changed: 23 additions & 3 deletions

File tree

‎src/App.tsx‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,17 @@ function App() {
258258
}
259259
}, [uiScale]);
260260

261+
// When a note is selected from the panel, center the map viewport on it.
262+
const handleSelectNote = useCallback((id: number | null) => {
263+
setSelectedNoteId(id);
264+
if (id != null) {
265+
const note = map.notes.find(n => n.id === id);
266+
if (note) {
267+
canvasRef.current?.centerOnTile(note.x, note.y);
268+
}
269+
}
270+
}, [setSelectedNoteId, map.notes]);
271+
261272
const handlePickTile = useCallback((tileType: typeof activeTile) => {
262273
setActiveTile(tileType);
263274
setActiveTool('paint');
@@ -386,7 +397,7 @@ function App() {
386397
<NotesPanel
387398
notes={map.notes}
388399
selectedNoteId={selectedNoteId}
389-
onSelectNote={setSelectedNoteId}
400+
onSelectNote={handleSelectNote}
390401
onUpdateNote={updateNote}
391402
onDeleteNote={deleteNote}
392403
onActivateNoteTool={() => setActiveTool('note')}
@@ -425,7 +436,7 @@ function App() {
425436
: map.notes
426437
}
427438
selectedNoteId={selectedNoteId}
428-
onSelectNote={setSelectedNoteId}
439+
onSelectNote={handleSelectNote}
429440
onUpdateNote={NOOP_UPDATE_NOTE}
430441
onDeleteNote={NOOP_DELETE_NOTE}
431442
onActivateNoteTool={NOOP_ACTIVATE_NOTE_TOOL}

‎src/components/MapCanvas.tsx‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ interface MapCanvasProps {
6969

7070
export interface MapCanvasHandle {
7171
getCanvas: () => HTMLCanvasElement | null;
72+
/** Pan the viewport so the given tile coordinate is centered on screen. */
73+
centerOnTile: (tileX: number, tileY: number) => void;
7274
}
7375

7476
const MINIMAP_MAX_W = 160;
@@ -273,7 +275,14 @@ const MapCanvas = forwardRef<MapCanvasHandle, MapCanvasProps>(({
273275

274276
useImperativeHandle(ref, () => ({
275277
getCanvas: () => canvasRef.current,
276-
}));
278+
centerOnTile: (tx: number, ty: number) => {
279+
const { width, height, tileSize: ts } = map.meta;
280+
setPan({
281+
x: (width / 2 - (tx + 0.5)) * zoom * ts,
282+
y: (height / 2 - (ty + 0.5)) * zoom * ts,
283+
});
284+
},
285+
}), [map.meta, zoom]);
277286

278287
// Forward selection changes to the parent so features outside the canvas
279288
// (e.g. the Generate Map dialog's "Generate into selection" toggle) can

0 commit comments

Comments
 (0)