@kiina/charts-comparison - npm Package Compare versions

Comparing version 0.1.8 to 0.1.9

bundles/kiina-charts-comparison.umd.js

@@ -250,24 +250,34 @@ (function (global, factory) {
             var element = this.chartContainer.nativeElement;
+            var contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+            var contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
             this.svg = d3.select(element).append('svg')
                 .attr('width', element.offsetWidth)
-                .attr('height', element.offsetHeight)
-                .append("g")
+                .attr('height', element.offsetHeight);
+            var g = this.svg.append("g")
                 .attr("transform", "translate(" + this.marginLeft + "," + this.marginTop + ")");
-            this.drawLine(this.createHorizontalAxis(element), this.createVerticalAxis(element));
+            this.drawLine(this.createHorizontalAxis(element, g, contentHeight, contentWidth), this.createVerticalAxis(element, g, contentHeight, contentWidth));
         };
-        ChartLineComponent.prototype.createHorizontalAxis = function (element) {
-            var contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
+        ChartLineComponent.prototype.createHorizontalAxis = function (element, g, contentHeight, contentWidth) {
             var x = d3.scaleLinear()
-                .domain([0, d3.max(this.data, function (d) { return +d.x_value; })])
+                .domain([
+                d3.min(this.data, function (d) { return d.x_value; }),
+                d3.max(this.data, function (d) { return d.x_value; })
+            ])
                 .range([0, contentWidth]);
-            this.svg.append("g")
+            g.append('g')
+                .attr('class', 'axis axis--x')
+                .attr('transform', 'translate(0,' + contentHeight + ')')
                 .call(d3.axisBottom(x));
             return x;
         };
-        ChartLineComponent.prototype.createVerticalAxis = function (element) {
-            var contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+        ChartLineComponent.prototype.createVerticalAxis = function (element, g, contentHeight, contentWidth) {
             var y = d3.scaleLinear()
-                .domain([0, d3.max(this.data, function (d) { return +d.y_value; })])
+                .domain([
+                d3.min(this.data, function (d) { return d.y_value; }),
+                d3.max(this.data, function (d) { return d.y_value; })
+            ])
                 .range([contentHeight, 0]);
-            this.svg.append("g")
+            g.append('g')
+                .attr('class', 'axis axis--y')
+                .attr('transform', 'translate(' + contentWidth + ', 0)')
                 .call(d3.axisLeft(y));
@@ -283,10 +293,4 @@ return y;
                 .attr("d", d3.line()
-                .x(function (d) {
-                console.log('x', d);
-                return x(d[0]);
-            })
-                .y(function (d) {
-                console.log('y', d);
-                return y(d[1]);
-            }));
+                .x(function (d) { return x(d[0]); })
+                .y(function (d) { return y(d[1]); }));
         };
@@ -293,0 +297,0 @@ __decorate([

bundles/kiina-charts-comparison.umd.min.js

@@ -1,2 +0,2 @@
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("@angular/core"),require("d3"),require("@angular/common")):"function"==typeof define&&define.amd?define("@kiina/charts-comparison",["exports","@angular/core","d3","@angular/common"],e):e(((t=t||self).kiina=t.kiina||{},t.kiina["charts-comparison"]={}),t.ng.core,t.d3,t.ng.common)}(this,(function(t,e,n,o){"use strict";
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(exports,require("@angular/core"),require("d3"),require("@angular/common")):"function"==typeof define&&define.amd?define("@kiina/charts-comparison",["exports","@angular/core","d3","@angular/common"],n):n(((t=t||self).kiina=t.kiina||{},t.kiina["charts-comparison"]={}),t.ng.core,t.d3,t.ng.common)}(this,(function(t,n,e,r){"use strict";
 /*! *****************************************************************************
@@ -15,3 +15,3 @@ Copyright (c) Microsoft Corporation.
     PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */function r(t,e,n,o){var r,i=arguments.length,a=i<3?e:null===o?o=Object.getOwnPropertyDescriptor(e,n):o;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,e,n,o);else for(var s=t.length-1;s>=0;s--)(r=t[s])&&(a=(i<3?r(a):i>3?r(e,n,a):r(e,n))||a);return i>3&&a&&Object.defineProperty(e,n,a),a}var i=function(){function t(){}return t.prototype.ngOnInit=function(){},t=r([e.Component({selector:"kiina-charts-comparison",template:"\n    <p>\n      charts-comparison works!\n    </p>\n  "})],t)}(),a=function(){function t(){this.marginTop=20,this.marginBottom=30,this.marginRight=20,this.marginLeft=40}return t.prototype.ngOnChanges=function(t){this.data&&this.createChart()},t.prototype.createChart=function(){n.select("svg").remove();var t=this.chartContainer.nativeElement;this.svg=n.select(t).append("svg").attr("width",t.offsetWidth).attr("height",t.offsetHeight).append("g").attr("transform","translate("+this.marginLeft+","+this.marginTop+")"),this.drawLine(this.createHorizontalAxis(t),this.createVerticalAxis(t))},t.prototype.createHorizontalAxis=function(t){var e=t.offsetWidth-this.marginLeft-this.marginRight,o=n.scaleLinear().domain([0,n.max(this.data,(function(t){return+t.x_value}))]).range([0,e]);return this.svg.append("g").call(n.axisBottom(o)),o},t.prototype.createVerticalAxis=function(t){var e=t.offsetHeight-this.marginTop-this.marginBottom,o=n.scaleLinear().domain([0,n.max(this.data,(function(t){return+t.y_value}))]).range([e,0]);return this.svg.append("g").call(n.axisLeft(o)),o},t.prototype.drawLine=function(t,e){this.svg.append("path").datum(this.data).attr("fill","none").attr("stroke","steelblue").attr("stroke-width",1.5).attr("d",n.line().x((function(e){return console.log("x",e),t(e[0])})).y((function(t){return console.log("y",t),e(t[1])})))},r([e.ViewChild("chart",{static:!0})],t.prototype,"chartContainer",void 0),r([e.Input()],t.prototype,"data",void 0),r([e.Input("marginTop")],t.prototype,"marginTop",void 0),r([e.Input("marginBottom")],t.prototype,"marginBottom",void 0),r([e.Input("marginRight")],t.prototype,"marginRight",void 0),r([e.Input("marginLeft")],t.prototype,"marginLeft",void 0),t=r([e.Component({selector:"kiina-chart-line",encapsulation:e.ViewEncapsulation.None,template:'<div #chart id="chart"></div>\n',styles:[""]})],t)}(),s=function(){function t(){}return t=r([e.NgModule({declarations:[],imports:[o.CommonModule]})],t)}(),c=function(){function t(){}var n;return n=t,t.forRoot=function(){return{ngModule:n,providers:[]}},t=n=r([e.NgModule({declarations:[i,a],imports:[s],exports:[i,a]})],t)}();t.ChartLineComponent=a,t.ChartsComparisonComponent=i,t.ChartsComparisonModule=c,t.ɵa=s,Object.defineProperty(t,"__esModule",{value:!0})}));
+    ***************************************************************************** */function i(t,n,e,r){var i,o=arguments.length,a=o<3?n:null===r?r=Object.getOwnPropertyDescriptor(n,e):r;if("object"==typeof Reflect&&"function"==typeof Reflect.decorate)a=Reflect.decorate(t,n,e,r);else for(var s=t.length-1;s>=0;s--)(i=t[s])&&(a=(o<3?i(a):o>3?i(n,e,a):i(n,e))||a);return o>3&&a&&Object.defineProperty(n,e,a),a}var o=function(){function t(){}return t.prototype.ngOnInit=function(){},t=i([n.Component({selector:"kiina-charts-comparison",template:"\n    <p>\n      charts-comparison works!\n    </p>\n  "})],t)}(),a=function(){function t(){this.marginTop=20,this.marginBottom=30,this.marginRight=20,this.marginLeft=40}return t.prototype.ngOnChanges=function(t){this.data&&this.createChart()},t.prototype.createChart=function(){e.select("svg").remove();var t=this.chartContainer.nativeElement,n=t.offsetHeight-this.marginTop-this.marginBottom,r=t.offsetWidth-this.marginLeft-this.marginRight;this.svg=e.select(t).append("svg").attr("width",t.offsetWidth).attr("height",t.offsetHeight);var i=this.svg.append("g").attr("transform","translate("+this.marginLeft+","+this.marginTop+")");this.drawLine(this.createHorizontalAxis(t,i,n,r),this.createVerticalAxis(t,i,n,r))},t.prototype.createHorizontalAxis=function(t,n,r,i){var o=e.scaleLinear().domain([e.min(this.data,(function(t){return t.x_value})),e.max(this.data,(function(t){return t.x_value}))]).range([0,i]);return n.append("g").attr("class","axis axis--x").attr("transform","translate(0,"+r+")").call(e.axisBottom(o)),o},t.prototype.createVerticalAxis=function(t,n,r,i){var o=e.scaleLinear().domain([e.min(this.data,(function(t){return t.y_value})),e.max(this.data,(function(t){return t.y_value}))]).range([r,0]);return n.append("g").attr("class","axis axis--y").attr("transform","translate("+i+", 0)").call(e.axisLeft(o)),o},t.prototype.drawLine=function(t,n){this.svg.append("path").datum(this.data).attr("fill","none").attr("stroke","steelblue").attr("stroke-width",1.5).attr("d",e.line().x((function(n){return t(n[0])})).y((function(t){return n(t[1])})))},i([n.ViewChild("chart",{static:!0})],t.prototype,"chartContainer",void 0),i([n.Input()],t.prototype,"data",void 0),i([n.Input("marginTop")],t.prototype,"marginTop",void 0),i([n.Input("marginBottom")],t.prototype,"marginBottom",void 0),i([n.Input("marginRight")],t.prototype,"marginRight",void 0),i([n.Input("marginLeft")],t.prototype,"marginLeft",void 0),t=i([n.Component({selector:"kiina-chart-line",encapsulation:n.ViewEncapsulation.None,template:'<div #chart id="chart"></div>\n',styles:[""]})],t)}(),s=function(){function t(){}return t=i([n.NgModule({declarations:[],imports:[r.CommonModule]})],t)}(),c=function(){function t(){}var e;return e=t,t.forRoot=function(){return{ngModule:e,providers:[]}},t=e=i([n.NgModule({declarations:[o,a],imports:[s],exports:[o,a]})],t)}();t.ChartLineComponent=a,t.ChartsComparisonComponent=o,t.ChartsComparisonModule=c,t.ɵa=s,Object.defineProperty(t,"__esModule",{value:!0})}));
 //# sourceMappingURL=kiina-charts-comparison.umd.min.js.map

