|
2 | 2 | * Copyright (c) 2017 NAVER Corp.
|
3 | 3 | * billboard.js project is licensed under the MIT license
|
4 | 4 | */
|
5 |
| -import bbAxis from "./bb.axis"; |
6 | 5 | import CLASS from "../config/classes";
|
7 | 6 | import {capitalize, isFunction, isString, isValue, isEmpty, isNumber, isObjectType} from "../internals/util";
|
| 7 | +import AxisRenderer from "./AxisRenderer"; |
8 | 8 |
|
9 | 9 | const isHorizontal = ($$, forHorizontal) => {
|
10 | 10 | const isRotated = $$.config.axis_rotated;
|
@@ -71,7 +71,7 @@ export default class Axis {
|
71 | 71 | orgXScale: $$.x
|
72 | 72 | };
|
73 | 73 |
|
74 |
| - const axis = bbAxis(axisParams) |
| 74 | + const axis = new AxisRenderer(axisParams) |
75 | 75 | .scale($$.zoomScale || scale)
|
76 | 76 | .orient(orient);
|
77 | 77 |
|
@@ -106,7 +106,8 @@ export default class Axis {
|
106 | 106 | axisName,
|
107 | 107 | tickTextRotate: withoutRotateTickText ? 0 : config.axis_y_tick_rotate
|
108 | 108 | };
|
109 |
| - const axis = bbAxis(axisParams) |
| 109 | + |
| 110 | + const axis = new AxisRenderer(axisParams) |
110 | 111 | .scale(scale)
|
111 | 112 | .orient(orient)
|
112 | 113 | .tickFormat(
|
@@ -425,7 +426,9 @@ export default class Axis {
|
425 | 426 | .style("top", "0px")
|
426 | 427 | .style("left", "0px");
|
427 | 428 |
|
428 |
| - dummy.call(axis).selectAll("text") |
| 429 | + axis.create(dummy); |
| 430 | + |
| 431 | + dummy.selectAll("text") |
429 | 432 | .each(function() {
|
430 | 433 | maxWidth = Math.max(maxWidth, this.getBoundingClientRect().width);
|
431 | 434 | });
|
@@ -542,9 +545,9 @@ export default class Axis {
|
542 | 545 | $$.axes[v].style("opacity", opacity);
|
543 | 546 | });
|
544 | 547 |
|
545 |
| - transitions.axisX.call($$.xAxis); |
546 |
| - transitions.axisY.call($$.yAxis); |
547 |
| - transitions.axisY2.call($$.y2Axis); |
548 |
| - transitions.axisSubX.call($$.subXAxis); |
| 548 | + $$.xAxis.create(transitions.axisX); |
| 549 | + $$.yAxis.create(transitions.axisY); |
| 550 | + $$.y2Axis.create(transitions.axisY2); |
| 551 | + $$.subXAxis.create(transitions.axisSubX); |
549 | 552 | }
|
550 | 553 | }
|
0 commit comments