sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement redo (#191)

Browse Source
This commit is contained in:
Guillermo Peralta Scura 2020-01-06 00:58:54 -03:00 committed by Christopher Chedeau
parent 3bbcb9cbdc
commit ea534dd535
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/index.tsx
View File

@ -27,6 +27,8 @@ const DEFAULT_PROJECT_NAME = `excalidraw-${getDateTime()}`;
let skipHistory = false; let skipHistory = false;
const stateHistory: string[] = []; const stateHistory: string[] = [];
const redoStack: string[] = [];
function generateHistoryCurrentEntry() { function generateHistoryCurrentEntry() {
return JSON.stringify( return JSON.stringify(
elements.map(element => ({ ...element, isSelected: false })) elements.map(element => ({ ...element, isSelected: false }))
@ -1351,13 +1353,25 @@ class App extends React.Component<{}, AppState> {
} else if (shapesShortcutKeys.includes(event.key.toLowerCase())) { } else if (shapesShortcutKeys.includes(event.key.toLowerCase())) {
this.setState({ elementType: findElementByKey(event.key) }); this.setState({ elementType: findElementByKey(event.key) });
} else if (event.metaKey && event.code === "KeyZ") { } else if (event.metaKey && event.code === "KeyZ") {
const currentEntry = generateHistoryCurrentEntry();
if (event.shiftKey) {
// Redo action
const entryToRestore = redoStack.pop();
if (entryToRestore !== undefined) {
restoreHistoryEntry(entryToRestore);
stateHistory.push(currentEntry);
}
} else {
// undo action
let lastEntry = stateHistory.pop(); let lastEntry = stateHistory.pop();
// If nothing was changed since last, take the previous one // If nothing was changed since last, take the previous one
if (generateHistoryCurrentEntry() === lastEntry) { if (currentEntry === lastEntry) {
lastEntry = stateHistory.pop(); lastEntry = stateHistory.pop();
} }
if (lastEntry !== undefined) { if (lastEntry !== undefined) {
restoreHistoryEntry(lastEntry); restoreHistoryEntry(lastEntry);
redoStack.push(currentEntry);
}
} }
this.forceUpdate(); this.forceUpdate();
event.preventDefault(); event.preventDefault();
@ -2046,6 +2060,7 @@ class App extends React.Component<{}, AppState> {
save(this.state); save(this.state);
if (!skipHistory) { if (!skipHistory) {
pushHistoryEntry(generateHistoryCurrentEntry()); pushHistoryEntry(generateHistoryCurrentEntry());
redoStack.splice(0, redoStack.length);
} }
skipHistory = false; skipHistory = false;
} }