Merge pull request #611 from VisActor/release/0.15.2

[Auto release] release 0.15.2

common/config/rush/version-policies.json

@@ -1 +1 @@
-[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.15.1","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.15.2","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]

docs/dev-demos/package.json

@@ -12,23 +12,23 @@
     "@internal/eslint-config": "workspace:*",
     "@internal/ts-config": "workspace:*",
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vgrammar": "workspace:0.15.1",
-    "@visactor/vgrammar-core": "workspace:0.15.1",
-    "@visactor/vgrammar-hierarchy": "workspace:0.15.1",
-    "@visactor/vgrammar-sankey": "workspace:0.15.1",
-    "@visactor/vgrammar-projection": "workspace:0.15.1",
-    "@visactor/vgrammar-wordcloud": "workspace:0.15.1",
-    "@visactor/vgrammar-wordcloud-shape": "workspace:0.15.1",
-    "@visactor/vgrammar-plot": "workspace:0.15.1",
-    "@visactor/vrender-core": "0.21.2",
-    "@visactor/vrender-kits": "0.21.2",
-    "@visactor/vrender": "0.21.2",
+    "@visactor/vgrammar": "workspace:0.15.2",
+    "@visactor/vgrammar-core": "workspace:0.15.2",
+    "@visactor/vgrammar-hierarchy": "workspace:0.15.2",
+    "@visactor/vgrammar-sankey": "workspace:0.15.2",
+    "@visactor/vgrammar-projection": "workspace:0.15.2",
+    "@visactor/vgrammar-wordcloud": "workspace:0.15.2",
+    "@visactor/vgrammar-wordcloud-shape": "workspace:0.15.2",
+    "@visactor/vgrammar-plot": "workspace:0.15.2",
+    "@visactor/vrender-core": "0.21.4",
+    "@visactor/vrender-kits": "0.21.4",
+    "@visactor/vrender": "0.21.4",
     "d3-scale-chromatic": "^3.0.0",
     "lodash": "4.17.21",
     "typescript": "4.9.5",
     "vite": "3.2.6",
-    "@visactor/vgrammar-util": "workspace:0.15.1",
-    "@visactor/vgrammar-coordinate": "workspace:0.15.1",
+    "@visactor/vgrammar-util": "workspace:0.15.2",
+    "@visactor/vgrammar-coordinate": "workspace:0.15.2",
     "@vitejs/plugin-react": "3.1.0"
   }
 }

docs/site/assets/changelog/en/release.md