esm2015/lib/chart-line/chart-line.component.js

@@ -19,26 +19,36 @@ import { __decorate } from "tslib";
         const element = this.chartContainer.nativeElement;
+        const contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+        const contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
         this.svg = d3.select(element).append('svg')
             .attr('width', element.offsetWidth)
-            .attr('height', element.offsetHeight)
-            .append("g")
+            .attr('height', element.offsetHeight);
+        const g = this.svg.append("g")
             .attr("transform", "translate(" + this.marginLeft + "," + this.marginTop + ")");
-        this.drawLine(this.createHorizontalAxis(element), this.createVerticalAxis(element));
+        this.drawLine(this.createHorizontalAxis(element, g, contentHeight, contentWidth), this.createVerticalAxis(element, g, contentHeight, contentWidth));
     }
-    createHorizontalAxis(element) {
-        const contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
+    createHorizontalAxis(element, g, contentHeight, contentWidth) {
         let x = d3
             .scaleLinear()
-            .domain([0, d3.max(this.data, d => +d.x_value)])
+            .domain([
+            d3.min(this.data, d => d.x_value),
+            d3.max(this.data, d => d.x_value)
+        ])
             .range([0, contentWidth]);
-        this.svg.append("g")
+        g.append('g')
+            .attr('class', 'axis axis--x')
+            .attr('transform', 'translate(0,' + contentHeight + ')')
             .call(d3.axisBottom(x));
         return x;
     }
-    createVerticalAxis(element) {
-        const contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+    createVerticalAxis(element, g, contentHeight, contentWidth) {
         let y = d3
             .scaleLinear()
-            .domain([0, d3.max(this.data, d => +d.y_value)])
+            .domain([
+            d3.min(this.data, d => d.y_value),
+            d3.max(this.data, d => d.y_value)
+        ])
             .range([contentHeight, 0]);
-        this.svg.append("g")
+        g.append('g')
+            .attr('class', 'axis axis--y')
+            .attr('transform', 'translate(' + contentWidth + ', 0)')
             .call(d3.axisLeft(y));
@@ -54,10 +64,4 @@ return y;
             .attr("d", d3.line()
-            .x(d => {
-            console.log('x', d);
-            return x(d[0]);
-        })
-            .y(d => {
-            console.log('y', d);
-            return y(d[1]);
-        }));
+            .x(d => x(d[0]))
+            .y(d => y(d[1])));
     }
@@ -92,2 +96,2 @@ };
 export { ChartLineComponent };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtbGluZS5jb21wb25lbnQuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9Aa2lpbmEvY2hhcnRzLWNvbXBhcmlzb24vIiwic291cmNlcyI6WyJsaWIvY2hhcnQtbGluZS9jaGFydC1saW5lLmNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLFNBQVMsRUFBYyxLQUFLLEVBQWEsU0FBUyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGVBQWUsQ0FBQztBQUNySCxPQUFPLEtBQUssRUFBRSxNQUFNLElBQUksQ0FBQztBQVN6QixJQUFhLGtCQUFrQixHQUEvQixNQUFhLGtCQUFrQjtJQUEvQjtRQVNFLGNBQVMsR0FBVyxFQUFFLENBQUM7UUFHdkIsaUJBQVksR0FBVyxFQUFFLENBQUM7UUFHMUIsZ0JBQVcsR0FBVyxFQUFFLENBQUM7UUFHekIsZUFBVSxHQUFXLEVBQUUsQ0FBQztJQW9FMUIsQ0FBQztJQWhFQyxXQUFXLENBQUMsT0FBc0I7UUFDaEMsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJO1lBQUUsT0FBTztRQUV2QixJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDckIsQ0FBQztJQUVPLFdBQVc7UUFDakIsRUFBRSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQztRQUUxQixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsY0FBYyxDQUFDLGFBQWEsQ0FBQztRQUVsRCxJQUFJLENBQUMsR0FBRyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQzthQUN4QyxJQUFJLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUM7YUFDbEMsSUFBSSxDQUFDLFFBQVEsRUFBRSxPQUFPLENBQUMsWUFBWSxDQUFDO2FBQ3BDLE1BQU0sQ0FBQyxHQUFHLENBQUM7YUFDWCxJQUFJLENBQUMsV0FBVyxFQUNmLFlBQVksR0FBRyxJQUFJLENB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Q0k7QUFHdkI7SUFEQyxLQUFLLENBQUMsY0FBYyxDQUFDO3dEQUNJO0FBRzFCO0lBREMsS0FBSyxDQUFDLGFBQWEsQ0FBQzt1REFDSTtBQUd6QjtJQURDLEtBQUssQ0FBQyxZQUFZLENBQUM7c0RBQ0k7QUFsQmIsa0JBQWtCO0lBTjlCLFNBQVMsQ0FBQztRQUNULFFBQVEsRUFBRSxrQkFBa0I7UUFDNUIsYUFBYSxFQUFFLGlCQUFpQixDQUFDLElBQUk7UUFDckMsNkNBQTBDOztLQUUzQyxDQUFDO0dBQ1csa0JBQWtCLENBc0Y5QjtTQXRGWSxrQkFBa0IiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb21wb25lbnQsIEVsZW1lbnRSZWYsIElucHV0LCBPbkNoYW5nZXMsIFZpZXdDaGlsZCwgVmlld0VuY2Fwc3VsYXRpb24sIFNpbXBsZUNoYW5nZXMgfSBmcm9tICdAYW5ndWxhci9jb3JlJztcbmltcG9ydCAqIGFzIGQzIGZyb20gJ2QzJztcbmltcG9ydCB7IERhdGFNb2RlbCB9IGZyb20gJy4uL3NoYXJlZC9kYXRhLm1vZGVsJztcblxuQENvbXBvbmVudCh7XG4gIHNlbGVjdG9yOiAna2lpbmEtY2hhcnQtbGluZScsXG4gIGVuY2Fwc3VsYXRpb246IFZpZXdFbmNhcHN1bGF0aW9uLk5vbmUsXG4gIHRlbXBsYXRlVXJsOiAnLi9jaGFydC1saW5lLmNvbXBvbmVudC5odG1sJyxcbiAgc3R5bGVVcmxzOiBbJy4vY2hhcnQtbGluZS5jb21wb25lbnQuY3NzJ11cbn0pXG5leHBvcnQgY2xhc3MgQ2hhcnRMaW5lQ29tcG9uZW50IGltcGxlbWVudHMgT25DaGFuZ2VzIHtcblxuICBAVmlld0NoaWxkKCdjaGFydCcsIHsgc3RhdGljOiB0cnVlIH0pXG4gIGNoYXJ0Q29udGFpbmVyOiBFbGVtZW50UmVmO1xuXG4gIEBJbnB1dCgpXG4gIGRhdGE6IERhdGFNb2RlbFtdO1xuXG4gIEBJbnB1dCgnbWFyZ2luVG9wJylcbiAgbWFyZ2luVG9wOiBudW1iZXIgPSAyMDtcblxuICBASW5wdXQoJ21hcmdpbkJvdHRvbScpXG4gIG1hcmdpbkJvdHRvbTogbnVtYmVyID0gMzA7XG5cbiAgQElucHV0KCdtYXJnaW5SaWdodCcpXG4gIG1hcmdpblJpZ2h0OiBudW1iZXIgPSAyMDtcblxuICBASW5wdXQoJ21hcmdpbkxlZnQnKVxuICBtYXJnaW5MZWZ0OiBudW1iZXIgPSA0MDtcblxuICBwcml2YXRlIHN2ZztcblxuICBuZ09uQ2hhbmdlcyhjaGFuZ2VzOiBTaW1wbGVDaGFuZ2VzKTogdm9pZCB7XG4gICAgaWYgKCF0aGlzLmRhdGEpIHJldHVybjtcblxuICAgIHRoaXMuY3JlYXRlQ2hhcnQoKTtcbiAgfVxuXG4gIHByaXZhdGUgY3JlYXRlQ2hhcnQoKSB7XG4gICAgZDMuc2VsZWN0KCdzdmcnKS5yZW1vdmUoKTtcblxuICAgIGNvbnN0IGVsZW1lbnQgPSB0aGlzLmNoYXJ0Q29udGFpbmVyLm5hdGl2ZUVsZW1lbnQ7XG5cbiAgICB0aGlzLnN2ZyA9IGQzLnNlbGVjdChlbGVtZW50KS5hcHBlbmQoJ3N2ZycpXG4gICAgICAuYXR0cignd2lkdGgnLCBlbGVtZW50Lm9mZnNldFdpZHRoKVxuICAgICAgLmF0dHIoJ2hlaWdodCcsIGVsZW1lbnQub2Zmc2V0SGVpZ2h0KVxuICAgICAgLmFwcGVuZChcImdcIilcbiAgICAgIC5hdHRyKFwidHJhbnNmb3JtXCIsXG4gICAgICAgIFwidHJhbnNsYXRlKFwiICsgdGhpcy5tYXJnaW5MZWZ0ICsgXCIsXCIgKyB0aGlzLm1hcmdpblRvcCArIFwiKVwiKTtcblxuICAgIHRoaXMuZHJhd0xpbmUoXG4gICAgICB0aGlzLmNyZWF0ZUhvcml6b250YWxBeGlzKGVsZW1lbnQpLFxuICAgICAgdGhpcy5jcmVhdGVWZXJ0aWNhbEF4aXMoZWxlbWVudClcbiAgICApO1xuICB9XG5cbiAgcHJpdmF0ZSBjcmVhdGVIb3Jpem9udGFsQXhpcyhlbGVtZW50KSB7XG4gICAgY29uc3QgY29udGVudFdpZHRoID0gZWxlbWVudC5vZmZzZXRXaWR0aCAtIHRoaXMubWFyZ2luTGVmdCAtIHRoaXMubWFyZ2luUmlnaHQ7XG4gICAgbGV0IHggPSBkM1xuICAgICAgLnNjYWxlTGluZWFyKClcbiAgICAgIC5kb21haW4oWzAsIGQzLm1heCh0aGlzLmRhdGEsIGQgPT4gK2QueF92YWx1ZSldKVxuICAgICAgLnJhbmdlKFswLCBjb250ZW50V2lkdGhdKTtcbiAgICB0aGlzLnN2Zy5hcHBlbmQoXCJnXCIpXG4gICAgICAuY2FsbChkMy5heGlzQm90dG9tKHgpKTtcbiAgICByZXR1cm4geDtcbiAgfVxuXG4gIHByaXZhdGUgY3JlYXRlVmVydGljYWxBeGlzKGVsZW1lbnQpIHtcbiAgICBjb25zdCBjb250ZW50SGVpZ2h0ID0gZWxlbWVudC5vZmZzZXRIZWlnaHQgLSB0aGlzLm1hcmdpblRvcCAtIHRoaXMubWFyZ2luQm90dG9tO1xuICAgIGxldCB5ID0gZDNcbiAgICAgIC5zY2FsZUxpbmVhcigpXG4gICAgICAuZG9tYWluKFswLCBkMy5tYXgodGhpcy5kYXRhLCBkID0+ICtkLnlfdmFsdWUpXSlcbiAgICAgIC5yYW5nZShbY29udGVudEhlaWdodCwgMF0pO1xuICAgIHRoaXMuc3ZnLmFwcGVuZChcImdcIilcbiAgICAgIC5jYWxsKGQzLmF4aXNMZWZ0KHkpKTtcbiAgICByZXR1cm4geTtcbiAgfVxuXG4gIHByaXZhdGUgZHJhd0xpbmUoeCwgeSkge1xuICAgIHRoaXMuc3ZnLmFwcGVuZChcInBhdGhcIilcbiAgICAgIC5kYXR1bSh0aGlzLmRhdGEpXG4gICAgICAuYXR0cihcImZpbGxcIiwgXCJub25lXCIpXG4gICAgICAuYXR0cihcInN0cm9rZVwiLCBcInN0ZWVsYmx1ZVwiKVxuICAgICAgLmF0dHIoXCJzdHJva2Utd2lkdGhcIiwgMS41KVxuICAgICAgLmF0dHIoXCJkXCIsIGQzLmxpbmUoKVxuICAgICAgICAueChkID0+IHtcbiAgICAgICAgICBjb25zb2xlLmxvZygneCcsIGQpO1xuICAgICAgICAgIHJldHVybiB4KGRbMF0pXG4gICAgICAgIH0pXG4gICAgICAgIC55KGQgPT4ge1xuICAgICAgICAgIGNvbnNvbGUubG9nKCd5JywgZCk7XG4gICAgICAgICAgcmV0dXJuIHkoZFsxXSlcbiAgICAgICAgfSlcbiAgICAgIClcbiAgfVxuXG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-line.component.js","sourceRoot":"ng://@kiina/charts-comparison/","sources":["lib/chart-line/chart-line.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, ElementRef, Input, OnChanges, ViewChild, ViewEncapsulation, SimpleChanges } from '@angular/core';\nimport * as d3 from 'd3';\nimport { DataModel } from '../shared/data.model';\n\n@Component({\n  selector: 'kiina-chart-line',\n  encapsulation: ViewEncapsulation.None,\n  templateUrl: './chart-line.component.html',\n  styleUrls: ['./chart-line.component.css']\n})\nexport class ChartLineComponent implements OnChanges {\n\n  @ViewChild('chart', { static: true })\n  chartContainer: ElementRef;\n\n  @Input()\n  data: DataModel[];\n\n  @Input('marginTop')\n  marginTop: number = 20;\n\n  @Input('marginBottom')\n  marginBottom: number = 30;\n\n  @Input('marginRight')\n  marginRight: number = 20;\n\n  @Input('marginLeft')\n  marginLeft: number = 40;\n\n  private svg;\n\n  ngOnChanges(changes: SimpleChanges): void {\n    if (!this.data) return;\n\n    this.createChart();\n  }\n\n  private createChart() {\n    d3.select('svg').remove();\n\n    const element = this.chartContainer.nativeElement;\n    const contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;\n    const contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;\n\n    this.svg = d3.select(element).append('svg')\n      .attr('width', element.offsetWidth)\n      .attr('height', element.offsetHeight)\n\n    const g = this.svg.append(\"g\")\n      .attr(\"transform\",\n        \"translate(\" + this.marginLeft + \",\" + this.marginTop + \")\");\n\n    this.drawLine(\n      this.createHorizontalAxis(element, g, contentHeight, contentWidth),\n      this.createVerticalAxis(element, g, contentHeight, contentWidth)\n    );\n  }\n\n  private createHorizontalAxis(element, g, contentHeight, contentWidth) {\n    let x = d3\n      .scaleLinear()\n      .domain([\n        d3.min(this.data, d => d.x_value),\n        d3.max(this.data, d => d.x_value)])\n      .range([0, contentWidth]);\n\n    g.append('g')\n      .attr('class', 'axis axis--x')\n      .attr('transform', 'translate(0,' + contentHeight + ')')\n      .call(d3.axisBottom(x));\n    return x;\n  }\n\n  private createVerticalAxis(element, g, contentHeight, contentWidth) {\n\n    let y = d3\n      .scaleLinear()\n      .domain([\n        d3.min(this.data, d => d.y_value),\n        d3.max(this.data, d => d.y_value)])\n      .range([contentHeight, 0]);\n    g.append('g')\n      .attr('class', 'axis axis--y')\n      .attr('transform', 'translate(' + contentWidth + ', 0)')\n      .call(d3.axisLeft(y));\n    return y;\n  }\n\n  private drawLine(x, y) {\n    this.svg.append(\"path\")\n      .datum(this.data)\n      .attr(\"fill\", \"none\")\n      .attr(\"stroke\", \"steelblue\")\n      .attr(\"stroke-width\", 1.5)\n      .attr(\"d\", d3.line()\n        .x(d => x(d[0]))\n        .y(d => y(d[1]))\n      )\n  }\n\n}\n"]}

