@rfkit/charts 1.1.40 → 1.1.41

package/index.js

@@ -11651,7 +11651,7 @@ const LINE_WIDTH_BASE = 0.5;
 const MAJOR_TICK_LENGTH = 6;
 const MINOR_TICK_LENGTH = 4;
 const TEXT_OFFSET = 8;
-const MINOR_TICK_DIVISIONS = 4;
+const MINOR_TICK_DIVISIONS = 2;
 const MIN_TICK_SPACING = 4;
 const MIN_CONTAINER_HEIGHT = 100;
 const IDEAL_TICK_COUNT = 7;
@@ -11693,18 +11693,14 @@ function useCanvasAxisY(options = {}) {
         resizeObserver.observe(container);
         return ()=>resizeObserver.disconnect();
     }, []);
-    const formatTickLabel = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((value)=>{
-        if (Math.abs(value) >= 1000) return `${(value / 1000).toFixed(1)}k`;
-        if (Math.abs(value) < 0.01 && 0 !== value) return value.toExponential(1);
-        const rangeSpan = range.max - range.min;
-        if (rangeSpan < 1) {
-            const decimalPlaces = Math.max(2, Math.ceil(-Math.log10(rangeSpan)) + 1);
-            return value.toFixed(Math.min(decimalPlaces, 4));
+    const formatTickLabel = (0, __WEBPACK_EXTERNAL_MODULE_react__.useCallback)((value, formatStrategy)=>{
+        if (formatStrategy.useScientific) return value.toExponential(1);
+        if (formatStrategy.useKFormat) {
+            const kValue = value / 1000;
+            return formatStrategy.useDecimals ? `${kValue.toFixed(1)}k` : `${Math.round(kValue)}k`;
         }
-        return value.toFixed(Math.abs(value) < 1 ? 2 : 1);
-    }, [
-        range
-    ]);
+        return formatStrategy.useDecimals ? value.toFixed(1) : Math.round(value).toString();
+    }, []);
     const ticksData = (0, __WEBPACK_EXTERNAL_MODULE_react__.useMemo)(()=>{
         if (0 === containerHeight) return {
             majorTicks: [],
@@ -11719,8 +11715,18 @@ function useCanvasAxisY(options = {}) {
         interval = normalizedInterval <= 1 ? magnitude : normalizedInterval <= 2 ? 2 * magnitude : normalizedInterval <= 5 ? 5 * magnitude : 10 * magnitude;
         const minTickInterval = MIN_RANGE_SPAN / (2 * IDEAL_TICK_COUNT);
         interval = Math.max(interval, minTickInterval);
-        const majorTicks = [];
+        const majorTickValues = [];
         const startTick = Math.ceil(range.min / interval) * interval;
+        for(let value = startTick; value <= range.max; value += interval)majorTickValues.push(value);
+        const hasLargeValues = majorTickValues.some((v)=>Math.abs(v) >= 1000);
+        const hasSmallValues = majorTickValues.some((v)=>Math.abs(v) < 0.01 && 0 !== v);
+        const hasDecimals = majorTickValues.some((v)=>v % 1 !== 0);
+        const formatStrategy = {
+            useScientific: hasSmallValues,
+            useKFormat: hasLargeValues && !hasSmallValues,
+            useDecimals: hasDecimals
+        };
+        const majorTicks = [];
         for(let value = startTick; value <= range.max; value += interval){
             const position = (range.max - value) / rangeSpan * containerHeight;
             let textPosition = position;
@@ -11743,7 +11749,7 @@ function useCanvasAxisY(options = {}) {
                 value,
                 position,
                 textPosition,
-                label: formatTickLabel(value),
+                label: formatTickLabel(value, formatStrategy),
                 isAdjusted
             });
         }

package/package.json

@@ -5,6 +5,6 @@
   "types": "index.d.ts",
   "author": "Hxgh",
   "license": "MIT",
-  "version": "1.1.40",
+  "version": "1.1.41",
   "private": false
 }