Skip to content

Commit

Permalink
Merge pull request #466 from VisActor/sync/main-0.13.5
Browse files Browse the repository at this point in the history 
[Auto Sync] Sync the code from branch main to branch develop after release 0.13.5
  • Loading branch information
@xile611
xile611 authored May 28, 2024
2 parents 52ff941 + 9f4d0ee commit 462598a
Show file tree
Hide file tree
Showing 20 changed files with 278 additions and 270 deletions.
312 changes: 149 additions & 163 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.3","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]
[{"definitionName":"lockStepVersion","policyName":"vgrammarMain","version":"0.13.4","mainProject":"@visactor/vgrammar-core","nextBump":"patch"}]
28 changes: 14 additions & 14 deletions docs/dev-demos/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
"devDependencies": {
"@internal/eslint-config": "workspace:*",
"@internal/ts-config": "workspace:*",
"@visactor/vutils": "~0.18.6",
"@visactor/vgrammar": "workspace:0.13.4",
"@visactor/vgrammar-core": "workspace:0.13.4",
"@visactor/vgrammar-hierarchy": "workspace:0.13.4",
"@visactor/vgrammar-sankey": "workspace:0.13.4",
"@visactor/vgrammar-projection": "workspace:0.13.4",
"@visactor/vgrammar-wordcloud": "workspace:0.13.4",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.4",
"@visactor/vgrammar-plot": "workspace:0.13.4",
"@visactor/vrender-core": "0.19.4",
"@visactor/vrender-kits": "0.19.4",
"@visactor/vrender": "0.19.4",
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar": "workspace:0.13.5",
"@visactor/vgrammar-core": "workspace:0.13.5",
"@visactor/vgrammar-hierarchy": "workspace:0.13.5",
"@visactor/vgrammar-sankey": "workspace:0.13.5",
"@visactor/vgrammar-projection": "workspace:0.13.5",
"@visactor/vgrammar-wordcloud": "workspace:0.13.5",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.5",
"@visactor/vgrammar-plot": "workspace:0.13.5",
"@visactor/vrender-core": "0.19.5",
"@visactor/vrender-kits": "0.19.5",
"@visactor/vrender": "0.19.5",
"d3-scale-chromatic": "^3.0.0",
"lodash": "4.17.21",
"typescript": "4.9.5",
"vite": "3.2.6",
"@visactor/vgrammar-util": "workspace:0.13.4",
"@visactor/vgrammar-coordinate": "workspace:0.13.4",
"@visactor/vgrammar-util": "workspace:0.13.5",
"@visactor/vgrammar-coordinate": "workspace:0.13.5",
"@vitejs/plugin-react": "3.1.0"
}
}
30 changes: 15 additions & 15 deletions docs/site/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
},
"dependencies": {
"@arco-design/web-react": "2.46.1",
"@visactor/vutils": "~0.18.6",
"@visactor/vgrammar": "workspace:0.13.4",
"@visactor/vgrammar-core": "workspace:0.13.4",
"@visactor/vgrammar-hierarchy": "workspace:0.13.4",
"@visactor/vgrammar-sankey": "workspace:0.13.4",
"@visactor/vgrammar-projection": "workspace:0.13.4",
"@visactor/vgrammar-wordcloud": "workspace:0.13.4",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.4",
"@visactor/vgrammar-plot": "workspace:0.13.4",
"@visactor/vgrammar-util": "workspace:0.13.4",
"@visactor/vgrammar-coordinate": "workspace:0.13.4",
"@visactor/vgrammar-venn": "workspace:0.13.4",
"@visactor/vrender-core": "0.19.4",
"@visactor/vrender-kits": "0.19.4",
"@visactor/vrender": "0.19.4",
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar": "workspace:0.13.5",
"@visactor/vgrammar-core": "workspace:0.13.5",
"@visactor/vgrammar-hierarchy": "workspace:0.13.5",
"@visactor/vgrammar-sankey": "workspace:0.13.5",
"@visactor/vgrammar-projection": "workspace:0.13.5",
"@visactor/vgrammar-wordcloud": "workspace:0.13.5",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.5",
"@visactor/vgrammar-plot": "workspace:0.13.5",
"@visactor/vgrammar-util": "workspace:0.13.5",
"@visactor/vgrammar-coordinate": "workspace:0.13.5",
"@visactor/vgrammar-venn": "workspace:0.13.5",
"@visactor/vrender-core": "0.19.5",
"@visactor/vrender-kits": "0.19.5",
"@visactor/vrender": "0.19.5",
"markdown-it": "^13.0.0",
"highlight.js": "^11.8.0",
"axios": "^1.4.0",
Expand Down
6 changes: 3 additions & 3 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.4",
"version": "0.13.5",
"description": "Coordinates for VGrammar",
"keywords": [
"coordinate",
Expand Down Expand Up @@ -34,8 +34,8 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
"@visactor/vutils": "~0.18.6",
"@visactor/vgrammar-util": "workspace:0.13.4"
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-util": "workspace:0.13.5"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
12 changes: 12 additions & 0 deletions packages/vgrammar-core/CHANGELOG.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
{
"name": "@visactor/vgrammar-core",
"entries": [
{
"version": "0.13.4",
"tag": "@visactor/vgrammar-core_v0.13.4",
"date": "Fri, 24 May 2024 10:35:14 GMT",
"comments": {
"none": [
{
"comment": "fix: upgrade vrender to 0.19.5, vutils to 0.18.9\n\n"
}
]
}
},
{
"version": "0.13.3",
"tag": "@visactor/vgrammar-core_v0.13.3",
Expand Down
11 changes: 10 additions & 1 deletion packages/vgrammar-core/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# Change Log - @visactor/vgrammar-core

This log was last generated on Fri, 17 May 2024 09:45:56 GMT and should not be manually modified.
This log was last generated on Fri, 24 May 2024 10:35:14 GMT and should not be manually modified.

## 0.13.4
Fri, 24 May 2024 10:35:14 GMT

### Updates

- fix: upgrade vrender to 0.19.5, vutils to 0.18.9



## 0.13.3
Fri, 17 May 2024 09:45:56 GMT
Expand Down
18 changes: 9 additions & 9 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.4",
"version": "0.13.5",
"description": "VGrammar is a visual grammar library",
"keywords": [
"grammar",
Expand Down Expand Up @@ -35,14 +35,14 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
"@visactor/vutils": "~0.18.6",
"@visactor/vdataset": "~0.18.6",
"@visactor/vgrammar-coordinate": "workspace:0.13.4",
"@visactor/vgrammar-util": "workspace:0.13.4",
"@visactor/vscale": "~0.18.6",
"@visactor/vrender-core": "0.19.4",
"@visactor/vrender-kits": "0.19.4",
"@visactor/vrender-components": "0.19.4"
"@visactor/vutils": "~0.18.9",
"@visactor/vdataset": "~0.18.9",
"@visactor/vgrammar-coordinate": "workspace:0.13.5",
"@visactor/vgrammar-util": "workspace:0.13.5",
"@visactor/vscale": "~0.18.9",
"@visactor/vrender-core": "0.19.5",
"@visactor/vrender-kits": "0.19.5",
"@visactor/vrender-components": "0.19.5"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
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.4",
"version": "0.13.5",
"description": "full packages of vgrammar.",
"keywords": [
"visualization",
Expand Down Expand Up @@ -33,14 +33,14 @@
"test": ""
},
"dependencies": {
"@visactor/vgrammar-core": "workspace:0.13.4",
"@visactor/vgrammar-hierarchy": "workspace:0.13.4",
"@visactor/vgrammar-plot": "workspace:0.13.4",
"@visactor/vgrammar-projection": "workspace:0.13.4",
"@visactor/vgrammar-sankey": "workspace:0.13.4",
"@visactor/vgrammar-wordcloud": "workspace:0.13.4",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.4",
"@visactor/vgrammar-venn": "workspace:0.13.4"
"@visactor/vgrammar-core": "workspace:0.13.5",
"@visactor/vgrammar-hierarchy": "workspace:0.13.5",
"@visactor/vgrammar-plot": "workspace:0.13.5",
"@visactor/vgrammar-projection": "workspace:0.13.5",
"@visactor/vgrammar-sankey": "workspace:0.13.5",
"@visactor/vgrammar-wordcloud": "workspace:0.13.5",
"@visactor/vgrammar-wordcloud-shape": "workspace:0.13.5",
"@visactor/vgrammar-venn": "workspace:0.13.5"
},
"devDependencies": {
"d3-array": "1.x",
Expand Down
13 changes: 7 additions & 6 deletions packages/vgrammar-hierarchy/__tests__/sunburst.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ test('layout data when innerRadius is number, outerRadius is any array', () => {
test('layout with label', () => {
const innerRadius = [20, 120, 220, 320];
const outerRadius = [100, 200, 300];

const layout = new SunburstLayout({ innerRadius, outerRadius, label: true });
const result = layout.layout(mockData, { width: 800, height: 800 });

Expand Down Expand Up @@ -237,15 +238,15 @@ test('layout with label', () => {

const child2 = child1.children[0];

expect(child2.innerRadius).toBeNaN();
expect(child2.outerRadius).toBeNaN();
expect(child2.innerRadius).toBeCloseTo(320);
expect(child2.outerRadius).toBeCloseTo(400);
expect(child2.label).toMatchObject({
maxLineWidth: undefined,
textAlign: 'center',
textBaseline: 'middle'
});
expect(child2.label.x).toBeNaN();
expect(child2.label.y).toBeNaN();
expect(child2.label.x).toBeCloseTo(419.38505580896873);
expect(child2.label.y).toBeCloseTo(759.4777039140024);
expect(child2.label.angle).toBeCloseTo(1.5169228934312207);
});

Expand Down Expand Up @@ -305,7 +306,7 @@ test('layout with label of array options', () => {

const child2 = child1.children[0];

expect(child2.innerRadius).toBeNaN();
expect(child2.outerRadius).toBeNaN();
expect(child2.innerRadius).toBeCloseTo(320);
expect(child2.outerRadius).toBeCloseTo(400);
expect(child2.label).toBeUndefined();
});
12 changes: 6 additions & 6 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.4",
"version": "0.13.5",
"description": "Layout of hierarchical data for VGrammar",
"keywords": [
"hierarchy",
Expand Down Expand Up @@ -38,11 +38,11 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
"@visactor/vutils": "~0.18.6",
"@visactor/vgrammar-core": "workspace:0.13.4",
"@visactor/vgrammar-util": "workspace:0.13.4",
"@visactor/vrender-core": "0.19.4",
"@visactor/vrender-kits": "0.19.4"
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-core": "workspace:0.13.5",
"@visactor/vgrammar-util": "workspace:0.13.5",
"@visactor/vrender-core": "0.19.5",
"@visactor/vrender-kits": "0.19.5"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/vgrammar-hierarchy/src/sunburst/layout.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export class SunburstLayout {

this._parsedOutterRadius = rangeArr.map((entry, index) => {
return isOuterArray
? parsedOuterRadius[index]
? parsedOuterRadius[index] ?? maxRadius
: index < maxDepth
? this._parsedInnerRadius[index + 1] - (isArray(gapRadius) ? gapRadius[index] ?? 0 : gapRadius)
: (parsedOuterRadius as number);
Expand Down
18 changes: 9 additions & 9 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.4",
"version": "0.13.5",
"description": "Plots of vgrammar.",
"keywords": [
"plot",
Expand Down Expand Up @@ -34,14 +34,14 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
"@visactor/vscale": "~0.18.6",
"@visactor/vutils": "~0.18.6",
"@visactor/vgrammar-util": "workspace:0.13.4",
"@visactor/vgrammar-coordinate": "workspace:0.13.4",
"@visactor/vgrammar-core": "workspace:0.13.4",
"@visactor/vrender-components": "0.19.4",
"@visactor/vrender-core": "0.19.4",
"@visactor/vrender-kits": "0.19.4"
"@visactor/vscale": "~0.18.9",
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-util": "workspace:0.13.5",
"@visactor/vgrammar-coordinate": "workspace:0.13.5",
"@visactor/vgrammar-core": "workspace:0.13.5",
"@visactor/vrender-components": "0.19.5",
"@visactor/vrender-core": "0.19.5",
"@visactor/vrender-kits": "0.19.5"
},
"devDependencies": {
"d3-array": "1.x",
Expand Down
8 changes: 4 additions & 4 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.4",
"version": "0.13.5",
"description": "Projections for map, used in VGrammar.",
"keywords": [
"projection",
Expand Down Expand Up @@ -34,9 +34,9 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
"@visactor/vutils": "~0.18.6",
"@visactor/vgrammar-util": "workspace:0.13.4",
"@visactor/vgrammar-core": "workspace:0.13.4",
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-util": "workspace:0.13.5",
"@visactor/vgrammar-core": "workspace:0.13.5",
"d3-geo": "^1.12.1"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 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.4",
"version": "0.13.5",
"description": "Layout of sankey chart, used by VGrammar",
"keywords": [
"sankey",
Expand Down Expand Up @@ -36,11 +36,11 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
"@visactor/vutils": "~0.18.6",
"@visactor/vgrammar-core": "workspace:0.13.4",
"@visactor/vgrammar-util": "workspace:0.13.4",
"@visactor/vrender-core": "0.19.4",
"@visactor/vrender-kits": "0.19.4"
"@visactor/vutils": "~0.18.9",
"@visactor/vgrammar-core": "workspace:0.13.5",
"@visactor/vgrammar-util": "workspace:0.13.5",
"@visactor/vrender-core": "0.19.5",
"@visactor/vrender-kits": "0.19.5"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/vgrammar-util/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-util",
"version": "0.13.4",
"version": "0.13.5",
"description": "The common utils functions of VGrammar",
"keywords": [
"utils",
Expand Down Expand Up @@ -34,7 +34,7 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
"@visactor/vutils": "~0.18.6"
"@visactor/vutils": "~0.18.9"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
12 changes: 6 additions & 6 deletions packages/vgrammar-venn/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@visactor/vgrammar-venn",
"version": "0.13.4",
"version": "0.13.5",
"description": "Venn layout transform for VGrammar",
"keywords": [
"venn",
Expand Down Expand Up @@ -34,11 +34,11 @@
"test-check": "DEBUG=jest jest --forceExit --detectOpenHandles --silent false --verbose false --runInBand"
},
"dependencies": {
"@visactor/vgrammar-core": "workspace:0.13.4",
"@visactor/vgrammar-util": "workspace:0.13.4",
"@visactor/vrender-core": "0.19.4",
"@visactor/vrender-kits": "0.19.4",
"@visactor/vutils": "~0.18.6"
"@visactor/vgrammar-core": "workspace:0.13.5",
"@visactor/vgrammar-util": "workspace:0.13.5",
"@visactor/vrender-core": "0.19.5",
"@visactor/vrender-kits": "0.19.5",
"@visactor/vutils": "~0.18.9"
},
"devDependencies": {
"@internal/bundler": "workspace:*",
Expand Down
Loading

0 comments on commit 462598a

Please sign in to comment.