minimap: address small review feedback

This commit is contained in:
Danielv123 committed 2026-02-09 18:54:55 +01:00
1 parent 923316b44d
commit 57b50048bc
7 files changed
+80 -250

No files matched your search

+7 -19
View File
@@ -544,19 +544,19 @@ export default function CanvasMinimapPage({
};
// Throttled zoom display update to avoid excessive re-renders
const throttledZoomUpdate = useRef<NodeJS.Timeout>();
// Debounced zoom display update to avoid excessive re-renders
const debouncedZoomUpdate = useRef<NodeJS.Timeout>();
// Helper to update view state without React re-render
const updateViewState = (updates: Partial<ViewState>) => {
Object.assign(viewStateRef.current, updates);
// Update display zoom if zoom changed (throttled)
// Update display zoom if zoom changed (debounced)
if (updates.zoomLevel !== undefined) {
if (throttledZoomUpdate.current) {
clearTimeout(throttledZoomUpdate.current);
if (debouncedZoomUpdate.current) {
clearTimeout(debouncedZoomUpdate.current);
}
throttledZoomUpdate.current = setTimeout(() => {
debouncedZoomUpdate.current = setTimeout(() => {
setDisplayZoom(viewStateRef.current.zoomLevel);
}, 100); // Update display every 100ms max
}
@@ -1544,19 +1544,7 @@ export default function CanvasMinimapPage({
// Start loading the tile in the background (but don't wait for it)
// Only attempt to load if data source is ready
if (currentState.isReady) {
getVirtualTile(tileX, tileY).then(() => {
// When tile loads, trigger a re-render
// But only if we're still looking at the same area
const latestState = currentStateRef.current;
if (latestState.isReady) {
// Use a small delay to batch multiple tile loads
setTimeout(() => {
if (animationFrameRef.current) {
// Render will happen on next animation frame anyway
}
}, 16);
}
});
void getVirtualTile(tileX, tileY).catch(() => {});
}
};
-174
View File
@@ -1,174 +0,0 @@
import React, { useState, useEffect, useContext } from "react";
import { Row, Col, Button, Card, Space, Select } from "antd";
import { MapContainer, TileLayer } from "react-leaflet";
import L from "leaflet";
import { ControlContext, useInstances } from "@clusterio/web_ui";
// Import Leaflet CSS
import "leaflet/dist/leaflet.css";
interface SurfaceForceData {
surfaces: string[];
forces: string[];
}
export default function MinimapPage() {
const [instances] = useInstances();
const [selectedInstance, setSelectedInstance] = useState<number | null>(null);
const [selectedSurface, setSelectedSurface] = useState<string>("nauvis");
const [selectedForce, setSelectedForce] = useState<string>("player");
const [surfaceForceData, setSurfaceForceData] = useState<SurfaceForceData>({ surfaces: [], forces: [] });
const [refreshTiles, setRefreshTiles] = useState(0);
const [loading, setLoading] = useState(false);
const control = useContext(ControlContext);
// Set default instance when instances become available
useEffect(() => {
if (instances.size > 0 && !selectedInstance) {
const firstInstance = instances.values().next().value;
if (firstInstance) {
setSelectedInstance(firstInstance.id);
}
}
}, [instances, selectedInstance]);
// Load surface and force data on component mount
useEffect(() => {
loadSurfaceForceData();
}, []);
// Keep subscription filters in sync with selection even on the legacy page
useEffect(() => {
const plugin = control.plugins.get("minimap") as import("./index").WebPlugin;
if (!plugin) { return; }
plugin.setInstanceSurfaceFilter(selectedInstance, selectedSurface || null);
}, [control, selectedInstance, selectedSurface]);
const loadSurfaceForceData = async () => {
const response = await fetch(`${window.location.origin}/api/minimap/surfaces`);
const data = await response.json();
setSurfaceForceData(data);
// Set default selections if available
if (data.surfaces.length > 0 && !selectedSurface) {
setSelectedSurface(data.surfaces.includes("nauvis") ? "nauvis" : data.surfaces[0]);
}
if (data.forces.length > 0 && !selectedForce) {
setSelectedForce(data.forces.includes("player") ? "player" : data.forces[0]);
}
};
// Use default map bounds centered around origin
const mapBounds = [
[-512 / 256, -512 / 256],
[512 / 256, 512 / 256],
] as L.LatLngBoundsExpression;
return (
<div style={{ padding: "20px" }}>
<Row gutter={[16, 16]}>
<Col span={24}>
<Card
title="Factorio Instance Minimap"
extra={
<Space wrap>
<Select
style={{ width: 200 }}
placeholder="Select instance"
value={selectedInstance}
onChange={setSelectedInstance}
loading={loading}
options={[...instances.values()].map(instance => ({
value: instance.id,
label: instance.name,
}))}
/>
<Select
style={{ width: 150 }}
placeholder="Select surface"
value={selectedSurface}
onChange={setSelectedSurface}
>
{surfaceForceData.surfaces.map(surface => (
<Select.Option key={surface} value={surface}>
{surface}
</Select.Option>
))}
</Select>
<Select
style={{ width: 150 }}
placeholder="Select force"
value={selectedForce}
onChange={setSelectedForce}
>
{surfaceForceData.forces.map(force => (
<Select.Option key={force} value={force}>
{force}
</Select.Option>
))}
</Select>
</Space>
}
>
{selectedInstance && mapBounds ? (
<div
style={{
height: "700px",
width: "100%",
}}
className="minimap-container"
>
<style>
{`/* Avoid blurry rendering when zooming in */
.minimap-container .leaflet-container .leaflet-overlay-pane svg,
.minimap-container .leaflet-container .leaflet-marker-pane img,
.minimap-container .leaflet-container .leaflet-shadow-pane img,
.minimap-container .leaflet-container .leaflet-tile-pane img,
.minimap-container .leaflet-container img.leaflet-image-layer {
image-rendering: pixelated;
}
`}
</style>
<MapContainer
bounds={mapBounds}
style={{ height: "100%", width: "100%", backgroundColor: "#1a1a1a" }}
attributionControl={false}
maxZoom={18}
minZoom={7}
crs={L.CRS.Simple}
>
{/* Chart layer with surface and force data */}
<TileLayer
// eslint-disable-next-line max-len
url={`${window.location.origin}/api/minimap/chart/${selectedInstance}/${selectedSurface}/${selectedForce}/{z}/{x}/{y}.png?refresh=${refreshTiles}`}
maxNativeZoom={10}
minNativeZoom={10}
opacity={1}
tileSize={512}
/>
</MapContainer>
</div>
) : (
<div
style={{
height: "400px",
display: "flex",
alignItems: "center",
justifyContent: "center",
backgroundColor: "#f5f5f5",
border: "1px dashed #d9d9d9",
borderRadius: "6px",
}}
>
<div style={{ textAlign: "center" }}>
<h3>No Instance Selected</h3>
<p>Select a running instance to view its minimap</p>
</div>
</div>
)}
</Card>
</Col>
</Row>
</div>
);
}
@@ -46,6 +46,11 @@ export class SingleInstanceDataSource implements MinimapDataSource {
private force = "player";
private activeInstances: number[] = [];
/**
* Data source for the canvas renderer that reads minimap data for a single selected instance.
*
* This bridges selection state to the minimap web plugin and keeps subscription filters in sync.
*/
constructor(control: Control) {
this.control = control;
this.plugin = control.plugins.get("minimap") as MinimapWebPlugin | undefined ?? null;
@@ -182,6 +187,7 @@ export class SingleInstanceDataSource implements MinimapDataSource {
return;
}
const filters = [{ instanceId: this.instanceId, surface: this.surface }];
// Support both the newer multi-filter API and the legacy single-filter API.
if (this.plugin.setInstanceSurfaceFilters) {
this.plugin.setInstanceSurfaceFilters(filters);
} else if (this.plugin.setInstanceSurfaceFilter) {