@coolon/angular-ui-powerups 16.1.0-aplpha.38 → 16.1.0-aplpha.39

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 (5) hide show
  1. package/esm2022/lib/components/tables/column/column-manager.mjs +17 -20
  2. package/esm2022/lib/components/tables/column/column-order-manager.mjs +2 -2
  3. package/fesm2022/coolon-angular-ui-powerups.mjs +17 -19
  4. package/fesm2022/coolon-angular-ui-powerups.mjs.map +1 -1
  5. package/package.json +1 -1
package/esm2022/lib/components/tables/column/column-manager.mjs CHANGED
@@ -1,5 +1,4 @@
1
- import { __decorate, __metadata } from "tslib";
2
- import { Dsl, GarbageCollector, lang, MutableListModel, Trace, WatchList } from '@coolon/pectin';
1
+ import { Dsl, GarbageCollector, lang, MutableListModel, WatchList } from '@coolon/pectin';
3
2
  import { generateKeyBetween } from "fractional-indexing";
4
3
  import { ColumnOrderManager } from "./column-order-manager";
5
4
  class ColumnRef {
@@ -29,7 +28,9 @@ export class ColumnManager extends GarbageCollector {
29
28
  }
30
29
  position(column, newPosition) {
31
30
  const target = this._columnRefs$.query().findMatching(it => it.column === column);
32
- this._columnRefs$.replace(target, { with: new ColumnRef(target.column, this.computePosition(newPosition)) });
31
+ const position = this.computePosition(newPosition);
32
+ this._columnRefs$.replace(target, { with: new ColumnRef(target.column, position) });
33
+ console.log(this._columnRefs$.value.map(r => [r.column.columnId, r.position]));
33
34
  }
34
35
  getColumn(id) {
35
36
  return this._columnsById$.get(id);
@@ -54,18 +55,20 @@ export class ColumnManager extends GarbageCollector {
54
55
  const q = this.orderedColumnRefs$.query();
55
56
  return ColumnOrderManager.processPosition(position, {
56
57
  before(col) {
57
- const beforeIndex = q.findIndex(ref => ref.column === col);
58
- const beforeCol = q.value[beforeIndex];
59
- const afterCol = beforeIndex - 1 > 0 ? q.value[beforeIndex - 1] : undefined;
60
- console.log({ afterCol, beforeCol });
61
- return generateKeyBetween(afterCol?.position, beforeCol.position);
58
+ const index = q.findIndex(ref => ref.column === col);
59
+ const beforeCol = q.value[index];
60
+ const afterCol = index - 1 >= 0 ? q.value[index - 1] : undefined;
61
+ return afterCol ?
62
+ generateKeyBetween(afterCol.position, beforeCol.position) :
63
+ generateKeyBetween(null, beforeCol.position);
62
64
  },
63
65
  after(col) {
64
- const afterIndex = q.findIndex(ref => ref.column === col);
65
- const afterCol = q.value[afterIndex];
66
- const beforeCol = afterIndex + 1 < q.length ? q.value[afterIndex + 1] : undefined;
67
- console.log({ afterCol, beforeCol });
68
- return generateKeyBetween(afterCol.position, beforeCol?.position);
66
+ const index = q.findIndex(ref => ref.column === col);
67
+ const afterCol = q.value[index];
68
+ const beforeCol = index + 1 < q.length ? q.value[index + 1] : undefined;
69
+ return beforeCol ?
70
+ generateKeyBetween(afterCol.position, beforeCol.position) :
71
+ generateKeyBetween(afterCol.position, null);
69
72
  },
70
73
  first() {
71
74
  return generateKeyBetween(null, q.first()?.position);
@@ -80,10 +83,4 @@ export class ColumnManager extends GarbageCollector {
80
83
  return this.allColumns$.value.filter(c => c.visible$.value);
81
84
  }
82
85
  }
83
- __decorate([
84
- Trace(),
85
- __metadata("design:type", Function),
86
- __metadata("design:paramtypes", [Object]),
87
- __metadata("design:returntype", String)
88
- ], ColumnManager.prototype, "computePosition", null);
89
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"column-manager.js","sourceRoot":"","sources":["../../../../../../../../libs/angular-ui-powerups/src/lib/components/tables/column/column-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Dsl,\n  GarbageCollector,\n  lang,\n  ListModel,\n  ListModelChain,\n  MapModelChain,\n  MutableListModel,\n  Trace,\n  WatchList\n} from '@coolon/pectin';\nimport {generateKeyBetween} from \"fractional-indexing\";\nimport {ColumnModel} from './column-model';\nimport {ColumnOrderManager} from \"./column-order-manager\";\n\nclass ColumnRef<ROW> {\n  constructor(readonly column: ColumnModel<ROW>, readonly position: string) {\n  }\n}\n\nexport class ColumnManager<Row> extends GarbageCollector implements ColumnOrderManager {\n\n  private readonly _columnRefs$ = new MutableListModel<ColumnRef<Row>>();\n  private readonly orderedColumnRefs$: ListModelChain<ColumnRef<Row>>;\n  private readonly _columnsById$: MapModelChain<string, ColumnModel<Row>>;\n  readonly allColumns$: ListModel<ColumnModel<Row>>;\n  readonly columnVisibilities$ = new WatchList<boolean>()\n  readonly visibleColumns$: ListModel<ColumnModel<Row>>;\n\n  constructor() {\n    super();\n    const {chain} = Dsl.disposeWith(this);\n    this.orderedColumnRefs$ = chain(this._columnRefs$).orderBy(\"position\", \"asc\");\n    this.allColumns$ = this.orderedColumnRefs$.pluck(\"column\");\n\n    this._columnsById$ = chain(this.allColumns$).indexBy('columnId');\n    this.visibleColumns$ = chain(this.allColumns$).select(it => it.visible$.value, {\n      dependsOn: this.columnVisibilities$\n    })\n  }\n\n  position(column: ColumnModel<any>, newPosition: ColumnOrderManager.Position) {\n    const target = this._columnRefs$.query().findMatching(it => it.column === column)\n    this._columnRefs$.replace(target, {with: new ColumnRef<Row>(target.column, this.computePosition(newPosition))})\n  }\n\n  getColumn(id: string): ColumnModel<Row> {\n    return this._columnsById$.get(id);\n  }\n\n  hasColumn(id: string): boolean {\n    return !!this._columnsById$.get(id);\n  }\n\n  hasMatchingColumn(row: Row, regex: RegExp): boolean {\n    // only search the visible columns\n    return !!this.visibleColumns$.value.find(c => regex.test(c.getSearchTextFor(row)));\n  }\n\n  addColumn<C extends ColumnModel<Row>>(column: C, position?: ColumnOrderManager.Position): C {\n    if (this.hasColumn(column.columnId)) {\n      lang.illegalState(`Column with id=${column.columnId} already exists`);\n    }\n    this.registerDisposable(column);\n    this._columnRefs$.push(new ColumnRef<Row>(column, this.computePosition(position)));\n    this.columnVisibilities$.add(column.visible$);\n    return column;\n  }\n\n  @Trace()\n  computePosition(position?: ColumnOrderManager.Position): string {\n    const q = this.orderedColumnRefs$.query();\n    return ColumnOrderManager.processPosition(position, {\n      before(col: ColumnModel<any>): string {\n        const beforeIndex = q.findIndex(ref => ref.column === col)\n        const beforeCol = q.value[beforeIndex];\n        const afterCol = beforeIndex - 1 > 0 ? q.value[beforeIndex - 1] : undefined;\n        console.log({afterCol, beforeCol})\n        return generateKeyBetween(\n          afterCol?.position,\n          beforeCol.position\n        );\n      },\n      after(col: ColumnModel<any>): string {\n        const afterIndex = q.findIndex(ref => ref.column === col)\n        const afterCol = q.value[afterIndex];\n        const beforeCol = afterIndex + 1 < q.length ? q.value[afterIndex + 1] : undefined;\n        console.log({afterCol, beforeCol})\n        return generateKeyBetween(\n          afterCol.position,\n          beforeCol?.position\n        );\n      },\n      first(): string {\n        return generateKeyBetween(null, q.first()?.position);\n      },\n      last() {\n        // add it to the end of the list\n        return generateKeyBetween(q.last()?.position, null);\n      }\n    })\n  }\n\n\n  doComputeValue(): ColumnModel<Row>[] {\n    return this.allColumns$.value.filter(c => c.visible$.value);\n  }\n}\n"]}
86
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"column-manager.js","sourceRoot":"","sources":["../../../../../../../../libs/angular-ui-powerups/src/lib/components/tables/column/column-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  Dsl,\n  GarbageCollector,\n  lang,\n  ListModel,\n  ListModelChain,\n  MapModelChain,\n  MutableListModel,\n  Trace,\n  WatchList\n} from '@coolon/pectin';\nimport {generateKeyBetween} from \"fractional-indexing\";\nimport {ColumnModel} from './column-model';\nimport {ColumnOrderManager} from \"./column-order-manager\";\n\nclass ColumnRef<ROW> {\n  constructor(readonly column: ColumnModel<ROW>, readonly position: string) {\n  }\n}\n\nexport class ColumnManager<Row> extends GarbageCollector implements ColumnOrderManager {\n\n  private readonly _columnRefs$ = new MutableListModel<ColumnRef<Row>>();\n  private readonly orderedColumnRefs$: ListModelChain<ColumnRef<Row>>;\n  private readonly _columnsById$: MapModelChain<string, ColumnModel<Row>>;\n  readonly allColumns$: ListModel<ColumnModel<Row>>;\n  readonly columnVisibilities$ = new WatchList<boolean>()\n  readonly visibleColumns$: ListModel<ColumnModel<Row>>;\n\n  constructor() {\n    super();\n    const {chain} = Dsl.disposeWith(this);\n    this.orderedColumnRefs$ = chain(this._columnRefs$).orderBy(\"position\", \"asc\");\n    this.allColumns$ = this.orderedColumnRefs$.pluck(\"column\");\n\n    this._columnsById$ = chain(this.allColumns$).indexBy('columnId');\n    this.visibleColumns$ = chain(this.allColumns$).select(it => it.visible$.value, {\n      dependsOn: this.columnVisibilities$\n    })\n  }\n\n  position(column: ColumnModel<any>, newPosition: ColumnOrderManager.Position) {\n    const target = this._columnRefs$.query().findMatching(it => it.column === column)\n    const position = this.computePosition(newPosition);\n    this._columnRefs$.replace(target, {with: new ColumnRef<Row>(target.column, position)});\n    console.log(this._columnRefs$.value.map(r => [r.column.columnId, r.position]))\n  }\n\n  getColumn(id: string): ColumnModel<Row> {\n    return this._columnsById$.get(id);\n  }\n\n  hasColumn(id: string): boolean {\n    return !!this._columnsById$.get(id);\n  }\n\n  hasMatchingColumn(row: Row, regex: RegExp): boolean {\n    // only search the visible columns\n    return !!this.visibleColumns$.value.find(c => regex.test(c.getSearchTextFor(row)));\n  }\n\n  addColumn<C extends ColumnModel<Row>>(column: C, position?: ColumnOrderManager.Position): C {\n    if (this.hasColumn(column.columnId)) {\n      lang.illegalState(`Column with id=${column.columnId} already exists`);\n    }\n    this.registerDisposable(column);\n    this._columnRefs$.push(new ColumnRef<Row>(column, this.computePosition(position)));\n    this.columnVisibilities$.add(column.visible$);\n    return column;\n  }\n\n  computePosition(position?: ColumnOrderManager.Position): string {\n    const q = this.orderedColumnRefs$.query();\n    return ColumnOrderManager.processPosition(position, {\n      before(col: ColumnModel<any>): string {\n        const index = q.findIndex(ref => ref.column === col)\n        const beforeCol = q.value[index];\n        const afterCol = index - 1 >= 0 ? q.value[index - 1] : undefined;\n        return afterCol ?\n          generateKeyBetween(afterCol.position, beforeCol.position) :\n          generateKeyBetween(null, beforeCol.position);\n      },\n      after(col: ColumnModel<any>): string {\n        const index = q.findIndex(ref => ref.column === col)\n        const afterCol = q.value[index];\n        const beforeCol = index + 1 < q.length ? q.value[index + 1] : undefined;\n        return beforeCol ?\n          generateKeyBetween(afterCol.position, beforeCol.position) :\n          generateKeyBetween(afterCol.position, null);\n      },\n      first(): string {\n        return generateKeyBetween(null, q.first()?.position);\n      },\n      last() {\n        // add it to the end of the list\n        return generateKeyBetween(q.last()?.position, null);\n      }\n    })\n  }\n\n\n  doComputeValue(): ColumnModel<Row>[] {\n    return this.allColumns$.value.filter(c => c.visible$.value);\n  }\n}\n"]}
package/esm2022/lib/components/tables/column/column-order-manager.mjs CHANGED
@@ -7,7 +7,7 @@ export var ColumnOrderManager;
7
7
  return position["before"] ? callback.before(position["before"]) : callback.first();
8
8
  }
9
9
  else {
10
- return position["after"] ? callback.before(position["after"]) : callback.last();
10
+ return position["after"] ? callback.after(position["after"]) : callback.last();
11
11
  }
12
12
  }
13
13
  else {
@@ -16,4 +16,4 @@ export var ColumnOrderManager;
16
16
  }
17
17
  ColumnOrderManager.processPosition = processPosition;
18
18
  })(ColumnOrderManager || (ColumnOrderManager = {}));
