Skip to content

Commit

Permalink
Merge pull request #471 from VisActor/release/0.13.7
Browse files Browse the repository at this point in the history 
[Auto release] release 0.13.7
  • Loading branch information
@xile611
xile611 authored Jun 6, 2024
2 parents c09d33c + 5a7fd7e commit 0f89fa1
Show file tree
Hide file tree
Showing 24 changed files with 278 additions and 201 deletions.
210 changes: 105 additions & 105 deletions common/config/rush/pnpm-lock.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.13.5","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]
[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.13.6","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]
26 changes: 13 additions & 13 deletions docs/dev-demos/package.json
View file
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.18.9",
"@visactor/vgrammar": "workspace:0.13.6",
"@visactor/vgrammar-core": "workspace:0.13.6",
"@visactor/vgrammar-hierarchy": "workspace:0.13.6",
"@visactor/vgrammar-sankey": "workspace:0.13.6",
"@visactor/vgrammar-projection": "workspace:0.13.6",
"@visactor/vgrammar-wordcloud": "workspace:0.13.6",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.6",
"@visactor/vgrammar-plot": "workspace:0.13.6",
"@visactor/vrender-core": "0.19.6",
"@visactor/vrender-kits": "0.19.6",
"@visactor/vrender": "0.19.6",
"@visactor/vgrammar": "workspace:0.13.7",
"@visactor/vgrammar-core": "workspace:0.13.7",
"@visactor/vgrammar-hierarchy": "workspace:0.13.7",
"@visactor/vgrammar-sankey": "workspace:0.13.7",
"@visactor/vgrammar-projection": "workspace:0.13.7",
"@visactor/vgrammar-wordcloud": "workspace:0.13.7",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.7",
"@visactor/vgrammar-plot": "workspace:0.13.7",
"@visactor/vrender-core": "0.19.8",
"@visactor/vrender-kits": "0.19.8",
"@visactor/vrender": "0.19.8",
"d3-scale-chromatic": "^3.0.0",
"lodash": "4.17.21",
"typescript": "4.9.5",
"vite": "3.2.6",
"@visactor/vgrammar-util": "workspace:0.13.6",
"@visactor/vgrammar-coordinate": "workspace:0.13.6",
"@visactor/vgrammar-util": "workspace:0.13.7",
"@visactor/vgrammar-coordinate": "workspace:0.13.7",
"@vitejs/plugin-react": "3.1.0"
}
}
2 changes: 1 addition & 1 deletion docs/dev-demos/src/specs/sankey.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const spec = {
nodeWidth: { signal: 'nodeWidth' },
nodeGap: { signal: 'nodeGap' },
minNodeHeight: 4,
minLinkHeight: 1,
minLinkHeight: 5,
}
]
},
Expand Down
28 changes: 14 additions & 14 deletions docs/site/package.json
View file
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.18.9",
"@visactor/vgrammar": "workspace:0.13.6",
"@visactor/vgrammar-core": "workspace:0.13.6",
"@visactor/vgrammar-hierarchy": "workspace:0.13.6",
"@visactor/vgrammar-sankey": "workspace:0.13.6",
"@visactor/vgrammar-projection": "workspace:0.13.6",
"@visactor/vgrammar-wordcloud": "workspace:0.13.6",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.6",
"@visactor/vgrammar-plot": "workspace:0.13.6",
"@visactor/vgrammar-util": "workspace:0.13.6",
"@visactor/vgrammar-coordinate": "workspace:0.13.6",
"@visactor/vgrammar-venn": "workspace:0.13.6",
"@visactor/vrender-core": "0.19.6",
"@visactor/vrender-kits": "0.19.6",
"@visactor/vrender": "0.19.6",
"@visactor/vgrammar": "workspace:0.13.7",
"@visactor/vgrammar-core": "workspace:0.13.7",
"@visactor/vgrammar-hierarchy": "workspace:0.13.7",
"@visactor/vgrammar-sankey": "workspace:0.13.7",
"@visactor/vgrammar-projection": "workspace:0.13.7",
"@visactor/vgrammar-wordcloud": "workspace:0.13.7",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.7",
"@visactor/vgrammar-plot": "workspace:0.13.7",
"@visactor/vgrammar-util": "workspace:0.13.7",
"@visactor/vgrammar-coordinate": "workspace:0.13.7",
"@visactor/vgrammar-venn": "workspace:0.13.7",
"@visactor/vrender-core": "0.19.8",
"@visactor/vrender-kits": "0.19.8",
"@visactor/vrender": "0.19.8",
"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
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-coordinate",
"version": "0.13.6",
"version": "0.13.7",
"description": "Coordinates for VGrammar",
"keywords": [
"coordinate",
Expand Down Expand Up @@ -35,7 +35,7 @@
},
"dependencies": {
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-util": "workspace:0.13.6"
"@visactor/vgrammar-util": "workspace:0.13.7"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
15 changes: 15 additions & 0 deletions packages/vgrammar-core/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
{
"name": "@visactor/vgrammar-core",
"entries": [
{
"version": "0.13.6",
"tag": "@visactor/vgrammar-core_v0.13.6",
"date": "Wed, 05 Jun 2024 09:41:14 GMT",
"comments": {
"none": [
{
"comment": "fix: fix useState when realtime encoder is assigned\n\n"
},
{
"comment": "feat: optimize the option `minLinkHeight` of sankey\n\n"
}
]
}
},
{
"version": "0.13.4",
"tag": "@visactor/vgrammar-core_v0.13.4",
Expand Down
14 changes: 13 additions & 1 deletion packages/vgrammar-core/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# Change Log - @visactor/vgrammar-core

This log was last generated on Fri, 24 May 2024 10:35:14 GMT and should not be manually modified.
This log was last generated on Wed, 05 Jun 2024 09:41:14 GMT and should not be manually modified.

## 0.13.6
Wed, 05 Jun 2024 09:41:14 GMT

### Updates

- fix: fix useState when realtime encoder is assigned


- feat: optimize the option `minLinkHeight` of sankey



## 0.13.4
Fri, 24 May 2024 10:35:14 GMT
Expand Down
12 changes: 6 additions & 6 deletions packages/vgrammar-core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-core",
"version": "0.13.6",
"version": "0.13.7",
"description": "VGrammar is a visual grammar library",
"keywords": [
"grammar",
Expand Down Expand Up @@ -37,12 +37,12 @@
"dependencies": {
"@visactor/vutils": "~0.18.9",
"@visactor/vdataset": "~0.18.9",
"@visactor/vgrammar-coordinate": "workspace:0.13.6",
"@visactor/vgrammar-util": "workspace:0.13.6",
"@visactor/vgrammar-coordinate": "workspace:0.13.7",
"@visactor/vgrammar-util": "workspace:0.13.7",
"@visactor/vscale": "~0.18.9",
"@visactor/vrender-core": "0.19.6",
"@visactor/vrender-kits": "0.19.6",
"@visactor/vrender-components": "0.19.6"
"@visactor/vrender-core": "0.19.8",
"@visactor/vrender-kits": "0.19.8",
"@visactor/vrender-components": "0.19.8"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
5 changes: 4 additions & 1 deletion packages/vgrammar-core/src/graph/element.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,10 @@ export class Element implements IElement {
protected getStateAttrs = (stateName: string, nextStates: string[]) => {
const isRuntimeState = !isNil(this.runtimeStatesEncoder?.[stateName]);
const encoder = isRuntimeState
? this.runtimeStatesEncoder[stateName]
? {
...(this.mark.getSpec() as MarkSpec).encode?.[stateName],
...this.runtimeStatesEncoder[stateName]
}
: (this.mark.getSpec() as MarkSpec).encode?.[stateName];

if (!encoder) {
Expand Down
5 changes: 4 additions & 1 deletion packages/vgrammar-core/src/graph/glyph-element.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,10 @@ export class GlyphElement extends Element implements IGlyphElement {
protected getStateAttrs = (stateName: string, nextStates: string[]) => {
const isRuntimeState = !isNil(this.runtimeStatesEncoder?.[stateName]);
const encoder = isRuntimeState
? this.runtimeStatesEncoder[stateName]
? {
...(this.mark.getSpec() as MarkSpec).encode?.[stateName],
...this.runtimeStatesEncoder[stateName]
}
: (this.mark.getSpec() as MarkSpec).encode?.[stateName];

const glyphStateAttributes = {} as {
Expand Down
9 changes: 8 additions & 1 deletion packages/vgrammar-core/src/view/group.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,14 @@ export class GroupMark extends Mark implements IGroupMark {
}

if (!isNil(spec.clipPath)) {
initAttrs.path = isFunction(spec.clipPath) ? spec.clipPath([element]) : spec.clipPath;
const paths = isFunction(spec.clipPath) ? spec.clipPath([element]) : spec.clipPath;

if (paths && paths.length) {
initAttrs.path = paths;
} else {
initAttrs.path = null;
initAttrs.clip = false;
}
}

if (!isNil(spec.interactive)) {
Expand Down
11 changes: 10 additions & 1 deletion packages/vgrammar-core/src/view/mark.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,16 @@ export class Mark extends GrammarBase implements IMark {
this.graphicItem.setAttribute('clip', spec.clip);
}
if (!isNil(spec.clipPath)) {
this.graphicItem.setAttribute('path', isArray(spec.clipPath) ? spec.clipPath : spec.clipPath(this.elements));
const paths = isArray(spec.clipPath) ? spec.clipPath : spec.clipPath(this.elements);

if (paths && paths.length) {
this.graphicItem.setAttribute('path', paths);
} else {
this.graphicItem.setAttributes({
path: paths,
clip: false
});
}
}

// only update interactive
Expand Down
18 changes: 9 additions & 9 deletions packages/vgrammar-full/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-full",
"version": "0.13.6",
"version": "0.13.7",
"description": "full packages of vgrammar.",
"keywords": [
"visualization",
Expand Down Expand Up @@ -33,14 +33,14 @@
"test": ""
},
"dependencies": {
"@visactor/vgrammar-core": "workspace:0.13.6",
"@visactor/vgrammar-hierarchy": "workspace:0.13.6",
"@visactor/vgrammar-plot": "workspace:0.13.6",
"@visactor/vgrammar-projection": "workspace:0.13.6",
"@visactor/vgrammar-sankey": "workspace:0.13.6",
"@visactor/vgrammar-wordcloud": "workspace:0.13.6",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.6",
"@visactor/vgrammar-venn": "workspace:0.13.6"
"@visactor/vgrammar-core": "workspace:0.13.7",
"@visactor/vgrammar-hierarchy": "workspace:0.13.7",
"@visactor/vgrammar-plot": "workspace:0.13.7",
"@visactor/vgrammar-projection": "workspace:0.13.7",
"@visactor/vgrammar-sankey": "workspace:0.13.7",
"@visactor/vgrammar-wordcloud": "workspace:0.13.7",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.7",
"@visactor/vgrammar-venn": "workspace:0.13.7"
},
"devDependencies": {
"d3-array": "1.x",
Expand Down
10 changes: 5 additions & 5 deletions packages/vgrammar-hierarchy/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-hierarchy",
"version": "0.13.6",
"version": "0.13.7",
"description": "Layout of hierarchical data for VGrammar",
"keywords": [
"hierarchy",
Expand Down Expand Up @@ -39,10 +39,10 @@
},
"dependencies": {
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-core": "workspace:0.13.6",
"@visactor/vgrammar-util": "workspace:0.13.6",
"@visactor/vrender-core": "0.19.6",
"@visactor/vrender-kits": "0.19.6"
"@visactor/vgrammar-core": "workspace:0.13.7",
"@visactor/vgrammar-util": "workspace:0.13.7",
"@visactor/vrender-core": "0.19.8",
"@visactor/vrender-kits": "0.19.8"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
14 changes: 7 additions & 7 deletions packages/vgrammar-plot/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-plot",
"version": "0.13.6",
"version": "0.13.7",
"description": "Plots of vgrammar.",
"keywords": [
"plot",
Expand Down Expand Up @@ -36,12 +36,12 @@
"dependencies": {
"@visactor/vscale": "~0.18.9",
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-util": "workspace:0.13.6",
"@visactor/vgrammar-coordinate": "workspace:0.13.6",
"@visactor/vgrammar-core": "workspace:0.13.6",
"@visactor/vrender-components": "0.19.6",
"@visactor/vrender-core": "0.19.6",
"@visactor/vrender-kits": "0.19.6"
"@visactor/vgrammar-util": "workspace:0.13.7",
"@visactor/vgrammar-coordinate": "workspace:0.13.7",
"@visactor/vgrammar-core": "workspace:0.13.7",
"@visactor/vrender-components": "0.19.8",
"@visactor/vrender-core": "0.19.8",
"@visactor/vrender-kits": "0.19.8"
},
"devDependencies": {
"d3-array": "1.x",
Expand Down
6 changes: 3 additions & 3 deletions packages/vgrammar-projection/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-projection",
"version": "0.13.6",
"version": "0.13.7",
"description": "Projections for map, used in VGrammar.",
"keywords": [
"projection",
Expand Down Expand Up @@ -35,8 +35,8 @@
},
"dependencies": {
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-util": "workspace:0.13.6",
"@visactor/vgrammar-core": "workspace:0.13.6",
"@visactor/vgrammar-util": "workspace:0.13.7",
"@visactor/vgrammar-core": "workspace:0.13.7",
"d3-geo": "^1.12.1"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/vgrammar-sankey/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-sankey",
"version": "0.13.6",
"version": "0.13.7",
"description": "Layout of sankey chart, used by VGrammar",
"keywords": [
"sankey",
Expand Down Expand Up @@ -37,10 +37,10 @@
},
"dependencies": {
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-core": "workspace:0.13.6",
"@visactor/vgrammar-util": "workspace:0.13.6",
"@visactor/vrender-core": "0.19.6",
"@visactor/vrender-kits": "0.19.6"
"@visactor/vgrammar-core": "workspace:0.13.7",
"@visactor/vgrammar-util": "workspace:0.13.7",
"@visactor/vrender-core": "0.19.8",
"@visactor/vrender-kits": "0.19.8"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
Loading

0 comments on commit 0f89fa1

Please sign in to comment.