perf: merge bbox & set refresh flag recursively

antvis · Apr 13, 2023 · 90e4f6c · 90e4f6c
1 parent 2beba3d
commit 90e4f6c
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 20 deletions.
diff --git a/packages/g-base/package.json b/packages/g-base/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@antv/g-base",
- "version": "0.5.14",
+ "version": "0.5.15",
  "description": "A common util collection for antv projects",
  "main": "lib/index.js",
  "module": "esm/index.js",

diff --git a/packages/g-base/src/abstract/container.ts b/packages/g-base/src/abstract/container.ts
@@ -77,23 +77,27 @@ abstract class Container extends Element implements IContainer {
  let maxX = -Infinity;
  let minY = Infinity;
  let maxY = -Infinity;
- const xArr = [];
- const yArr = [];
  // 将可见元素、图形以及不为空的图形分组筛选出来，用于包围盒合并
  const children = this.getChildren().filter(
  (child) =>
  child.get('visible') && (!child.isGroup() || (child.isGroup() && (child as IGroup).getChildren().length > 0))
  );
  if (children.length > 0) {
  each(children, (child: IElement) => {
- const box = child.getBBox();
- xArr.push(box.minX, box.maxX);
- yArr.push(box.minY, box.maxY);
+ const { minX: childMinX, maxX: childMaxX, minY: childMinY, maxY: childMaxY } = child.getBBox();
+ if (childMinX < minX) {
+ minX = childMinX;
+ }
+ if (childMaxX > maxX) {
+ maxX = childMaxX;
+ }
+ if (childMinY < minY) {
+ minY = childMinY;
+ }
+ if (childMaxY > maxY) {
+ maxY = childMaxY;
+ }
  });
- minX = min(xArr);
- maxX = max(xArr);
- minY = min(yArr);
- maxY = max(yArr);
  } else {
  minX = 0;
  maxX = 0;
@@ -119,23 +123,27 @@ abstract class Container extends Element implements IContainer {
  let maxX = -Infinity;
  let minY = Infinity;
  let maxY = -Infinity;
- const xArr = [];
- const yArr = [];
  // 将可见元素、图形以及不为空的图形分组筛选出来，用于包围盒合并
  const children = this.getChildren().filter(
  (child) =>
  child.get('visible') && (!child.isGroup() || (child.isGroup() && (child as IGroup).getChildren().length > 0))
  );
  if (children.length > 0) {
  each(children, (child: IElement) => {
- const box = child.getCanvasBBox();
- xArr.push(box.minX, box.maxX);
- yArr.push(box.minY, box.maxY);
+ const { minX: childMinX, maxX: childMaxX, minY: childMinY, maxY: childMaxY } = child.getCanvasBBox();
+ if (childMinX < minX) {
+ minX = childMinX;
+ }
+ if (childMaxX > maxX) {
+ maxX = childMaxX;
+ }
+ if (childMinY < minY) {
+ minY = childMinY;
+ }
+ if (childMaxY > maxY) {
+ maxY = childMaxY;
+ }
  });
- minX = min(xArr);
- maxX = max(xArr);
- minY = min(yArr);
- maxY = max(yArr);
  } else {
  minX = 0;
  maxX = 0;

diff --git a/packages/g-canvas/package.json b/packages/g-canvas/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@antv/g-canvas",
- "version": "0.5.13",
+ "version": "0.5.14",
  "description": "A canvas library which providing 2d",
  "main": "lib/index.js",
  "module": "esm/index.js",

diff --git a/packages/g-canvas/src/util/draw.ts b/packages/g-canvas/src/util/draw.ts
@@ -116,6 +116,9 @@ export function clearChanged(elements: IElement[]) {
 function setChildrenRefresh(children: IElement[], region: Region) {
  for (let i = 0; i < children.length; i++) {
  const child = children[i] as IElement;
+ if (!child.cfg.visible) {
+ continue;
+ }
  // let refresh = true;
  // 获取缓存的 bbox，如果这个 bbox 还存在则说明父元素不是矩阵发生了改变
  // const bbox = child.cfg.canvasBBox;