@unovis/ts 1.6.5-topojson.9 → 1.6.5

package/components/topojson-map/index.d.ts

@@ -69,7 +69,7 @@ export declare class TopoJSONMap<AreaDatum, PointDatum = GenericDataRecord, Link
     _onZoom(event: D3ZoomEvent<SVGGElement, unknown>): void;
     _onZoomEnd(): void;
     private _runCollisionDetection;
-    _onZoomHandler(transform: ZoomTransform, isMouseEvent: boolean, isExternalEvent: boolean): void;
+    _onZoomHandler(transform: ZoomTransform, isMouseEvent: boolean, isExternalEvent: boolean, isResizeEvent?: boolean): void;
     zoomIn(increment?: number): void;
     zoomOut(increment?: number): void;
     setZoom(zoomLevel: number): void;

package/components/topojson-map/index.js

@@ -174,10 +174,7 @@ class TopoJSONMap extends ComponentCore {
         }
     }
     _renderBackground() {
-        renderBackground(this._backgroundRect, {
-            bleed: { left: this.bleed.left, top: this.bleed.top },
-            onClick: () => this._collapseExpandedCluster(),
-        });
+        renderBackground(this._backgroundRect, this.bleed.left, this.bleed.top, () => this._collapseExpandedCluster());
     }
     _renderGroups(duration) {
         const transformString = this._transform.toString();
@@ -811,10 +808,25 @@ class TopoJSONMap extends ComponentCore {
         const prevTranslate = this._projection.translate();
         this._projection.fitExtent([[0, 0], [this._width, this._height]], this._featureCollection);
         this._initialScale = this._projection.scale();
-        this._center = [
-            this._projection.translate()[0] * this._center[0] / prevTranslate[0],
-            this._projection.translate()[1] * this._center[1] / prevTranslate[1],
-        ];
+        // If a point is selected, center the view on it after resize
+        if (this._selectedPoint) {
+            const coords = this._selectedPoint.geometry.coordinates;
+            const pos = this._projection(coords);
+            const projTranslate = this._projection.translate();
+            if (pos) {
+                const k = this._currentZoomLevel;
+                this._center = [
+                    this._width / 2 - (pos[0] - projTranslate[0]) * k,
+                    this._height / 2 - (pos[1] - projTranslate[1]) * k,
+                ];
+            }
+        }
+        else {
+            this._center = [
+                this._projection.translate()[0] * this._center[0] / prevTranslate[0],
+                this._projection.translate()[1] * this._center[1] / prevTranslate[1],
+            ];
+        }
         this._applyZoom();
         this._isResizing = false;
         this._prevWidth = this._width;
@@ -829,8 +841,9 @@ class TopoJSONMap extends ComponentCore {
             (_b = (_a = this.g.node()) === null || _a === void 0 ? void 0 : _a.parentElement) === null || _b === void 0 ? void 0 : _b.style.setProperty('--vis-map-current-zoom-level', String(this._currentZoomLevel));
             return; // To prevent double render because of binding zoom behaviour
         }
-        const isMouseEvent = event.sourceEvent !== undefined;
+        const isMouseEvent = !!event.sourceEvent;
         const isExternalEvent = !(event === null || event === void 0 ? void 0 : event.sourceEvent) && !this._isResizing;
+        const isResizeEvent = this._isResizing && !(event === null || event === void 0 ? void 0 : event.sourceEvent);
         this._isZooming = true;
         // Clear any pending zoom end timeout
         if (this._zoomEndTimeoutId) {
@@ -844,7 +857,7 @@ class TopoJSONMap extends ComponentCore {
             this._collapsedClusterPointIds = null;
         }
         window.cancelAnimationFrame(this._animFrameId);
-        this._animFrameId = window.requestAnimationFrame(this._onZoomHandler.bind(this, event.transform, isMouseEvent, isExternalEvent));
+        this._animFrameId = window.requestAnimationFrame(this._onZoomHandler.bind(this, event.transform, isMouseEvent, isExternalEvent, isResizeEvent));
         if (isMouseEvent) {
             // Update the center coordinate so that the next call to _applyZoom()
             // will zoom with respect to the current view
@@ -877,13 +890,13 @@ class TopoJSONMap extends ComponentCore {
             collidePointBottomLabels(pointBottomLabels, duration);
         });
     }
-    _onZoomHandler(transform, isMouseEvent, isExternalEvent) {
+    _onZoomHandler(transform, isMouseEvent, isExternalEvent, isResizeEvent = false) {
         const scale = transform.k / this._initialScale || 1;
         const center = this._projection.translate();
         this._transform = zoomIdentity
             .translate(transform.x - center[0] * scale, transform.y - center[1] * scale)
             .scale(scale);
-        const customDuration = isExternalEvent
+        const customDuration = (isExternalEvent || isResizeEvent)
             ? this.config.zoomDuration
             : (isMouseEvent ? 0 : null);
         // Call render functions that depend on this._transform
@@ -897,11 +910,13 @@ class TopoJSONMap extends ComponentCore {
     zoomIn(increment = 0.5) {
         if (this._isZooming)
             return;
+        this._resetExpandedCluster();
         this.setZoom(this._currentZoomLevel + increment);
     }
     zoomOut(increment = 0.5) {
         if (this._isZooming)
             return;
+        this._resetExpandedCluster();
         this.setZoom(this._currentZoomLevel - increment);
     }
     setZoom(zoomLevel) {
@@ -930,6 +945,7 @@ class TopoJSONMap extends ComponentCore {
     fitView() {
         var _a, _b, _c, _d, _e;
         const { config } = this;
+        this._resetExpandedCluster();
         if (config.mapFitToPoints) {
             // When mapFitToPoints is enabled, fitView should refit the projection to the points
             // and reset the zoom level relative to that fitted scale.