19
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sdW1uLW9yZGVyLW1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9saWJzL2FuZ3VsYXItdWktcG93ZXJ1cHMvc3JjL2xpYi9jb21wb25lbnRzL3RhYmxlcy9jb2x1bW4vY29sdW1uLW9yZGVyLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsTUFBTSxLQUFXLGtCQUFrQixDQXlCbEM7QUF6QkQsV0FBaUIsa0JBQWtCO0lBTWpDLFNBQWdCLGVBQWUsQ0FBQyxRQUE4QixFQUFFLFFBSy9EO1FBQ0MsSUFBSSxRQUFRLEVBQUU7WUFDWixNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ25DLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsRUFBRTtnQkFDM0IsT0FBTyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsQ0FBQTthQUNuRjtpQkFBTTtnQkFDTCxPQUFPLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO2FBQ2hGO1NBQ0Y7YUFBTTtZQUNMLE9BQU8sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO1NBQ3hCO0lBQ0gsQ0FBQztJQWhCZSxrQ0FBZSxrQkFnQjlCLENBQUE7QUFHSCxDQUFDLEVBekJnQixrQkFBa0IsS0FBbEIsa0JBQWtCLFFBeUJsQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7Q29sdW1uTWFuYWdlcn0gZnJvbSBcIi4vY29sdW1uLW1hbmFnZXJcIjtcbmltcG9ydCB7Q29sdW1uTW9kZWx9IGZyb20gXCIuL2NvbHVtbi1tb2RlbFwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIENvbHVtbk9yZGVyTWFuYWdlciB7XG5cbiAgcG9zaXRpb24oY29sdW1uOiBDb2x1bW5Nb2RlbDxhbnk+LCBwb3NpdGlvbjogQ29sdW1uT3JkZXJNYW5hZ2VyLlBvc2l0aW9uKTp2b2lkO1xuXG59XG5cbmV4cG9ydCBuYW1lc3BhY2UgQ29sdW1uT3JkZXJNYW5hZ2VyIHtcbiAgaW50ZXJmYWNlIEJlZm9yZSB7IGJlZm9yZTogQ29sdW1uTW9kZWw8YW55PiB8IG51bGwgfSAvLyBiZWZvcmU6bnVsbCA9PT0gZmlyc3RcbiAgaW50ZXJmYWNlIEFmdGVyIHsgYWZ0ZXI6IENvbHVtbk1vZGVsPGFueT4gfCBudWxsIH0gLy8gYWZ0ZXI6bnVsbCA9PT0gbGFzdFxuXG4gIGV4cG9ydCB0eXBlIFBvc2l0aW9uID0gQmVmb3JlIHwgQWZ0ZXI7XG5cbiAgZXhwb3J0IGZ1bmN0aW9uIHByb2Nlc3NQb3NpdGlvbihwb3NpdGlvbjogUG9zaXRpb24gfCB1bmRlZmluZWQsIGNhbGxiYWNrOiB7XG4gICAgYmVmb3JlKGNvbDogQ29sdW1uTW9kZWw8YW55PiB8IG51bGwpOiBzdHJpbmcsXG4gICAgYWZ0ZXIoY29sOiBDb2x1bW5Nb2RlbDxhbnk+IHwgbnVsbCk6IHN0cmluZyxcbiAgICBmaXJzdCgpOiBzdHJpbmdcbiAgICBsYXN0KCk6IHN0cmluZ1xuICB9KTogc3RyaW5nIHtcbiAgICBpZiAocG9zaXRpb24pIHtcbiAgICAgIGNvbnN0IGtleXMgPSBPYmplY3Qua2V5cyhwb3NpdGlvbik7XG4gICAgICBpZiAoa2V5cy5pbmNsdWRlcyhcImJlZm9yZVwiKSkge1xuICAgICAgICByZXR1cm4gcG9zaXRpb25bXCJiZWZvcmVcIl0gPyBjYWxsYmFjay5iZWZvcmUocG9zaXRpb25bXCJiZWZvcmVcIl0pIDogY2FsbGJhY2suZmlyc3QoKVxuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIHBvc2l0aW9uW1wiYWZ0ZXJcIl0gPyBjYWxsYmFjay5iZWZvcmUocG9zaXRpb25bXCJhZnRlclwiXSkgOiBjYWxsYmFjay5sYXN0KClcbiAgICAgIH1cbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIGNhbGxiYWNrLmxhc3QoKTtcbiAgICB9XG4gIH1cblxuXG59XG5cbiJdfQ==
19
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29sdW1uLW9yZGVyLW1hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi8uLi9saWJzL2FuZ3VsYXItdWktcG93ZXJ1cHMvc3JjL2xpYi9jb21wb25lbnRzL3RhYmxlcy9jb2x1bW4vY29sdW1uLW9yZGVyLW1hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBU0EsTUFBTSxLQUFXLGtCQUFrQixDQXlCbEM7QUF6QkQsV0FBaUIsa0JBQWtCO0lBTWpDLFNBQWdCLGVBQWUsQ0FBQyxRQUE4QixFQUFFLFFBSy9EO1FBQ0MsSUFBSSxRQUFRLEVBQUU7WUFDWixNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQ25DLElBQUksSUFBSSxDQUFDLFFBQVEsQ0FBQyxRQUFRLENBQUMsRUFBRTtnQkFDM0IsT0FBTyxRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsQ0FBQTthQUNuRjtpQkFBTTtnQkFDTCxPQUFPLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxDQUFBO2FBQy9FO1NBQ0Y7YUFBTTtZQUNMLE9BQU8sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO1NBQ3hCO0lBQ0gsQ0FBQztJQWhCZSxrQ0FBZSxrQkFnQjlCLENBQUE7QUFHSCxDQUFDLEVBekJnQixrQkFBa0IsS0FBbEIsa0JBQWtCLFFBeUJsQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7Q29sdW1uTWFuYWdlcn0gZnJvbSBcIi4vY29sdW1uLW1hbmFnZXJcIjtcbmltcG9ydCB7Q29sdW1uTW9kZWx9IGZyb20gXCIuL2NvbHVtbi1tb2RlbFwiO1xuXG5leHBvcnQgaW50ZXJmYWNlIENvbHVtbk9yZGVyTWFuYWdlciB7XG5cbiAgcG9zaXRpb24oY29sdW1uOiBDb2x1bW5Nb2RlbDxhbnk+LCBwb3NpdGlvbjogQ29sdW1uT3JkZXJNYW5hZ2VyLlBvc2l0aW9uKTp2b2lkO1xuXG59XG5cbmV4cG9ydCBuYW1lc3BhY2UgQ29sdW1uT3JkZXJNYW5hZ2VyIHtcbiAgaW50ZXJmYWNlIEJlZm9yZSB7IGJlZm9yZTogQ29sdW1uTW9kZWw8YW55PiB8IG51bGwgfSAvLyBiZWZvcmU6bnVsbCA9PT0gZmlyc3RcbiAgaW50ZXJmYWNlIEFmdGVyIHsgYWZ0ZXI6IENvbHVtbk1vZGVsPGFueT4gfCBudWxsIH0gLy8gYWZ0ZXI6bnVsbCA9PT0gbGFzdFxuXG4gIGV4cG9ydCB0eXBlIFBvc2l0aW9uID0gQmVmb3JlIHwgQWZ0ZXI7XG5cbiAgZXhwb3J0IGZ1bmN0aW9uIHByb2Nlc3NQb3NpdGlvbihwb3NpdGlvbjogUG9zaXRpb24gfCB1bmRlZmluZWQsIGNhbGxiYWNrOiB7XG4gICAgYmVmb3JlKGNvbDogQ29sdW1uTW9kZWw8YW55PiB8IG51bGwpOiBzdHJpbmcsXG4gICAgYWZ0ZXIoY29sOiBDb2x1bW5Nb2RlbDxhbnk+IHwgbnVsbCk6IHN0cmluZyxcbiAgICBmaXJzdCgpOiBzdHJpbmdcbiAgICBsYXN0KCk6IHN0cmluZ1xuICB9KTogc3RyaW5nIHtcbiAgICBpZiAocG9zaXRpb24pIHtcbiAgICAgIGNvbnN0IGtleXMgPSBPYmplY3Qua2V5cyhwb3NpdGlvbik7XG4gICAgICBpZiAoa2V5cy5pbmNsdWRlcyhcImJlZm9yZVwiKSkge1xuICAgICAgICByZXR1cm4gcG9zaXRpb25bXCJiZWZvcmVcIl0gPyBjYWxsYmFjay5iZWZvcmUocG9zaXRpb25bXCJiZWZvcmVcIl0pIDogY2FsbGJhY2suZmlyc3QoKVxuICAgICAgfSBlbHNlIHtcbiAgICAgICAgcmV0dXJuIHBvc2l0aW9uW1wiYWZ0ZXJcIl0gPyBjYWxsYmFjay5hZnRlcihwb3NpdGlvbltcImFmdGVyXCJdKSA6IGNhbGxiYWNrLmxhc3QoKVxuICAgICAgfVxuICAgIH0gZWxzZSB7XG4gICAgICByZXR1cm4gY2FsbGJhY2subGFzdCgpO1xuICAgIH1cbiAgfVxuXG5cbn1cblxuIl19
package/fesm2022/coolon-angular-ui-powerups.mjs CHANGED
@@ -39,7 +39,7 @@ import { MatTableModule } from '@angular/material/table';
39
39
  import * as i4$1 from '@angular/material/tooltip';
