Disable world map interactions in non-interactive mode. (#20004)

* Disable world map interactions in non-interactive mode. * Add changelog.
Graylog2 · Jul 24, 2024 · 82d6ba5 · 82d6ba5
1 parent 6d7a6a8
commit 82d6ba5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/changelog/unreleased/pr-20004.toml b/changelog/unreleased/pr-20004.toml
@@ -0,0 +1,4 @@
+type = "f"
+message = "Disable world map interactions in non-interactive mode."
+
+pulls = ["20004"]
diff --git a/graylog2-web-interface/src/views/components/visualizations/worldmap/MapVisualization.tsx b/graylog2-web-interface/src/views/components/visualizations/worldmap/MapVisualization.tsx
@@ -219,18 +219,24 @@ class MapVisualization extends React.Component<MapVisualizationProps> {
         {(interactive) => (
           <div className={locked ? style.mapLocked : ''} style={{ position: 'relative', zIndex: 0 }}>
             {locked && <div className={style.overlay} style={{ height, width }} />}
-            <MapContainer center={viewport.center}
-                          boundsOptions={{ maxZoom: 19, animate: interactive }}
-                          zoom={viewport.zoom}
+            <MapContainer boundsOptions={{ maxZoom: 19, animate: interactive }}
+                          center={viewport.center}
                           className={style.map}
+                          closePopupOnClick={interactive}
+                          doubleClickZoom={interactive}
+                          dragging={interactive}
                           fadeAnimation={interactive}
-                          key={`visualization-${id}-${width}-${height}`}
                           id={`visualization-${id}`}
+                          key={`visualization-${id}-${width}-${height}`}
                           markerZoomAnimation={interactive}
-                          scrollWheelZoom
+                          scrollWheelZoom={interactive}
                           style={{ height, width }}
+                          touchZoom={interactive}
+                          trackResize={interactive}
                           whenReady={this._handleMapReady}
-                          zoomAnimation={interactive}>
+                          zoom={viewport.zoom}
+                          zoomAnimation={interactive}
+                          zoomControl={interactive}>
               <MapEvents onViewportChanged={onChange} />
               <TileLayer url={url} attribution={attribution} eventHandlers={{ load: this._handleTilesReady }} />
               {markers}