@wcardinal/wcardinal-ui 0.331.0 → 0.333.0

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 (29) hide show
  1. package/dist/types/wcardinal/ui/d-base-padding-adjustable.d.ts +12 -34
  2. package/dist/types/wcardinal/ui/d-base.d.ts +2 -0
  3. package/dist/types/wcardinal/ui/d-table-body-cell-input-tree-input.d.ts +1 -1
  4. package/dist/types/wcardinal/ui/d-table-body-cell-tree.d.ts +1 -0
  5. package/dist/types/wcardinal/ui/d-tree-item-text.d.ts +1 -0
  6. package/dist/types/wcardinal/ui/shape/e-shape-connector-edge-impl.d.ts +7 -1
  7. package/dist/wcardinal/ui/d-base-padding-adjustable.js +27 -88
  8. package/dist/wcardinal/ui/d-base-padding-adjustable.js.map +1 -1
  9. package/dist/wcardinal/ui/d-base.js +5 -1
  10. package/dist/wcardinal/ui/d-base.js.map +1 -1
  11. package/dist/wcardinal/ui/d-table-body-cell-input-tree-input.js +5 -4
  12. package/dist/wcardinal/ui/d-table-body-cell-input-tree-input.js.map +1 -1
  13. package/dist/wcardinal/ui/d-table-body-cell-tree.js +4 -4
  14. package/dist/wcardinal/ui/d-table-body-cell-tree.js.map +1 -1
  15. package/dist/wcardinal/ui/d-tree-item-text.js +3 -1
  16. package/dist/wcardinal/ui/d-tree-item-text.js.map +1 -1
  17. package/dist/wcardinal/ui/shape/e-shape-connector-edge-container-impl.js +6 -2
  18. package/dist/wcardinal/ui/shape/e-shape-connector-edge-container-impl.js.map +1 -1
  19. package/dist/wcardinal/ui/shape/e-shape-connector-edge-impl.js +94 -28
  20. package/dist/wcardinal/ui/shape/e-shape-connector-edge-impl.js.map +1 -1
  21. package/dist/wcardinal-ui-theme-dark.js +1 -1
  22. package/dist/wcardinal-ui-theme-dark.min.js +1 -1
  23. package/dist/wcardinal-ui-theme-white.js +1 -1
  24. package/dist/wcardinal-ui-theme-white.min.js +1 -1
  25. package/dist/wcardinal-ui.cjs.js +144 -129
  26. package/dist/wcardinal-ui.js +144 -129
  27. package/dist/wcardinal-ui.min.js +2 -2
  28. package/dist/wcardinal-ui.min.js.map +1 -1
  29. package/package.json +1 -1
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.331.0
2
+ Winter Cardinal UI v0.333.0
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -13777,7 +13777,8 @@
13777
13777
  _this._snippet = new DBaseSnippetContainer(_this);
13778
13778
  _this._reflowable = new DBaseReflowableContainer();
13779
13779
  _this._clearType = toEnum((_b = options === null || options === void 0 ? void 0 : options.clear) !== null && _b !== void 0 ? _b : theme.getClearType(), DLayoutClearType);
