@tetacom/svg-charts 1.3.2 → 1.3.3

package/fesm2020/tetacom-svg-charts.mjs

@@ -409,19 +409,7 @@ class ZoomService {
         }
     }
     setBroadcastChannel(channel) {
-        if (this.broadcastSub) {
-            this.broadcastSub?.unsubscribe();
-        }
         this.broadcastChannel = channel;
-        if (this.broadcastChannel?.length) {
-            this.broadcastSub = combineLatest([this._broadcast.subscribeToZoom(this.broadcastChannel), this._chart.config])
-                .pipe(filter(([zoom, config]) => {
-                return zoom.message?.chartId !== config.id;
-            }))
-                .subscribe(([zoom, config]) => {
-                this.fireZoom(zoom.message);
-            });
-        }
     }
     getD3Transform(targetDomain, originalDomain, scale, orientation, inverted) {
         const zoomScale = Math.abs(scale(originalDomain[1]) - scale(originalDomain[0])) / Math.abs(scale(targetDomain[1]) - scale(targetDomain[0]));
@@ -444,9 +432,6 @@ class ZoomService {
         }
         return transform;
     }
-    ngOnDestroy() {
-        this.broadcastSub?.unsubscribe();
-    }
 }
 ZoomService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: ZoomService, deps: [{ token: BroadcastService }, { token: ChartService }], target: i0.ɵɵFactoryTarget.Injectable });
 ZoomService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: ZoomService, providedIn: 'root' });
