mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-05-03 10:00:07 -04:00
Undo/Redo buttons, refactor menu toggles (#793)
* Make Undo & Redo and the menu buttons into actions; add undo/redo buttons * Create variables for the ToolIcon colors * Darken the menu buttons when they’re active * Put the more intensive test in `perform` * Fix & restyle hint viewer * Add pinch zoom for macOS Safari * Chrome/Firefox trackpad pinch zoom * openedMenu → openMenu * needsShapeEditor.ts → showSelectedShapeActions.ts * Call showSelectedShapeActions
This commit is contained in:
parent
0ee33fe341
commit
8e0206cc1e
17 changed files with 271 additions and 127 deletions
73
src/actions/actionHistory.tsx
Normal file
73
src/actions/actionHistory.tsx
Normal file
|
@ -0,0 +1,73 @@
|
|||
import { Action } from "./types";
|
||||
import React from "react";
|
||||
import { undo, redo } from "../components/icons";
|
||||
import { ToolButton } from "../components/ToolButton";
|
||||
import { t } from "../i18n";
|
||||
import { SceneHistory } from "../history";
|
||||
import { ExcalidrawElement } from "../element/types";
|
||||
import { AppState } from "../types";
|
||||
import { KEYS } from "../keys";
|
||||
|
||||
const writeData = (
|
||||
appState: AppState,
|
||||
data: { elements: ExcalidrawElement[]; appState: AppState } | null,
|
||||
) => {
|
||||
if (data !== null) {
|
||||
return {
|
||||
elements: data.elements,
|
||||
appState: { ...appState, ...data.appState },
|
||||
};
|
||||
}
|
||||
return {};
|
||||
};
|
||||
|
||||
const testUndo = (shift: boolean) => (
|
||||
event: KeyboardEvent,
|
||||
appState: AppState,
|
||||
) => event[KEYS.META] && /z/i.test(event.key) && event.shiftKey === shift;
|
||||
|
||||
export const createUndoAction: (h: SceneHistory) => Action = history => ({
|
||||
name: "undo",
|
||||
perform: (_, appState) =>
|
||||
[
|
||||
appState.multiElement,
|
||||
appState.resizingElement,
|
||||
appState.editingElement,
|
||||
appState.draggingElement,
|
||||
].every(x => x === null)
|
||||
? writeData(appState, history.undoOnce())
|
||||
: {},
|
||||
keyTest: testUndo(false),
|
||||
PanelComponent: ({ updateData }) => (
|
||||
<ToolButton
|
||||
type="button"
|
||||
icon={undo}
|
||||
aria-label={t("buttons.undo")}
|
||||
onClick={updateData}
|
||||
/>
|
||||
),
|
||||
commitToHistory: () => false,
|
||||
});
|
||||
|
||||
export const createRedoAction: (h: SceneHistory) => Action = history => ({
|
||||
name: "redo",
|
||||
perform: (_, appState) =>
|
||||
[
|
||||
appState.multiElement,
|
||||
appState.resizingElement,
|
||||
appState.editingElement,
|
||||
appState.draggingElement,
|
||||
].every(x => x === null)
|
||||
? writeData(appState, history.redoOnce())
|
||||
: {},
|
||||
keyTest: testUndo(true),
|
||||
PanelComponent: ({ updateData }) => (
|
||||
<ToolButton
|
||||
type="button"
|
||||
icon={redo}
|
||||
aria-label={t("buttons.redo")}
|
||||
onClick={updateData}
|
||||
/>
|
||||
),
|
||||
commitToHistory: () => false,
|
||||
});
|
Loading…
Add table
Add a link
Reference in a new issue