Skip to content
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

fix: copying multiple times only kept last undo CellExternalCopyManager #1075

Merged
merged 1 commit into from
Aug 17, 2023
Merged

fix: copying multiple times only kept last undo CellExternalCopyManager #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 24 additions & 11 deletions packages/common/src/extensions/__tests__/slickCellExternalCopyManager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,13 @@ describe('CellExternalCopyManager', () => {
});

it('should Copy, Paste and run Execute clip command', (done) => {
jest.spyOn(gridStub.getSelectionModel(), 'getSelectedRanges').mockReturnValueOnce([{ fromRow: 0, fromCell: 1, toRow: 1, toCell: 2 }]).mockReturnValueOnce(null);

plugin.init(gridStub, { clipboardPasteDelay: 1, clearCopySelectionDelay: 1, includeHeaderWhenCopying: true, });
let clipCommand;
const clipboardCommandHandler = (cmd) => {
clipCommand = cmd;
cmd.execute();
};
jest.spyOn(gridStub.getSelectionModel() as SelectionModel, 'getSelectedRanges').mockReturnValueOnce([new Slick.Range(0, 1, 1, 2)]).mockReturnValueOnce(null as any);
plugin.init(gridStub, { clipboardPasteDelay: 1, clearCopySelectionDelay: 1, includeHeaderWhenCopying: true, clipboardCommandHandler });

const keyDownCtrlCopyEvent = new Event('keydown');
Object.defineProperty(keyDownCtrlCopyEvent, 'ctrlKey', { writable: true, configurable: true, value: true });
Expand All @@ -318,16 +322,21 @@ describe('CellExternalCopyManager', () => {
expect(updateCellSpy).toHaveBeenCalledWith(1, 1);
expect(onCellChangeSpy).toHaveBeenCalledWith({ row: 1, cell: 0, item: { firstName: 'John', lastName: 'serialized output' }, grid: gridStub, column: {} });
const getDataItemSpy = jest.spyOn(gridStub, 'getDataItem');
plugin.clipCommand.undo();
clipCommand.undo();
expect(getDataItemSpy).toHaveBeenCalled();
done();
}, 2);
});

