Merge pull request #1572 from VisActor/release/0.20.16

[Auto release] release 0.20.16
VisActor · Nov 21, 2024 · f331e64 · f331e64
2 parents 130915e + b13eaba
commit f331e64
Show file tree

Hide file tree

Showing 68 changed files with 792 additions and 416 deletions.
diff --git a/.gitignore b/.gitignore
@@ -96,3 +96,6 @@ docs/demos/src/node/image.png
 
 # generated documents
 docs/public/documents
+
+spec-types
+*.tsbuildinfo
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/common/config/rush/version-policies.json b/common/config/rush/version-policies.json
@@ -1 +1 @@
-[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.20.15","nextBump":"patch"}]
+[{"definitionName":"lockStepVersion","policyName":"vrenderMain","version":"0.20.16","nextBump":"patch"}]
diff --git a/docs/assets/changelog/en/changelog.md b/docs/assets/changelog/en/changelog.md
@@ -1,3 +1,20 @@
+# v0.20.15
+
+2024-11-21
+
+
+**🆕 New feature**
+
+- **@visactor/vrender-core**: support keepStrokeScale
+
+**🐛 Bug fix**
+
+- **@visactor/vrender-kits**: fix press in andiord
+
+
+
+[more detail about v0.20.15](https://github.com/VisActor/VRender/releases/tag/v0.20.15)
+
 # v0.20.14
 
 2024-11-13

diff --git a/docs/assets/changelog/zh/changelog.md b/docs/assets/changelog/zh/changelog.md
@@ -1,3 +1,20 @@
+# v0.20.15
+
+2024-11-21
+
+
+**🆕 新增功能**
+
+- **@visactor/vrender-core**: support keepStrokeScale
+
+**🐛 功能修复**
+
+- **@visactor/vrender-kits**: fix press in andiord
+
+
+
+[更多详情请查看 v0.20.15](https://github.com/VisActor/VRender/releases/tag/v0.20.15)
+
 # v0.20.14
 
 2024-11-13

diff --git a/docs/package.json b/docs/package.json
@@ -13,7 +13,7 @@
     "@visactor/vchart": "1.3.0",
     "@visactor/vutils": "~0.18.18",
     "@visactor/vgrammar": "~0.5.7",
-    "@visactor/vrender": "workspace:0.20.15",
+    "@visactor/vrender": "workspace:0.20.16",
     "markdown-it": "^13.0.0",
     "highlight.js": "^11.8.0",
     "axios": "^1.4.0",

diff --git a/packages/react-vrender-utils/CHANGELOG.json b/packages/react-vrender-utils/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender-utils",
   "entries": [
+    {
+      "version": "0.20.16",
+      "tag": "@visactor/react-vrender-utils_v0.20.16",
+      "date": "Thu, 21 Nov 2024 06:58:23 GMT",
+      "comments": {}
+    },
     {
       "version": "0.20.15",
       "tag": "@visactor/react-vrender-utils_v0.20.15",

diff --git a/packages/react-vrender-utils/CHANGELOG.md b/packages/react-vrender-utils/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/react-vrender-utils
 
-This log was last generated on Fri, 15 Nov 2024 08:34:34 GMT and should not be manually modified.
+This log was last generated on Thu, 21 Nov 2024 06:58:23 GMT and should not be manually modified.
+
+## 0.20.16
+Thu, 21 Nov 2024 06:58:23 GMT
+
+_Version update only_
 
 ## 0.20.15
 Fri, 15 Nov 2024 08:34:34 GMT

diff --git a/packages/react-vrender-utils/package.json b/packages/react-vrender-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vrender-utils",
-  "version": "0.20.15",
+  "version": "0.20.16",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -24,8 +24,8 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.20.15",
-    "@visactor/react-vrender": "workspace:0.20.15",
+    "@visactor/vrender": "workspace:0.20.16",
+    "@visactor/react-vrender": "workspace:0.20.16",
     "@visactor/vutils": "~0.18.18",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"

diff --git a/packages/react-vrender/CHANGELOG.json b/packages/react-vrender/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/react-vrender",
   "entries": [
+    {
+      "version": "0.20.16",
+      "tag": "@visactor/react-vrender_v0.20.16",
+      "date": "Thu, 21 Nov 2024 06:58:23 GMT",
+      "comments": {}
+    },
     {
       "version": "0.20.15",
       "tag": "@visactor/react-vrender_v0.20.15",

diff --git a/packages/react-vrender/CHANGELOG.md b/packages/react-vrender/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/react-vrender
 
-This log was last generated on Fri, 15 Nov 2024 08:34:34 GMT and should not be manually modified.
+This log was last generated on Thu, 21 Nov 2024 06:58:23 GMT and should not be manually modified.
+
+## 0.20.16
+Thu, 21 Nov 2024 06:58:23 GMT
+
+_Version update only_
 
 ## 0.20.15
 Fri, 15 Nov 2024 08:34:34 GMT

diff --git a/packages/react-vrender/package.json b/packages/react-vrender/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/react-vrender",
-  "version": "0.20.15",
+  "version": "0.20.16",
   "description": "",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -23,7 +23,7 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@visactor/vrender": "workspace:0.20.15",
+    "@visactor/vrender": "workspace:0.20.16",
     "@visactor/vutils": "~0.18.18",
     "react-reconciler": "^0.29.0",
     "tslib": "^2.3.1"

diff --git a/packages/vrender-components/CHANGELOG.json b/packages/vrender-components/CHANGELOG.json
@@ -1,6 +1,12 @@
 {
   "name": "@visactor/vrender-components",
   "entries": [
+    {
+      "version": "0.20.16",
+      "tag": "@visactor/vrender-components_v0.20.16",
+      "date": "Thu, 21 Nov 2024 06:58:23 GMT",
+      "comments": {}
+    },
     {
       "version": "0.20.15",
       "tag": "@visactor/vrender-components_v0.20.15",

diff --git a/packages/vrender-components/CHANGELOG.md b/packages/vrender-components/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log - @visactor/vrender-components
 
-This log was last generated on Fri, 15 Nov 2024 08:34:34 GMT and should not be manually modified.
+This log was last generated on Thu, 21 Nov 2024 06:58:23 GMT and should not be manually modified.
+
+## 0.20.16
+Thu, 21 Nov 2024 06:58:23 GMT
+
+_Version update only_
 
 ## 0.20.15
 Fri, 15 Nov 2024 08:34:34 GMT

diff --git a/packages/vrender-components/package.json b/packages/vrender-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-components",
-  "version": "0.20.15",
+  "version": "0.20.16",
   "description": "components library for dp visualization",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -21,13 +21,14 @@
     "test-cov": "jest --coverage",
     "test-live": "npm run test-watch __tests__/unit/",
     "test-watch": "cross-env DEBUG_MODE=1 jest --watch",
-    "analysis-core": "cross-env DEBUG='Bundler*' bundle -f umd -a -i core.ts"
+    "analysis-core": "cross-env DEBUG='Bundler*' bundle -f umd -a -i core.ts",
+    "build:spec-types": "rm -rf ./spec-types && tsc -p ./tsconfig.spec.json --declaration --emitDeclarationOnly --outDir ./spec-types"
   },
   "dependencies": {
     "@visactor/vutils": "~0.18.18",
     "@visactor/vscale": "~0.18.18",
-    "@visactor/vrender-core": "workspace:0.20.15",
-    "@visactor/vrender-kits": "workspace:0.20.15"
+    "@visactor/vrender-core": "workspace:0.20.16",
+    "@visactor/vrender-kits": "workspace:0.20.16"
   },
   "devDependencies": {
     "@internal/bundler": "workspace:*",

diff --git a/packages/vrender-components/src/axis/type.ts b/packages/vrender-components/src/axis/type.ts
@@ -1,6 +1,5 @@
 import type {
   ILineGraphicAttribute,
-  SymbolType,
   ITextGraphicAttribute,
   ISymbolGraphicAttribute,
   IRectGraphicAttribute,
@@ -12,8 +11,8 @@ import type {
 import type { Dict } from '@visactor/vutils';
 import type { ContinuousScale, CustomTicksFunc } from '@visactor/vscale';
 import type { Point, TextContent } from '../core/type';
-import type { SegmentAttributes } from '../segment';
-import type { TagAttributes } from '../tag';
+import type { SegmentAttributes } from '../segment/type';
+import type { TagAttributes } from '../tag/type';
 
 export type AxisItemStateStyle<T> = {
   hover?: T;

diff --git a/packages/vrender-components/src/data-zoom/type.ts b/packages/vrender-components/src/data-zoom/type.ts
@@ -8,7 +8,7 @@ import type {
 } from '@visactor/vrender-core';
 import type { IPointLike } from '@visactor/vutils';
 import type { IDelayType, OrientType } from '../interface';
-import type { TagAttributes } from '../tag';
+import type { TagAttributes } from '../tag/type';
 
 export enum DataZoomActiveTag {
   startHandler = 'startHandler',

diff --git a/packages/vrender-components/src/interface.ts b/packages/vrender-components/src/interface.ts
@@ -1,12 +1,4 @@
-import type {
-  ICustomPath2D,
-  IGraphicAttribute,
-  IGroup,
-  IRectGraphicAttribute,
-  IRichText,
-  IText
-} from '@visactor/vrender-core';
-import type { TextContent } from './core/type';
+import type { ICustomPath2D, IGraphicAttribute, IGroup, IRectGraphicAttribute } from '@visactor/vrender-core';
 
 export type Direction = 'horizontal' | 'vertical';
 

diff --git a/packages/vrender-components/src/label/base.ts b/packages/vrender-components/src/label/base.ts
@@ -527,19 +527,30 @@ export class LabelBase<T extends BaseLabelAttrs> extends AbstractComponent<T> {
     if (clampForce) {
       for (let i = 0; i < result.length; i++) {
         const text = labels[i];
-        const { dx = 0, dy = 0 } = clampText(text as IText, bmpTool.width, bmpTool.height);
+        const { dx = 0, dy = 0 } = clampText(text as IText, bmpTool.width, bmpTool.height, bmpTool.padding);
         if (dx !== 0 || dy !== 0) {
           text.setAttributes({ x: text.attribute.x + dx, y: text.attribute.y + dy });
+          text._isClamped = true;
         }
       }
     }
-    result = shiftY(result as any, { maxY: bmpTool.height, ...(strategy as ShiftYStrategy) });
+    result = shiftY(result as any, {
+      maxY: bmpTool.height,
+      ...(strategy as ShiftYStrategy),
+      labelling: (text: IText) => {
+        const baseMark = this.getRelatedGraphic(text.attribute);
+        const graphicBound = this._isCollectionBase
+          ? this.getGraphicBounds(null, this._idToPoint.get((text.attribute as any).id))
+          : this.getGraphicBounds(baseMark, text);
+        return this.labeling(text.AABBBounds, graphicBound, 'bottom', this.attribute.offset);
+      }
+    });
 
     for (let i = 0; i < result.length; i++) {
       const text = result[i];
       const bounds = text.AABBBounds;
       const range = boundToRange(bmpTool, bounds, true);
-      if (canPlace(bmpTool, bitmap, bounds, clampForce, overlapPadding)) {
+      if (canPlace(bmpTool, bitmap, bounds, clampForce, text._isClamped ? 0 : overlapPadding)) {
         bitmap.setRange(range);
       } else {
         if (hideOnHit) {
@@ -549,7 +560,6 @@ export class LabelBase<T extends BaseLabelAttrs> extends AbstractComponent<T> {
         }
       }
     }
-
     return result;
   }
 
@@ -646,7 +656,7 @@ export class LabelBase<T extends BaseLabelAttrs> extends AbstractComponent<T> {
       // 尝试向内挤压
       if (!hasPlace && clampForce) {
         // 向内挤压不考虑 overlapPadding
-        const { dx = 0, dy = 0 } = clampText(text as IText, bmpTool.width, bmpTool.height);
+        const { dx = 0, dy = 0 } = clampText(text as IText, bmpTool.width, bmpTool.height, bmpTool.padding);
         if (dx === 0 && dy === 0) {
           if (canPlace(bmpTool, bitmap, text.AABBBounds)) {
             // xy方向偏移都为0，意味着不考虑 overlapPadding 时，实际上可以放得下