fix: fix rebase issue

antvis · Mar 5, 2024 · 596d415 · 596d415
1 parent 0de7ec9
commit 596d415
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/packages/g6/src/elements/combos/base-combo.ts b/packages/g6/src/elements/combos/base-combo.ts
@@ -1,7 +1,7 @@
 import type { AABB, BaseStyleProps, DisplayObject, DisplayObjectConfig, Group } from '@antv/g';
 import { deepMix, isEmpty } from '@antv/util';
 import type { BaseComboProps, Combo, Node, Position, PrefixObject, STDSize } from '../../types';
-import { getBBoxHeight, getBBoxWidth, getElementsBBox, getExpandedBBox } from '../../utils/bbox';
+import { getBBoxHeight, getBBoxWidth, getCombinedBBox, getExpandedBBox } from '../../utils/bbox';
 import { getCollapsedMarkerText, getXYByCollapsedOrigin } from '../../utils/combo';
 import { getXYByPosition } from '../../utils/element';
 import { subStyleProps } from '../../utils/prefix';
@@ -95,8 +95,8 @@ export abstract class BaseCombo<S extends BaseComboStyleProps = BaseComboStylePr
   }
 
   protected getContentBBox(attributes: Required<S>): AABB {
-    const { children, padding } = attributes;
-    const childrenBBox = getElementsBBox(children!);
+    const { children = [], padding } = attributes;
+    const childrenBBox = getCombinedBBox(children.map((child) => child.getBounds()));
 
     if (!padding) return childrenBBox;
 

diff --git a/packages/g6/src/elements/combos/rect.ts b/packages/g6/src/elements/combos/rect.ts
@@ -10,7 +10,7 @@ export type RectComboStyleProps = BaseComboStyleProps<KeyStyleProps>;
 type ParsedRectComboStyleProps = ParsedBaseComboStyleProps<KeyStyleProps>;
 type RectComboOptions = DisplayObjectConfig<RectComboStyleProps>;
 
-export class RectCombo extends BaseCombo<GRect, KeyStyleProps> {
+export class RectCombo extends BaseCombo<RectComboStyleProps> {
   static defaultStyleProps: RectComboStyleProps = {
     size: [100, 30],
     anchor: [0.5, 0.5],
@@ -25,14 +25,13 @@ export class RectCombo extends BaseCombo<GRect, KeyStyleProps> {
   }
 
   protected getKeyStyle(attributes: ParsedRectComboStyleProps): GRectStyleProps {
-    const { collapsed } = attributes;
     const keyStyle = super.getKeyStyle(attributes);
     const collapsedStyle = subStyleProps(keyStyle, 'collapsed');
 
     const [width, height] = this.getKeySize(attributes);
     return {
       ...keyStyle,
-      ...(collapsed && collapsedStyle),
+      ...(attributes.collapsed && collapsedStyle),
       width,
       height,
     };