evui 3.4.154 → 3.4.156

package/dist/evui.common.js

@@ -11235,7 +11235,7 @@ $({ target: 'Number', stat: true }, {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"3.4.154\"}");
+module.exports = JSON.parse("{\"a\":\"3.4.156\"}");
 
 /***/ }),
 
@@ -39902,7 +39902,7 @@ var modules = {
         return null;
       }
 
-      itemPosition = [this.getItemByPosition([dataInfo.xp, dataInfo.yp], useApproximate, dataIndex, true)];
+      itemPosition = [this.getHitItemByPosition([dataInfo.xp, dataInfo.yp], useApproximate, dataIndex, true)];
     } else {
       var seriesList = Object.entries(this.seriesList);
       var firShowSeriesID;
@@ -39927,7 +39927,7 @@ var modules = {
           return null;
         }
 
-        return _this7.getItemByPosition([(_dataInfo$xp = dataInfo === null || dataInfo === void 0 ? void 0 : dataInfo.xp) !== null && _dataInfo$xp !== void 0 ? _dataInfo$xp : 0, (_dataInfo$yp = dataInfo === null || dataInfo === void 0 ? void 0 : dataInfo.yp) !== null && _dataInfo$yp !== void 0 ? _dataInfo$yp : 0], useApproximate, idx, true);
+        return _this7.getHitItemByPosition([(_dataInfo$xp = dataInfo === null || dataInfo === void 0 ? void 0 : dataInfo.xp) !== null && _dataInfo$xp !== void 0 ? _dataInfo$xp : 0, (_dataInfo$yp = dataInfo === null || dataInfo === void 0 ? void 0 : dataInfo.yp) !== null && _dataInfo$yp !== void 0 ? _dataInfo$yp : 0], useApproximate, idx, true);
       });
     }
 
@@ -39951,30 +39951,50 @@ var modules = {
   },
 
   /**
-   * Find graph item by position x and y
+   * Find the hit item at the given position (x, y).
+   *
+   * 선택 우선순위:
+   *   1. directHit (bar 박스 내부 클릭) — 가장 가까운 것
+   *   2. hit (line 포인트 근접 등) — 가장 가까운 것
+   *   3. hit이 전혀 없으면 데이터가 있는 첫 시리즈로 fallback (기존 동작 호환)
+   *
+   * 과거에는 "같은 라벨 위에서 값이 가장 큰 시리즈"를 돌려주는 max-value 덮어쓰기 방식이었으나,
+   * bar + line combo 차트에서 작은 bar를 클릭해도 큰 값의 line이 선택되는 버그의 원인이었다.
+   * 이번 수정으로 사용자가 실제로 가리킨 시리즈(hit)가 선택되도록 바뀐다.
+   *
    * @param {array}   offset          position x and y
    * @param {boolean} useApproximate  if it's true. it'll look for closed item on mouse position
    * @param {number} dataIndex        selected data index
    * @param {boolean}  useSelectLabelOrItem   used to display select label/item at tooltip location
    *
-   * @returns {object} clicked item information
+   * @returns {object} hit item information
    */
