@antv/layout 0.3.17 → 0.3.19

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.
@@ -1,5 +1,5 @@
1
- import { Base } from "../layout/base";
2
- import { isObject } from "../util";
1
+ import { Base } from '../layout/base';
2
+ import { isObject } from '../util';
3
3
  const map = new Map();
4
4
  export const registerLayout = (name, layoutOverride) => {
5
5
  if (map.get(name)) {
@@ -9,10 +9,11 @@ export const registerLayout = (name, layoutOverride) => {
9
9
  // tslint:disable-next-line: max-classes-per-file
10
10
  class GLayout extends Base {
11
11
  constructor(cfg) {
12
+ var _a;
12
13
  super();
13
14
  const self = this;
14
15
  const props = {};
15
- const defaultCfg = self.getDefaultCfg();
16
+ const defaultCfg = Object.assign({}, self.getDefaultCfg(), ((_a = layoutOverride.getDefaultCfg) === null || _a === void 0 ? void 0 : _a.call(layoutOverride)) || {});
16
17
  Object.assign(props, defaultCfg, layoutOverride, cfg);
17
18
  Object.keys(props).forEach((key) => {
18
19
  const value = props[key];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/registy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,MAAM,GAAG,GAAqB,IAAI,GAAG,EAAE,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,cAAmB,EAAE,EAAE;IAClE,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,CAAC,IAAI,CAAC,4BAA4B,IAAI,wCAAwC,CAAC,CAAC;KACxF;IACD,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE;QAC5B,iDAAiD;QACjD,MAAM,OAAQ,SAAQ,IAAI;YACxB,YAAY,GAAQ;gBAClB,KAAK,EAAE,CAAC;gBACR,MAAM,IAAI,GAAG,IAAW,CAAC;gBACzB,MAAM,KAAK,GAAQ,EAAE,CAAC;gBACtB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,GAAc,CAAC,CAAC;gBACjE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;oBACzC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACzB,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACpB,CAAC,CAAC,CAAC;YACL,CAAC;SACF;QACD,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACxB;SAAM;QACL,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;KAC/B;IACD,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/C,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE;IAC9C,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACtB;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/registy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,MAAM,GAAG,GAAqB,IAAI,GAAG,EAAE,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,cAAmB,EAAE,EAAE;IAClE,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,CAAC,IAAI,CACV,4BAA4B,IAAI,wCAAwC,CACzE,CAAC;KACH;IACD,IAAI,QAAQ,CAAC,cAAc,CAAC,EAAE;QAC5B,iDAAiD;QACjD,MAAM,OAAQ,SAAQ,IAAI;YACxB,YAAY,GAAQ;;gBAClB,KAAK,EAAE,CAAC;gBACR,MAAM,IAAI,GAAG,IAAW,CAAC;gBACzB,MAAM,KAAK,GAAQ,EAAE,CAAC;gBACtB,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAC9B,EAAE,EACF,IAAI,CAAC,aAAa,EAAE,EACpB,CAAA,MAAA,cAAc,CAAC,aAAa,8DAAI,KAAI,EAAE,CACvC,CAAC;gBACF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,GAAc,CAAC,CAAC;gBACjE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;oBACzC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACzB,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACpB,CAAC,CAAC,CAAC;YACL,CAAC;SACF;QACD,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACxB;SAAM;QACL,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;KAC/B;IACD,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC/C,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE;IAC9C,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACtB;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
@@ -28,10 +28,12 @@ var registerLayout = function (name, layoutOverride) {
28
28
  var GLayout = /** @class */ (function (_super) {
29
29
  __extends(GLayout, _super);
30
30
  function GLayout(cfg) {
31
- var _this = _super.call(this) || this;
31
+ var _this = this;
32
+ var _a;
33
+ _this = _super.call(this) || this;
32
34
  var self = _this;
33
35
  var props = {};
34
- var defaultCfg = self.getDefaultCfg();
36
+ var defaultCfg = Object.assign({}, self.getDefaultCfg(), ((_a = layoutOverride.getDefaultCfg) === null || _a === void 0 ? void 0 : _a.call(layoutOverride)) || {});
35
37
  Object.assign(props, defaultCfg, layoutOverride, cfg);
36
38
  Object.keys(props).forEach(function (key) {
37
39
  var value = props[key];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/registy/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AACtC,gCAAmC;AAEnC,IAAM,GAAG,GAAqB,IAAI,GAAG,EAAE,CAAC;AAEjC,IAAM,cAAc,GAAG,UAAC,IAAY,EAAE,cAAmB;IAC9D,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,CAAC,IAAI,CAAC,mCAA4B,IAAI,2CAAwC,CAAC,CAAC;KACxF;IACD,IAAI,IAAA,eAAQ,EAAC,cAAc,CAAC,EAAE;QAC5B,iDAAiD;QACjD;YAAsB,2BAAI;YACxB,iBAAY,GAAQ;gBAApB,YACE,iBAAO,SASR;gBARC,IAAM,IAAI,GAAG,KAAW,CAAC;gBACzB,IAAM,KAAK,GAAQ,EAAE,CAAC;gBACtB,IAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,GAAc,CAAC,CAAC;gBACjE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAC,GAAW;oBACrC,IAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACzB,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACpB,CAAC,CAAC,CAAC;;YACL,CAAC;YACH,cAAC;QAAD,CAAC,AAZD,CAAsB,WAAI,GAYzB;QACD,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACxB;SAAM;QACL,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;KAC/B;IACD,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC;AAxBW,QAAA,cAAc,kBAwBzB;AAEK,IAAM,gBAAgB,GAAG,UAAC,IAAY;IAC3C,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B;AAEK,IAAM,eAAe,GAAG,UAAC,IAAY;IAC1C,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACtB;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AALW,QAAA,eAAe,mBAK1B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/registy/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AACtC,gCAAmC;AAEnC,IAAM,GAAG,GAAqB,IAAI,GAAG,EAAE,CAAC;AAEjC,IAAM,cAAc,GAAG,UAAC,IAAY,EAAE,cAAmB;IAC9D,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,CAAC,IAAI,CACV,mCAA4B,IAAI,2CAAwC,CACzE,CAAC;KACH;IACD,IAAI,IAAA,eAAQ,EAAC,cAAc,CAAC,EAAE;QAC5B,iDAAiD;QACjD;YAAsB,2BAAI;YACxB,iBAAY,GAAQ;gBAApB,iBAcC;;wBAbC,iBAAO;gBACP,IAAM,IAAI,GAAG,KAAW,CAAC;gBACzB,IAAM,KAAK,GAAQ,EAAE,CAAC;gBACtB,IAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAC9B,EAAE,EACF,IAAI,CAAC,aAAa,EAAE,EACpB,CAAA,MAAA,cAAc,CAAC,aAAa,8DAAI,KAAI,EAAE,CACvC,CAAC;gBACF,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,GAAc,CAAC,CAAC;gBACjE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAC,GAAW;oBACrC,IAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;oBACzB,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBACpB,CAAC,CAAC,CAAC;;YACL,CAAC;YACH,cAAC;QAAD,CAAC,AAhBD,CAAsB,WAAI,GAgBzB;QACD,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACxB;SAAM;QACL,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;KAC/B;IACD,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACvB,CAAC,CAAC;AA9BW,QAAA,cAAc,kBA8BzB;AAEK,IAAM,gBAAgB,GAAG,UAAC,IAAY;IAC3C,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAJW,QAAA,gBAAgB,oBAI3B;AAEK,IAAM,eAAe,GAAG,UAAC,IAAY;IAC1C,IAAI,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KACtB;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AALW,QAAA,eAAe,mBAK1B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@antv/layout",
3
- "version": "0.3.17",
3
+ "version": "0.3.19",
4
4
  "description": "graph layout algorithm",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -1,11 +1,13 @@
1
- import { Base } from "../layout/base";
2
- import { isObject } from "../util";
1
+ import { Base } from '../layout/base';
2
+ import { isObject } from '../util';
3
3
 
4
4
  const map: Map<string, any> = new Map();
5
5
 
6
6
  export const registerLayout = (name: string, layoutOverride: any) => {
7
7
  if (map.get(name)) {
8
- console.warn(`The layout with the name ${name} exists already, it will be overridden`);
8
+ console.warn(
9
+ `The layout with the name ${name} exists already, it will be overridden`
10
+ );
9
11
  }
10
12
  if (isObject(layoutOverride)) {
11
13
  // tslint:disable-next-line: max-classes-per-file
@@ -14,7 +16,11 @@ export const registerLayout = (name: string, layoutOverride: any) => {
14
16
  super();
15
17
  const self = this as any;
16
18
  const props: any = {};
17
- const defaultCfg = self.getDefaultCfg();
19
+ const defaultCfg = Object.assign(
20
+ {},
21
+ self.getDefaultCfg(),
22
+ layoutOverride.getDefaultCfg?.() || {}
23
+ );
18
24
  Object.assign(props, defaultCfg, layoutOverride, cfg as unknown);
19
25
  Object.keys(props).forEach((key: string) => {
20
26
  const value = props[key];