40
40
  import { MatTooltipModule } from '@angular/material/tooltip';
41
41
  import * as i1$3 from '@coolon/pectin';
42
- import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl, Logger, proxify, ValueModel, Proxify, StoreInValueModel, Command, MutableListModel, StoreInListModel, Disposable, DelegatingListModel, MutableValueModel, DelegateToValueModel, FocusManager, EventListenerList, Guard, DelegatingFormListModel, Binding, DebugContext, DelegateToListModel, DelegatingFormValueModel, ListModel, Functions, PageController, SelectionModel, CanProxy, MultipleSelectionModel, WatchList, Trace, DirtyTrackingForm, ProxyRegistry, DelegatingCommand, PagedListModel, ComputedListModel, Deferred, ReducingValueModel, AndValueModel } from '@coolon/pectin';
42
+ import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl, Logger, proxify, ValueModel, Proxify, StoreInValueModel, Command, MutableListModel, StoreInListModel, Disposable, DelegatingListModel, MutableValueModel, DelegateToValueModel, FocusManager, EventListenerList, Guard, DelegatingFormListModel, Binding, DebugContext, DelegateToListModel, DelegatingFormValueModel, ListModel, Functions, PageController, SelectionModel, CanProxy, MultipleSelectionModel, WatchList, DirtyTrackingForm, ProxyRegistry, DelegatingCommand, PagedListModel, ComputedListModel, Deferred, ReducingValueModel, AndValueModel } from '@coolon/pectin';
43
43
  import { __decorate, __param, __metadata } from 'tslib';
