@coolon/angular-ui-powerups 16.1.0-aplpha.123 → 16.1.0-aplpha.124

package/fesm2022/coolon-angular-ui-powerups.mjs

@@ -4072,29 +4072,34 @@ class PropertyColumnModel extends ColumnModel {
 }
 
 class SelectionColumnModel extends ColumnModel {
-    selectionModel;
     _enableHeaderControls = true;
     _color = "accent";
-    constructor(columnId, order, defaults, selectionModel) {
+    _selectionModelProxy = proxify((SelectionModel));
+    _isUsingTemporarySelection$ = new MutableValueModel(false);
+    _userSelectionModel;
+    constructor(columnId, order, defaults) {
         super(columnId, order, defaults);
-        this.selectionModel = selectionModel;
         const { chain } = Dsl.disposeWith(this);
         this._selectRowOnClick(false);
         this.cellHeaderRenderer(SelectionHeaderCellComponent, (component) => {
-            component.selectionModel = this.selectionModel;
+            component.selectionModel = this._selectionModelProxy;
             component.enableHeaderControls = this._enableHeaderControls;
             component.color = this._color;
         });
         this.configureCellRenderer(new ComponentCellRendererPortalRef(SelectionCellComponent, (component, rowData) => {
             component.row = rowData.row;
-            component.selectionModel = this.selectionModel;
+            component.selectionModel = this._selectionModelProxy;
             component.color = this._color;
         }));
-        this.setMasterVisibility(this.selectionModel.enabled$);
-        this.setDefaultVisibility(chain(this.selectionModel.mode$).equals(SelectionModel.Mode.MULTIPLE));
+        this.setMasterVisibility(this._selectionModelProxy.enabled$);
+        this.setDefaultVisibility(chain(this._selectionModelProxy.mode$).equals(SelectionModel.Mode.MULTIPLE));
+    }
+    get selectionModel() {
+        return this._selectionModelProxy;
     }
     useSelectionModel(selectionModel) {
-        this.selectionModel.setProxyTarget(selectionModel);
+        this._userSelectionModel = selectionModel;
+        this._selectionModelProxy.setProxyTarget(selectionModel);
     }
     getDefaultHeaderText() {
         return '';
@@ -4110,10 +4115,24 @@ class SelectionColumnModel extends ColumnModel {
         this._color = color;
     }
     selectRow(row) {
-        this.selectionModel.selectCommand.execute(row);
+        this._selectionModelProxy.selectCommand.execute(row);
     }
     isSelected(row) {
-        return this.selectionModel.isSelected(row);
+        return this._selectionModelProxy.isSelected(row);
+    }
+    async withTemporarySelectionModel(createSelectionModel, process) {
+        const garbage = new GarbageCollector();
+        this._isUsingTemporarySelection$.value = true;
+        const selectionModel = createSelectionModel(garbage);
+        this._selectionModelProxy.setProxyTarget(selectionModel);
+        try {
+            await process(selectionModel);
+        }
+        finally {
+            this._selectionModelProxy.setProxyTarget(this._userSelectionModel);
+            garbage.dispose();
+            this._isUsingTemporarySelection$.value = false;
+        }
     }
 }
 
@@ -4249,7 +4268,6 @@ class AbstractTableModel extends GarbageCollector {
     textSearchPredicate$;
     identityOf;
     dataSourceEmpty$;
-    selectionModelProxy = proxify((SelectionModel));
     selectedItems$;
     leadSelection$;
     hasSelection$;
@@ -4268,13 +4286,16 @@ class AbstractTableModel extends GarbageCollector {
                 return (!regex || !!columns.find(c => regex.test(c.getSearchTextFor(row))));
             };
         });
+        this.selectionColumnModel = new SelectionColumnModel("selection-column", this.columnManager, () => this.getColumnTextProperties("selection-column"));
+        this.addColumn(this.selectionColumnModel, { before: null }); // first column
+        this.addRowClass("aup-row-selected", row => this.selectionColumnModel.isSelected(row));
         this.firstEditableColumn$ = chain(this.columns$).select(c => c.hasEditorPortal()).first();
         this.firstVisibleColumn$ = chain(this.visibleColumns$).first();
         this.lastVisibleColumn$ = chain(this.visibleColumns$).last();
         this.rowSelectionDisabledOnAllColumns$ = chain(this.columnManager.visibleColumns$).select(column => column.isRowSelectionEnabled()).count().equals(0);
         this.dataSourceEmpty$ = chain(this.dataSource$).isEmpty();
-        this.selectedItems$ = this.selectionModelProxy.selectedItems$;
-        this.leadSelection$ = this.selectionModelProxy.leadSelection$;
+        this.selectedItems$ = this.selectionColumnModel.selectionModel.selectedItems$;
+        this.leadSelection$ = this.selectionColumnModel.selectionModel.leadSelection$;
         this.hasSelection$ = chain(this.selectedItems$).isNotEmpty();
     }
     setDataSource(dataSource$) {
@@ -4376,21 +4397,8 @@ class AbstractTableModel extends GarbageCollector {
         const columnId = options?.columnId || property.toString();
         return this.addColumn(new ListPropertyColumnModel(columnId, this.columnManager, property, () => this.getColumnTextProperties(columnId)));
     }
-    // TODO: clean this up and assign the selection model on teh table directly.
-    //       tableModel.useSelectionModel(model) and have the seleciton column automatically
-    //       added.  Need to look at how we're using the visibility controls as well.
-    //       Should also lazy create the selection column model if someone accesses it.
-    _addSelectionColumn(selectionModel, visible) {
-        assert.isNil(this.selectionColumnModel);
-        const columnId = "selection-column";
-        this.selectionColumnModel = new SelectionColumnModel(columnId, this.columnManager, () => this.getColumnTextProperties(columnId), this.selectionModelProxy);
+    useSelectionModel(selectionModel) {
         this.selectionColumnModel.useSelectionModel(selectionModel);
-        this.addRowClass("aup-row-selected", row => this.selectionColumnModel.isSelected(row));
-        const selectionColumnModel = this.addColumn(this.selectionColumnModel, { before: null }); // first column
-        if (!isNil(visible)) {
-            selectionColumnModel.visibleWhile(visible instanceof ValueModel ? visible : ValueModel.constant(visible));
-        }
-        return selectionColumnModel;
     }
     addEditControls(saveCommandFactory, formFactory) {
         this.saveCommandFactory = saveCommandFactory;
@@ -4462,11 +4470,10 @@ class AbstractTableModel extends GarbageCollector {
         return this.hasUserSelectionModelThatIsEnabled() && !this.rowSelectionDisabledOnAllColumns$.value;
     }
     hasUserSelectionModelThatIsEnabled() {
-        const userSelectionModel = this.selectionColumnModel?.selectionModel.getProxyTarget();
-        return !!userSelectionModel && userSelectionModel.enabled$.value;
+        return this.selectionColumnModel.selectionModel.enabled$.value;
     }
     getSelectionModel() {
-        return this.selectionColumnModel?.selectionModel;
+        return this.selectionColumnModel.selectionModel;
     }
     isHoverEnabled() {
         return this.isRowSelectionEnabled() || this.rowClickListeners.listenerCount > 0;
@@ -5128,8 +5135,13 @@ class TableModel extends AbstractTableModel {
         this._filteredRows$.setDelegate(filteredRows$);
         this._visibleRows$.setDelegate(visibleRows$);
     }
-    addSelectionColumn(selectionModel, showSelectionColumn) {
-        return this._addSelectionColumn(selectionModel, showSelectionColumn);
+    async withTemporaryMultipleSelectionModel(process) {
+        return this.selectionColumnModel.withTemporarySelectionModel(garbage => {
+            return new MultipleSelectionModel(this.filteredRows$, {
+                identifiedWith: this.dataSource$.identityOf,
+                disposedWith: garbage
+            });
+        }, process);
     }
 }
 
@@ -5614,9 +5626,6 @@ class TreeTableModel extends AbstractTableModel {
     isExpanded(row) {
         return this.treeExpansionModel.isExpanded(row);
     }
-    addSelectionColumn(selectionModel, showSelectionColumn) {
-        return this._addSelectionColumn(selectionModel, showSelectionColumn);
-    }
 }
 // export class FlattenStrategy<T extends VisitableTree<any>> extends SelfAndDescendantsVisitor<T> {
 //