@@ -1,3 +1,15 @@
+# v0.15.1
+
+2024-12-19
+
+
+**What's Changed**
+
+
+**Full Changelog**: https://github.com/VisActor/VGrammar/compare/v0.15.0...v0.15.1
+
+[more detail about v0.15.1](https://github.com/VisActor/VGrammar/releases/tag/v0.15.1)
+
 # v0.14.18
 
 2024-12-05

docs/site/assets/changelog/zh/release.md

@@ -1,3 +1,15 @@
+# v0.15.1
+
+2024-12-19
+
+
+**What's Changed**
+
+
+**Full Changelog**: https://github.com/VisActor/VGrammar/compare/v0.15.0...v0.15.1
+
+[更多详情请查看 v0.15.1](https://github.com/VisActor/VGrammar/releases/tag/v0.15.1)
+
 # v0.14.18
 
 2024-12-05

docs/site/package.json

@@ -14,20 +14,20 @@
   "dependencies": {
     "@arco-design/web-react": "2.46.1",
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vgrammar": "workspace:0.15.1",
-    "@visactor/vgrammar-core": "workspace:0.15.1",
-    "@visactor/vgrammar-hierarchy": "workspace:0.15.1",
-    "@visactor/vgrammar-sankey": "workspace:0.15.1",
-    "@visactor/vgrammar-projection": "workspace:0.15.1",
-    "@visactor/vgrammar-wordcloud": "workspace:0.15.1",
-    "@visactor/vgrammar-wordcloud-shape": "workspace:0.15.1",
-    "@visactor/vgrammar-plot": "workspace:0.15.1",
-    "@visactor/vgrammar-util": "workspace:0.15.1",
-    "@visactor/vgrammar-coordinate": "workspace:0.15.1",
-    "@visactor/vgrammar-venn": "workspace:0.15.1",
-    "@visactor/vrender-core": "0.21.2",
-    "@visactor/vrender-kits": "0.21.2",
-    "@visactor/vrender": "0.21.2",
+    "@visactor/vgrammar": "workspace:0.15.2",
+    "@visactor/vgrammar-core": "workspace:0.15.2",
+    "@visactor/vgrammar-hierarchy": "workspace:0.15.2",
+    "@visactor/vgrammar-sankey": "workspace:0.15.2",
+    "@visactor/vgrammar-projection": "workspace:0.15.2",
+    "@visactor/vgrammar-wordcloud": "workspace:0.15.2",
+    "@visactor/vgrammar-wordcloud-shape": "workspace:0.15.2",
+    "@visactor/vgrammar-plot": "workspace:0.15.2",
+    "@visactor/vgrammar-util": "workspace:0.15.2",
+    "@visactor/vgrammar-coordinate": "workspace:0.15.2",
+    "@visactor/vgrammar-venn": "workspace:0.15.2",
+    "@visactor/vrender-core": "0.21.4",
+    "@visactor/vrender-kits": "0.21.4",
+    "@visactor/vrender": "0.21.4",
     "markdown-it": "^13.0.0",
     "highlight.js": "^11.8.0",
     "axios": "^1.4.0",

packages/vgrammar-coordinate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-coordinate",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Coordinates for VGrammar",
   "keywords": [
     "coordinate",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vgrammar-util": "workspace:0.15.1"
+    "@visactor/vgrammar-util": "workspace:0.15.2"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

packages/vgrammar-core/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "@visactor/vgrammar-core",
   "entries": [
+    {
+      "version": "0.15.2",
+      "tag": "@visactor/vgrammar-core_v0.15.2",
+      "date": "Mon, 23 Dec 2024 10:47:20 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "feat: add `clickInterval` and `autoPreventDefault` event config"
+          },
+          {
+            "comment": "fix: fix `minNodeHeight` of sankey when set `nodeGap`\n\n"
+          }
+        ]
+      }
+    },
     {
       "version": "0.15.1",
       "tag": "@visactor/vgrammar-core_v0.15.1",

packages/vgrammar-core/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log - @visactor/vgrammar-core
 
-This log was last generated on Fri, 13 Dec 2024 02:22:10 GMT and should not be manually modified.
+This log was last generated on Mon, 23 Dec 2024 10:47:20 GMT and should not be manually modified.
+
+## 0.15.2
+Mon, 23 Dec 2024 10:47:20 GMT
+
+### Updates
+
+- feat: add `clickInterval` and `autoPreventDefault` event config
+- fix: fix `minNodeHeight` of sankey when set `nodeGap`
+
+
 
 ## 0.15.1
 Fri, 13 Dec 2024 02:22:10 GMT

packages/vgrammar-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-core",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "VGrammar is a visual grammar library",
   "keywords": [
     "grammar",
@@ -37,12 +37,12 @@
   "dependencies": {
     "@visactor/vutils": "~0.19.2",
     "@visactor/vdataset": "~0.19.2",
-    "@visactor/vgrammar-coordinate": "workspace:0.15.1",
-    "@visactor/vgrammar-util": "workspace:0.15.1",
+    "@visactor/vgrammar-coordinate": "workspace:0.15.2",
+    "@visactor/vgrammar-util": "workspace:0.15.2",
     "@visactor/vscale": "~0.19.2",
-    "@visactor/vrender-core": "0.21.2",
-    "@visactor/vrender-kits": "0.21.2",
-    "@visactor/vrender-components": "0.21.2"
+    "@visactor/vrender-core": "0.21.4",
+    "@visactor/vrender-kits": "0.21.4",
+    "@visactor/vrender-components": "0.21.4"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

packages/vgrammar-core/src/graph/canvas-renderer.ts

@@ -222,6 +222,10 @@ export default class CanvasRenderer implements IRenderer {
         ticker: viewOptions.ticker,
         supportsTouchEvents: viewOptions.supportsTouchEvents,
         supportsPointerEvents: viewOptions.supportsPointerEvents,
+        event:{
+          clickInterval: this._eventConfig.clickInterval,
+          autoPreventDefault: !!this._eventConfig.autoPreventDefault
+        },
         ReactDOM: viewOptions.ReactDOM,
         autoRefresh: viewOptions.autoRefresh
       });

packages/vgrammar-core/src/types/view.ts

@@ -85,6 +85,19 @@ export interface IViewEventConfig {
   gesture?: boolean | GestureConfig;
   /** use drag events or not */
   drag?: boolean;
+  /**
+   * @since 0.15.2
+   * @default 200
+   * VRender 参数 ，单位 ms
+   * 多次点击之间的最大时间，默认为 200 ms，用于判断点击次数
+   */
+  clickInterval?: number;
+  /**
+   * @since 0.15.2
+   * @default false
+   * VRender 参数 是否自动阻止事件
+   */
+  autoPreventDefault?: boolean;
 }
 
 export interface srIOption3DType extends IOption3D {

packages/vgrammar-full/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-full",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "full packages of vgrammar.",
   "keywords": [
     "visualization",
@@ -33,14 +33,14 @@
     "test": ""
   },
   "dependencies": {
-    "@visactor/vgrammar-core": "workspace:0.15.1",
-    "@visactor/vgrammar-hierarchy": "workspace:0.15.1",
-    "@visactor/vgrammar-plot": "workspace:0.15.1",
-    "@visactor/vgrammar-projection": "workspace:0.15.1",
-    "@visactor/vgrammar-sankey": "workspace:0.15.1",
-    "@visactor/vgrammar-wordcloud": "workspace:0.15.1",
-    "@visactor/vgrammar-wordcloud-shape": "workspace:0.15.1",
-    "@visactor/vgrammar-venn": "workspace:0.15.1"
+    "@visactor/vgrammar-core": "workspace:0.15.2",
+    "@visactor/vgrammar-hierarchy": "workspace:0.15.2",
+    "@visactor/vgrammar-plot": "workspace:0.15.2",
+    "@visactor/vgrammar-projection": "workspace:0.15.2",
+    "@visactor/vgrammar-sankey": "workspace:0.15.2",
+    "@visactor/vgrammar-wordcloud": "workspace:0.15.2",
+    "@visactor/vgrammar-wordcloud-shape": "workspace:0.15.2",
+    "@visactor/vgrammar-venn": "workspace:0.15.2"
   },
   "devDependencies": {
     "d3-array": "1.x",

packages/vgrammar-hierarchy/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-hierarchy",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Layout of hierarchical data for VGrammar",
   "keywords": [
     "hierarchy",
@@ -39,10 +39,10 @@
   },
   "dependencies": {
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vgrammar-core": "workspace:0.15.1",
-    "@visactor/vgrammar-util": "workspace:0.15.1",
-    "@visactor/vrender-core": "0.21.2",
-    "@visactor/vrender-kits": "0.21.2"
+    "@visactor/vgrammar-core": "workspace:0.15.2",
+    "@visactor/vgrammar-util": "workspace:0.15.2",
+    "@visactor/vrender-core": "0.21.4",
+    "@visactor/vrender-kits": "0.21.4"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

packages/vgrammar-plot/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-plot",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Plots of vgrammar.",
   "keywords": [
     "plot",
@@ -36,12 +36,12 @@
   "dependencies": {
     "@visactor/vscale": "~0.19.2",
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vgrammar-util": "workspace:0.15.1",
-    "@visactor/vgrammar-coordinate": "workspace:0.15.1",
-    "@visactor/vgrammar-core": "workspace:0.15.1",
-    "@visactor/vrender-components": "0.21.2",
-    "@visactor/vrender-core": "0.21.2",
-    "@visactor/vrender-kits": "0.21.2"
+    "@visactor/vgrammar-util": "workspace:0.15.2",
+    "@visactor/vgrammar-coordinate": "workspace:0.15.2",
+    "@visactor/vgrammar-core": "workspace:0.15.2",
+    "@visactor/vrender-components": "0.21.4",
+    "@visactor/vrender-core": "0.21.4",
+    "@visactor/vrender-kits": "0.21.4"
   },
   "devDependencies": {
     "d3-array": "1.x",

packages/vgrammar-projection/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-projection",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Projections for map, used in VGrammar.",
   "keywords": [
     "projection",
@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vgrammar-util": "workspace:0.15.1",
-    "@visactor/vgrammar-core": "workspace:0.15.1",
+    "@visactor/vgrammar-util": "workspace:0.15.2",
+    "@visactor/vgrammar-core": "workspace:0.15.2",
     "d3-geo": "^1.12.1"
   },
   "devDependencies": {

packages/vgrammar-sankey/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-sankey",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Layout of sankey chart, used by VGrammar",
   "keywords": [
     "sankey",
@@ -37,10 +37,10 @@
   },
   "dependencies": {
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vgrammar-core": "workspace:0.15.1",
-    "@visactor/vgrammar-util": "workspace:0.15.1",
-    "@visactor/vrender-core": "0.21.2",
-    "@visactor/vrender-kits": "0.21.2"
+    "@visactor/vgrammar-core": "workspace:0.15.2",
+    "@visactor/vgrammar-util": "workspace:0.15.2",
+    "@visactor/vrender-core": "0.21.4",
+    "@visactor/vrender-kits": "0.21.4"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

packages/vgrammar-sankey/src/layout.ts

@@ -674,13 +674,14 @@ export class SankeyLayout {
         return Math.max(cnt, column.length);
       }, 0);
       const maxStepHeight = this._viewBox.height / maxRowCount;
-      const gapY = Math.min(this.options.nodeGap, maxStepHeight);
-      getGapY = () => gapY;
-      this._gapY = gapY;
+      let gapY = Math.min(this.options.nodeGap, maxStepHeight);
 
-      if ((minNodeHeight + gapY) * maxRowCount > this._viewBox.height) {
-        minNodeHeight = maxStepHeight - gapY;
+      if (minNodeHeight + gapY > maxStepHeight) {
+        gapY = minNodeHeight >= maxStepHeight ? maxStepHeight / 2 : (maxStepHeight - minNodeHeight) / 2;
+        minNodeHeight = Math.min(maxStepHeight - gapY, minNodeHeight);
       }
+      getGapY = () => gapY;
+      this._gapY = gapY;
 
       if (this.options.equalNodeHeight) {
         forceNodeHeight = this._viewBox.height / maxRowCount - gapY;

packages/vgrammar-util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vgrammar-util",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "The common utils functions of VGrammar",
   "keywords": [
     "utils",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@visactor/vutils": "~0.19.2",
-    "@visactor/vrender-core": "0.21.2"
+    "@visactor/vrender-core": "0.21.4"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",