@tetacom/svg-charts 1.3.1 → 1.3.3

package/fesm2020/tetacom-svg-charts.mjs

@@ -409,22 +409,10 @@ 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(originalDomain[1] - originalDomain[0]) / Math.abs(targetDomain[1] - targetDomain[0]);
+        const zoomScale = Math.abs(scale(originalDomain[1]) - scale(originalDomain[0])) / Math.abs(scale(targetDomain[1]) - scale(targetDomain[0]));
         let transform = zoomIdentity.scale(zoomScale);
         if (orientation === AxisOrientation.x) {
             if (!!inverted) {
@@ -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' });
@@ -861,7 +846,7 @@ class LinearSeriesBase extends SeriesBaseComponent {
     }
     set series(series) {
         this.__series = series;
-        this.markers = this.__series.data?.filter((_) => _?.marker && _?.x !== undefined && _?.y !== undefined);
+        this.markers = this.__series.data?.filter((_) => _?.marker && _?.x !== undefined && _?.y !== undefined && _?.x !== null && _?.y !== null);
     }
     get series() {
         return this.__series;
@@ -1588,12 +1573,13 @@ class XAxisComponent {
     constructor(scaleService, _svc) {
         this.scaleService = scaleService;
         this._svc = _svc;
+        this.update$ = new BehaviorSubject(null);
         this._alive = true;
         this.x = this.scaleService.scales.pipe(map((_) => {
             return _.x.get(this.axis.index)?.scale;
         }));
-        this.ticks = this.x.pipe(withLatestFrom(this._svc.size), map((_) => {
-            const [x, size] = _;
+        this.ticks = combineLatest([this.x, this.update$]).pipe(withLatestFrom(this._svc.size), map((_) => {
+            const [[x], size] = _;
             const tickSize = x.ticks().map((_) => getTextWidth(this.axis.options.tickFormat ? this.axis.options.tickFormat(_) : this.axis.defaultFormatter()(_), 0.45, 11));
             return x.ticks(size.width / parseInt(d3.max(tickSize), 10) / 10);
         }));
@@ -1606,9 +1592,14 @@ class XAxisComponent {
     ngOnDestroy() {
         this._alive = false;
     }
+    ngOnChanges(changes) {
+        if (changes.hasOwnProperty('axis')) {
+            this.update$.next();
+        }
+    }
 }
 XAxisComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: XAxisComponent, deps: [{ token: ScaleService }, { token: ChartService }], target: i0.ɵɵFactoryTarget.Component });
-XAxisComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.0.2", type: XAxisComponent, selector: "[teta-x-axis]", inputs: { axis: "axis", size: "size" }, ngImport: i0, template: "<ng-container *ngIf=\"{x: x | async, ticks: ticks | async} as data\">\n  <svg:g text-anchor=\"middle\" *ngFor=\"let tick of data.ticks\" [attr.transform]=\"'translate('+ data.x(tick) +', 0)'\">\n    <text fill=\"var(--color-text-70)\" [attr.dy]=\"axis.options.opposite ? '-0.71em' : '0.71em'\" [attr.y]=\"axis.options.opposite ? 0 : 9\">{{ this.axis.options.tickFormat ? this.axis.options.tickFormat(tick) : this.axis.defaultFormatter()(tick) }}</text>\n    <line stroke=\"var(--color-text-30)\" [attr.y2]=\"axis.options.opposite ? -6 : 6\"></line>\n  </svg:g>\n\n  <svg:g class=\"label-axis font-caption\" [attr.transform]=\"getLabelTransform()\">\n    <text fill=\"var(--color-text-70)\"  text-anchor=\"middle\" dominant-baseline=\"middle\">{{ axis.options.title }}</text>\n  </svg:g>\n</ng-container>\n\n", styles: [":host .tick{stroke:var(--color-text-20)}\n"], dependencies: [{ kind: "directive", type: i4.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i4.AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+XAxisComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.0.2", type: XAxisComponent, selector: "[teta-x-axis]", inputs: { axis: "axis", size: "size" }, usesOnChanges: true, ngImport: i0, template: "<ng-container *ngIf=\"{x: x | async, ticks: ticks | async} as data\">\n  <svg:g text-anchor=\"middle\" *ngFor=\"let tick of data.ticks\" [attr.transform]=\"'translate('+ data.x(tick) +', 0)'\">\n    <text fill=\"var(--color-text-70)\" [attr.dy]=\"axis.options.opposite ? '-0.71em' : '0.71em'\" [attr.y]=\"axis.options.opposite ? 0 : 9\">{{ this.axis.options.tickFormat ? this.axis.options.tickFormat(tick) : this.axis.defaultFormatter()(tick) }}</text>\n    <line stroke=\"var(--color-text-30)\" [attr.y2]=\"axis.options.opposite ? -6 : 6\"></line>\n  </svg:g>\n\n  <svg:g class=\"label-axis font-caption\" [attr.transform]=\"getLabelTransform()\">\n    <text fill=\"var(--color-text-70)\"  text-anchor=\"middle\" dominant-baseline=\"middle\">{{ axis.options.title }}</text>\n  </svg:g>\n</ng-container>\n\n", styles: [":host .tick{stroke:var(--color-text-20)}\n"], dependencies: [{ kind: "directive", type: i4.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i4.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "pipe", type: i4.AsyncPipe, name: "async" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: XAxisComponent, decorators: [{
             type: Component,
             args: [{ selector: '[teta-x-axis]', changeDetection: ChangeDetectionStrategy.OnPush, template: "<ng-container *ngIf=\"{x: x | async, ticks: ticks | async} as data\">\n  <svg:g text-anchor=\"middle\" *ngFor=\"let tick of data.ticks\" [attr.transform]=\"'translate('+ data.x(tick) +', 0)'\">\n    <text fill=\"var(--color-text-70)\" [attr.dy]=\"axis.options.opposite ? '-0.71em' : '0.71em'\" [attr.y]=\"axis.options.opposite ? 0 : 9\">{{ this.axis.options.tickFormat ? this.axis.options.tickFormat(tick) : this.axis.defaultFormatter()(tick) }}</text>\n    <line stroke=\"var(--color-text-30)\" [attr.y2]=\"axis.options.opposite ? -6 : 6\"></line>\n  </svg:g>\n\n  <svg:g class=\"label-axis font-caption\" [attr.transform]=\"getLabelTransform()\">\n    <text fill=\"var(--color-text-70)\"  text-anchor=\"middle\" dominant-baseline=\"middle\">{{ axis.options.title }}</text>\n  </svg:g>\n</ng-container>\n\n", styles: [":host .tick{stroke:var(--color-text-20)}\n"] }]
@@ -1978,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() {
@@ -2030,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) {
@@ -2061,31 +2056,54 @@ class ZoomableDirective {
             [0, 0],
             [this.size.width, this.size.height],
         ]);
-        if (this.config.zoom?.limitTranslateByData) {
+        const min = this.config?.zoom?.minTranslate
+            ? this.axis.scale(this.config?.zoom?.minTranslate)
+            : 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, 0],
+                [max, this.size.height],
+            ]);
+        }
+        if (this.axis.orientation === AxisOrientation.y && this.config.zoom?.type === ZoomType.y) {
             this.zoom.translateExtent([
-                [0, 0],
-                [this.size.width, this.size.height],
+                [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
             : Infinity;
         this.zoom.scaleExtent([maxZoom, minZoom]);
         this.zoom.on('zoom end', this.zoomed);
-        this._element.call(this.zoom).on('dblclick.zoom', null); // Disable dbclick zoom
+        this._element.call(this.zoom).on('dblclick.zoom', null);
         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';
@@ -2102,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
@@ -2116,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) => {
@@ -2151,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
@@ -2196,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')) {
@@ -2286,7 +2295,7 @@ class BrushableDirective {
                     }
                     this._container.call(this.brush.move, this.selection
                         ? this.selection.map(brushScale)
-                        : domain.map(brushScale), {});
+                        : domain.map(brushScale));
                 }, 0);
             });
         }
@@ -2388,8 +2397,6 @@ class CrosshairComponent {
     }
     ngOnInit() {
         this.transform = this.chartService.pointerMove.pipe(map((event) => {
-            const composedPath = event.composedPath();
-            const classes = composedPath.map((_) => _.classList?.contains('crosshair')).filter((_) => _);
             return {
                 x: event.type === 'mouseleave' ? -9999 : event.offsetX,
                 y: event.type === 'mouseleave' ? -9999 : event.offsetY