-  getItemByPosition: function getItemByPosition(offset) {
-    var _maxValue;
+  getHitItemByPosition: function getHitItemByPosition(offset) {
+    var _ref4;
 
     var useApproximate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var dataIndex = arguments.length > 2 ? arguments[2] : undefined;
     var useSelectLabelOrItem = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     var seriesIDs = Object.keys(this.seriesList);
-    var isHorizontal = !!this.options.horizontal;
-    var maxType = null;
-    var maxLabel = null;
-    var maxValuePos = null;
-    var maxValue = null;
-    var maxSeriesID = '';
+    var isHorizontal = !!this.options.horizontal; // hit 기반 결과 (최우선)
+
+    var hitType = null;
+    var hitLabel = null;
+    var hitValuePos = null;
+    var hitValue = null;
+    var hitSeriesID = '';
+    var hitDataIndex = null;
+    var hitDistance = Infinity;
+    var hasDirectHit = false; // fallback: hit이 전혀 없을 때 사용할 "데이터 있는 첫 시리즈" 정보
+
+    var fallbackType = null;
+    var fallbackLabel = null;
+    var fallbackValuePos = null;
+    var fallbackValue = null;
+    var fallbackSeriesID = '';
+    var fallbackDataIndex = null;
     var acc = 0;
     var useStack = false;
-    var maxIndex = null;
 
     for (var ix = 0; ix < seriesIDs.length; ix++) {
       var seriesID = seriesIDs[ix];
@@ -39988,12 +40008,13 @@ var modules = {
 
         if (data) {
           if (helpers_util.isPieType(item.type)) {
-            maxLabel = seriesID;
-            maxSeriesID = seriesID;
-            maxValuePos = (data.ea - data.sa) / 2;
-            maxValue = data.o;
-            maxIndex = data.index;
-            maxType = item.type;
+            // pie 차트는 hit detection 체계가 달라 기존 동작 유지 (단일 pie 시리즈가 일반적)
+            hitType = item.type;
+            hitLabel = seriesID;
+            hitSeriesID = seriesID;
+            hitValuePos = (data.ea - data.sa) / 2;
+            hitValue = data.o;
+            hitDataIndex = data.index;
           } else {
             var ldata = isHorizontal ? data.y : data.x;
             var lp = isHorizontal ? data.yp : data.xp;
@@ -40006,24 +40027,48 @@ var modules = {
                 useStack = true;
               } else {
                 acc += data.y;
-              }
+              } // fallback 기록: 데이터가 있는 첫 시리즈를 저장
+
+
+              if (fallbackSeriesID === '') {
+                fallbackType = series.type;
+                fallbackLabel = ldata;
+                fallbackValuePos = lp;
+                fallbackValue = g;
+                fallbackSeriesID = seriesID;
+                fallbackDataIndex = index;
+              } // hit 기반 선택: item.hit이 true이고 유효한 좌표가 있을 때만 고려
+
+
+              if (item.hit && data.xp !== undefined && data.yp !== undefined) {
+                var distance = Math.pow(data.xp - offset[0], 2) + Math.pow(data.yp - offset[1], 2);
+
+                if (item.directHit) {
+                  // 직접 박스 히트는 최우선. 여러 개이면 가장 가까운 것.
+                  if (!hasDirectHit || distance < hitDistance) {
+                    hitDistance = distance;
+                    hitType = series.type;
+                    hitLabel = ldata;
+                    hitValuePos = lp;
+                    hitValue = g;
+                    hitSeriesID = seriesID;
+                    hitDataIndex = index;
+                  }
 
-              if (maxType === 'bar' && useStack) {
-                if (item.hit) {
-                  maxValue = g;
-                  maxSeriesID = seriesID;
-                  maxIndex = index;
-                  maxLabel = ldata;
-                  maxValuePos = lp;
-                  maxType = series.type;
+                  hasDirectHit = true;
+                } else if (!hasDirectHit) {
+                  // directHit가 없을 때만 일반 hit 거리 비교 참여
+                  // (라인 근접 히트가 박스 직접 히트를 이기지 못하도록)
+                  if (distance < hitDistance) {
+                    hitDistance = distance;
+                    hitType = series.type;
+                    hitLabel = ldata;
+                    hitValuePos = lp;
+                    hitValue = g;
+                    hitSeriesID = seriesID;
+                    hitDataIndex = index;
+                  }
                 }
-              } else if (maxValue === null || maxValue <= g) {
-                maxValue = g;
-                maxSeriesID = seriesID;
-                maxLabel = ldata;
-                maxValuePos = lp;
-                maxIndex = index;
-                maxType = series.type;
               }
             }
           }
@@ -40031,22 +40076,23 @@ var modules = {
       }
     }
 
+    var hasHit = hitSeriesID !== '';
     return {
-      type: maxType,
-      label: maxLabel,
-      pos: maxValuePos,
-      value: (_maxValue = maxValue) !== null && _maxValue !== void 0 ? _maxValue : 0,
-      sId: maxSeriesID,
+      type: hasHit ? hitType : fallbackType,
+      label: hasHit ? hitLabel : fallbackLabel,
+      pos: hasHit ? hitValuePos : fallbackValuePos,
+      value: (_ref4 = hasHit ? hitValue : fallbackValue) !== null && _ref4 !== void 0 ? _ref4 : 0,
+      sId: hasHit ? hitSeriesID : fallbackSeriesID,
       acc: acc,
       useStack: useStack,
-      maxIndex: maxIndex
+      dataIndex: hasHit ? hitDataIndex : fallbackDataIndex
     };
   },
 
   /**
    * @typedef {Object} LabelInfoResult
    * @property {number} labelIndex - 선택된 라벨의 인덱스
-   * @property {object} hitInfo - 해당 위치에서의 히트 정보 (getItemByPosition 반환값)
+   * @property {object} hitInfo - 해당 위치에서의 히트 정보 (getHitItemByPosition 반환값)
    */
 
   /**
@@ -40071,9 +40117,9 @@ var modules = {
     };
     var seriesList = this.data.series;
     var pointSize = (_Object$values$sort$ = (_Object$values$sort$2 = Object.values(seriesList).sort(function (a, b) {
-      var _ref4, _b$pointSize;
+      var _ref5, _b$pointSize;
 
-      return (_ref4 = (_b$pointSize = b.pointSize) !== null && _b$pointSize !== void 0 ? _b$pointSize : 0 - a.pointSize) !== null && _ref4 !== void 0 ? _ref4 : 0;
+      return (_ref5 = (_b$pointSize = b.pointSize) !== null && _b$pointSize !== void 0 ? _b$pointSize : 0 - a.pointSize) !== null && _ref5 !== void 0 ? _ref5 : 0;
     })[0]) === null || _Object$values$sort$2 === void 0 ? void 0 : _Object$values$sort$2.pointSize) !== null && _Object$values$sort$ !== void 0 ? _Object$values$sort$ : 3; // default pointSize 3
 
     var _this$options = this.options,
@@ -40105,10 +40151,10 @@ var modules = {
           _scrollbarOpt2$interv = _scrollbarOpt2.interval,
           interval = _scrollbarOpt2$interv === void 0 ? 1 : _scrollbarOpt2$interv;
 
-      var _ref5 = range !== null && range !== void 0 ? range : [0, scale.labels.length],
-          _ref6 = _slicedToArray(_ref5, 2),
-          min = _ref6[0],
-          max = _ref6[1];
+      var _ref6 = range !== null && range !== void 0 ? range : [0, scale.labels.length],
+          _ref7 = _slicedToArray(_ref6, 2),
+          min = _ref7[0],
+          max = _ref7[1];
 
       var labelCount = Math.floor((+max - +min) / interval) + 1;
       var labelGap = (endPoint - startPoint) / labelCount;
@@ -40134,7 +40180,7 @@ var modules = {
 
       labelIndex = scale.labels.length > _index ? _index : -1;
     } else {
-      var _hitInfo$maxIndex;
+      var _hitInfo$dataIndex;
 
       var offsetX;
       var dataIndex;
@@ -40149,8 +40195,8 @@ var modules = {
         offsetX = x;
       }
 
-      hitInfo = this.getItemByPosition([offsetX, y], selectLabel === null || selectLabel === void 0 ? void 0 : selectLabel.useApproximateValue, dataIndex, true);
-      labelIndex = (_hitInfo$maxIndex = hitInfo.maxIndex) !== null && _hitInfo$maxIndex !== void 0 ? _hitInfo$maxIndex : -1;
+      hitInfo = this.getHitItemByPosition([offsetX, y], selectLabel === null || selectLabel === void 0 ? void 0 : selectLabel.useApproximateValue, dataIndex, true);
+      labelIndex = (_hitInfo$dataIndex = hitInfo.dataIndex) !== null && _hitInfo$dataIndex !== void 0 ? _hitInfo$dataIndex : -1;
     }
 
     return {
@@ -42133,7 +42179,7 @@ var element_line_Line = /*#__PURE__*/function () {
   }, {
     key: "findGraphData",
     value: function findGraphData(offset, isHorizontal, dataIndex, useSelectLabelOrItem) {
-      var _item$data;
+      var _this$pointSize, _item$data;
 
       var xp = offset[0];
       var yp = offset[1];
@@ -42145,7 +42191,23 @@ var element_line_Line = /*#__PURE__*/function () {
       var gdata = this.data.filter(function (data) {
         return !helpers_util.isNullOrUndefined(data.x);
       });
-      var isLinearInterpolation = this.useLinearInterpolation();
+      var isLinearInterpolation = this.useLinearInterpolation(); // line 포인트 "정확 히트" 판정용 반경.
+      // combo 차트에서 line 포인트 중심을 직격한 경우, 같은 좌표의 bar(directHit)보다
+      // line이 우선되도록 item.directHit = true로 표시한다. 그 외(단순 Y축 근접)는 기존처럼 hit만.
+      // 포인트 반지름에 기본 포인트 크기(LINE_OPTION.pointSize)만큼의 클릭 여유 마진을 더하고,
+      // 시각적으로 하이라이트되는 포인트 반경(highlight.maxSize)을 최소 보장값으로 사용한다.
+
+      var directHitRadius = Math.max(((_this$pointSize = this.pointSize) !== null && _this$pointSize !== void 0 ? _this$pointSize : LINE_OPTION.pointSize) + LINE_OPTION.pointSize, LINE_OPTION.highlight.maxSize);
+
+      var isLinePointDirectHit = function isLinePointDirectHit(point) {
+        if (!point || point.xp === undefined || point.yp === undefined) {
+          return false;
+        }
+
+        var dx = xp - point.xp;
+        var dy = yp - point.yp;
+        return dx * dx + dy * dy <= directHitRadius * directHitRadius;
+      };
 
       if (gdata !== null && gdata !== void 0 && gdata.length) {
         if (typeof dataIndex === 'number' && this.show) {
@@ -42160,6 +42222,11 @@ var element_line_Line = /*#__PURE__*/function () {
             if (yDist <= directHitThreshold) {
               item.hit = true;
             }
+
+            if (isLinePointDirectHit(point)) {
+              item.hit = true;
+              item.directHit = true;
+            }
           }
         } else if (typeof this.beforeFindItemIndex === 'number' && this.beforeFindItemIndex !== -1 && this.show && useSelectLabelOrItem) {
           item.data = gdata[this.beforeFindItemIndex];
@@ -42308,6 +42375,11 @@ var element_line_Line = /*#__PURE__*/function () {
               if (_yDist <= _directHitThreshold) {
                 item.hit = true;
               }
+
+              if (isLinePointDirectHit(_point3)) {
+                item.hit = true;
+                item.directHit = true;
+              }
             }
           }
         }
@@ -43038,17 +43110,16 @@ var element_bar_Bar = /*#__PURE__*/function () {
       this.borderRadius = param.borderRadius;
       this.filteredCount = totalCount;
       var startIndex = truthyNumber(minIndex) ? minIndex : 0;
-      var endIndex = truthyNumber(maxIndex) ? maxIndex : this.data.length - 1; // 스크롤 범위 내에서만 루프 돌림
+      var endIndex = truthyNumber(maxIndex) ? maxIndex : this.data.length - 1;
+      this.visibleStartIndex = startIndex;
 
       for (var i = startIndex; i <= endIndex; i++) {
-        var screenIndex = i - startIndex; // 현재 화면상의 위치 인덱스
-
-        var item = this.data[i]; // 실제 데이터 인덱스에 해당하는 항목
+        var screenIndex = i - startIndex;
+        var item = this.data[i];
 
         if (item) {
           var _param$selectLabel, _param$selectItem, _param$selectLabel$se, _param$selectLabel2, _param$selectLabel2$s, _param$selectItem$sel, _param$selectItem2;
 
-          // 스크롤 offset(minIndex)만큼 보정해서 그리기
           var categoryPoint = isHorizontal ? ysp - cArea * screenIndex - cPad : xsp + cArea * screenIndex + cPad;
 
           if (isHorizontal) {
@@ -43147,11 +43218,7 @@ var element_bar_Bar = /*#__PURE__*/function () {
 
           item.h = isHorizontal ? -h : h; // eslint-disable-line
 
-          item.index = i; // 실제 데이터 인덱스 (스크롤 offset 포함)
-          // 검색(hitInfo) 로직은 this.data[0..filteredCount-1] 범위만 검사하므로,
-          // 현재 화면에 그린 항목을 배열 앞쪽으로 매핑해준다.
-
-          this.data[screenIndex] = item;
+          item.index = i;
         }
       }
     }
@@ -43237,17 +43304,26 @@ var element_bar_Bar = /*#__PURE__*/function () {
     key: "findGraphData",
     value: function findGraphData(offset, isHorizontal, dataIndex, useIndicatorOnLabel) {
       if (typeof dataIndex === 'number' && this.show && useIndicatorOnLabel) {
-        var gdata = this.data;
+        var _this$visibleStartInd, _this$filteredCount;
+
+        var barData = this.data;
         var item = {
           data: null,
           hit: false,
           color: this.color
-        };
+        }; // dataIndex를 현재 화면에 보이는 범위로 clamp하여 stale xp/yp 참조 방지
 
-        if (gdata[dataIndex]) {
-          item.data = gdata[dataIndex];
-          item.index = dataIndex;
-          item.hit = this.isPointInBar(offset, gdata[dataIndex]);
+        var visStart = (_this$visibleStartInd = this.visibleStartIndex) !== null && _this$visibleStartInd !== void 0 ? _this$visibleStartInd : 0;
+        var visEnd = visStart + ((_this$filteredCount = this.filteredCount) !== null && _this$filteredCount !== void 0 ? _this$filteredCount : barData.length) - 1;
+        var clampedIndex = Math.max(visStart, Math.min(dataIndex, visEnd));
+
+        if (barData[clampedIndex]) {
+          item.data = barData[clampedIndex];
+          item.index = clampedIndex;
+          item.hit = this.isPointInBar(offset, barData[clampedIndex]); // bar 박스 내부 클릭은 "직접 박스 히트"로 표시.
+          // findHitItem에서 line 포인트 근접 히트보다 우선 선택되도록 하기 위함.
+
+          item.directHit = item.hit;
         }
 
         return item;
@@ -43273,7 +43349,7 @@ var element_bar_Bar = /*#__PURE__*/function () {
   }, {
     key: "binarySearchBar",
     value: function binarySearchBar(offset, isHorizontal) {
-      var _this$filteredCount;
+      var _this$visibleStartInd2, _this$filteredCount2;
 
       var _offset = _slicedToArray(offset, 2),
           xp = _offset[0],
@@ -43285,9 +43361,10 @@ var element_bar_Bar = /*#__PURE__*/function () {
         color: this.color
       };
       var gdata = this.data;
-      var totalCount = (_this$filteredCount = this.filteredCount) !== null && _this$filteredCount !== void 0 ? _this$filteredCount : gdata.length;
-      var s = 0;
-      var e = totalCount - 1;
+      var startIdx = (_this$visibleStartInd2 = this.visibleStartIndex) !== null && _this$visibleStartInd2 !== void 0 ? _this$visibleStartInd2 : 0;
+      var totalCount = (_this$filteredCount2 = this.filteredCount) !== null && _this$filteredCount2 !== void 0 ? _this$filteredCount2 : gdata.length;
+      var s = startIdx;
+      var e = startIdx + totalCount - 1;
 
       while (s <= e) {
         var m = Math.floor((s + e) / 2);
@@ -43303,7 +43380,9 @@ var element_bar_Bar = /*#__PURE__*/function () {
         if (inRange) {
           item.data = barData;
           item.index = barData.index;
-          item.hit = this.isPointInBar(offset, barData);
+          item.hit = this.isPointInBar(offset, barData); // bar 박스 내부 클릭은 "직접 박스 히트"로 표시 (findHitItem 우선순위용).
+
+          item.directHit = item.hit;
           return item;
         }
 
@@ -50194,13 +50273,20 @@ var plugins_scrollbar_module = {
     Object.keys(merged).forEach(function (key) {
       scrollbarOpt[key] = merged[key];
     });
-    delete scrollbarOpt.savedPosition;
+
+    if (scrollbarOpt.resetPosition) {
+      var _axisOpt$2, _axisOpt$2$range, _axisOpt$3;
+
+      scrollbarOpt.range = axisOpt !== null && axisOpt !== void 0 && (_axisOpt$2 = axisOpt[0]) !== null && _axisOpt$2 !== void 0 && (_axisOpt$2$range = _axisOpt$2.range) !== null && _axisOpt$2$range !== void 0 && _axisOpt$2$range.length ? _toConsumableArray(axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$3 = axisOpt[0]) === null || _axisOpt$3 === void 0 ? void 0 : _axisOpt$3.range) : null;
+      this.resetScrollbarSavedPositions(dir);
+    }
 
     if (!scrollbarOpt.isInit) {
-      var _axisOpt$2, _axisOpt$3, _axisOpt$3$range, _axisOpt$4;
+      var _axisOpt$4, _axisOpt$5, _axisOpt$5$range, _axisOpt$6;
 
-      scrollbarOpt.type = axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$2 = axisOpt[0]) === null || _axisOpt$2 === void 0 ? void 0 : _axisOpt$2.type;
-      scrollbarOpt.range = axisOpt !== null && axisOpt !== void 0 && (_axisOpt$3 = axisOpt[0]) !== null && _axisOpt$3 !== void 0 && (_axisOpt$3$range = _axisOpt$3.range) !== null && _axisOpt$3$range !== void 0 && _axisOpt$3$range.length ? _toConsumableArray(axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$4 = axisOpt[0]) === null || _axisOpt$4 === void 0 ? void 0 : _axisOpt$4.range) : null;
+      scrollbarOpt.type = axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$4 = axisOpt[0]) === null || _axisOpt$4 === void 0 ? void 0 : _axisOpt$4.type;
+      scrollbarOpt.range = axisOpt !== null && axisOpt !== void 0 && (_axisOpt$5 = axisOpt[0]) !== null && _axisOpt$5 !== void 0 && (_axisOpt$5$range = _axisOpt$5.range) !== null && _axisOpt$5$range !== void 0 && _axisOpt$5$range.length ? _toConsumableArray(axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$6 = axisOpt[0]) === null || _axisOpt$6 === void 0 ? void 0 : _axisOpt$6.range) : null;
+      this.resetScrollbarSavedPositions(dir);
       this.initScrollbarRange(dir);
       this.createScrollbarLayout(dir);
       this.createScrollbar(dir);
@@ -50263,7 +50349,7 @@ var plugins_scrollbar_module = {
    * @param updateData is update data
    */
   updateScrollbarInfo: function updateScrollbarInfo(dir, updateData) {
-    var _newOpt$, _newOpt$$scrollbar, _newOpt$2, _newOpt$0$scrollbar, _newOpt$3, _newOpt$4, _axisOpt$5, _newOpt$0$scrollbar2;
+    var _newOpt$, _newOpt$$scrollbar, _newOpt$2, _newOpt$0$scrollbar, _newOpt$3, _newOpt$4, _axisOpt$7, _newOpt$0$scrollbar2;
 
     var _this$options = this.options,
         axesX = _this$options.axesX,
@@ -50279,23 +50365,21 @@ var plugins_scrollbar_module = {
     }
 
     var axisOpt = dir === 'x' ? this.axesX : this.axesY;
-    var isUpdateAxesRange = !lodash_es_isEqual(newOpt === null || newOpt === void 0 ? void 0 : (_newOpt$4 = newOpt[0]) === null || _newOpt$4 === void 0 ? void 0 : _newOpt$4.range, axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$5 = axisOpt[0]) === null || _axisOpt$5 === void 0 ? void 0 : _axisOpt$5.range);
+    var isUpdateAxesRange = !lodash_es_isEqual(newOpt === null || newOpt === void 0 ? void 0 : (_newOpt$4 = newOpt[0]) === null || _newOpt$4 === void 0 ? void 0 : _newOpt$4.range, axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$7 = axisOpt[0]) === null || _axisOpt$7 === void 0 ? void 0 : _axisOpt$7.range);
 
     if (isUpdateAxesRange || updateData) {
       var _this$options$axesX2, _this$options$axesX2$, _this$options$axesX2$2, _this$options$axesY2, _this$options$axesY2$, _this$options$axesY2$2;
 
       var isResetPosition = dir === 'x' ? (_this$options$axesX2 = this.options.axesX) === null || _this$options$axesX2 === void 0 ? void 0 : (_this$options$axesX2$ = _this$options$axesX2[0]) === null || _this$options$axesX2$ === void 0 ? void 0 : (_this$options$axesX2$2 = _this$options$axesX2$.scrollbar) === null || _this$options$axesX2$2 === void 0 ? void 0 : _this$options$axesX2$2.resetPosition : (_this$options$axesY2 = this.options.axesY) === null || _this$options$axesY2 === void 0 ? void 0 : (_this$options$axesY2$ = _this$options$axesY2[0]) === null || _this$options$axesY2$ === void 0 ? void 0 : (_this$options$axesY2$2 = _this$options$axesY2$.scrollbar) === null || _this$options$axesY2$2 === void 0 ? void 0 : _this$options$axesY2$2.resetPosition;
 
-      if (isUpdateAxesRange || isResetPosition) {
+      if (isUpdateAxesRange) {
         var _newOpt$5, _newOpt$5$range, _newOpt$6;
 
-        this.scrollbar[dir].range = newOpt !== null && newOpt !== void 0 && (_newOpt$5 = newOpt[0]) !== null && _newOpt$5 !== void 0 && (_newOpt$5$range = _newOpt$5.range) !== null && _newOpt$5$range !== void 0 && _newOpt$5$range.length ? _toConsumableArray(newOpt === null || newOpt === void 0 ? void 0 : (_newOpt$6 = newOpt[0]) === null || _newOpt$6 === void 0 ? void 0 : _newOpt$6.range) : null; // range가 업데이트되면 저장된 스크롤 위치를 초기화
+        this.scrollbar[dir].range = newOpt !== null && newOpt !== void 0 && (_newOpt$5 = newOpt[0]) !== null && _newOpt$5 !== void 0 && (_newOpt$5$range = _newOpt$5.range) !== null && _newOpt$5$range !== void 0 && _newOpt$5$range.length ? _toConsumableArray(newOpt === null || newOpt === void 0 ? void 0 : (_newOpt$6 = newOpt[0]) === null || _newOpt$6 === void 0 ? void 0 : _newOpt$6.range) : null;
+      }
 
-        delete this.scrollbar[dir].savedPosition;
-      } else if (updateData) {
-        // 데이터가 업데이트되면 저장된 픽셀 위치는 더 이상 유효하지 않으므로 삭제하여
-        // 논리적 범위에 따라 다시 계산하도록 합니다.
-        delete this.scrollbar[dir].savedPosition;
+      if (isResetPosition || updateData) {
+        this.resetScrollbarSavedPositions(dir);
       }
 
       this.initScrollbarRange(dir);
@@ -50433,17 +50517,32 @@ var plugins_scrollbar_module = {
     var scrollHeight = isXScroll ? scrollbarOpt.height : scrollbarOpt.width;
     var fullSize = isXScroll ? aPos.x2 - aPos.x1 : aPos.y2 - aPos.y1;
     var buttonSize = scrollbarOpt.showButton ? scrollHeight : 0;
-    var trackSize = fullSize - buttonSize * 2; // 현재 위치를 보존해야 하는 경우 기존 위치를 저장
+    var trackSize = fullSize - buttonSize * 2;
+    var thumbSize = this.getScrollbarThumbSize(dir, trackSize); // 비율로 저장된 위치가 있으면 새 track 크기에 맞게 복원
 
-    var savedThumbPosition = null;
+    if (preservePosition && scrollbarOpt.savedPositionRatio !== undefined) {
+      var maxPosition = Math.max(0, trackSize - thumbSize.size);
+
+      if (scrollbarOpt.savedAtStart) {
+        thumbSize.position = 0;
+      } else if (scrollbarOpt.savedAtEnd) {
+        thumbSize.position = maxPosition;
+      } else {
+        thumbSize.position = Math.min(scrollbarOpt.savedPositionRatio * trackSize, maxPosition);
+      }
+    } // 위치를 비율 및 처음/끝 고정 여부로 저장
+    // currentMaxPosition === 0 (thumbSize >= trackSize) 인 경우 저장하지 않음
+    // → trackSize가 다시 커졌을 때 이전 savedAtEnd/savedAtStart/savedPositionRatio 상태를 유지
 
-    if (preservePosition && scrollbarOpt.savedPosition !== undefined) {
-      savedThumbPosition = scrollbarOpt.savedPosition;
-    }
 
-    var thumbSize = this.getScrollbarThumbSize(dir, trackSize, savedThumbPosition); // 새로 계산된 위치를 저장
+    var currentMaxPosition = Math.max(0, trackSize - thumbSize.size);
+
+    if (currentMaxPosition > 0) {
+      scrollbarOpt.savedPositionRatio = thumbSize.position / trackSize;
+      scrollbarOpt.savedAtStart = thumbSize.position <= 0;
+      scrollbarOpt.savedAtEnd = thumbSize.position >= currentMaxPosition;
+    }
 
-    scrollbarOpt.savedPosition = thumbSize.position;
     var scrollbarStyle = 'display: block;';
     var scrollbarTrackStyle;
     var scrollbarThumbStyle;
@@ -50510,9 +50609,8 @@ var plugins_scrollbar_module = {
    * get scrollbar thumb size
    * @param dir axis direction ('x' | 'y')
    * @param trackSize scrollbar track size
-   * @param savedThumbPosition 기존 위치를 보존해야 하는 경우 저장된 위치
    */
-  getScrollbarThumbSize: function getScrollbarThumbSize(dir, trackSize, savedThumbPosition) {
+  getScrollbarThumbSize: function getScrollbarThumbSize(dir, trackSize) {
     var scrollbarOpt = this.scrollbar[dir];
 
     var _scrollbarOpt$range3 = _slicedToArray(scrollbarOpt.range, 2),
@@ -50543,9 +50641,9 @@ var plugins_scrollbar_module = {
       var _range = +max - +min;
 
       if (axesType === 'time') {
-        var _axisOpt$6, _this$labelRange$dir, _this$labelRange$dir$;
+        var _axisOpt$8, _this$labelRange$dir, _this$labelRange$dir$;
 
-        interval = axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$6 = axisOpt[0]) === null || _axisOpt$6 === void 0 ? void 0 : _axisOpt$6.getInterval({
+        interval = axisOpt === null || axisOpt === void 0 ? void 0 : (_axisOpt$8 = axisOpt[0]) === null || _axisOpt$8 === void 0 ? void 0 : _axisOpt$8.getInterval({
           minValue: minMax.min,
           maxValue: minMax.max,
           maxSteps: (_this$labelRange$dir = this.labelRange[dir]) === null || _this$labelRange$dir === void 0 ? void 0 : (_this$labelRange$dir$ = _this$labelRange$dir[0]) === null || _this$labelRange$dir$ === void 0 ? void 0 : _this$labelRange$dir$.max
@@ -50565,12 +50663,7 @@ var plugins_scrollbar_module = {
 
     scrollbarOpt.startValue = startValue;
     scrollbarOpt.steps = steps;
-    scrollbarOpt.interval = interval; // 기존 위치를 보존해야 하는 경우 저장된 위치를 사용
-
-    if (savedThumbPosition !== null) {
-      thumbPosition = savedThumbPosition;
-    }
-
+    scrollbarOpt.interval = interval;
     return {
       size: thumbSize,
       position: thumbPosition
@@ -50637,18 +50730,35 @@ var plugins_scrollbar_module = {
     if (!isOutOfRange) {
       scrollbarOpt.range = [minValue, maxValue]; // 사용자가 스크롤할 때는 저장된 위치를 초기화
 
-      delete scrollbarOpt.savedPosition;
+      this.resetScrollbarSavedPositions(dir);
       this.update({
         updateSeries: false,
         updateSelTip: {
           update: false,
           keepDomain: false
         },
-        lightUpdate: minValue > 1
+        lightUpdate: minValue > 1,
+        updateByScrollbar: true
       });
     }
   },
 
+  /**
+   * reset scrollbar saved positions
+   * @param dir axis direction ('x' | 'y')
+   */
+  resetScrollbarSavedPositions: function resetScrollbarSavedPositions(dir) {
+    var scrollbarOpt = this.scrollbar[dir];
+
+    if (!scrollbarOpt) {
+      return;
+    }
+
+    delete scrollbarOpt.savedPositionRatio;
+    delete scrollbarOpt.savedAtStart;
+    delete scrollbarOpt.savedAtEnd;
+  },
+
   /**
    * create scroll event
    */
@@ -50903,13 +51013,15 @@ var plugins_scrollbar_module = {
 
     this.scrollbar[dir].range = [movedMin, movedMax]; // 사용자가 드래그로 스크롤할 때는 저장된 위치를 초기화
 
-    delete this.scrollbar[dir].savedPosition;
+    this.resetScrollbarSavedPositions(dir);
     this.update({
       updateSeries: false,
       updateSelTip: {
         update: false,
         keepDomain: false
-      }
+      },
+      lightUpdate: movedMin > 1,
+      updateByScrollbar: true
     });
   },
 
@@ -51779,19 +51891,19 @@ var plugins_interaction_modules = {
       var useSelectSeries = (selectSeriesOpt === null || selectSeriesOpt === void 0 ? void 0 : selectSeriesOpt.use) && (selectSeriesOpt === null || selectSeriesOpt === void 0 ? void 0 : selectSeriesOpt.useClick);
 
       var setSelectedItemInfo = function setSelectedItemInfo() {
-        var hitInfo = _this.getItemByPosition(offset, false);
+        var hitInfo = _this.getHitItemByPosition(offset, false);
 
         args.label = hitInfo.label;
         args.value = hitInfo.value;
         args.seriesId = hitInfo.sId;
-        args.dataIndex = hitInfo.maxIndex;
+        args.dataIndex = hitInfo.dataIndex;
         args.acc = hitInfo.acc;
 
         if (hitInfo !== null && hitInfo !== void 0 && hitInfo.sId) {
           args.selected = {
             eventTarget: 'item',
             seriesId: _this.isDeselectItem(hitInfo) ? null : hitInfo.sId,
-            dataIndex: _this.isDeselectItem(hitInfo) ? null : hitInfo.maxIndex
+            dataIndex: _this.isDeselectItem(hitInfo) ? null : hitInfo.dataIndex
           };
         }
       };
@@ -52465,7 +52577,10 @@ var plugins_interaction_modules = {
     var maxv = '';
     var maxg = null;
     var maxSID = null;
-    var minDistance = Infinity; // 1. 먼저 공통으로 사용할 데이터 인덱스 결정
+    var minDistance = Infinity; // directHit(bar 박스 내부 클릭/hover) 시리즈가 발견되었는지 추적.
+    // 한 번이라도 directHit가 있으면 line의 근접 포인트 히트는 hitId 후보에서 배제된다.
+
+    var hasDirectHit = false; // 1. 먼저 공통으로 사용할 데이터 인덱스 결정
 
     var targetDataIndex = this.findClosestDataIndex(offset, sIds);
 
@@ -52541,13 +52656,25 @@ var plugins_interaction_modules = {
             if (maxg === null || maxg <= gdata) {
               maxg = gdata;
               maxSID = sId;
-            } // 마우스 위치와의 거리 계산하여 가장 가까운 시리즈 선택
+            } // 마우스 위치와의 거리 계산하여 가장 가까운 시리즈 선택.
+            // directHit(bar 박스 내부)가 하나라도 있으면 그중에서만 선택하고,
+            // 라인의 근접 포인트 히트(item.hit=true, directHit=false)는 hitId 후보에서 배제한다.
+            // bar + line combo 차트에서 작은 bar 클릭 시 큰 값의 line이 잡히던 버그 방지.
 
 
             if (item.hit && item.data.xp !== undefined && item.data.yp !== undefined) {
               var distance = Math.pow(item.data.xp - offset[0], 2) + Math.pow(item.data.yp - offset[1], 2);
 
-              if (distance < minDistance) {
+              if (item.directHit) {
+                // directHit는 최우선. 여러 directHit 중에서는 가장 가까운 것 선택.
+                if (!hasDirectHit || distance < minDistance) {
+                  minDistance = distance;
+                  hitId = sId;
+                }
+
+                hasDirectHit = true;
+              } else if (!hasDirectHit && distance < minDistance) {
+                // directHit가 없을 때만 일반 hit 거리 비교
                 minDistance = distance;
                 hitId = sId;
               }
@@ -53243,7 +53370,7 @@ var plugins_interaction_modules = {
   isDeselectItem: function isDeselectItem(hitInfo) {
     var _this$defaultSelectIt, _this$defaultSelectIt2;
 
-    return this.options.selectItem.useDeselectItem && (hitInfo === null || hitInfo === void 0 ? void 0 : hitInfo.maxIndex) === ((_this$defaultSelectIt = this.defaultSelectItemInfo) === null || _this$defaultSelectIt === void 0 ? void 0 : _this$defaultSelectIt.dataIndex) && (hitInfo === null || hitInfo === void 0 ? void 0 : hitInfo.sId) === ((_this$defaultSelectIt2 = this.defaultSelectItemInfo) === null || _this$defaultSelectIt2 === void 0 ? void 0 : _this$defaultSelectIt2.seriesID) && !isNaN(hitInfo === null || hitInfo === void 0 ? void 0 : hitInfo.maxIndex);
+    return this.options.selectItem.useDeselectItem && (hitInfo === null || hitInfo === void 0 ? void 0 : hitInfo.dataIndex) === ((_this$defaultSelectIt = this.defaultSelectItemInfo) === null || _this$defaultSelectIt === void 0 ? void 0 : _this$defaultSelectIt.dataIndex) && (hitInfo === null || hitInfo === void 0 ? void 0 : hitInfo.sId) === ((_this$defaultSelectIt2 = this.defaultSelectItemInfo) === null || _this$defaultSelectIt2 === void 0 ? void 0 : _this$defaultSelectIt2.seriesID) && !isNaN(hitInfo === null || hitInfo === void 0 ? void 0 : hitInfo.dataIndex);
   },
 
   /**
@@ -54917,7 +55044,7 @@ var element_tip_modules = {
 
     if (tipType === 'sel') {
       if (hitInfo && hitInfo.label !== null) {
-        lastTip.pos = type === 'bar' ? hitInfo.maxIndex : hitInfo.label;
+        lastTip.pos = type === 'bar' ? hitInfo.dataIndex : hitInfo.label;
         ldata = lastTip.pos;
       } else if (lastTip.pos !== null) {
         ldata = lastTip.pos;
@@ -55129,9 +55256,10 @@ var element_tip_modules = {
               interval = scrollbarOpt.interval,
               type = scrollbarOpt.type;
 
-          var _range = _slicedToArray(range, 2),
-              min = _range[0],
-              max = _range[1];
+          var _ref3 = range !== null && range !== void 0 ? range : [],
+              _ref4 = _slicedToArray(_ref3, 2),
+              min = _ref4[0],
+              max = _ref4[1];
 
           if (truthyNumber(min) && truthyNumber(max)) {
             labelCount = Math.floor((+max - +min) / interval) + 1;
@@ -55800,15 +55928,15 @@ var chart_core_EvChart = /*#__PURE__*/function () {
       this.axesRange = this.getAxesRange();
       this.labelOffset = this.getLabelOffset();
       this.labelRange = this.getAxesLabelRange();
-      this.axesSteps = this.calculateSteps();
-      this.adjustXAndYAxisWidth();
-      this.drawAxis(hitInfo);
-      this.drawSeries(hitInfo);
 
       if ((_this$scrollbar = this.scrollbar) !== null && _this$scrollbar !== void 0 && (_this$scrollbar$x = _this$scrollbar.x) !== null && _this$scrollbar$x !== void 0 && _this$scrollbar$x.use || (_this$scrollbar2 = this.scrollbar) !== null && _this$scrollbar2 !== void 0 && (_this$scrollbar2$y = _this$scrollbar2.y) !== null && _this$scrollbar2$y !== void 0 && _this$scrollbar2$y.use) {
         this.updateScrollbarPosition();
       }
 
+      this.axesSteps = this.calculateSteps();
+      this.adjustXAndYAxisWidth();
+      this.drawAxis(hitInfo);
+      this.drawSeries(hitInfo);
       this.drawTip();
 
       if (this.bufferCanvas && ((_this$bufferCanvas = this.bufferCanvas) === null || _this$bufferCanvas === void 0 ? void 0 : _this$bufferCanvas.width) > 1 && ((_this$bufferCanvas2 = this.bufferCanvas) === null || _this$bufferCanvas2 === void 0 ? void 0 : _this$bufferCanvas2.height) > 1) {
@@ -56015,10 +56143,10 @@ var chart_core_EvChart = /*#__PURE__*/function () {
                   var lastHitInfo = this.lastHitInfo;
                   var defaultSelectInfo = this.defaultSelectItemInfo;
 
-                  if (lastHitInfo !== null && lastHitInfo !== void 0 && lastHitInfo.maxIndex || (lastHitInfo === null || lastHitInfo === void 0 ? void 0 : lastHitInfo.maxIndex) === 0) {
+                  if (lastHitInfo !== null && lastHitInfo !== void 0 && lastHitInfo.dataIndex || (lastHitInfo === null || lastHitInfo === void 0 ? void 0 : lastHitInfo.dataIndex) === 0) {
                     _selectInfo = {
                       seriesID: lastHitInfo.sId,
-                      dataIndex: lastHitInfo.maxIndex
+                      dataIndex: lastHitInfo.dataIndex
                     };
                   } else if (defaultSelectInfo !== null && defaultSelectInfo !== void 0 && defaultSelectInfo.dataIndex || (defaultSelectInfo === null || defaultSelectInfo === void 0 ? void 0 : defaultSelectInfo.dataIndex) === 0) {
                     _selectInfo = _objectSpread2({}, defaultSelectInfo);
@@ -56467,14 +56595,20 @@ var chart_core_EvChart = /*#__PURE__*/function () {
 
   }, {
     key: "updateScrollbar",
-    value: function updateScrollbar(updateData) {
-      var _this$scrollbar3, _this$scrollbar3$x, _this$options$axesX2, _this$options$axesX2$, _this$options$axesX2$2, _this$scrollbar4, _this$scrollbar4$y, _this$options$axesY2, _this$options$axesY2$, _this$options$axesY2$2;
+    value: function updateScrollbar(updateData, updateByScrollbar) {
+      var _this$options$axesX$2, _this$options$axesX2, _this$options$axesX2$, _this$options$axesX2$2, _this$options$axesY$2, _this$options$axesY2, _this$options$axesY2$, _this$options$axesY2$2, _this$scrollbar$x$use, _this$scrollbar3, _this$scrollbar3$x, _this$scrollbar$y$use, _this$scrollbar4, _this$scrollbar4$y;
+
+      var isForceUpdate = updateByScrollbar || updateData;
+      var xUse = (_this$options$axesX$2 = (_this$options$axesX2 = this.options.axesX) === null || _this$options$axesX2 === void 0 ? void 0 : (_this$options$axesX2$ = _this$options$axesX2[0]) === null || _this$options$axesX2$ === void 0 ? void 0 : (_this$options$axesX2$2 = _this$options$axesX2$.scrollbar) === null || _this$options$axesX2$2 === void 0 ? void 0 : _this$options$axesX2$2.use) !== null && _this$options$axesX$2 !== void 0 ? _this$options$axesX$2 : false;
+      var yUse = (_this$options$axesY$2 = (_this$options$axesY2 = this.options.axesY) === null || _this$options$axesY2 === void 0 ? void 0 : (_this$options$axesY2$ = _this$options$axesY2[0]) === null || _this$options$axesY2$ === void 0 ? void 0 : (_this$options$axesY2$2 = _this$options$axesY2$.scrollbar) === null || _this$options$axesY2$2 === void 0 ? void 0 : _this$options$axesY2$2.use) !== null && _this$options$axesY$2 !== void 0 ? _this$options$axesY$2 : false;
+      var prevXUse = (_this$scrollbar$x$use = (_this$scrollbar3 = this.scrollbar) === null || _this$scrollbar3 === void 0 ? void 0 : (_this$scrollbar3$x = _this$scrollbar3.x) === null || _this$scrollbar3$x === void 0 ? void 0 : _this$scrollbar3$x.use) !== null && _this$scrollbar$x$use !== void 0 ? _this$scrollbar$x$use : false;
+      var prevYUse = (_this$scrollbar$y$use = (_this$scrollbar4 = this.scrollbar) === null || _this$scrollbar4 === void 0 ? void 0 : (_this$scrollbar4$y = _this$scrollbar4.y) === null || _this$scrollbar4$y === void 0 ? void 0 : _this$scrollbar4$y.use) !== null && _this$scrollbar$y$use !== void 0 ? _this$scrollbar$y$use : false;
 
-      if ((_this$scrollbar3 = this.scrollbar) !== null && _this$scrollbar3 !== void 0 && (_this$scrollbar3$x = _this$scrollbar3.x) !== null && _this$scrollbar3$x !== void 0 && _this$scrollbar3$x.isInit || (_this$options$axesX2 = this.options.axesX) !== null && _this$options$axesX2 !== void 0 && (_this$options$axesX2$ = _this$options$axesX2[0]) !== null && _this$options$axesX2$ !== void 0 && (_this$options$axesX2$2 = _this$options$axesX2$.scrollbar) !== null && _this$options$axesX2$2 !== void 0 && _this$options$axesX2$2.use) {
+      if (xUse !== prevXUse || xUse || isForceUpdate && xUse) {
         this.updateScrollbarInfo('x', updateData);
       }
 
-      if ((_this$scrollbar4 = this.scrollbar) !== null && _this$scrollbar4 !== void 0 && (_this$scrollbar4$y = _this$scrollbar4.y) !== null && _this$scrollbar4$y !== void 0 && _this$scrollbar4$y.isInit || (_this$options$axesY2 = this.options.axesY) !== null && _this$options$axesY2 !== void 0 && (_this$options$axesY2$ = _this$options$axesY2[0]) !== null && _this$options$axesY2$ !== void 0 && (_this$options$axesY2$2 = _this$options$axesY2$.scrollbar) !== null && _this$options$axesY2$2 !== void 0 && _this$options$axesY2$2.use) {
+      if (yUse !== prevYUse || yUse || isForceUpdate && yUse) {
         this.updateScrollbarInfo('y', updateData);
       }
     }
@@ -56500,13 +56634,14 @@ var chart_core_EvChart = /*#__PURE__*/function () {
           updateLegend = updateInfo.updateLegend,
           updateData = updateInfo.updateData,
           updateTooltip = updateInfo.updateTooltip,
-          lightUpdate = updateInfo.lightUpdate;
+          lightUpdate = updateInfo.lightUpdate,
+          updateByScrollbar = updateInfo.updateByScrollbar;
 
       if (!this.isInit) {
         return;
       }
 
-      this.updateScrollbar(updateData);
+      this.updateScrollbar(updateData, updateByScrollbar);
       this.resetProps();
       this.updateSeries = updateSeries;