44
44
  import * as i1 from '@angular/platform-browser';
45
45
  import escapeStringRegexp from 'escape-string-regexp';
@@ -3504,7 +3504,7 @@ var ColumnOrderManager;
3504
3504
  return position["before"] ? callback.before(position["before"]) : callback.first();
3505
3505
  }
3506
3506
  else {
3507
- return position["after"] ? callback.before(position["after"]) : callback.last();
3507
+ return position["after"] ? callback.after(position["after"]) : callback.last();
3508
3508
  }
3509
3509
  }
3510
3510
  else {
@@ -3541,7 +3541,9 @@ class ColumnManager extends GarbageCollector {
3541
3541
  }
3542
3542
  position(column, newPosition) {
3543
3543
  const target = this._columnRefs$.query().findMatching(it => it.column === column);
3544
- this._columnRefs$.replace(target, { with: new ColumnRef(target.column, this.computePosition(newPosition)) });
3544
+ const position = this.computePosition(newPosition);
3545
+ this._columnRefs$.replace(target, { with: new ColumnRef(target.column, position) });
3546
+ console.log(this._columnRefs$.value.map(r => [r.column.columnId, r.position]));
3545
3547
  }
3546
3548
  getColumn(id) {
3547
3549
  return this._columnsById$.get(id);
@@ -3566,18 +3568,20 @@ class ColumnManager extends GarbageCollector {
3566
3568
  const q = this.orderedColumnRefs$.query();
3567
3569
  return ColumnOrderManager.processPosition(position, {
3568
3570
  before(col) {
3569
- const beforeIndex = q.findIndex(ref => ref.column === col);
3570
- const beforeCol = q.value[beforeIndex];
3571
- const afterCol = beforeIndex - 1 > 0 ? q.value[beforeIndex - 1] : undefined;
3572
- console.log({ afterCol, beforeCol });
3573
- return generateKeyBetween(afterCol?.position, beforeCol.position);
3571
+ const index = q.findIndex(ref => ref.column === col);
3572
+ const beforeCol = q.value[index];
3573
+ const afterCol = index - 1 >= 0 ? q.value[index - 1] : undefined;
3574
+ return afterCol ?
3575
+ generateKeyBetween(afterCol.position, beforeCol.position) :
3576
+ generateKeyBetween(null, beforeCol.position);
3574
3577
  },
3575
3578
  after(col) {
3576
- const afterIndex = q.findIndex(ref => ref.column === col);
3577
- const afterCol = q.value[afterIndex];
3578
- const beforeCol = afterIndex + 1 < q.length ? q.value[afterIndex + 1] : undefined;
3579
- console.log({ afterCol, beforeCol });
3580
- return generateKeyBetween(afterCol.position, beforeCol?.position);
3579
+ const index = q.findIndex(ref => ref.column === col);
3580
+ const afterCol = q.value[index];
3581
+ const beforeCol = index + 1 < q.length ? q.value[index + 1] : undefined;
3582
+ return beforeCol ?
3583
+ generateKeyBetween(afterCol.position, beforeCol.position) :
3584
+ generateKeyBetween(afterCol.position, null);
3581
3585
  },
3582
3586
  first() {
3583
3587
  return generateKeyBetween(null, q.first()?.position);
@@ -3592,12 +3596,6 @@ class ColumnManager extends GarbageCollector {
3592
3596
  return this.allColumns$.value.filter(c => c.visible$.value);
3593
3597
  }
3594
3598
  }
3595
- __decorate([
3596
- Trace(),
3597
- __metadata("design:type", Function),
3598
- __metadata("design:paramtypes", [Object]),
3599
- __metadata("design:returntype", String)
3600
- ], ColumnManager.prototype, "computePosition", null);
3601
3599
 
3602
3600
  const TEXT_SEARCH_FORMATTER_KEY = `aup:table:textSearchFormatter`;
3603
3601
  const Keys = Enum("useFunction", "useInstance", "useClass");