From 1b273ebd6d1cbea6b2b430f0487757b4407ca08f Mon Sep 17 00:00:00 2001 From: xile611 Date: Wed, 13 Nov 2024 15:09:11 +0800 Subject: [PATCH] fix: upgrade vrender to 0.20.14 --- common/config/rush/pnpm-lock.yaml | 118 +++++++++--------- docs/dev-demos/package.json | 6 +- docs/site/package.json | 6 +- packages/vgrammar-core/package.json | 6 +- packages/vgrammar-core/src/types/view.ts | 3 +- packages/vgrammar-hierarchy/package.json | 4 +- packages/vgrammar-plot/package.json | 6 +- packages/vgrammar-sankey/package.json | 4 +- packages/vgrammar-util/package.json | 2 +- packages/vgrammar-venn/package.json | 4 +- .../vgrammar-wordcloud-shape/package.json | 4 +- packages/vgrammar-wordcloud/package.json | 4 +- 12 files changed, 84 insertions(+), 83 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 3f08966cf..0fec35e51 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -19,9 +19,9 @@ importers: '@visactor/vgrammar-util': workspace:0.14.13 '@visactor/vgrammar-wordcloud': workspace:0.14.13 '@visactor/vgrammar-wordcloud-shape': workspace:0.14.13 - '@visactor/vrender': 0.20.12 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender': 0.20.14 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': ~0.18.18 '@vitejs/plugin-react': 3.1.0 d3-scale-chromatic: ^3.0.0 @@ -41,9 +41,9 @@ importers: '@visactor/vgrammar-util': link:../../packages/vgrammar-util '@visactor/vgrammar-wordcloud': link:../../packages/vgrammar-wordcloud '@visactor/vgrammar-wordcloud-shape': link:../../packages/vgrammar-wordcloud-shape - '@visactor/vrender': 0.20.12 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender': 0.20.14 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': 0.18.18 '@vitejs/plugin-react': 3.1.0_vite@3.2.6 d3-scale-chromatic: 3.1.0 @@ -71,9 +71,9 @@ importers: '@visactor/vgrammar-venn': workspace:0.14.13 '@visactor/vgrammar-wordcloud': workspace:0.14.13 '@visactor/vgrammar-wordcloud-shape': workspace:0.14.13 - '@visactor/vrender': 0.20.12 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender': 0.20.14 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': ~0.18.18 '@vitejs/plugin-react': 3.1.0 axios: ^1.4.0 @@ -109,9 +109,9 @@ importers: '@visactor/vgrammar-venn': link:../../packages/vgrammar-venn '@visactor/vgrammar-wordcloud': link:../../packages/vgrammar-wordcloud '@visactor/vgrammar-wordcloud-shape': link:../../packages/vgrammar-wordcloud-shape - '@visactor/vrender': 0.20.12 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender': 0.20.14 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': 0.18.18 axios: 1.6.8 highlight.js: 11.9.0 @@ -231,9 +231,9 @@ importers: '@visactor/vdataset': ~0.18.18 '@visactor/vgrammar-coordinate': workspace:0.14.13 '@visactor/vgrammar-util': workspace:0.14.13 - '@visactor/vrender-components': 0.20.12 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-components': 0.20.14 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vscale': ~0.18.18 '@visactor/vutils': ~0.18.18 eslint: ~8.18.0 @@ -246,9 +246,9 @@ importers: '@visactor/vdataset': 0.18.18 '@visactor/vgrammar-coordinate': link:../vgrammar-coordinate '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-components': 0.20.12 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-components': 0.20.14 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vscale': 0.18.18 '@visactor/vutils': 0.18.18 devDependencies: @@ -340,8 +340,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.14.13 '@visactor/vgrammar-util': workspace:0.14.13 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': ~0.18.18 eslint: ~8.18.0 jest: ~29.5.0 @@ -352,8 +352,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': 0.18.18 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -385,9 +385,9 @@ importers: '@visactor/vgrammar-coordinate': workspace:0.14.13 '@visactor/vgrammar-core': workspace:0.14.13 '@visactor/vgrammar-util': workspace:0.14.13 - '@visactor/vrender-components': 0.20.12 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-components': 0.20.14 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vscale': ~0.18.18 '@visactor/vutils': ~0.18.18 d3-array: 1.x @@ -401,9 +401,9 @@ importers: '@visactor/vgrammar-coordinate': link:../vgrammar-coordinate '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-components': 0.20.12 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-components': 0.20.14 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vscale': 0.18.18 '@visactor/vutils': 0.18.18 devDependencies: @@ -481,8 +481,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.14.13 '@visactor/vgrammar-util': workspace:0.14.13 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': ~0.18.18 eslint: ~8.18.0 jest: ~29.5.0 @@ -493,8 +493,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': 0.18.18 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -522,7 +522,7 @@ importers: '@rushstack/eslint-patch': ~1.1.4 '@types/jest': ~29.5.0 '@types/node': '*' - '@visactor/vrender-core': 0.20.12 + '@visactor/vrender-core': 0.20.14 '@visactor/vutils': ~0.18.18 eslint: ~8.18.0 jest: ~29.5.0 @@ -531,7 +531,7 @@ importers: typescript: 4.9.5 vite: 3.2.6 dependencies: - '@visactor/vrender-core': 0.20.12 + '@visactor/vrender-core': 0.20.14 '@visactor/vutils': 0.18.18 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -561,8 +561,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.14.13 '@visactor/vgrammar-util': workspace:0.14.13 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': ~0.18.18 eslint: ~8.18.0 jest: ~29.5.0 @@ -573,8 +573,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': 0.18.18 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -604,8 +604,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.14.13 '@visactor/vgrammar-util': workspace:0.14.13 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': ~0.18.18 eslint: ~8.18.0 jest: ~29.5.0 @@ -616,8 +616,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vutils': 0.18.18 devDependencies: '@internal/bundler': link:../../tools/bundler @@ -647,8 +647,8 @@ importers: '@types/node': '*' '@visactor/vgrammar-core': workspace:0.14.13 '@visactor/vgrammar-util': workspace:0.14.13 - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vscale': ~0.18.18 '@visactor/vutils': ~0.18.18 eslint: ~8.18.0 @@ -660,8 +660,8 @@ importers: dependencies: '@visactor/vgrammar-core': link:../vgrammar-core '@visactor/vgrammar-util': link:../vgrammar-util - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vscale': 0.18.18 '@visactor/vutils': 0.18.18 devDependencies: @@ -3448,34 +3448,34 @@ packages: topojson-client: 3.1.0 dev: false - /@visactor/vrender-components/0.20.12: - resolution: {integrity: sha512-Dt+Ua+5b8zEQfpOsNSdTjtnhvP1iw4kCrILgcvlWBUqfVIFl+jG7TStSm9pqtB9o6+0mLUCnH9fgOSICfsa0yQ==} + /@visactor/vrender-components/0.20.14: + resolution: {integrity: sha512-GVU+dYq5qPBdOmg+87wi3F/3U40rqjQHnEBygnEZFhQbNcJGhgDMl4kAXNxq4YanxkDlHHFpQmfhqvOnZ6HngA==} dependencies: - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 '@visactor/vscale': 0.18.18 '@visactor/vutils': 0.18.18 dev: false - /@visactor/vrender-core/0.20.12: - resolution: {integrity: sha512-cvqqb6hVSpcwzWo6Og5TTH+mXbWNwc45rbF2/37/DBCjNm9S1feDf3fwbwAlUo0pxyKWF1bDU6GZKgsaTdypFw==} + /@visactor/vrender-core/0.20.14: + resolution: {integrity: sha512-eIHD4V2fl3Ps6UZlx0Ef6S/1iTOjKGZP39Lpn7+KO4G45O39EQwB8J8KmgrY/kmZDLCy93aH1QYPJhKVWQdTTw==} dependencies: '@visactor/vutils': 0.18.18 color-convert: 2.0.1 - /@visactor/vrender-kits/0.20.12: - resolution: {integrity: sha512-5r0dHVBZOBrUaKElSWBp676VDa+TqEui8C9qewyEWTzMqlN7tBmhrlcogFeVRbkTzXfNAKGWzrafbLHlQuMduQ==} + /@visactor/vrender-kits/0.20.14: + resolution: {integrity: sha512-seA+Af//ydPWLwuS461eti8vIukxGcy+84m2qnic7q0F774NZLYeNrWUlHw46Hu7SBQhAyZrb8GU9Hp+fPnLiw==} dependencies: '@resvg/resvg-js': 2.4.1 - '@visactor/vrender-core': 0.20.12 + '@visactor/vrender-core': 0.20.14 '@visactor/vutils': 0.18.18 roughjs: 4.5.2 - /@visactor/vrender/0.20.12: - resolution: {integrity: sha512-jzUOaK/iqS5A34mohZyLmFwhsohSBSlRDFNJar2fbN/VNlwCgsPnv8S5eE6HGcyJ7Far7b7LB2NR4PXEcRtOlg==} + /@visactor/vrender/0.20.14: + resolution: {integrity: sha512-vMX/h+PNE0hiYZe2bnimT+Rpq2WOshnAwMN5CLyAL0B3q5aDhoml4Wg6kQVWDcxlAKLioIg5VvnAGFR+vPmlMQ==} dependencies: - '@visactor/vrender-core': 0.20.12 - '@visactor/vrender-kits': 0.20.12 + '@visactor/vrender-core': 0.20.14 + '@visactor/vrender-kits': 0.20.14 /@visactor/vscale/0.18.18: resolution: {integrity: sha512-iRG4kv+5Fv4KX3AxEfV95XU3I6OmF0QizyAhqHxKa7L1MaT+MRvDDk5zHWf1E8gialLbL2xDe3GnT6g/4u5jhA==} diff --git a/docs/dev-demos/package.json b/docs/dev-demos/package.json index a8ae718cf..b4e6732a0 100644 --- a/docs/dev-demos/package.json +++ b/docs/dev-demos/package.json @@ -20,9 +20,9 @@ "@visactor/vgrammar-wordcloud": "workspace:0.14.13", "@visactor/vgrammar-wordcloud-shape": "workspace:0.14.13", "@visactor/vgrammar-plot": "workspace:0.14.13", - "@visactor/vrender-core": "0.20.12", - "@visactor/vrender-kits": "0.20.12", - "@visactor/vrender": "0.20.12", + "@visactor/vrender-core": "0.20.14", + "@visactor/vrender-kits": "0.20.14", + "@visactor/vrender": "0.20.14", "d3-scale-chromatic": "^3.0.0", "lodash": "4.17.21", "typescript": "4.9.5", diff --git a/docs/site/package.json b/docs/site/package.json index 0d4d1bdda..34c4ac7aa 100644 --- a/docs/site/package.json +++ b/docs/site/package.json @@ -25,9 +25,9 @@ "@visactor/vgrammar-util": "workspace:0.14.13", "@visactor/vgrammar-coordinate": "workspace:0.14.13", "@visactor/vgrammar-venn": "workspace:0.14.13", - "@visactor/vrender-core": "0.20.12", - "@visactor/vrender-kits": "0.20.12", - "@visactor/vrender": "0.20.12", + "@visactor/vrender-core": "0.20.14", + "@visactor/vrender-kits": "0.20.14", + "@visactor/vrender": "0.20.14", "markdown-it": "^13.0.0", "highlight.js": "^11.8.0", "axios": "^1.4.0", diff --git a/packages/vgrammar-core/package.json b/packages/vgrammar-core/package.json index ca227a96f..941dcce5a 100644 --- a/packages/vgrammar-core/package.json +++ b/packages/vgrammar-core/package.json @@ -40,9 +40,9 @@ "@visactor/vgrammar-coordinate": "workspace:0.14.13", "@visactor/vgrammar-util": "workspace:0.14.13", "@visactor/vscale": "~0.18.18", - "@visactor/vrender-core": "0.20.12", - "@visactor/vrender-kits": "0.20.12", - "@visactor/vrender-components": "0.20.12" + "@visactor/vrender-core": "0.20.14", + "@visactor/vrender-kits": "0.20.14", + "@visactor/vrender-components": "0.20.14" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-core/src/types/view.ts b/packages/vgrammar-core/src/types/view.ts index 57c1fcd6a..3c10ee308 100644 --- a/packages/vgrammar-core/src/types/view.ts +++ b/packages/vgrammar-core/src/types/view.ts @@ -27,6 +27,7 @@ import type { IAxis, IDatazoom, IGrid, ILabel, ILegend, IPlayer, IScrollbar, ISl import type { CoordinateSpec } from './coordinate'; import type { ITheme } from './theme'; import type { IInteraction, InteractionSpec } from './interaction'; +import type { GestureConfig } from '@visactor/vrender-kits'; export interface IViewThemeConfig { labelMonospace?: boolean; @@ -81,7 +82,7 @@ export interface IViewEventConfig { /** disable all the events */ disable?: boolean; /** use gesture events or not */ - gesture?: boolean; + gesture?: boolean | GestureConfig; /** use drag events or not */ drag?: boolean; } diff --git a/packages/vgrammar-hierarchy/package.json b/packages/vgrammar-hierarchy/package.json index 867b4ac26..54337a26f 100644 --- a/packages/vgrammar-hierarchy/package.json +++ b/packages/vgrammar-hierarchy/package.json @@ -41,8 +41,8 @@ "@visactor/vutils": "~0.18.18", "@visactor/vgrammar-core": "workspace:0.14.13", "@visactor/vgrammar-util": "workspace:0.14.13", - "@visactor/vrender-core": "0.20.12", - "@visactor/vrender-kits": "0.20.12" + "@visactor/vrender-core": "0.20.14", + "@visactor/vrender-kits": "0.20.14" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-plot/package.json b/packages/vgrammar-plot/package.json index fdecc3bf3..713229585 100644 --- a/packages/vgrammar-plot/package.json +++ b/packages/vgrammar-plot/package.json @@ -39,9 +39,9 @@ "@visactor/vgrammar-util": "workspace:0.14.13", "@visactor/vgrammar-coordinate": "workspace:0.14.13", "@visactor/vgrammar-core": "workspace:0.14.13", - "@visactor/vrender-components": "0.20.12", - "@visactor/vrender-core": "0.20.12", - "@visactor/vrender-kits": "0.20.12" + "@visactor/vrender-components": "0.20.14", + "@visactor/vrender-core": "0.20.14", + "@visactor/vrender-kits": "0.20.14" }, "devDependencies": { "d3-array": "1.x", diff --git a/packages/vgrammar-sankey/package.json b/packages/vgrammar-sankey/package.json index 67a493b27..da0fd6ec0 100644 --- a/packages/vgrammar-sankey/package.json +++ b/packages/vgrammar-sankey/package.json @@ -39,8 +39,8 @@ "@visactor/vutils": "~0.18.18", "@visactor/vgrammar-core": "workspace:0.14.13", "@visactor/vgrammar-util": "workspace:0.14.13", - "@visactor/vrender-core": "0.20.12", - "@visactor/vrender-kits": "0.20.12" + "@visactor/vrender-core": "0.20.14", + "@visactor/vrender-kits": "0.20.14" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-util/package.json b/packages/vgrammar-util/package.json index c97697b5f..00c0f11c0 100644 --- a/packages/vgrammar-util/package.json +++ b/packages/vgrammar-util/package.json @@ -35,7 +35,7 @@ }, "dependencies": { "@visactor/vutils": "~0.18.18", - "@visactor/vrender-core": "0.20.12" + "@visactor/vrender-core": "0.20.14" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-venn/package.json b/packages/vgrammar-venn/package.json index 70fe01b13..200ffbbc4 100644 --- a/packages/vgrammar-venn/package.json +++ b/packages/vgrammar-venn/package.json @@ -36,8 +36,8 @@ "dependencies": { "@visactor/vgrammar-core": "workspace:0.14.13", "@visactor/vgrammar-util": "workspace:0.14.13", - "@visactor/vrender-core": "0.20.12", - "@visactor/vrender-kits": "0.20.12", + "@visactor/vrender-core": "0.20.14", + "@visactor/vrender-kits": "0.20.14", "@visactor/vutils": "~0.18.18" }, "devDependencies": { diff --git a/packages/vgrammar-wordcloud-shape/package.json b/packages/vgrammar-wordcloud-shape/package.json index 3d2bfc0eb..7de0cb638 100644 --- a/packages/vgrammar-wordcloud-shape/package.json +++ b/packages/vgrammar-wordcloud-shape/package.json @@ -38,8 +38,8 @@ "@visactor/vscale": "~0.18.18", "@visactor/vgrammar-core": "workspace:0.14.13", "@visactor/vgrammar-util": "workspace:0.14.13", - "@visactor/vrender-core": "0.20.12", - "@visactor/vrender-kits": "0.20.12" + "@visactor/vrender-core": "0.20.14", + "@visactor/vrender-kits": "0.20.14" }, "devDependencies": { "@internal/bundler": "workspace:*", diff --git a/packages/vgrammar-wordcloud/package.json b/packages/vgrammar-wordcloud/package.json index 216fb30a7..49cbaa76f 100644 --- a/packages/vgrammar-wordcloud/package.json +++ b/packages/vgrammar-wordcloud/package.json @@ -37,8 +37,8 @@ "@visactor/vutils": "~0.18.18", "@visactor/vgrammar-core": "workspace:0.14.13", "@visactor/vgrammar-util": "workspace:0.14.13", - "@visactor/vrender-core": "0.20.12", - "@visactor/vrender-kits": "0.20.12" + "@visactor/vrender-core": "0.20.14", + "@visactor/vrender-kits": "0.20.14" }, "devDependencies": { "@internal/bundler": "workspace:*",