evui 3.4.147 → 3.4.148

package/dist/evui.common.js

@@ -11227,7 +11227,7 @@ var update = add("9519e5b6", content, true, {"sourceMap":false,"shadowMode":fals
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.4.147\"}");
+module.exports = JSON.parse("{\"a\":\"3.4.148\"}");
 
 /***/ }),
 
@@ -54040,14 +54040,13 @@ var plugins_tooltip_modules = {
     }
 
     var horizontal = this.options.horizontal;
+    var rect = this.chartDOM.getBoundingClientRect();
 
-    var _this$chartDOM$getBou2 = this.chartDOM.getBoundingClientRect(),
-        top = _this$chartDOM$getBou2.top,
-        bottom = _this$chartDOM$getBou2.bottom,
-        left = _this$chartDOM$getBou2.left,
-        right = _this$chartDOM$getBou2.right;
+    var _mousePosition2 = _slicedToArray(mousePosition, 2),
+        mouseX = _mousePosition2[0],
+        mouseY = _mousePosition2[1];
 
-    var isHoveredChart = lodash_es_inRange(mousePosition[0], left, right) && lodash_es_inRange(mousePosition[1], bottom, top);
+    var isHoveredChart = lodash_es_inRange(mouseX, rect.left, rect.right) && lodash_es_inRange(mouseY, rect.bottom, rect.top);
 
     if (isHoveredChart) {
       return;
@@ -54064,25 +54063,64 @@ var plugins_tooltip_modules = {
     var indicatorPosition;
 
     if (horizontal) {
-      var _this$options$axesY;
-
-      var chartHeight = graphPos.y2 - graphPos.y1; // CategoryMode인 경우 라벨들이 균등 간격으로 배치됨
+      var _this$options$axesY, _this$options$axesY2;
 
+      var chartHeight = graphPos.y2 - graphPos.y1;
       var isCategoryMode = (_this$options$axesY = this.options.axesY) === null || _this$options$axesY === void 0 ? void 0 : _this$options$axesY.some(function (axis) {
         return axis.categoryMode;
       });
-      var positionY = isCategoryMode ? graphPos.y1 + chartHeight * (matchingLabelIndex + 0.5) / labelsCount : graphPos.y1 + chartHeight * matchingLabelIndex / (labelsCount - 1);
+      var isTimeAxis = (_this$options$axesY2 = this.options.axesY) === null || _this$options$axesY2 === void 0 ? void 0 : _this$options$axesY2.some(function (axis) {
+        return axis.type === 'time';
+      });
+      var positionY;
+
+      if (isCategoryMode) {
+        positionY = graphPos.y1 + chartHeight * (matchingLabelIndex + 0.5) / labelsCount;
+      } else if (isTimeAxis) {
+        var _this$axesSteps, _this$axesSteps$y, _axisStep$graphMin, _this$data$labels8, _axisStep$graphMax, _this$data$labels9;
+
+        // 틱 위치와 동일하게 graphMin/graphMax 사용
+        var axisStep = (_this$axesSteps = this.axesSteps) === null || _this$axesSteps === void 0 ? void 0 : (_this$axesSteps$y = _this$axesSteps.y) === null || _this$axesSteps$y === void 0 ? void 0 : _this$axesSteps$y[0];
+        var graphMin = (_axisStep$graphMin = axisStep === null || axisStep === void 0 ? void 0 : axisStep.graphMin) !== null && _axisStep$graphMin !== void 0 ? _axisStep$graphMin : +((_this$data$labels8 = this.data.labels) === null || _this$data$labels8 === void 0 ? void 0 : _this$data$labels8[0]);
+        var graphMax = (_axisStep$graphMax = axisStep === null || axisStep === void 0 ? void 0 : axisStep.graphMax) !== null && _axisStep$graphMax !== void 0 ? _axisStep$graphMax : +((_this$data$labels9 = this.data.labels) === null || _this$data$labels9 === void 0 ? void 0 : _this$data$labels9[this.data.labels.length - 1]);
+        positionY = graphPos.y1 + chartHeight * (+dataLabel - graphMin) / (graphMax - graphMin);
+      } else {
+        positionY = graphPos.y1 + chartHeight * matchingLabelIndex / (labelsCount - 1);
+      }
+
       indicatorPosition = [graphPos.x2, positionY];
     } else {
-      var _this$options$axesX;
+      var _this$options$axesX, _this$options$axesX2;
 
-      var chartWidth = graphPos.x2 - graphPos.x1; // CategoryMode인 경우 라벨들이 균등 간격으로 배치됨
+      var chartWidth = graphPos.x2 - graphPos.x1;
 
       var _isCategoryMode = (_this$options$axesX = this.options.axesX) === null || _this$options$axesX === void 0 ? void 0 : _this$options$axesX.some(function (axis) {
         return axis.categoryMode;
       });
 
-      var positionX = _isCategoryMode ? graphPos.x1 + chartWidth * (matchingLabelIndex + 0.5) / labelsCount : graphPos.x1 + chartWidth * matchingLabelIndex / (labelsCount - 1);
+      var _isTimeAxis = (_this$options$axesX2 = this.options.axesX) === null || _this$options$axesX2 === void 0 ? void 0 : _this$options$axesX2.some(function (axis) {
+        return axis.type === 'time';
+      });
+
+      var positionX;
+
+      if (_isCategoryMode) {
+        positionX = graphPos.x1 + chartWidth * (matchingLabelIndex + 0.5) / labelsCount;
+      } else if (_isTimeAxis) {
+        var _this$axesSteps2, _this$axesSteps2$x, _axisStep$graphMin2, _this$data$labels10, _axisStep$graphMax2, _this$data$labels11;
+
+        // 틱 위치와 동일하게 graphMin/graphMax 사용
+        var _axisStep = (_this$axesSteps2 = this.axesSteps) === null || _this$axesSteps2 === void 0 ? void 0 : (_this$axesSteps2$x = _this$axesSteps2.x) === null || _this$axesSteps2$x === void 0 ? void 0 : _this$axesSteps2$x[0];
+
+        var _graphMin = (_axisStep$graphMin2 = _axisStep === null || _axisStep === void 0 ? void 0 : _axisStep.graphMin) !== null && _axisStep$graphMin2 !== void 0 ? _axisStep$graphMin2 : +((_this$data$labels10 = this.data.labels) === null || _this$data$labels10 === void 0 ? void 0 : _this$data$labels10[0]);
+
+        var _graphMax = (_axisStep$graphMax2 = _axisStep === null || _axisStep === void 0 ? void 0 : _axisStep.graphMax) !== null && _axisStep$graphMax2 !== void 0 ? _axisStep$graphMax2 : +((_this$data$labels11 = this.data.labels) === null || _this$data$labels11 === void 0 ? void 0 : _this$data$labels11[this.data.labels.length - 1]);
+
+        positionX = graphPos.x1 + chartWidth * (+dataLabel - _graphMin) / (_graphMax - _graphMin);
+      } else {
+        positionX = graphPos.x1 + chartWidth * matchingLabelIndex / (labelsCount - 1);
+      }
+
       indicatorPosition = [positionX, graphPos.y2];
     }