refactor: adapt concentric node size

antvis · Nov 4, 2024 · 25cee7d · 25cee7d
1 parent a9af1af
commit 25cee7d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/layout/src/concentric.ts b/packages/layout/src/concentric.ts
@@ -11,6 +11,7 @@ import type {
 } from './types';
 import { cloneFormatData, isArray } from './util';
 import { handleSingleNodeGraph } from './util/common';
+import { parseSize } from './util/size';
 
 const DEFAULTS_LAYOUT_OPTIONS: Partial<ConcentricLayoutOptions> = {
   nodeSize: 30,
@@ -26,7 +27,7 @@ const DEFAULTS_LAYOUT_OPTIONS: Partial<ConcentricLayoutOptions> = {
 
 /**
  * <zh/> 同心圆布局
- * 
+ *
  * <en/> Concentric layout
  */
 export class ConcentricLayout implements Layout<ConcentricLayoutOptions> {
@@ -51,7 +52,7 @@ export class ConcentricLayout implements Layout<ConcentricLayoutOptions> {
    * To directly assign the positions to the nodes.
    */
   async assign(graph: Graph, options?: ConcentricLayoutOptions) {
-   await this.genericConcentricLayout(true, graph, options);
+    await this.genericConcentricLayout(true, graph, options);
   }
 
   private async genericConcentricLayout(
@@ -112,7 +113,7 @@ export class ConcentricLayout implements Layout<ConcentricLayoutOptions> {
     } else if (isFunction(nodeSize)) {
       maxNodeSize = -Infinity;
       nodes.forEach((node) => {
-        const currentSize = nodeSize(node);
+        const currentSize = Math.max(...parseSize(nodeSize(node)));
         if (currentSize > maxNodeSize) maxNodeSize = currentSize;
       });
     } else {

diff --git a/packages/layout/src/util/function.ts b/packages/layout/src/util/function.ts
@@ -115,7 +115,7 @@ export const formatNodeSizeToNumber = (
   }
 
   const func = (d: Node) => {
-    const nodeSize = nodeSizeFunc(d);
+    const nodeSize = nodeSizeFunc(d) as Size;
     const nodeSpacing = nodeSpacingFunc(d);
     return Math.max(...parseSize(nodeSize)) + nodeSpacing;
   };