@flashist/appframework 0.0.329 → 0.0.330

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.
@@ -15,7 +15,7 @@ export class AlignWithMaxSizeLayout extends BaseLayout {
15
15
  //
16
16
  let childrenCount = container.layoutGetChildrenNum();
17
17
  for (let childIndex = 0; childIndex < childrenCount; childIndex++) {
18
- tempChild = container.layoutGetChildAt(childIndex);
18
+ tempChild = this.getChildAt(container, childIndex);
19
19
  tempChildSize = GetSizeTools.getObjectSize(tempChild);
20
20
  this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, 0, 0);
21
21
  prevChild = tempChild;
@@ -1 +1 @@
1
- {"version":3,"file":"AlignWithMaxSizeLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/AlignWithMaxSizeLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,OAAO,sBAAuB,SAAQ,UAAU;IAE3C,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,kCAAkC,EAAE,gCAAgC,CAAC,CAAC;YACjF,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAoB,CAAC;QAEzB,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,EAAE;QACF,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAEnD,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAEtD,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAEvG,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAES,6BAA6B,CAAC,SAA+B,EAAE,YAAoB,EAAE,SAAiB;QAC5G,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAE9D,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
1
+ {"version":3,"file":"AlignWithMaxSizeLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/AlignWithMaxSizeLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,OAAO,sBAAuB,SAAQ,UAAU;IAE3C,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,kCAAkC,EAAE,gCAAgC,CAAC,CAAC;YACjF,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAoB,CAAC;QAEzB,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,EAAE;QACF,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAEnD,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAEtD,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAEvG,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAES,6BAA6B,CAAC,SAA+B,EAAE,YAAoB,EAAE,SAAiB;QAC5G,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAC1D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAE9D,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
@@ -27,7 +27,7 @@ export class ColumnLayout extends BaseLayout {
27
27
  //
28
28
  var childrenCount = container.layoutGetChildrenNum();
29
29
  for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
30
- tempChild = container.layoutGetChildAt(childIndex);
30
+ tempChild = this.getChildAt(container, childIndex);
31
31
  tempChildSize = GetSizeTools.getObjectSize(tempChild);
32
32
  this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, 0, childIndex);
33
33
  // Запоминаем данные о текущем элементе
@@ -68,7 +68,7 @@ export class ColumnLayout extends BaseLayout {
68
68
  // не на основе максимального размера, а на положения и размера последнего элемента
69
69
  var childrenCount = container.layoutGetChildrenNum();
70
70
  if (childrenCount > 0) {
71
- var lastChild = container.layoutGetChildAt(childrenCount - 1);
71
+ var lastChild = this.getChildAt(container, childrenCount - 1);
72
72
  if (lastChild) {
73
73
  var lastChildSize = GetSizeTools.getObjectSize(lastChild);
74
74
  this._totalSize.y = lastChild.y + lastChildSize.y + this.settings.paddingY;
@@ -1 +1 @@
1
- {"version":3,"file":"ColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/ColumnLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAGxD;;;GAGG;AACH,MAAM,OAAO,YAAa,SAAQ,UAAU;IAExC;;;;OAIG;IACI,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAC;YACvE,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,sCAAsC;QACtC,IAAI,aAAoB,CAAC;QAGzB,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,EAAE;QACF,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAoB,CAAC;QACzB,EAAE;QACF,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAEnD,aAAa,GAAG,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAEtD,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;YAEhH,uCAAuC;YACvC,SAAS,GAAG,SAAS,CAAC;YACtB,aAAa,GAAG,aAAa,CAAC;QAClC,CAAC;QAGD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED;;;;;;;;;;OAUG;IACO,YAAY,CAAC,KAAuB,EAAE,SAA2B,EAAE,KAAa,EAAE,MAAc,EAAE,YAAmB,EAAE,cAAsB,CAAC,EAAE,WAAmB,CAAC,EAAE,YAAmB,IAAI;QACnM,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QAEpG,2FAA2F;QAC3F,qGAAqG;QACrG,IAAI,SAAS,EAAE,CAAC;YACZ,IAAI,aAAa,GAAU,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YACjE,oEAAoE;YAEpE,IAAI,CAAC,kBAAkB,CACnB,KAAK,EACL,KAAK,CAAC,CAAC,EACP,SAAS,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CACzD,CAAC;QACN,CAAC;IACL,CAAC;IAED;;;;OAIG;IACO,eAAe,CAAC,SAA+B;QACrD,KAAK,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAEjC,mGAAmG;QACnG,mFAAmF;QACnF,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACpB,IAAI,SAAS,GAAqB,SAAS,CAAC,gBAAgB,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;YAChF,IAAI,SAAS,EAAE,CAAC;gBACZ,IAAI,aAAa,GAAU,YAAY,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;gBACjE,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC/E,CAAC;QACL,CAAC;IACL,CAAC;IAGD;;;;;;OAMG;IACI,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,EAAE,CAAC;QAEhC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;QACb,MAAM,CAAC,CAAC,GAAG,aAAa,CAAC;QAGzB,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
1
+ {"version":3,"file":"ColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/ColumnLayout.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,7 @@ export class MultiColumnLayout extends BaseLayout {
19
19
  var prevChild;
20
20
  var childrenCount = container.layoutGetChildrenNum();
21
21
  for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
22
- tempChild = container.layoutGetChildAt(childIndex);
22
+ tempChild = this.getChildAt(container, childIndex);
23
23
  let colIndex = childIndex % this.settings.columnsCount;
24
24
  let rowIndex = Math.floor(childIndex / this.settings.columnsCount);
25
25
  this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, colIndex, rowIndex);
@@ -1 +1 @@
1
- {"version":3,"file":"MultiColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/MultiColumnLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IAI7C,YAAY,QAA0C;QAClD,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAEM,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAC;YACvE,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;YAEnD,IAAI,QAAQ,GAAW,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC/D,IAAI,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAE3E,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAErH,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAGD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,EAAE,CAAC;QAEhC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QACtC,MAAM,CAAC,CAAC,GAAG,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QAEtD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
1
+ {"version":3,"file":"MultiColumnLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/MultiColumnLayout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C;;;GAGG;AACH,MAAM,OAAO,iBAAkB,SAAQ,UAAU;IAI7C,YAAY,QAA0C;QAClD,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAEM,OAAO,CAAC,SAA+B;QAE1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE,gCAAgC,CAAC,CAAC;YACvE,OAAO;QACX,CAAC;QAED,IAAI,SAA2B,CAAC;QAChC,IAAI,YAAY,GAAU,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,SAA2B,CAAC;QAChC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,KAAK,IAAI,UAAU,GAAW,CAAC,EAAE,UAAU,GAAG,aAAa,EAAE,UAAU,EAAE,EAAE,CAAC;YACxE,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;YAEnD,IAAI,QAAQ,GAAW,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YAC/D,IAAI,QAAQ,GAAW,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAE3E,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAErH,SAAS,GAAG,SAAS,CAAC;QAC1B,CAAC;QAGD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAEM,2BAA2B,CAAC,SAA+B;QAC9D,IAAI,MAAM,GAAU,IAAI,KAAK,EAAE,CAAC;QAEhC,IAAI,aAAa,GAAW,SAAS,CAAC,oBAAoB,EAAE,CAAC;QAC7D,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QACtC,MAAM,CAAC,CAAC,GAAG,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QAEtD,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ"}
@@ -23,7 +23,7 @@ export class RowLayout extends BaseLayout {
23
23
  //
24
24
  var childrenCount = container.layoutGetChildrenNum();
25
25
  for (var childIndex = 0; childIndex < childrenCount; childIndex++) {
26
- tempChild = container.layoutGetChildAt(childIndex);
26
+ tempChild = this.getChildAt(container, childIndex);
27
27
  tempChildSize = GetSizeTools.getObjectSize(tempChild);
28
28
  this.arrangeChild(tempChild, prevChild, this.settings.align, this.settings.valign, childMaxSize, childIndex);
29
29
  // Запоминаем данные о текущем элементе
@@ -64,7 +64,7 @@ export class RowLayout extends BaseLayout {
64
64
  // не на основе максимального размера, а на положения и размера последнего элемента
65
65
  var childrenCount = container.layoutGetChildrenNum();
66
66
  if (childrenCount > 0) {
67
- var lastChild = container.layoutGetChildAt(childrenCount - 1);
67
+ var lastChild = this.getChildAt(container, childrenCount - 1);
68
68
  if (lastChild) {
69
69
  var lastChildSize = GetSizeTools.getObjectSize(lastChild);
70
70
  this._totalSize.x = lastChild.x + lastChildSize.x + this.settings.paddingX;
@@ -1 +1 @@
1
- {"version":3,"file":"RowLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/RowLayout.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RowLayout.js","sourceRoot":"","sources":["../../../../src/display/views/layout/RowLayout.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@flashist/appframework",
3
- "version": "0.0.329",
3
+ "version": "0.0.330",
4
4
  "scripts": {
5
5
  "build": "gulp",
6
6
  "publish:patch": "npm version patch && npm run build && cd ./dist && npm publish",