@antv/layout 1.2.14-beta.5 → 1.2.14-beta.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/{e56150a6fd4fea601b13.worker.js → 39a5a15c96cf2db887c3.worker.js} +2 -2
  2. package/dist/39a5a15c96cf2db887c3.worker.js.map +1 -0
  3. package/dist/index.min.js +1 -1
  4. package/dist/index.min.js.map +1 -1
  5. package/lib/comboCombined.js +20 -6
  6. package/lib/comboCombined.js.map +1 -1
  7. package/lib/types.d.ts +10 -6
  8. package/package.json +1 -1
  9. package/dist/e56150a6fd4fea601b13.worker.js.map +0 -1
package/lib/comboCombined.js CHANGED
@@ -4,6 +4,7 @@ import { isFunction, isNumber, isObject } from '@antv/util';
4
4
  import { ConcentricLayout } from './concentric';
5
5
  import { ForceLayout } from './force';
6
6
  import { MDSLayout } from './mds';
7
+ import { isLayoutWithIterations } from './types';
7
8
  import { getLayoutBBox, graphTreeDfs, isArray } from './util';
8
9
  import { handleSingleNodeGraph } from './util/common';
9
10
  const FORCE_LAYOUT_TYPE_MAP = {
@@ -83,7 +84,7 @@ export class ComboCombinedLayout {
83
84
  comboMap.set(combo.id, combo);
84
85
  });
85
86
  // each one in comboNodes is a combo contains the size and child nodes
86
- // comboNodes ncludes the node who has no parent combo
87
+ // comboNodes includes the node who has no parent combo
87
88
  const comboNodes = new Map();
88
89
  // the inner layouts, the result positions are stored in comboNodes and their child nodes
89
90
  const innerGraphLayoutPromises = this.getInnerGraphs(graph, treeKey, nodeMap, comboMap, edges, mergedOptions, comboNodes);
@@ -152,7 +153,7 @@ export class ComboCombinedLayout {
152
153
  : new ConcentricLayout();
153
154
  yield outerLayoutPreset.assign(outerLayoutGraph);
154
155
  }
155
- outerPositions = yield outerLayout.execute(outerLayoutGraph, Object.assign({ center, kg: 5, preventOverlap: true, animate: false }, (outerLayout.id === 'force'
156
+ const options = Object.assign({ center, kg: 5, preventOverlap: true, animate: false }, (outerLayout.id === 'force'
156
157
  ? {
157
158
  gravity: 1,
158
159
  factor: 4,
@@ -162,7 +163,8 @@ export class ComboCombinedLayout {
162
163
  return sourceSize / 2 + targetSize / 2 + 200;
163
164
  },
164
165
  }
165
- : {})));
166
+ : {}));
167
+ outerPositions = yield executeLayout(outerLayout, outerLayoutGraph, options);
166
168
  }
167
169
  // move the combos and their child nodes
168
170
  comboNodes.forEach((comboNode) => {
@@ -384,9 +386,9 @@ export class ComboCombinedLayout {
384
386
  // innerGraphLayout.assign(innerGraphCore, innerLayoutOptions);
385
387
  start = start.then(() => __awaiter(this, void 0, void 0, function* () {
386
388
  const innerGraphCore = new GraphCore(innerGraphData);
387
- const innerLayout = yield innerGraphLayout.assign(innerGraphCore, innerLayoutOptions);
389
+ yield executeLayout(innerGraphLayout, innerGraphCore, innerLayoutOptions, true);
388
390
  const { minX, minY, maxX, maxY } = getLayoutBBox(innerLayoutNodes);
389
- // move the innerGraph to [0, 0], for later controled by parent layout
391
+ // move the innerGraph to [0, 0], for later controlled by parent layout
390
392
  const center = { x: (maxX + minX) / 2, y: (maxY + minY) / 2 };
391
393
  innerGraphData.nodes.forEach((node) => {
392
394
  node.data.x -= center.x;
@@ -398,7 +400,6 @@ export class ComboCombinedLayout {
398
400
  ];
399
401
  comboNodes.get(treeNode.id).data.size = size;
400
402
  comboNodes.get(treeNode.id).data.nodes = innerLayoutNodes;
401
- return innerLayout;
402
403
  }));
403
404
  }
404
405
  return true;
@@ -408,4 +409,17 @@ export class ComboCombinedLayout {
408
409
  return innerLayoutPromises;
409
410
  }
410
411
  }
412
+ function executeLayout(layout, graph, options, assign) {
413
+ var _a;
414
+ return __awaiter(this, void 0, void 0, function* () {
415
+ if (isLayoutWithIterations(layout)) {
416
+ layout.execute(graph, options);
417
+ layout.stop();
418
+ return layout.tick((_a = options.iterations) !== null && _a !== void 0 ? _a : 300);
419
+ }
420
+ if (assign)
421
+ return yield layout.assign(graph, options);
422
+ return yield layout.execute(graph, options);
423
+ });
424
+ }
411
425
  //# sourceMappingURL=comboCombined.js.map
package/lib/comboCombined.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"comboCombined.js","sourceRoot":"","sources":["../src/comboCombined.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"comboCombined.js","sourceRoot":"","sources":["../src/comboCombined.ts"],"names":[],"mappings":"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"}
package/lib/types.d.ts CHANGED
@@ -821,12 +821,14 @@ export interface ComboCombinedLayoutOptions {
821
821
  */
822
822
  spacing?: number | ((d?: Node) => number);
823
823
  /**
824
- * <zh/> 最外层的布局算法，默认为 gForce
824
+ * <zh/> 最外层的布局算法，默认为 force
825
825
  *
826
- * <en/> The outermost layout algorithm, default to gForce
826
+ * <en/> The outermost layout algorithm, default to force
827
827
  * @example
828
828
  * ```ts
829
- * outerLayout: new G6.Layout['gForce']({
829
+ * import { ForceLayout } from '@antv/layout';
830
+ *
831
+ * outerLayout: new ForceLayout({
830
832
  * gravity: 1,
831
833
  * factor: 2,
832
834
  * linkDistance: (edge: any, source: any, target: any) => {
@@ -835,7 +837,7 @@ export interface ComboCombinedLayoutOptions {
835
837
  * }
836
838
  * });
837
839
  * ```
838
- * @defaultVaule GForce 实例
840
+ * @defaultVaule ForceLayout
839
841
  */
840
842
  outerLayout?: Layout<any>;
841
843
  /**
@@ -844,11 +846,13 @@ export interface ComboCombinedLayoutOptions {
844
846
  * <en/> The layout algorithm inside the combo, which needs to use a synchronized layout algorithm, default to concentric
845
847
  * @example
846
848
  * ```ts
847
- * innerLayout: new G6.Layout['concentric']({
849
+ * import { ConcentricLayout } from '@antv/layout';
850
+ *
851
+ * innerLayout: new ConcentricLayout({
848
852
  * sortBy: 'id'
849
853
  * });
850
854
  * ```
851
- * @defaultVaule Concentric 实例
855
+ * @defaultVaule ConcentricLayout
852
856
  */
853
857
  innerLayout?: Layout<any>;
854
858
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@antv/layout",
3
- "version": "1.2.14-beta.5",
3
+ "version": "1.2.14-beta.6",
4
4
  "description": "graph layout algorithm",
5
5
  "license": "MIT",
6
6
  "repository": {