it('should Copy, Paste and run Execute clip command with only 1 cell to copy', (done) => {
jest.spyOn(gridStub.getSelectionModel(), 'getSelectedRanges').mockReturnValueOnce([{ fromRow: 0, fromCell: 1, toRow: 1, toCell: 2 }]).mockReturnValueOnce([{ fromRow: 0, fromCell: 1, toRow: 1, toCell: 2 }]);
jest.spyOn(gridStub.getSelectionModel() as SelectionModel, 'getSelectedRanges').mockReturnValueOnce([new Slick.Range(0, 1, 1, 2)]).mockReturnValueOnce([new Slick.Range(0, 1, 1, 2)]);
let clipCommand;
const clipboardCommandHandler = (cmd) => {
clipCommand = cmd;
cmd.execute();
};

plugin.init(gridStub, { clipboardPasteDelay: 1, clearCopySelectionDelay: 1, includeHeaderWhenCopying: true, });
plugin.init(gridStub, { clipboardPasteDelay: 1, clearCopySelectionDelay: 1, includeHeaderWhenCopying: true, clipboardCommandHandler });

const keyDownCtrlCopyEvent = new Event('keydown');
Object.defineProperty(keyDownCtrlCopyEvent, 'ctrlKey', { writable: true, configurable: true, value: true });
Expand Down Expand Up @@ -358,7 +367,7 @@ describe('CellExternalCopyManager', () => {
const updateCell2Spy = jest.spyOn(gridStub, 'updateCell');
const onCellChange2Spy = jest.spyOn(gridStub.onCellChange, 'notify');
const setDataItemValSpy = jest.spyOn(plugin, 'setDataItemValueForColumn');
plugin.clipCommand.undo();
clipCommand.undo();
expect(getDataItemSpy).toHaveBeenCalled();
expect(updateCell2Spy).toHaveBeenCalled();
expect(onCellChangeSpy).toHaveBeenCalled();
Expand Down Expand Up @@ -434,8 +443,12 @@ describe('CellExternalCopyManager', () => {
const renderSpy = jest.spyOn(gridStub, 'render');
const setDataSpy = jest.spyOn(gridStub, 'setData');
jest.spyOn(gridStub.getSelectionModel(), 'getSelectedRanges').mockReturnValueOnce([{ fromRow: 0, fromCell: 1, toRow: 2, toCell: 2 }]).mockReturnValueOnce(null);

plugin.init(gridStub, { clearCopySelectionDelay: 1, clipboardPasteDelay: 1, includeHeaderWhenCopying: true, newRowCreator: mockNewRowCreator, onPasteCells: mockOnPasteCells });
let clipCommand;
const clipboardCommandHandler = (cmd) => {
clipCommand = cmd;
cmd.execute();
};
plugin.init(gridStub, { clearCopySelectionDelay: 1, clipboardPasteDelay: 1, includeHeaderWhenCopying: true, clipboardCommandHandler, newRowCreator: mockNewRowCreator, onPasteCells: mockOnPasteCells });

const keyDownCtrlCopyEvent = new Event('keydown');
Object.defineProperty(keyDownCtrlCopyEvent, 'ctrlKey', { writable: true, configurable: true, value: true });
Expand All @@ -452,7 +465,7 @@ describe('CellExternalCopyManager', () => {
Object.defineProperty(keyDownCtrlPasteEvent, 'isPropagationStopped', { writable: true, configurable: true, value: jest.fn() });
Object.defineProperty(keyDownCtrlPasteEvent, 'isImmediatePropagationStopped', { writable: true, configurable: true, value: jest.fn() });
gridStub.onKeyDown.notify({ cell: 0, row: 0, grid: gridStub }, keyDownCtrlPasteEvent, gridStub);
document.querySelector('textarea').value = `Doe\tserialized output`;
document.querySelector('textarea')!.value = `Doe\tserialized output`;

setTimeout(() => {
expect(getActiveCellSpy).toHaveBeenCalled();
Expand All @@ -463,7 +476,7 @@ describe('CellExternalCopyManager', () => {
const getDataItemSpy = jest.spyOn(gridStub, 'getDataItem');
const setData2Spy = jest.spyOn(gridStub, 'setData');
const render2Spy = jest.spyOn(gridStub, 'render');
plugin.clipCommand.undo();
clipCommand.undo();
expect(getDataItemSpy).toHaveBeenCalled();
expect(setData2Spy).toHaveBeenCalledWith([{ firstName: 'John', lastName: 'Doe', age: 30 }, { firstName: 'Jane', lastName: 'Doe' }]);
expect(render2Spy).toHaveBeenCalled();
Expand Down
47 changes: 21 additions & 26 deletions packages/common/src/extensions/slickCellExternalCopyManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export class SlickCellExternalCopyManager {
protected _addonOptions!: ExcelCopyBufferOption;
protected _bodyElement = document.body;
protected _clearCopyTI?: NodeJS.Timeout;
protected _clipCommand!: ExternalCopyClipCommand;
protected _copiedCellStyle = 'copied';
protected _copiedCellStyleLayerKey = 'copy-manager';
protected _copiedRanges: CellRange[] | null = null;
Expand All @@ -48,10 +47,6 @@ export class SlickCellExternalCopyManager {
return this._addonOptions;
}

get clipCommand(): ExternalCopyClipCommand {
return this._clipCommand;
}

get eventHandler(): SlickEventHandler {
return this._eventHandler;
}
Expand Down Expand Up @@ -238,7 +233,7 @@ export class SlickCellExternalCopyManager {
this._addonOptions.newRowCreator(newRowsNeeded);
}

this._clipCommand = {
const clipCommand: ExternalCopyClipCommand = {
isClipboardCommand: true,
clippedRange,
oldValues: [],
Expand All @@ -257,20 +252,20 @@ export class SlickCellExternalCopyManager {
w: 0,

execute: () => {
this._clipCommand.h = 0;
for (let y = 0; y < this._clipCommand.destH; y++) {
this._clipCommand.oldValues[y] = [];
this._clipCommand.w = 0;
this._clipCommand.h++;
for (let x = 0; x < this._clipCommand.destW; x++) {
this._clipCommand.w++;
clipCommand.h = 0;
for (let y = 0; y < clipCommand.destH; y++) {
clipCommand.oldValues[y] = [];
clipCommand.w = 0;
clipCommand.h++;
for (let x = 0; x < clipCommand.destW; x++) {
clipCommand.w++;
const desty = activeRow + y;
const destx = activeCell + x;

if (desty < this._clipCommand.maxDestY && destx < this._clipCommand.maxDestX) {
if (desty < clipCommand.maxDestY && destx < clipCommand.maxDestX) {
// const nd = this._grid.getCellNode(desty, destx);
const dt = this._grid.getDataItem(desty);
this._clipCommand.oldValues[y][x] = dt[columns[destx]['field']];
clipCommand.oldValues[y][x] = dt[columns[destx]['field']];
if (oneCellToMultiple) {
this.setDataItemValueForColumn(dt, columns[destx], clippedRange[0][0]);
} else {
Expand All @@ -291,27 +286,27 @@ export class SlickCellExternalCopyManager {
const bRange = {
fromCell: activeCell,
fromRow: activeRow,
toCell: activeCell + this._clipCommand.w - 1,
toRow: activeRow + this._clipCommand.h - 1
toCell: activeCell + clipCommand.w - 1,
toRow: activeRow + clipCommand.h - 1
};
this.markCopySelection([bRange]);
this._grid.getSelectionModel()?.setSelectedRanges([bRange]);
this.onPasteCells.notify({ ranges: [bRange] });
},

undo: () => {
for (let y = 0; y < this._clipCommand.destH; y++) {
for (let x = 0; x < this._clipCommand.destW; x++) {
for (let y = 0; y < clipCommand.destH; y++) {
for (let x = 0; x < clipCommand.destW; x++) {
const desty = activeRow + y;
const destx = activeCell + x;

if (desty < this._clipCommand.maxDestY && destx < this._clipCommand.maxDestX) {
if (desty < clipCommand.maxDestY && destx < clipCommand.maxDestX) {
// const nd = this._grid.getCellNode(desty, destx);
const dt = this._grid.getDataItem(desty);
if (oneCellToMultiple) {
this.setDataItemValueForColumn(dt, columns[destx], this._clipCommand.oldValues[0][0]);
this.setDataItemValueForColumn(dt, columns[destx], clipCommand.oldValues[0][0]);
} else {
this.setDataItemValueForColumn(dt, columns[destx], this._clipCommand.oldValues[y][x]);
this.setDataItemValueForColumn(dt, columns[destx], clipCommand.oldValues[y][x]);
}
this._grid.updateCell(desty, destx);
this._grid.onCellChange.notify({
Expand All @@ -328,8 +323,8 @@ export class SlickCellExternalCopyManager {
const bRange = {
fromCell: activeCell,
fromRow: activeRow,
toCell: activeCell + this._clipCommand.w - 1,
toRow: activeRow + this._clipCommand.h - 1
toCell: activeCell + clipCommand.w - 1,
toRow: activeRow + clipCommand.h - 1
};

this.markCopySelection([bRange]);
Expand All @@ -351,9 +346,9 @@ export class SlickCellExternalCopyManager {
};

if (this._addonOptions.clipboardCommandHandler) {
this._addonOptions.clipboardCommandHandler(this._clipCommand);
this._addonOptions.clipboardCommandHandler(clipCommand);
} else {
this._clipCommand.execute();
clipCommand.execute();
}
}

Expand Down
2 changes: 1 addition & 1 deletion pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.