evui 3.4.152 → 3.4.154

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "evui",
-  "version": "3.4.152",
+  "version": "3.4.154",
   "description": "A EXEM Library project",
   "author": "exem <dev_client@ex-em.com>",
   "license": "MIT",

package/src/components/chart/chart.core.js

@@ -127,6 +127,10 @@ class EvChart {
     this.axesX = this.createAxes('x', axesX);
     this.axesY = this.createAxes('y', axesY);
 
+    if (axesX?.[0]?.scrollbar?.use || axesY?.[0]?.scrollbar?.use) {
+      this.initScrollbar();
+    }
+
     this.initDefaultSelectInfo();
 
     this.drawChart();
@@ -162,10 +166,6 @@ class EvChart {
       this.setLegendPosition();
     }
 
-    if (opt.axesX?.[0]?.scrollbar?.use || opt.axesY?.[0]?.scrollbar?.use) {
-      this.initScrollbar();
-    }
-
     this.chartRect = this.getChartRect();
   }
 
@@ -277,7 +277,6 @@ class EvChart {
     this.drawSeries(hitInfo);
 
     if (this.scrollbar?.x?.use || this.scrollbar?.y?.use) {
-      this.initScrollbar();
       this.updateScrollbarPosition();
     }
 
@@ -852,6 +851,21 @@ class EvChart {
     return labelOffset;
   }
 
+  /**
+   * Update scrollbar information
+   * @param {boolean} updateData is update data
+   * @returns {undefined}
+   */
+  updateScrollbar(updateData) {
+    if (this.scrollbar?.x?.isInit || this.options.axesX?.[0]?.scrollbar?.use) {
+      this.updateScrollbarInfo('x', updateData);
+    }
+
+    if (this.scrollbar?.y?.isInit || this.options.axesY?.[0]?.scrollbar?.use) {
+      this.updateScrollbarInfo('y', updateData);
+    }
+  }
+
   /**
    * To re-render chart, reset properties, canvas and then render chart.
    * @param {object} updateInfo   information for each components are needed to update
@@ -871,7 +885,6 @@ class EvChart {
       updateLegend,
       updateData,
       updateTooltip,
-      updateByScrollbar,
       lightUpdate,
     } = updateInfo;
 
@@ -879,9 +892,7 @@ class EvChart {
       return;
     }
 
-    if (updateByScrollbar) {
-      this.updateScrollbar?.(updateData);
-    }
+    this.updateScrollbar(updateData);
 
     this.resetProps();
 
@@ -992,7 +1003,6 @@ class EvChart {
 
     this.initDefaultSelectInfo();
 
-
     let renderHitInfo = updateInfo?.hitInfo;
     if (!renderHitInfo?.legend && this.legendHover?.sId) {
       renderHitInfo = { ...(renderHitInfo || {}), legend: this.legendHover };
@@ -1065,20 +1075,16 @@ class EvChart {
    * @returns {undefined}
    */
   resize(promiseRes) {
-    // 차트 크기가 변경될 때 저장된 스크롤 픽셀 위치를 초기화하여
-    // 새로운 크기에 맞춰 스크롤바 크기/위치를 재계산하도록 함
-    if (this.scrollbar?.x) {
-      delete this.scrollbar.x.savedPosition;
-    }
-    if (this.scrollbar?.y) {
-      delete this.scrollbar.y.savedPosition;
-    }
-
     this.clear();
     this.bufferCtx.restore();
     this.bufferCtx.save();
 
     this.initRect();
+
+    if (this.options.axesX?.[0]?.scrollbar?.use || this.options.axesY?.[0]?.scrollbar?.use) {
+      this.initScrollbar();
+    }
+
     this.initScale();
     this.chartRect = this.getChartRect();
     this.drawChart();

package/src/components/chart/plugins/plugins.interaction.js

@@ -1018,8 +1018,11 @@ const modules = {
     const isHorizontal = !!this.options.horizontal;
     const mousePos = isHorizontal ? yp : xp;
 
-    // 첫 번째 표시 중인 시리즈를 기준으로 라벨 위치 확인
-    const referenceSeries = sIds.find(sId => this.seriesList[sId]?.show);
+    // 데이터 있는 시리즈를 기준으로 라벨 위치 확인
+    const referenceSeries = sIds.find((sId) => {
+      const series = this.seriesList[sId];
+      return series?.show && series?.data?.length > 0;
+    });
     if (!referenceSeries || !this.seriesList[referenceSeries]?.data) {
       return -1;
     }

package/src/components/chart/plugins/plugins.scrollbar.js

@@ -29,6 +29,8 @@ const module = {
       scrollbarOpt[key] = merged[key];
     });
 
+    delete scrollbarOpt.savedPosition;
+
     if (!scrollbarOpt.isInit) {
       scrollbarOpt.type = axisOpt?.[0]?.type;
       scrollbarOpt.range = axisOpt?.[0]?.range?.length ? [...axisOpt?.[0]?.range] : null;
@@ -83,14 +85,6 @@ const module = {
     }
   },
 
-  /**
-   * update scrollbar information
-   */
-  updateScrollbar(updateData) {
-    this.updateScrollbarInfo('x', updateData);
-    this.updateScrollbarInfo('y', updateData);
-  },
-
   /**
    * Updated scrollbar information with updated axis information
    * @param dir axis direction (x | y)
@@ -449,7 +443,6 @@ const module = {
       this.update({
         updateSeries: false,
         updateSelTip: { update: false, keepDomain: false },
-        updateByScrollbar: true,
         lightUpdate: minValue > 1,
       });
     }

package/src/components/chart/scale/scale.time.js

@@ -44,100 +44,6 @@ class TimeScale extends Scale {
     }
     return Math.ceil((max - min) / step);
   }
-
-  /**
-   * With range information, calculate how many labels in axis
-   * @param {object} range    min/max information
-   *
-   * @returns {object} steps, interval, min/max graph value
-  */
-  calculateSteps(range) {
-    const { maxValue, minValue, maxSteps } = range;
-
-    // 사용자 interval로 인식하는 경우: 숫자 또는 객체({ time, unit }) 형태만
-    // 문자열('hour', 'second' 등)은 기존 로직(분기 D)으로 처리
-    const hasUserRange = Array.isArray(this.range) && this.range.length === 2;
-    const hasUserInterval = (
-      typeof this.interval === 'number'
-      || (typeof this.interval === 'object' && this.interval !== null)
-    );
-
-    const resolvedInterval = hasUserInterval ? this.getInterval(range) : null;
-    const isValidInterval = (
-      resolvedInterval != null
-      && resolvedInterval > 0
-      && isFinite(resolvedInterval)
-    );
-
-    const graphMin = +minValue;
-    let graphMax = +maxValue;
-    const graphRange = graphMax - graphMin;
-
-    let interval;
-    let steps;
-
-    if (hasUserRange && isValidInterval) {
-      // 1) user range + interval
-      const candidateSteps = graphRange / resolvedInterval;
-      const isExactlyDividable = Math.abs(candidateSteps - Math.round(candidateSteps)) < 1e-10;
-      if (isExactlyDividable && candidateSteps <= maxSteps) {
-        // 1-1) interval 호환되는 경우
-        interval = resolvedInterval;
-        steps = Math.round(candidateSteps);
-      } else {
-        // 1-2) interval 호환되지 않음 -> 사용자 interval을 사용하지 않음
-        steps = maxSteps;
-        interval = graphRange / steps;
-      }
-    } else if (hasUserRange) {
-      // 2) user range only
-      steps = maxSteps;
-      interval = graphRange / steps;
-    } else if (isValidInterval) {
-      // 3) user interval only
-      interval = resolvedInterval;
-      steps = Math.ceil(graphRange / interval);
-      while (steps > maxSteps) {
-        interval *= 2;
-        steps = Math.ceil(graphRange / interval);
-      }
-      graphMax = graphMin + (interval * steps);
-    } else {
-      // 4) 기존 로직
-      interval = this.getInterval(range);
-      let increase = minValue;
-      let numberOfSteps;
-
-      while (increase < maxValue) {
-        increase += interval;
-      }
-
-      graphMax = increase;
-
-      numberOfSteps = Math.round(graphRange / interval);
-
-      while (numberOfSteps > maxSteps) {
-        interval *= 2;
-        numberOfSteps = Math.round(graphRange / interval);
-        const tempInterval = graphRange / numberOfSteps;
-        interval = this.decimalPoint ? tempInterval : Math.ceil(tempInterval);
-      }
-
-      if (graphMax - graphMin > (numberOfSteps * interval)) {
-        const tempInterval = (graphMax - graphMin) / numberOfSteps;
-        interval = this.decimalPoint ? tempInterval : Math.ceil(tempInterval);
-      }
-
-      steps = numberOfSteps;
-    }
-
-    return {
-      steps,
-      interval,
-      graphMin,
-      graphMax,
-    };
-  }
 }
 
 export default TimeScale;