Skip to content

Paste bug fix/cut cells refactor #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Aug 13, 2020
Merged

Paste bug fix/cut cells refactor #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29a7702
Paste bug fix
thegooman Aug 13, 2020
cfc3519
Cut refactor to use clearCells
thegooman Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 6 additions & 26 deletions src/newmodel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,8 +983,6 @@ export class EditorModel extends MutableDataModel {
* Cut a selection of cells.
* NOTE: this method both copies the cells to the _clipboard property and clears them
* from the region.
*
* TODO: refactor so that cut uses the already existing method clearCells.
*/
cut(
region: DataModel.CellRegion,
Expand All @@ -993,32 +991,14 @@ export class EditorModel extends MutableDataModel {
endRow: number,
endColumn: number
): DSVEditor.ModelChangedArgs {
// Set up the update object for the litestore.
const update: DSVEditor.ModelChangedArgs = {};
// we use the value map to redefine values within the cut as ''. Need to map
// to the static values.
// copy the values
this.copy('body', startRow, startColumn, endRow, endColumn);
const rowSpan = Math.abs(startRow - endRow) + 1;
const columnSpan = Math.abs(startColumn - endColumn) + 1;

// Fill in the new blank values.
const values = new Array(rowSpan)
.fill('')
.map(elem => new Array(columnSpan).fill(''));

// set the new data.
this.setData(
'body',
startRow,
startColumn,
values,
rowSpan,
columnSpan,
update
);

return update;
return this.clearCells('body', {
r1: startRow,
r2: endRow,
c1: startColumn,
c2: endColumn
});
}

/**
Expand Down
7 changes: 3 additions & 4 deletions src/widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,14 +644,15 @@ export class DSVEditor extends Widget {

/**
* Updates the current transaction with the raw data, header, and changeArgs
* Requires Litestore.beginTransaction() to be called before and Litestore.endTransaction to be called after
* @param update The modelChanged args for the Datagrid (may be null)
*/
public updateModel(update?: DSVEditor.ModelChangedArgs): void {
// for every litestore change except the init, set the dirty boolean to true
// grab current selection if none exists
if (!update.selection) {
update.selection = this._grid.selectionModel.currentSelection();
}

// for every litestore change except the init, set the dirty boolean to true
this.dirty =
update &&
update.gridStateUpdate &&
Expand Down Expand Up @@ -718,9 +719,7 @@ export class DSVEditor extends Widget {
const column = Math.min(c1, c2);
const update = this.dataModel.paste(this._region, row, column, copiedText);
this._cancelEditing();
this.litestore.beginTransaction();
this.updateModel(update);
this.litestore.endTransaction();
}

private _cancelEditing(): void {
Expand Down