inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

selection management enhancements for DT/DL (#2209)

Browse Source
This commit is contained in:
Denys Vuika 2017-08-14 11:08:27 +01:00 committed by Mario Romano
parent 919f2a9fdf
commit f3515ad02b
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
View File

@ -133,7 +133,7 @@ describe('DataTable', () => {
expect(rows[1].isSelected).toBeTruthy(); expect(rows[1].isSelected).toBeTruthy();
}); });
it('should unselect the row with [single] selection mode', () => { it('should not unselect the row with [single] selection mode', () => {
dataTable.selectionMode = 'single'; dataTable.selectionMode = 'single';
dataTable.data = new ObjectDataTableAdapter( dataTable.data = new ObjectDataTableAdapter(
[ [
@ -150,10 +150,29 @@ describe('DataTable', () => {
expect(rows[1].isSelected).toBeFalsy(); expect(rows[1].isSelected).toBeFalsy();
dataTable.onRowClick(rows[0], null); dataTable.onRowClick(rows[0], null);
expect(rows[0].isSelected).toBeFalsy(); expect(rows[0].isSelected).toBeTruthy();
expect(rows[1].isSelected).toBeFalsy(); expect(rows[1].isSelected).toBeFalsy();
}); });
it('should unselect the row with [multiple] selection mode and modifier key', () => {
dataTable.selectionMode = 'multiple';
dataTable.data = new ObjectDataTableAdapter(
[ { name: '1' } ],
[ new ObjectDataColumn({ key: 'name'}) ]
);
const rows = dataTable.data.getRows();
dataTable.ngOnChanges({});
dataTable.onRowClick(rows[0], null);
expect(rows[0].isSelected).toBeTruthy();
dataTable.onRowClick(rows[0], null);
expect(rows[0].isSelected).toBeTruthy();
dataTable.onRowClick(rows[0], <any> { metaKey: true, preventDefault() {} });
expect(rows[0].isSelected).toBeFalsy();
});
it('should select multiple rows with [multiple] selection mode', () => { it('should select multiple rows with [multiple] selection mode', () => {
dataTable.selectionMode = 'multiple'; dataTable.selectionMode = 'multiple';
dataTable.data = new ObjectDataTableAdapter( dataTable.data = new ObjectDataTableAdapter(

12
ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts
View File

@ -237,17 +237,17 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck
if (row) { if (row) {
if (this.data) { if (this.data) {
const newValue = !row.isSelected;
const domEventName = newValue ? 'row-select' : 'row-unselect';
if (this.isSingleSelectionMode()) { if (this.isSingleSelectionMode()) {
this.resetSelection(); this.resetSelection();
this.selectRow(row, newValue); this.selectRow(row, true);
this.emitRowSelectionEvent(domEventName, row); this.emitRowSelectionEvent('row-select', row);
} }
if (this.isMultiSelectionMode()) { if (this.isMultiSelectionMode()) {
const modifier = e.metaKey || e.ctrlKey; const modifier = e && (e.metaKey || e.ctrlKey);
const newValue = modifier ? !row.isSelected : true;
const domEventName = newValue ? 'row-select' : 'row-unselect';
if (!modifier) { if (!modifier) {
this.resetSelection(); this.resetSelection();
} }