@@ -1984,37 +1969,41 @@ class BrushMessage {
 }
 
 class ZoomableDirective {
-    constructor(elementRef, zoomService, chartService, zone) {
+    constructor(elementRef, zoomService, chartService, broadcast, zone) {
         this.elementRef = elementRef;
         this.zoomService = zoomService;
         this.chartService = chartService;
+        this.broadcast = broadcast;
         this.zone = zone;
         this.zoomable = false;
         this.crosshair = false;
         this.alive = true;
         this.currentTransform = zoomIdentity;
         this.zoomed = (event) => {
-            if (event.sourceEvent) {
-                if (Object.keys(event.sourceEvent).length !== 0) {
-                    const origin = this.axis.scale.copy().domain(this.axis.originDomain);
-                    let domain = this.axis.orientation === AxisOrientation.y
-                        ? event.transform.rescaleY(origin).domain()
-                        : event.transform.rescaleX(origin).domain();
-                    const message = new ZoomMessage({
-                        eventType: event.type,
-                        axis: {
-                            index: this.axis.index,
-                            orientation: this.axis.orientation,
-                        },
-                        element: this.elementRef,
-                        domain: domain,
-                        chartId: this.config.id
-                    });
-                    this.zoomService.fireZoom(message);
-                    this.zoomService.broadcastZoom(message);
-                }
-                this.currentTransform = event.transform;
+            if (!event.sourceEvent)
+                return;
+            const origin = this.axis.scale.copy().domain(this.axis.originDomain);
+            let domain = this.axis.orientation === AxisOrientation.y
+                ? event.transform.rescaleY(origin).domain()
+                : event.transform.rescaleX(origin).domain();
+            const message = new ZoomMessage({
+                eventType: event.type,
+                axis: {
+                    index: this.axis.index,
+                    orientation: this.axis.orientation,
+                },
+                element: this.elementRef,
+                domain: domain,
+                chartId: this.config.id
+            });
+            if (event.sourceEvent.type === 'broadcast') {
+                this.zoomService.fireZoom(message);
+            }
+            if (event.sourceEvent.type === 'wheeling' || event.sourceEvent instanceof MouseEvent || (window.TouchEvent && event.sourceEvent instanceof TouchEvent)) {
+                this.zoomService.fireZoom(message);
+                this.zoomService.broadcastZoom(message);
             }
+            this.currentTransform = event.transform;
         };
     }
     ngOnInit() {
@@ -2036,7 +2025,7 @@ class ZoomableDirective {
         this.zoomService.zoomed.pipe(takeWhile(() => this.alive)).subscribe((zoomed) => {
             if (this._element && this.elementRef !== zoomed?.element
                 && zoomed?.axis?.index === this.axis.index
-                && zoomed?.axis?.orientation === this.axis.orientation) {
+                && zoomed?.axis?.orientation === this.axis.orientation && zoomed.eventType === 'end') {
                 const scale = this.axis.scale.copy().domain(this.axis.originDomain);
                 let transform;
                 if (zoomed.domain === null) {
@@ -2069,31 +2058,30 @@ class ZoomableDirective {
         ]);
         const min = this.config?.zoom?.minTranslate
             ? this.axis.scale(this.config?.zoom?.minTranslate)
-            : -Infinity;
-        const max = (this.config?.zoom?.maxTranslate
-            ? this.axis.scale(this.config?.zoom?.maxTranslate) - (this.axis.orientation === AxisOrientation.x ? this.size.width : this.size.height)
-            : Infinity);
-        if (this.axis.orientation === AxisOrientation.x && this.config.zoom.type === ZoomType.x) {
+            : 0;
+        const max = this.config?.zoom?.maxTranslate
+            ? this.axis.scale(this.config?.zoom?.maxTranslate)
+            : this.axis.orientation === AxisOrientation.x ? this.size.width : this.size.height;
+        if (this.axis.orientation === AxisOrientation.x && this.config.zoom?.type === ZoomType.x) {
             this.zoom.translateExtent([
-                [min, -Infinity],
-                [max, Infinity],
+                [min, 0],
+                [max, this.size.height],
             ]);
         }
-        if (this.axis.orientation === AxisOrientation.y && this.config.zoom.type === ZoomType.y) {
+        if (this.axis.orientation === AxisOrientation.y && this.config.zoom?.type === ZoomType.y) {
             this.zoom.translateExtent([
-                [-Infinity, min],
-                [Infinity, max],
+                [0, min],
+                [this.size.width, max],
             ]);
         }
         if (this.config.zoom?.wheelDelta) {
             this.zoom.wheelDelta(this.config.zoom?.wheelDelta);
         }
         const maxZoom = this.config.zoom?.max
-            ? (this.axis.extremes[1] - this.axis.extremes[0]) /
-                this.config.zoom?.max
-            : this.config.zoom?.limitZoomByData
-                ? 1
-                : 0;
+            ? (this.axis.extremes[1] - this.axis.extremes[0]) / this.config.zoom?.max : this.config.zoom?.limitZoomByData ? 1 : 0;
+        if (this.config.zoom?.wheelDelta) {
+            this.zoom.wheelDelta(this.config.zoom?.wheelDelta);
+        }
         const minZoom = this.config.zoom?.min
             ? (this.axis.extremes[1] - this.axis.extremes[0]) /
                 this.config.zoom?.min
@@ -2104,6 +2092,18 @@ class ZoomableDirective {
         if (this.config?.zoom?.zoomBehavior === ZoomBehaviorType.wheel) {
             this.runWheelTranslate();
         }
+        this.broadcast.subscribeToZoom(this.config?.zoom.syncChannel).subscribe((zoom) => {
+            if (zoom.message.chartId !== this.config?.id && zoom.message.axis.orientation === this.axis.orientation && zoom.message.axis.index === this.axis.index) {
+                const scale = this.axis.scale.copy().domain(this.axis.originDomain);
+                const transform = this.zoomService.getD3Transform(zoom.message.domain, this.axis.originDomain, scale, this.axis.orientation, this.axis.options.inverted);
+                if (zoom.message.style?.transition) {
+                    this._element.transition().duration(300).call(this.zoom.transform, transform, null, { type: 'broadcast' });
+                }
+                else {
+                    this._element.call(this.zoom.transform, transform, null, { type: 'broadcast' });
+                }
+            }
+        });
     }
     runWheelTranslate() {
         let type = 'start';
@@ -2120,7 +2120,6 @@ class ZoomableDirective {
             return delta * 0.002;
         });
         const emit = (type, event) => {
-            const origin = this.axis.scale.copy().domain(this.axis.originDomain);
             let transform = zoomIdentity;
             const delta = type === 'end'
                 ? 0
@@ -2134,22 +2133,7 @@ class ZoomableDirective {
                 transform = transform.translate(this.currentTransform.x - delta / 2, 0);
             }
             transform = transform.scale(this.currentTransform.k);
-            let domain = this.axis.orientation === AxisOrientation.y
-                ? transform.rescaleY(origin).domain()
-                : transform.rescaleX(origin).domain();
-            const message = new ZoomMessage({
-                eventType: type,
-                element: this.elementRef,
-                axis: {
-                    index: this.axis.index,
-                    orientation: this.axis.orientation
-                },
-                domain,
-                chartId: this.config.id,
-            });
-            this._element?.call(this.zoom.transform, transform);
-            this.zoomService.fireZoom(message);
-            this.zoomService.broadcastZoom(message);
+            this._element?.call(this.zoom.transform, transform, null, { type: 'wheeling' });
             this.currentTransform = transform;
         };
         this._element.on('wheel', (event) => {
@@ -2169,14 +2153,14 @@ class ZoomableDirective {
         });
     }
 }
-ZoomableDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: ZoomableDirective, deps: [{ token: i0.ElementRef }, { token: ZoomService }, { token: ChartService }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
+ZoomableDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: ZoomableDirective, deps: [{ token: i0.ElementRef }, { token: ZoomService }, { token: ChartService }, { token: BroadcastService }, { token: i0.NgZone }], target: i0.ɵɵFactoryTarget.Directive });
 ZoomableDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.0.2", type: ZoomableDirective, selector: "[tetaZoomable]", inputs: { config: "config", axis: "axis", size: "size" }, host: { properties: { "class.zoomable": "this.zoomable", "class.crosshair": "this.crosshair" } }, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: ZoomableDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[tetaZoomable]',
                 }]
-        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: ZoomService }, { type: ChartService }, { type: i0.NgZone }]; }, propDecorators: { config: [{
+        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: ZoomService }, { type: ChartService }, { type: BroadcastService }, { type: i0.NgZone }]; }, propDecorators: { config: [{
                 type: Input
             }], axis: [{
                 type: Input
@@ -2214,6 +2198,13 @@ class BrushableDirective {
         this._alive = false;
     }
     ngAfterViewInit() {
+        if (this.config?.brush?.enable) {
+            const brushMessage = new BrushMessage({
+                chartId: this.config.id,
+                selection: [this.config.brush?.from, this.config.brush?.to],
+            });
+            this.brushService.setBrush(brushMessage);
+        }
     }
     ngOnChanges(changes) {
         if (changes.hasOwnProperty('config')) {
@@ -2304,7 +2295,7 @@ class BrushableDirective {
                     }
                     this._container.call(this.brush.move, this.selection
                         ? this.selection.map(brushScale)
-                        : domain.map(brushScale), {});
+                        : domain.map(brushScale));
                 }, 0);
             });
         }