feat: update vutils/vscale version to support custom callback in tick…

docs/demos/package.json

@@ -12,7 +12,7 @@
     "@internal/eslint-config": "workspace:*",
     "@internal/ts-config": "workspace:*",
     "@visactor/vrender-kits": "workspace:0.14.8",
-    "@visactor/vutils": "~0.18.13",
+    "@visactor/vutils": "~0.18.14",
     "d3-scale-chromatic": "^3.0.0",
     "lodash": "4.17.21",
     "dat.gui": "^0.7.9",

docs/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@arco-design/web-react": "2.46.1",
     "@visactor/vchart": "1.3.0",
-    "@visactor/vutils": "~0.18.13",
+    "@visactor/vutils": "~0.18.14",
     "@visactor/vgrammar": "~0.5.7",
     "@visactor/vrender": "workspace:0.19.23",
     "markdown-it": "^13.0.0",

packages/react-vrender-utils/package.json

@@ -26,7 +26,7 @@
   "dependencies": {
     "@visactor/vrender": "workspace:0.19.23",
     "@visactor/react-vrender": "workspace:0.19.23",
-    "@visactor/vutils": "~0.18.13",
+    "@visactor/vutils": "~0.18.14",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"
   },

packages/react-vrender/package.json

@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@visactor/vrender": "workspace:0.19.23",
-    "@visactor/vutils": "~0.18.13",
+    "@visactor/vutils": "~0.18.14",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"
   },

packages/vrender-components/__tests__/unit/axis/tick.test.ts

@@ -0,0 +1,30 @@
+import { LinearScale, wilkinsonExtended } from '@visactor/vscale';
+import { ticks } from '../../../src';
+
+test('Custom Line Ticks', () => {
+  const s = new LinearScale().domain([0, 100]).range([500, 1000]);
+  expect(
+    ticks(s, {
+      coordinateType: 'cartesian',
+      axisOrientType: 'bottom',
+      labelStyle: {},
+      tickCount: 5,
+      tickMode: (scale, count) => {
+        const d = scale.calculateVisibleDomain(scale.get('_range'));
+        return wilkinsonExtended(d[0], d[1], count);
+      }
+    }).map(tick => tick.value)
+  ).toStrictEqual([0, 25, 50, 75, 100]);
+});
+
+test('Normal Line Ticks', () => {
+  const s = new LinearScale().domain([0, 100]).range([500, 1000]);
+  expect(
+    ticks(s, {
+      coordinateType: 'cartesian',
+      axisOrientType: 'bottom',
+      labelStyle: {},
+      tickCount: 5
+    }).map(tick => tick.value)
+  ).toStrictEqual([0, 20, 40, 60, 80, 100]);
+});

packages/vrender-components/package.json

@@ -26,15 +26,15 @@
   "dependencies": {
     "@visactor/vrender-core": "workspace:0.19.23",
     "@visactor/vrender-kits": "workspace:0.19.23",
-    "@visactor/vutils": "~0.18.13",
-    "@visactor/vscale": "~0.18.9"
+    "@visactor/vutils": "~0.18.14",
+    "@visactor/vscale": "~0.18.14"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",
     "@internal/eslint-config": "workspace:*",
     "@internal/ts-config": "workspace:*",
     "@rushstack/eslint-patch": "~1.1.4",
-    "@visactor/vscale": "~0.18.9",
+    "@visactor/vscale": "~0.18.14",
     "@types/jest": "^26.0.0",
     "jest": "^26.0.0",
     "jest-electron": "^0.1.12",

packages/vrender-components/src/axis/tick-data/continuous.ts

@@ -40,7 +40,8 @@ export const continuousTicks = (scale: ContinuousScale, op: ITickDataOpt): ITick
     scaleTicks = (scale as LinearScale).d3Ticks(count ?? DEFAULT_CONTINUOUS_TICK_COUNT, { noDecimals });
   } else {
     const count = isFunction(tickCount) ? tickCount({ axisLength: rangeSize, labelStyle }) : tickCount;
-    scaleTicks = (scale as LinearScale).ticks(count ?? DEFAULT_CONTINUOUS_TICK_COUNT, { noDecimals });
+    const customTicks = isFunction(op.tickMode) ? op.tickMode : undefined;
+    scaleTicks = (scale as LinearScale).ticks(count ?? DEFAULT_CONTINUOUS_TICK_COUNT, { noDecimals, customTicks });
   }
 
   if (op.sampling) {

packages/vrender-components/src/axis/type.ts

@@ -11,6 +11,7 @@ import type {
   IGraphic
 } from '@visactor/vrender-core';
 import type { Dict } from '@visactor/vutils';
+import type { ContinuousScale, CustomTicksFunc } from '@visactor/vscale';
 import type { Point, TextContent } from '../core/type';
 import type { SegmentAttributes } from '../segment';
 import type { TagAttributes } from '../tag';
@@ -453,7 +454,7 @@ export interface ITickDataOpt {
   tickCount?: number | ((option: ITickCallbackOption) => number);
   forceTickCount?: number;
   tickStep?: number;
-  tickMode?: 'average' | 'd3' | string;
+  tickMode?: 'average' | 'd3' | string | CustomTicksFunc<ContinuousScale>;
   noDecimals?: boolean;
 
   coordinateType: CoordinateType;

packages/vrender-core/package.json

@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "color-convert": "2.0.1",
-    "@visactor/vutils": "~0.18.13"
+    "@visactor/vutils": "~0.18.14"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

packages/vrender-kits/package.json

@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@visactor/vrender-core": "workspace:0.19.23",
-    "@visactor/vutils": "~0.18.13",
+    "@visactor/vutils": "~0.18.14",
     "@resvg/resvg-js": "2.4.1",
     "roughjs": "4.5.2"
   },

packages/vrender/package.json

@@ -32,7 +32,7 @@
     "@internal/eslint-config": "workspace:*",
     "@internal/ts-config": "workspace:*",
     "@rushstack/eslint-patch": "~1.1.4",
-    "@visactor/vutils": "~0.18.13",
+    "@visactor/vutils": "~0.18.14",
     "canvas": "2.11.2",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",