Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 107 additions & 107 deletions common/config/rush/pnpm-lock.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
Original file line number Diff line number Diff line change
@@ -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"}]
26 changes: 13 additions & 13 deletions docs/dev-demos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
12 changes: 12 additions & 0 deletions docs/site/assets/changelog/en/release.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 12 additions & 0 deletions docs/site/assets/changelog/zh/release.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
28 changes: 14 additions & 14 deletions docs/site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/vgrammar-coordinate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-coordinate",
"version": "0.15.1",
"version": "0.15.2",
"description": "Coordinates for VGrammar",
"keywords": [
"coordinate",
Expand Down Expand Up @@ -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:*",
Expand Down
15 changes: 15 additions & 0 deletions packages/vgrammar-core/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
12 changes: 11 additions & 1 deletion packages/vgrammar-core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions packages/vgrammar-core/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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:*",
Expand Down
4 changes: 4 additions & 0 deletions packages/vgrammar-core/src/graph/canvas-renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
Expand Down
13 changes: 13 additions & 0 deletions packages/vgrammar-core/src/types/view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
18 changes: 9 additions & 9 deletions packages/vgrammar-full/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-full",
"version": "0.15.1",
"version": "0.15.2",
"description": "full packages of vgrammar.",
"keywords": [
"visualization",
Expand Down Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions packages/vgrammar-hierarchy/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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:*",
Expand Down
14 changes: 7 additions & 7 deletions packages/vgrammar-plot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-plot",
"version": "0.15.1",
"version": "0.15.2",
"description": "Plots of vgrammar.",
"keywords": [
"plot",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/vgrammar-projection/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
10 changes: 5 additions & 5 deletions packages/vgrammar-sankey/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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:*",
Expand Down
11 changes: 6 additions & 5 deletions packages/vgrammar-sankey/src/layout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions packages/vgrammar-util/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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:*",
Expand Down
Loading
Loading