13780
- _this._padding = new DBasePadding(theme, options, function () {
13780
+ _this._padding = _this.newPadding(theme, options, function () {
13781
+ _this.toDirty();
13781
13782
  _this.toParentResized();
13782
13783
  _this.toHierarchyDirty();
13783
13784
  DApplications.update(_this);
@@ -14023,6 +14024,9 @@
14023
14024
  _this.emit("init", _this);
14024
14025
  return _this;
14025
14026
  }
14027
+ DBase.prototype.newPadding = function (theme, options, callback) {
14028
+ return new DBasePadding(theme, options, callback);
14029
+ };
14026
14030
  DBase.prototype.toCursor = function (cursor, state) {
14027
14031
  if (cursor) {
14028
14032
  if (isFunction(cursor)) {
@@ -17960,6 +17964,9 @@
17960
17964
  this._parent = parent;
17961
17965
  this._onChange = onChange;
17962
17966
  this._acceptor = new EShapeConnectorEdgeAcceptorImpl(this);
17967
+ this._acceptorTransformNew = new pixi_js.Matrix();
17968
+ this._acceptorTransformOld = new pixi_js.Matrix();
17969
+ this._hasAcceptorTransformOld = false;
17963
17970
  this._local = new pixi_js.ObservablePoint(function () {
17964
17971
  _this.onLocalChange();
17965
17972
  }, undefined);
@@ -17972,6 +17979,7 @@
17972
17979
  this._normalId = 0;
17973
17980
  this._side = EShapeAcceptorEdgeSide.TOP;
17974
17981
  this._margin = 0;
17982
+ this._other = null;
17975
17983
  this._lockCount = 0;
17976
17984
  this._isAcceptorChanged = false;
17977
17985
  this._isLocalChanged = false;
@@ -18005,6 +18013,7 @@
18005
18013
  isChanged = true;
18006
18014
  }
18007
18015
  if (this._isAcceptorChanged) {
18016
+ this._hasAcceptorTransformOld = false;
18008
18017
  if (!this._isLocalChanged) {
18009
18018
  this._localIdRequired += 1;
18010
18019
  }
@@ -18088,6 +18097,16 @@
18088
18097
  enumerable: false,
18089
18098
  configurable: true
18090
18099
  });
18100
+ Object.defineProperty(EShapeConnectorEdgeImpl.prototype, "other", {
18101
+ get: function () {
18102
+ return this._other;
18103
+ },
18104
+ set: function (other) {
18105
+ this._other = other;
18106
+ },
18107
+ enumerable: false,
18108
+ configurable: true
18109
+ });
18091
18110
  EShapeConnectorEdgeImpl.prototype.set = function (acceptorShape, acceptorEdge, acceptorX, acceptorY, margin, x, y, nx, ny, side) {
18092
18111
  this.lock();
18093
18112
  this._acceptor.set(acceptorShape, acceptorEdge, acceptorX, acceptorY);
@@ -18189,7 +18208,7 @@
18189
18208
  return this;
18190
18209
  };
18191
18210
  EShapeConnectorEdgeImpl.prototype.doFit = function () {
18192
- var _a, _b;
18211
+ var _a, _b, _c;
18193
18212
  var localIdRequired = this._localIdRequired;
18194
18213
  var isLocalDirty = this._localId !== localIdRequired;
18195
18214
  var normalIdRequired = this._normalIdRequired;
@@ -18203,35 +18222,82 @@
18203
18222
  if (acceptorShape != null && acceptorEdge != null) {
18204
18223
  var edge = EShapeAcceptors.get(acceptorShape.type).get(acceptorShape, acceptorEdge);
18205
18224
  if (edge) {
18206
- var transform = this.toAcceptorTransform(acceptorShape);
18207
- var a = transform.a;
18208
- var b = transform.b;
18209
- var c = transform.c;
18210
- var d = transform.d;
18211
- var tx = transform.tx;
18212
- var ty = transform.ty;
18225
+ var oat = this._acceptorTransformOld;
18226
+ var nat = this._acceptorTransformNew;
18227
+ this.toAcceptorTransform(acceptorShape, nat);
18228
+ var other = this._other;
18229
+ var isOtherDangling = this._hasAcceptorTransformOld &&
18230
+ other != null &&
18231
+ other.acceptor.shape == null;
18232
+ var work = ((_a = EShapeConnectorEdgeImpl.WORK_MATRIX) !== null && _a !== void 0 ? _a : (EShapeConnectorEdgeImpl.WORK_MATRIX = new pixi_js.Matrix()));
18233
+ if (isOtherDangling) {
18234
+ oat.copyTo(work).invert().prepend(nat);
18235
+ }
18236
+ this._acceptorTransformNew = oat;
18237
+ this._acceptorTransformOld = nat;
18238
+ this._hasAcceptorTransformOld = true;
18213
18239
  this.lock();
18214
18240
  if (isLocalDirty) {
18241
+ var l = this._local;
18242
+ var olx = l.x;
18243
+ var oly = l.y;
18215
18244
  var size = acceptorShape.size;
18216
18245
  var pivot = acceptorShape.transform.pivot;
18217
- var lx = pivot.x + size.x * ((_a = acceptor.x) !== null && _a !== void 0 ? _a : edge.x);
18218
- var ly = pivot.y + size.y * ((_b = acceptor.y) !== null && _b !== void 0 ? _b : edge.y);
18219
- this._local.set(a * lx + c * ly + tx, b * lx + d * ly + ty);
18246
+ var x = pivot.x + size.x * ((_b = acceptor.x) !== null && _b !== void 0 ? _b : edge.x);
18247
+ var y = pivot.y + size.y * ((_c = acceptor.y) !== null && _c !== void 0 ? _c : edge.y);
18248
+ var nlx = nat.a * x + nat.c * y + nat.tx;
18249
+ var nly = nat.b * x + nat.d * y + nat.ty;
18250
+ l.set(nlx, nly);
18251
+ if (isOtherDangling) {
18252
+ var ol = other.local;
18253
+ var oolx = ol.x;
18254
+ var ooly = ol.y;
18255
+ var nolx = work.a * oolx + work.c * ooly + work.tx;
18256
+ var noly = work.b * oolx + work.d * ooly + work.ty;
18257
+ var odx = oolx - olx;
18258
+ var ody = ooly - oly;
18259
+ var ndx = nolx - nlx;
18260
+ var ndy = noly - nly;
18261
+ var od = odx * odx + ody * ody;
18262
+ var nd = ndx * ndx + ndy * ndy;
18263
+ if (0.000001 < nd) {
18264
+ var f = Math.sqrt(od / nd);
18265
+ ol.set(nlx + ndx * f, nly + ndy * f);
18266
+ }
18267
+ else {
18268
+ ol.set(nolx, noly);
18269
+ }
18270
+ }
18220
18271
  }
18221
18272
  if (isNormalDirty) {
18222
- var edgeNormal = edge.normal;
18223
- var nx = edgeNormal.x;
18224
- var ny = edgeNormal.y;
18225
- var x = a * nx + c * ny;
18226
- var y = b * nx + d * ny;
18227
- var l = x * x + y * y;
18228
- var normal = this._normal;
18229
- if (0.000001 < l) {
18230
- var f = 1 / Math.sqrt(l);
18231
- normal.set(x * f, y * f);
18273
+ var en = edge.normal;
18274
+ var enx = en.x;
18275
+ var eny = en.y;
18276
+ var nx = nat.a * enx + nat.c * eny;
18277
+ var ny = nat.b * enx + nat.d * eny;
18278
+ var sd = nx * nx + ny * ny;
18279
+ var n = this._normal;
18280
+ if (0.000001 < sd) {
18281
+ var f = 1 / Math.sqrt(sd);
18282
+ n.set(nx * f, ny * f);
18232
18283
  }
18233
18284
  else {
18234
- normal.set(nx, ny);
18285
+ n.set(enx, eny);
18286
+ }
18287
+ if (isOtherDangling) {
18288
+ var on = other.normal;
18289
+ var oonx = on.x;
18290
+ var oony = on.y;
18291
+ var nonx = work.a * oonx + work.c * oony;
18292
+ var nony = work.b * oonx + work.d * oony;
18293
+ var osd = nonx * nonx + nony * nony;
18294
+ if (0.000001 < osd) {
18295
+ var f = 1 / Math.sqrt(osd);
18296
+ on.set(nonx * f, nony * f);
18297
+ }
18298
+ else {
18299
+ on.set(oonx, oony);
18300
+ }
18235
18301
  }
18236
18302
  }
18237
18303
  var result = this._isLocalChanged || this._isNormalChanged;
@@ -18242,20 +18308,19 @@
18242
18308
  }
18243
18309
  return false;
18244
18310
  };
18245
- EShapeConnectorEdgeImpl.prototype.toAcceptorTransform = function (shape) {
18246
- var _a;
18311
+ EShapeConnectorEdgeImpl.prototype.toAcceptorTransform = function (shape, result) {
18247
18312
  shape.updateTransform();
18248
18313
  var parent = this._parent;
18249
18314
  var parentParent = parent.parent;
18250
18315
  if (parentParent) {
18251
18316
  parent.updateTransform();
18252
- return ((_a = EShapeConnectorEdgeImpl.WORK_MATRIX) !== null && _a !== void 0 ? _a : (EShapeConnectorEdgeImpl.WORK_MATRIX = new pixi_js.Matrix()))
18317
+ return result
18253
18318
  .copyFrom(parentParent.transform.worldTransform)
18254
18319
  .invert()
18255
18320
  .append(shape.transform.worldTransform);
18256
18321
  }
18257
18322
  else {
18258
- return shape.transform.worldTransform;
18323
+ return result.copyFrom(shape.transform.worldTransform);
18259
18324
  }
18260
18325
  };
18261
18326
  EShapeConnectorEdgeImpl.prototype.onAcceptorChange = function () {
@@ -18265,6 +18330,7 @@
18265
18330
  this._isAcceptorChanged = true;
18266
18331
  return;
18267
18332
  }
18333
+ this._hasAcceptorTransformOld = false;
18268
18334
  this.fit(true);
18269
18335
  };
18270
18336
  EShapeConnectorEdgeImpl.prototype.onLocalChange = function () {
@@ -18295,14 +18361,18 @@
18295
18361
  EShapeConnectorEdgeImpl.prototype.attach = function () {
18296
18362
  var shape = this._acceptor.shape;
18297
18363
  if (shape) {
18298
- shape.connector.add(this);
18364
+ if (shape.connector.add(this)) {
18365
+ this.onAcceptorChange();
18366
+ }
18299
18367
  }
18300
18368
  return this;
18301
18369
  };
18302
18370
  EShapeConnectorEdgeImpl.prototype.detach = function () {
18303
18371
  var shape = this._acceptor.shape;
18304
18372
  if (shape) {
18305
- shape.connector.remove(this);
18373
+ if (shape.connector.remove(this)) {
18374
+ this.onAcceptorChange();
18375
+ }
18306
18376
  }
18307
18377
  return this;
18308
18378
  };
@@ -18323,8 +18393,12 @@
18323
18393
  var onChangeBound = function () {
18324
18394
  _this.onChange();
18325
18395
  };
18326
- this._tail = new EShapeConnectorEdgeImpl(parent, onChangeBound);
18327
- this._head = new EShapeConnectorEdgeImpl(parent, onChangeBound);
18396
+ var tail = new EShapeConnectorEdgeImpl(parent, onChangeBound);
18397
+ var head = new EShapeConnectorEdgeImpl(parent, onChangeBound);
18398
+ tail.other = head;
18399
+ head.other = tail;
18400
+ this._tail = tail;
18401
+ this._head = head;
18328
18402
  }
18329
18403
  EShapeConnectorEdgeContainerImpl.prototype.lock = function () {
18330
18404
  this._lockCount += 1;
@@ -49385,128 +49459,66 @@
49385
49459
  * Copyright (C) 2019 Toshiba Corporation
49386
49460
  * SPDX-License-Identifier: Apache-2.0
49387
49461
  */
49388
- var DBasePaddingAdjustable = /** @class */ (function () {
49389
- function DBasePaddingAdjustable(target) {
49390
- this._target = target;
49391
- this._top = 0;
49392
- this._right = 0;
49393
- this._bottom = 0;
49394
- this._left = 0;
49395
- if (target instanceof DBasePadding) {
49396
- this._callback = target.getCallback();
49397
- }
49462
+ var DBasePaddingAdjustable = /** @class */ (function (_super) {
49463
+ __extends(DBasePaddingAdjustable, _super);
49464
+ function DBasePaddingAdjustable(theme, options, callback) {
49465
+ var _this = _super.call(this, theme, options, callback) || this;
49466
+ _this._atop = 0;
49467
+ _this._aright = 0;
49468
+ _this._abottom = 0;
49469
+ _this._aleft = 0;
49470
+ return _this;
49398
49471
  }
49399
- DBasePaddingAdjustable.prototype.getTheme = function () {
49400
- return this._target.getTheme();
49401
- };
49402
- DBasePaddingAdjustable.prototype.setTheme = function (theme) {
49403
- this._target.setTheme(theme);
49404
- };
49405
49472
  DBasePaddingAdjustable.prototype.getLeft = function () {
49406
- return this._target.getLeft() + this._left;
49473
+ return _super.prototype.getLeft.call(this) + this._aleft;
49407
49474
  };
49408
- DBasePaddingAdjustable.prototype.adjLeft = function (left) {
49409
- if (this._left !== left) {
49410
- this._left = left;
49475
+ DBasePaddingAdjustable.prototype.adjLeft = function (aleft) {
49476
+ if (this._aleft !== aleft) {
49477
+ this._aleft = aleft;
49411
49478
  var callback = this._callback;
49412
49479
  if (callback) {
49413
49480
  callback();
49414
49481
  }
49415
49482
  }
49416
49483
  };
49417
- Object.defineProperty(DBasePaddingAdjustable.prototype, "left", {
49418
- get: function () {
49419
- return this._target.left;
49420
- },
49421
- set: function (left) {
49422
- this._target.left = left;
49423
- },
49424
- enumerable: false,
49425
- configurable: true
49426
- });
49427
49484
  DBasePaddingAdjustable.prototype.getTop = function () {
49428
- return this._target.getTop() + this._top;
49485
+ return _super.prototype.getTop.call(this) + this._atop;
49429
49486
  };
49430
- DBasePaddingAdjustable.prototype.adjTop = function (top) {
49431
- if (this._top !== top) {
49432
- this._top = top;
49487
+ DBasePaddingAdjustable.prototype.adjTop = function (atop) {
49488
+ if (this._atop !== atop) {
49489
+ this._atop = atop;
49433
49490
  var callback = this._callback;
49434
49491
  if (callback) {
49435
49492
  callback();
49436
49493
  }
49437
49494
  }
49438
49495
  };
49439
- Object.defineProperty(DBasePaddingAdjustable.prototype, "top", {
49440
- get: function () {
49441
- return this._target.top;
49442
- },
49443
- set: function (top) {
49444
- this._target.top = top;
49445
- },
49446
- enumerable: false,
49447
- configurable: true
49448
- });
49449
49496
  DBasePaddingAdjustable.prototype.getRight = function () {
49450
- return this._target.getRight() + this._right;
49497
+ return _super.prototype.getRight.call(this) + this._aright;
49451
49498
  };
49452
- DBasePaddingAdjustable.prototype.adjRight = function (right) {
49453
- if (this._right !== right) {
49454
- this._right = right;
49499
+ DBasePaddingAdjustable.prototype.adjRight = function (aright) {
49500
+ if (this._aright !== aright) {
49501
+ this._aright = aright;
49455
49502
  var callback = this._callback;
49456
49503
  if (callback) {
49457
49504
  callback();
49458
49505
  }
49459
49506
  }
49460
49507
  };
49461
- Object.defineProperty(DBasePaddingAdjustable.prototype, "right", {
49462
- get: function () {
49463
- return this._target.right;
49464
- },
49465
- set: function (right) {
49466
- this._target.right = right;
49467
- },
49468
- enumerable: false,
49469
- configurable: true
49470
- });
49471
49508
  DBasePaddingAdjustable.prototype.getBottom = function () {
49472
- return this._target.getBottom() + this._bottom;
49509
+ return _super.prototype.getBottom.call(this) + this._abottom;
49473
49510
  };
49474
- DBasePaddingAdjustable.prototype.adjBottom = function (bottom) {
49475
- if (this._bottom !== bottom) {
49476
- this._bottom = bottom;
49511
+ DBasePaddingAdjustable.prototype.adjBottom = function (abottom) {
49512
+ if (this._abottom !== abottom) {
49513
+ this._abottom = abottom;
49477
49514
  var callback = this._callback;
49478
49515
  if (callback) {
49479
49516
  callback();
49480
49517
  }
49481
49518
  }
49482
49519
  };
49483
- Object.defineProperty(DBasePaddingAdjustable.prototype, "bottom", {
49484
- get: function () {
49485
- return this._target.bottom;
49486
- },
49487
- set: function (bottom) {
49488
- this._target.bottom = bottom;
49489
- },
49490
- enumerable: false,
49491
- configurable: true
49492
- });
49493
- DBasePaddingAdjustable.prototype.set = function (top, right, bottom, left) {
49494
- var target = this._target;
49495
- if (right == null) {
49496
- target.set(top);
49497
- }
49498
- else if (bottom == null) {
49499
- target.set(top, right);
49500
- }
49501
- else if (left == null) {
49502
- target.set(top, right, bottom);
49503
- }
49504
- else {
49505
- target.set(top, right, bottom, left);
49506
- }
49507
- };
49508
49520
  return DBasePaddingAdjustable;
49509
- }());
49521
+ }(DBasePadding));
49510
49522
 
49511
49523
  /*
49512
49524
  * Copyright (C) 2019 Toshiba Corporation
@@ -68949,11 +68961,12 @@
68949
68961
  */
68950
68962
  var DTableBodyCellInputTreeInput = /** @class */ (function (_super) {
68951
68963
  __extends(DTableBodyCellInputTreeInput, _super);
68952
- function DTableBodyCellInputTreeInput(options) {
68953
- var _this = _super.call(this, options) || this;
68954
- _this._padding = new DBasePaddingAdjustable(_this._padding);
68955
- return _this;
68964
+ function DTableBodyCellInputTreeInput() {
68965
+ return _super !== null && _super.apply(this, arguments) || this;
68956
68966
  }
68967
+ DTableBodyCellInputTreeInput.prototype.newPadding = function (theme, options, callback) {
68968
+ return new DBasePaddingAdjustable(theme, options, callback);
68969
+ };
68957
68970
  Object.defineProperty(DTableBodyCellInputTreeInput.prototype, "padding", {
68958
68971
  get: function () {
68959
68972
  return this._padding;
@@ -69539,12 +69552,12 @@
69539
69552
  var DTableBodyCellTree = /** @class */ (function (_super) {
69540
69553
  __extends(DTableBodyCellTree, _super);
69541
69554
  function DTableBodyCellTree(columnIndex, column, onChange, options) {
69542
- var _this = this;
69543
69555
  var _a;
69544
- _this = _super.call(this, columnIndex, column, onChange, DLinks.toStateOptions((_a = options === null || options === void 0 ? void 0 : options.link) === null || _a === void 0 ? void 0 : _a.target, options)) || this;
69545
- _this._padding = new DBasePaddingAdjustable(_this._padding);
69546
- return _this;
69556
+ return _super.call(this, columnIndex, column, onChange, DLinks.toStateOptions((_a = options === null || options === void 0 ? void 0 : options.link) === null || _a === void 0 ? void 0 : _a.target, options)) || this;
69547
69557
  }
69558
+ DTableBodyCellTree.prototype.newPadding = function (theme, options, callback) {
69559
+ return new DBasePaddingAdjustable(theme, options, callback);
69560
+ };
69548
69561
  DTableBodyCellTree.prototype.onClick = function (e) {
69549
69562
  var _a;
69550
69563
  if (((_a = this.link) === null || _a === void 0 ? void 0 : _a.onClick(this, e)) !== true) {
@@ -74615,10 +74628,12 @@
74615
74628
  __extends(DTreeItemText, _super);
74616
74629
  function DTreeItemText(data, options) {
74617
74630
  var _this = _super.call(this, options) || this;
74618
- _this._padding = new DBasePaddingAdjustable(_this._padding);
74619
74631
  _this._data = data;
74620
74632
  return _this;
74621
74633
  }
74634
+ DTreeItemText.prototype.newPadding = function (theme, options, callback) {
74635
+ return new DBasePaddingAdjustable(theme, options, callback);
74636
+ };
74622
74637
  Object.defineProperty(DTreeItemText.prototype, "node", {
74623
74638
  get: function () {
74624
74639
  return this._node;