esm5/lib/chart-line/chart-line.component.js

@@ -19,26 +19,36 @@ import { __decorate } from "tslib";
         var element = this.chartContainer.nativeElement;
+        var contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+        var contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
         this.svg = d3.select(element).append('svg')
             .attr('width', element.offsetWidth)
-            .attr('height', element.offsetHeight)
-            .append("g")
+            .attr('height', element.offsetHeight);
+        var g = this.svg.append("g")
             .attr("transform", "translate(" + this.marginLeft + "," + this.marginTop + ")");
-        this.drawLine(this.createHorizontalAxis(element), this.createVerticalAxis(element));
+        this.drawLine(this.createHorizontalAxis(element, g, contentHeight, contentWidth), this.createVerticalAxis(element, g, contentHeight, contentWidth));
     };
-    ChartLineComponent.prototype.createHorizontalAxis = function (element) {
-        var contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
+    ChartLineComponent.prototype.createHorizontalAxis = function (element, g, contentHeight, contentWidth) {
         var x = d3
             .scaleLinear()
-            .domain([0, d3.max(this.data, function (d) { return +d.x_value; })])
+            .domain([
+            d3.min(this.data, function (d) { return d.x_value; }),
+            d3.max(this.data, function (d) { return d.x_value; })
+        ])
             .range([0, contentWidth]);
-        this.svg.append("g")
+        g.append('g')
+            .attr('class', 'axis axis--x')
+            .attr('transform', 'translate(0,' + contentHeight + ')')
             .call(d3.axisBottom(x));
         return x;
     };
-    ChartLineComponent.prototype.createVerticalAxis = function (element) {
-        var contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+    ChartLineComponent.prototype.createVerticalAxis = function (element, g, contentHeight, contentWidth) {
         var y = d3
             .scaleLinear()
-            .domain([0, d3.max(this.data, function (d) { return +d.y_value; })])
+            .domain([
+            d3.min(this.data, function (d) { return d.y_value; }),
+            d3.max(this.data, function (d) { return d.y_value; })
+        ])
             .range([contentHeight, 0]);
-        this.svg.append("g")
+        g.append('g')
+            .attr('class', 'axis axis--y')
+            .attr('transform', 'translate(' + contentWidth + ', 0)')
             .call(d3.axisLeft(y));
@@ -54,10 +64,4 @@ return y;
             .attr("d", d3.line()
-            .x(function (d) {
-            console.log('x', d);
-            return x(d[0]);
-        })
-            .y(function (d) {
-            console.log('y', d);
-            return y(d[1]);
-        }));
+            .x(function (d) { return x(d[0]); })
+            .y(function (d) { return y(d[1]); }));
     };
@@ -93,2 +97,2 @@ __decorate([
 export { ChartLineComponent };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtbGluZS5jb21wb25lbnQuanMiLCJzb3VyY2VSb290Ijoibmc6Ly9Aa2lpbmEvY2hhcnRzLWNvbXBhcmlzb24vIiwic291cmNlcyI6WyJsaWIvY2hhcnQtbGluZS9jaGFydC1saW5lLmNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLFNBQVMsRUFBYyxLQUFLLEVBQWEsU0FBUyxFQUFFLGlCQUFpQixFQUFpQixNQUFNLGVBQWUsQ0FBQztBQUNySCxPQUFPLEtBQUssRUFBRSxNQUFNLElBQUksQ0FBQztBQVN6QjtJQUFBO1FBU0UsY0FBUyxHQUFXLEVBQUUsQ0FBQztRQUd2QixpQkFBWSxHQUFXLEVBQUUsQ0FBQztRQUcxQixnQkFBVyxHQUFXLEVBQUUsQ0FBQztRQUd6QixlQUFVLEdBQVcsRUFBRSxDQUFDO0lBb0UxQixDQUFDO0lBaEVDLHdDQUFXLEdBQVgsVUFBWSxPQUFzQjtRQUNoQyxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUk7WUFBRSxPQUFPO1FBRXZCLElBQUksQ0FBQyxXQUFXLEVBQUUsQ0FBQztJQUNyQixDQUFDO0lBRU8sd0NBQVcsR0FBbkI7UUFDRSxFQUFFLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLE1BQU0sRUFBRSxDQUFDO1FBRTFCLElBQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxjQUFjLENBQUMsYUFBYSxDQUFDO1FBRWxELElBQUksQ0FBQyxHQUFHLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO2FBQ3hDLElBQUksQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQzthQUNsQyxJQUFJLENBQUMsUUFBUSxFQUFFLE9BQU8sQ0FBQyxZQUFZLENBQUM7YUFDcEMsTUFBTSxDQUFDLEdBQUcsQ0FBQzthQUNYLElBQUksQ0FBQyxXQUFXLEVBQ2YsWUFBWSxHQUFHLElBQUksQ0FBQyxVQUFVLEdBQUcsR0FBRyxH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eURBQ0k7SUFHdkI7UUFEQyxLQUFLLENBQUMsY0FBYyxDQUFDOzREQUNJO0lBRzFCO1FBREMsS0FBSyxDQUFDLGFBQWEsQ0FBQzsyREFDSTtJQUd6QjtRQURDLEtBQUssQ0FBQyxZQUFZLENBQUM7MERBQ0k7SUFsQmIsa0JBQWtCO1FBTjlCLFNBQVMsQ0FBQztZQUNULFFBQVEsRUFBRSxrQkFBa0I7WUFDNUIsYUFBYSxFQUFFLGlCQUFpQixDQUFDLElBQUk7WUFDckMsNkNBQTBDOztTQUUzQyxDQUFDO09BQ1csa0JBQWtCLENBc0Y5QjtJQUFELHlCQUFDO0NBQUEsQUF0RkQsSUFzRkM7U0F0Rlksa0JBQWtCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50LCBFbGVtZW50UmVmLCBJbnB1dCwgT25DaGFuZ2VzLCBWaWV3Q2hpbGQsIFZpZXdFbmNhcHN1bGF0aW9uLCBTaW1wbGVDaGFuZ2VzIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XG5pbXBvcnQgKiBhcyBkMyBmcm9tICdkMyc7XG5pbXBvcnQgeyBEYXRhTW9kZWwgfSBmcm9tICcuLi9zaGFyZWQvZGF0YS5tb2RlbCc7XG5cbkBDb21wb25lbnQoe1xuICBzZWxlY3RvcjogJ2tpaW5hLWNoYXJ0LWxpbmUnLFxuICBlbmNhcHN1bGF0aW9uOiBWaWV3RW5jYXBzdWxhdGlvbi5Ob25lLFxuICB0ZW1wbGF0ZVVybDogJy4vY2hhcnQtbGluZS5jb21wb25lbnQuaHRtbCcsXG4gIHN0eWxlVXJsczogWycuL2NoYXJ0LWxpbmUuY29tcG9uZW50LmNzcyddXG59KVxuZXhwb3J0IGNsYXNzIENoYXJ0TGluZUNvbXBvbmVudCBpbXBsZW1lbnRzIE9uQ2hhbmdlcyB7XG5cbiAgQFZpZXdDaGlsZCgnY2hhcnQnLCB7IHN0YXRpYzogdHJ1ZSB9KVxuICBjaGFydENvbnRhaW5lcjogRWxlbWVudFJlZjtcblxuICBASW5wdXQoKVxuICBkYXRhOiBEYXRhTW9kZWxbXTtcblxuICBASW5wdXQoJ21hcmdpblRvcCcpXG4gIG1hcmdpblRvcDogbnVtYmVyID0gMjA7XG5cbiAgQElucHV0KCdtYXJnaW5Cb3R0b20nKVxuICBtYXJnaW5Cb3R0b206IG51bWJlciA9IDMwO1xuXG4gIEBJbnB1dCgnbWFyZ2luUmlnaHQnKVxuICBtYXJnaW5SaWdodDogbnVtYmVyID0gMjA7XG5cbiAgQElucHV0KCdtYXJnaW5MZWZ0JylcbiAgbWFyZ2luTGVmdDogbnVtYmVyID0gNDA7XG5cbiAgcHJpdmF0ZSBzdmc7XG5cbiAgbmdPbkNoYW5nZXMoY2hhbmdlczogU2ltcGxlQ2hhbmdlcyk6IHZvaWQge1xuICAgIGlmICghdGhpcy5kYXRhKSByZXR1cm47XG5cbiAgICB0aGlzLmNyZWF0ZUNoYXJ0KCk7XG4gIH1cblxuICBwcml2YXRlIGNyZWF0ZUNoYXJ0KCkge1xuICAgIGQzLnNlbGVjdCgnc3ZnJykucmVtb3ZlKCk7XG5cbiAgICBjb25zdCBlbGVtZW50ID0gdGhpcy5jaGFydENvbnRhaW5lci5uYXRpdmVFbGVtZW50O1xuXG4gICAgdGhpcy5zdmcgPSBkMy5zZWxlY3QoZWxlbWVudCkuYXBwZW5kKCdzdmcnKVxuICAgICAgLmF0dHIoJ3dpZHRoJywgZWxlbWVudC5vZmZzZXRXaWR0aClcbiAgICAgIC5hdHRyKCdoZWlnaHQnLCBlbGVtZW50Lm9mZnNldEhlaWdodClcbiAgICAgIC5hcHBlbmQoXCJnXCIpXG4gICAgICAuYXR0cihcInRyYW5zZm9ybVwiLFxuICAgICAgICBcInRyYW5zbGF0ZShcIiArIHRoaXMubWFyZ2luTGVmdCArIFwiLFwiICsgdGhpcy5tYXJnaW5Ub3AgKyBcIilcIik7XG5cbiAgICB0aGlzLmRyYXdMaW5lKFxuICAgICAgdGhpcy5jcmVhdGVIb3Jpem9udGFsQXhpcyhlbGVtZW50KSxcbiAgICAgIHRoaXMuY3JlYXRlVmVydGljYWxBeGlzKGVsZW1lbnQpXG4gICAgKTtcbiAgfVxuXG4gIHByaXZhdGUgY3JlYXRlSG9yaXpvbnRhbEF4aXMoZWxlbWVudCkge1xuICAgIGNvbnN0IGNvbnRlbnRXaWR0aCA9IGVsZW1lbnQub2Zmc2V0V2lkdGggLSB0aGlzLm1hcmdpbkxlZnQgLSB0aGlzLm1hcmdpblJpZ2h0O1xuICAgIGxldCB4ID0gZDNcbiAgICAgIC5zY2FsZUxpbmVhcigpXG4gICAgICAuZG9tYWluKFswLCBkMy5tYXgodGhpcy5kYXRhLCBkID0+ICtkLnhfdmFsdWUpXSlcbiAgICAgIC5yYW5nZShbMCwgY29udGVudFdpZHRoXSk7XG4gICAgdGhpcy5zdmcuYXBwZW5kKFwiZ1wiKVxuICAgICAgLmNhbGwoZDMuYXhpc0JvdHRvbSh4KSk7XG4gICAgcmV0dXJuIHg7XG4gIH1cblxuICBwcml2YXRlIGNyZWF0ZVZlcnRpY2FsQXhpcyhlbGVtZW50KSB7XG4gICAgY29uc3QgY29udGVudEhlaWdodCA9IGVsZW1lbnQub2Zmc2V0SGVpZ2h0IC0gdGhpcy5tYXJnaW5Ub3AgLSB0aGlzLm1hcmdpbkJvdHRvbTtcbiAgICBsZXQgeSA9IGQzXG4gICAgICAuc2NhbGVMaW5lYXIoKVxuICAgICAgLmRvbWFpbihbMCwgZDMubWF4KHRoaXMuZGF0YSwgZCA9PiArZC55X3ZhbHVlKV0pXG4gICAgICAucmFuZ2UoW2NvbnRlbnRIZWlnaHQsIDBdKTtcbiAgICB0aGlzLnN2Zy5hcHBlbmQoXCJnXCIpXG4gICAgICAuY2FsbChkMy5heGlzTGVmdCh5KSk7XG4gICAgcmV0dXJuIHk7XG4gIH1cblxuICBwcml2YXRlIGRyYXdMaW5lKHgsIHkpIHtcbiAgICB0aGlzLnN2Zy5hcHBlbmQoXCJwYXRoXCIpXG4gICAgICAuZGF0dW0odGhpcy5kYXRhKVxuICAgICAgLmF0dHIoXCJmaWxsXCIsIFwibm9uZVwiKVxuICAgICAgLmF0dHIoXCJzdHJva2VcIiwgXCJzdGVlbGJsdWVcIilcbiAgICAgIC5hdHRyKFwic3Ryb2tlLXdpZHRoXCIsIDEuNSlcbiAgICAgIC5hdHRyKFwiZFwiLCBkMy5saW5lKClcbiAgICAgICAgLngoZCA9PiB7XG4gICAgICAgICAgY29uc29sZS5sb2coJ3gnLCBkKTtcbiAgICAgICAgICByZXR1cm4geChkWzBdKVxuICAgICAgICB9KVxuICAgICAgICAueShkID0+IHtcbiAgICAgICAgICBjb25zb2xlLmxvZygneScsIGQpO1xuICAgICAgICAgIHJldHVybiB5KGRbMV0pXG4gICAgICAgIH0pXG4gICAgICApXG4gIH1cblxufVxuIl19
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-line.component.js","sourceRoot":"ng://@kiina/charts-comparison/","sources":["lib/chart-line/chart-line.component.ts"],"names":[],"mappings":"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","sourcesContent":["import { Component, ElementRef, Input, OnChanges, ViewChild, ViewEncapsulation, SimpleChanges } from '@angular/core';\nimport * as d3 from 'd3';\nimport { DataModel } from '../shared/data.model';\n\n@Component({\n  selector: 'kiina-chart-line',\n  encapsulation: ViewEncapsulation.None,\n  templateUrl: './chart-line.component.html',\n  styleUrls: ['./chart-line.component.css']\n})\nexport class ChartLineComponent implements OnChanges {\n\n  @ViewChild('chart', { static: true })\n  chartContainer: ElementRef;\n\n  @Input()\n  data: DataModel[];\n\n  @Input('marginTop')\n  marginTop: number = 20;\n\n  @Input('marginBottom')\n  marginBottom: number = 30;\n\n  @Input('marginRight')\n  marginRight: number = 20;\n\n  @Input('marginLeft')\n  marginLeft: number = 40;\n\n  private svg;\n\n  ngOnChanges(changes: SimpleChanges): void {\n    if (!this.data) return;\n\n    this.createChart();\n  }\n\n  private createChart() {\n    d3.select('svg').remove();\n\n    const element = this.chartContainer.nativeElement;\n    const contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;\n    const contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;\n\n    this.svg = d3.select(element).append('svg')\n      .attr('width', element.offsetWidth)\n      .attr('height', element.offsetHeight)\n\n    const g = this.svg.append(\"g\")\n      .attr(\"transform\",\n        \"translate(\" + this.marginLeft + \",\" + this.marginTop + \")\");\n\n    this.drawLine(\n      this.createHorizontalAxis(element, g, contentHeight, contentWidth),\n      this.createVerticalAxis(element, g, contentHeight, contentWidth)\n    );\n  }\n\n  private createHorizontalAxis(element, g, contentHeight, contentWidth) {\n    let x = d3\n      .scaleLinear()\n      .domain([\n        d3.min(this.data, d => d.x_value),\n        d3.max(this.data, d => d.x_value)])\n      .range([0, contentWidth]);\n\n    g.append('g')\n      .attr('class', 'axis axis--x')\n      .attr('transform', 'translate(0,' + contentHeight + ')')\n      .call(d3.axisBottom(x));\n    return x;\n  }\n\n  private createVerticalAxis(element, g, contentHeight, contentWidth) {\n\n    let y = d3\n      .scaleLinear()\n      .domain([\n        d3.min(this.data, d => d.y_value),\n        d3.max(this.data, d => d.y_value)])\n      .range([contentHeight, 0]);\n    g.append('g')\n      .attr('class', 'axis axis--y')\n      .attr('transform', 'translate(' + contentWidth + ', 0)')\n      .call(d3.axisLeft(y));\n    return y;\n  }\n\n  private drawLine(x, y) {\n    this.svg.append(\"path\")\n      .datum(this.data)\n      .attr(\"fill\", \"none\")\n      .attr(\"stroke\", \"steelblue\")\n      .attr(\"stroke-width\", 1.5)\n      .attr(\"d\", d3.line()\n        .x(d => x(d[0]))\n        .y(d => y(d[1]))\n      )\n  }\n\n}\n"]}

fesm2015/kiina-charts-comparison.js

 import { __decorate } from 'tslib';
 import { Component, ViewChild, Input, ViewEncapsulation, NgModule } from '@angular/core';
-import { select, scaleLinear, max, axisBottom, axisLeft, line } from 'd3';
+import { select, scaleLinear, min, max, axisBottom, axisLeft, line } from 'd3';
 import { CommonModule } from '@angular/common';
@@ -37,24 +37,34 @@
         const element = this.chartContainer.nativeElement;
+        const contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+        const contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
         this.svg = select(element).append('svg')
             .attr('width', element.offsetWidth)
-            .attr('height', element.offsetHeight)
-            .append("g")
+            .attr('height', element.offsetHeight);
+        const g = this.svg.append("g")
             .attr("transform", "translate(" + this.marginLeft + "," + this.marginTop + ")");
-        this.drawLine(this.createHorizontalAxis(element), this.createVerticalAxis(element));
+        this.drawLine(this.createHorizontalAxis(element, g, contentHeight, contentWidth), this.createVerticalAxis(element, g, contentHeight, contentWidth));
     }
-    createHorizontalAxis(element) {
-        const contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
+    createHorizontalAxis(element, g, contentHeight, contentWidth) {
         let x = scaleLinear()
-            .domain([0, max(this.data, d => +d.x_value)])
+            .domain([
+            min(this.data, d => d.x_value),
+            max(this.data, d => d.x_value)
+        ])
             .range([0, contentWidth]);
-        this.svg.append("g")
+        g.append('g')
+            .attr('class', 'axis axis--x')
+            .attr('transform', 'translate(0,' + contentHeight + ')')
             .call(axisBottom(x));
         return x;
     }
-    createVerticalAxis(element) {
-        const contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+    createVerticalAxis(element, g, contentHeight, contentWidth) {
         let y = scaleLinear()
-            .domain([0, max(this.data, d => +d.y_value)])
+            .domain([
+            min(this.data, d => d.y_value),
+            max(this.data, d => d.y_value)
+        ])
             .range([contentHeight, 0]);
-        this.svg.append("g")
+        g.append('g')
+            .attr('class', 'axis axis--y')
+            .attr('transform', 'translate(' + contentWidth + ', 0)')
             .call(axisLeft(y));
@@ -70,10 +80,4 @@ return y;
             .attr("d", line()
-            .x(d => {
-            console.log('x', d);
-            return x(d[0]);
-        })
-            .y(d => {
-            console.log('y', d);
-            return y(d[1]);
-        }));
+            .x(d => x(d[0]))
+            .y(d => y(d[1])));
     }
@@ -80,0 +84,0 @@ };

fesm5/kiina-charts-comparison.js

 import { __decorate } from 'tslib';
 import { Component, ViewChild, Input, ViewEncapsulation, NgModule } from '@angular/core';
-import { select, scaleLinear, max, axisBottom, axisLeft, line } from 'd3';
+import { select, scaleLinear, min, max, axisBottom, axisLeft, line } from 'd3';
 import { CommonModule } from '@angular/common';
@@ -35,24 +35,34 @@
         var element = this.chartContainer.nativeElement;
+        var contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+        var contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
         this.svg = select(element).append('svg')
             .attr('width', element.offsetWidth)
-            .attr('height', element.offsetHeight)
-            .append("g")
+            .attr('height', element.offsetHeight);
+        var g = this.svg.append("g")
             .attr("transform", "translate(" + this.marginLeft + "," + this.marginTop + ")");
-        this.drawLine(this.createHorizontalAxis(element), this.createVerticalAxis(element));
+        this.drawLine(this.createHorizontalAxis(element, g, contentHeight, contentWidth), this.createVerticalAxis(element, g, contentHeight, contentWidth));
     };
-    ChartLineComponent.prototype.createHorizontalAxis = function (element) {
-        var contentWidth = element.offsetWidth - this.marginLeft - this.marginRight;
+    ChartLineComponent.prototype.createHorizontalAxis = function (element, g, contentHeight, contentWidth) {
         var x = scaleLinear()
-            .domain([0, max(this.data, function (d) { return +d.x_value; })])
+            .domain([
+            min(this.data, function (d) { return d.x_value; }),
+            max(this.data, function (d) { return d.x_value; })
+        ])
             .range([0, contentWidth]);
-        this.svg.append("g")
+        g.append('g')
+            .attr('class', 'axis axis--x')
+            .attr('transform', 'translate(0,' + contentHeight + ')')
             .call(axisBottom(x));
         return x;
     };
-    ChartLineComponent.prototype.createVerticalAxis = function (element) {
-        var contentHeight = element.offsetHeight - this.marginTop - this.marginBottom;
+    ChartLineComponent.prototype.createVerticalAxis = function (element, g, contentHeight, contentWidth) {
         var y = scaleLinear()
-            .domain([0, max(this.data, function (d) { return +d.y_value; })])
+            .domain([
+            min(this.data, function (d) { return d.y_value; }),
+            max(this.data, function (d) { return d.y_value; })
+        ])
             .range([contentHeight, 0]);
-        this.svg.append("g")
+        g.append('g')
+            .attr('class', 'axis axis--y')
+            .attr('transform', 'translate(' + contentWidth + ', 0)')
             .call(axisLeft(y));
@@ -68,10 +78,4 @@ return y;
             .attr("d", line()
-            .x(function (d) {
-            console.log('x', d);
-            return x(d[0]);
-        })
-            .y(function (d) {
-            console.log('y', d);
-            return y(d[1]);
-        }));
+            .x(function (d) { return x(d[0]); })
+            .y(function (d) { return y(d[1]); }));
     };
@@ -78,0 +82,0 @@ __decorate([

package.json

@@ -6,3 +6,3 @@ {
   "name": "@kiina/charts-comparison",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "",
@@ -9,0 +9,0 @@ "main": "bundles/kiina-charts-comparison.umd.js",

No alert changes

Improved metrics

Total package byte prevSize

146725

increased by4.58%

Lines of code

1032

increased by2.08%

No dependency changes