Skip to content

Commit

Permalink
2.12.1
Browse files Browse the repository at this point in the history
  • Loading branch information
youjung-hong committed Dec 18, 2017
1 parent ae3b0b0 commit e999c6e
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 57 deletions.
4 changes: 2 additions & 2 deletions dist/chart.css
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
* @fileoverview tui.chart
* @author NHN Ent. FE Development Lab <[email protected]>
* @version 2.12.0
* @version 2.12.1
* @license MIT
* @link https://github.com/nhnent/tui.chart
* bundle created at "Fri Dec 01 2017 18:56:23 GMT+0900 (KST)"
* bundle created at "Mon Dec 18 2017 17:18:42 GMT+0900 (KST)"
*/
.tui-chart {
position: relative;
Expand Down
118 changes: 78 additions & 40 deletions dist/chart.js
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/*!
* @fileoverview tui.chart
* @author NHN Ent. FE Development Lab <[email protected]>
* @version 2.12.0
* @version 2.12.1
* @license MIT
* @link https://github.com/nhnent/tui.chart
* bundle created at "Fri Dec 01 2017 18:56:23 GMT+0900 (KST)"
* bundle created at "Mon Dec 18 2017 17:18:42 GMT+0900 (KST)"
*/
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
Expand Down Expand Up @@ -4756,35 +4756,48 @@

/**
* Get series item bound by indexes
* @param {string} name - series name
* @param {number} index - category index
* @param {number} [outlierIndex] - index of outlier of boxplot series, it only exists in boxplot chart
* @param {number} index - tooltip data's category index
* @param {number} seriesIndex - tooltip data's series index
* @param {number} [outlierIndex] - outlier index of tooltip, exists only hovered on boxplot chart's outlier point
*
* @returns {?object} - series item bound
* @private
*/
_getSeriesData: function(name, index, outlierIndex) {
var legendModel = this.componentManager.get('legend').legendModel;
var foundSeries = legendModel.getDatumByLabel(name);
var seriesIndex = foundSeries.seriesIndex;
var indexes, foundData;
_getSeriesData: function(index, seriesIndex, outlierIndex) {
var indexes = {
index: index,
seriesIndex: seriesIndex,
outlierIndex: outlierIndex
};

if (seriesIndex < 0) {
return null;
}

indexes = {
index: index,
seriesIndex: seriesIndex,
outlierIndex: outlierIndex
};
return this.componentManager.get('mouseEventDetector').findDataByIndexes(indexes);
},

foundData = this.componentManager.get('mouseEventDetector').findDataByIndexes(indexes);
/**
* find series index by legend label
* @param {string} chartType - chart tyoe
* @param {string} legendLabel - legend label
* @returns {number} - if not found return -1, else return found series index
* @private
*/
_findSeriesIndexByLabel: function(chartType, legendLabel) {
var labels = this.dataProcessor.getLegendLabels(chartType);
var seriesIndex = -1;
var i = 0;
var len = labels ? labels.length : 0;

if (tui.util.isNumber(outlierIndex)) {
foundData.indexes.outlierIndex = outlierIndex;
for (; i < len; i += 1) {
if (labels[i] === legendLabel) {
seriesIndex = i;
break;
}
}

return foundData;
return seriesIndex;
},

/**
Expand All @@ -4802,7 +4815,7 @@
* @ignore
*/
showTooltip: function(params) {
var isGroupTooltip, mouseEventDetector, foundData;
var isGroupTooltip, mouseEventDetector, foundSeriesIndex, foundData;

if (!predicate.isSupportPublicShowTooptipAPI(this.chartType)) {
return;
Expand All @@ -4814,7 +4827,8 @@
if (isGroupTooltip) {
foundData = {indexes: {groupIndex: params.index}};
} else {
foundData = this._getSeriesData(params.legend, params.index, params.outlierIndex);
foundSeriesIndex = this._findSeriesIndexByLabel(params.chartType, params.legend);
foundData = this._getSeriesData(params.index, foundSeriesIndex, params.outlierIndex);
}

if (foundData) {
Expand All @@ -4833,17 +4847,17 @@
* @ignore
*/
hideTooltip: function() {
var isGroupTooltip, mouseEventDetector, prevData;
var isGroupTooltip, mouseEventDetector;

if (!predicate.isSupportPublicShowTooptipAPI(this.chartType)) {
return;
}

isGroupTooltip = this.options.tooltip && this.options.tooltip.grouped;
mouseEventDetector = this.componentManager.get('mouseEventDetector');
prevData = isGroupTooltip ? mouseEventDetector.prevIndex : mouseEventDetector.prevFoundData;

if (prevData) {
if ((isGroupTooltip && mouseEventDetector.prevIndex >= 0) ||
(!isGroupTooltip && mouseEventDetector.prevFoundData)) {
mouseEventDetector._hideTooltip({silent: true});
}
}
Expand Down Expand Up @@ -10702,14 +10716,15 @@
_makeShowTooltipParams: function(indexes, additionParams) {
var legendIndex = indexes.index;
var legendData = this.dataProcessor.getLegendItem(legendIndex);
var chartType = legendData.chartType;
var chartType;

var params;

if (!legendData) {
return null;
}

chartType = legendData.chartType;
params = tui.util.extend({
chartType: chartType,
legend: legendData.label,
Expand Down Expand Up @@ -11775,7 +11790,7 @@
var self = this;
var indexes = this._getIndexesCustomAttribute(tooltipElement);
var chartType = tooltipElement.getAttribute('data-chart-type');
var silent = options.silent;
var silent = !!(options && options.silent);

if (predicate.isChartToDetectMouseEventOnSeries(chartType)) {
this.eventBus.fire('hoverOffSeries', indexes, chartType);
Expand Down Expand Up @@ -12036,6 +12051,10 @@
cssTextTemplate = tooltipTemplate.tplGroupCssText,
colors = this._makeColors(this.theme),
itemsHtml = tui.util.map(items, function(item, index) {
if (!item.value) {
return null;
}

return template(tui.util.extend({
cssText: cssTextTemplate({color: colors[index]})
}, item));
Expand Down Expand Up @@ -12341,7 +12360,11 @@
_hideTooltipSector: function(index) {
var groupTooltipSector = this._getTooltipSectorElement();

dom.removeClass(groupTooltipSector, 'show');
if (!dom.hasClass(groupTooltipSector, 'show')) {
this.eventBus.fire('hideGroupTooltipLine');
} else {
dom.removeClass(groupTooltipSector, 'show');
}
this.eventBus.fire('hideGroupAnimation', index);
this.eventBus.fire('hideGroupTooltipLine');
},
Expand Down Expand Up @@ -13461,7 +13484,8 @@
this.attachEvent(container);
this.mouseEventDetectorContainer = container;

dom.append(container, this._createTransparentChild());
this.transparentChild = this._createTransparentChild();
dom.append(container, this.transparentChild);

return container;
},
Expand Down Expand Up @@ -13548,6 +13572,8 @@
this.selectedData = null;
this._setDataForRendering(data);
this._renderMouseEventDetectorArea(this.mouseEventDetectorContainer, tickCount);

this.transparentChild.style.height = renderUtil.getStyle(this.mouseEventDetectorContainer).height;
},

/**
Expand Down Expand Up @@ -15130,7 +15156,7 @@
seriesIndex: index
};

return this._findDataByIndexes(indexes);
return this.findDataByIndexes(indexes);
}
});

Expand Down Expand Up @@ -15368,8 +15394,14 @@
*/
_isOuterPosition: function(layerX, layerY) {
var dimension = this.dimension;
var width = dimension.width;
var height = dimension.height;
var position = this.layout.position;
var top = position.top;
var left = position.left;

return layerX < 0 || layerX > dimension.width || layerY < 0 || layerY > dimension.height;
return layerX < left || layerX > left + width ||
layerY < top || layerY > top + height;
},

/**
Expand All @@ -15383,15 +15415,21 @@
var positionValue = (this.isVertical ? this.layout.position.left : this.layout.position.top)
- chartConst.CHART_PADDING;

this.prevIndex = index;
this.eventBus.fire('showTooltip', {
index: index,
range: this.tickBaseCoordinateModel.makeRange(index, positionValue),
size: this.dimension[this.sizeType],
isVertical: this.isVertical,
isMoving: isMoving,
silent: foundData.silent
});
/**
* Can be called with showTooltip function
* At this time, the index may be larger than the data size.
*/
if (this.tickBaseCoordinateModel.data.length > index) {
this.prevIndex = index;
this.eventBus.fire('showTooltip', {
index: index,
range: this.tickBaseCoordinateModel.makeRange(index, positionValue),
size: this.dimension[this.sizeType],
isVertical: this.isVertical,
isMoving: isMoving,
silent: foundData.silent
});
}
},

/**
Expand Down Expand Up @@ -18084,7 +18122,7 @@
* To call hideGroupTooltipLine function of graphRenderer.
*/
onHideGroupTooltipLine: function() {
if (!this.seriesData.length
if (!this.seriesData
|| !this.seriesData.isAvailable()
|| !this.graphRenderer.hideGroupTooltipLine
) {
Expand Down
Loading

0 comments on commit e999c6e

Please sign in to comment.