mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-05-03 10:00:07 -04:00
32df5502ae
* Introducing fractional indices as part of `element.index` * Ensuring invalid fractional indices are always synchronized with the array order * Simplifying reconciliation based on the fractional indices * Moving reconciliation inside the `@excalidraw/excalidraw` package --------- Co-authored-by: Marcel Mraz <marcel@excalidraw.com> Co-authored-by: dwelle <5153846+dwelle@users.noreply.github.com>
114 lines
3.3 KiB
TypeScript
114 lines
3.3 KiB
TypeScript
import { Action, ActionResult } from "./types";
|
|
import { UndoIcon, RedoIcon } from "../components/icons";
|
|
import { ToolButton } from "../components/ToolButton";
|
|
import { t } from "../i18n";
|
|
import History, { HistoryEntry } from "../history";
|
|
import { ExcalidrawElement } from "../element/types";
|
|
import { AppState } from "../types";
|
|
import { KEYS } from "../keys";
|
|
import { newElementWith } from "../element/mutateElement";
|
|
import { fixBindingsAfterDeletion } from "../element/binding";
|
|
import { arrayToMap } from "../utils";
|
|
import { isWindows } from "../constants";
|
|
import { syncInvalidIndices } from "../fractionalIndex";
|
|
|
|
const writeData = (
|
|
prevElements: readonly ExcalidrawElement[],
|
|
appState: AppState,
|
|
updater: () => HistoryEntry | null,
|
|
): ActionResult => {
|
|
const commitToHistory = false;
|
|
if (
|
|
!appState.multiElement &&
|
|
!appState.resizingElement &&
|
|
!appState.editingElement &&
|
|
!appState.draggingElement
|
|
) {
|
|
const data = updater();
|
|
if (data === null) {
|
|
return { commitToHistory };
|
|
}
|
|
|
|
const prevElementMap = arrayToMap(prevElements);
|
|
const nextElements = data.elements;
|
|
const nextElementMap = arrayToMap(nextElements);
|
|
|
|
const deletedElements = prevElements.filter(
|
|
(prevElement) => !nextElementMap.has(prevElement.id),
|
|
);
|
|
const elements = nextElements
|
|
.map((nextElement) =>
|
|
newElementWith(
|
|
prevElementMap.get(nextElement.id) || nextElement,
|
|
nextElement,
|
|
),
|
|
)
|
|
.concat(
|
|
deletedElements.map((prevElement) =>
|
|
newElementWith(prevElement, { isDeleted: true }),
|
|
),
|
|
);
|
|
fixBindingsAfterDeletion(elements, deletedElements);
|
|
// TODO: will be replaced in #7348
|
|
syncInvalidIndices(elements);
|
|
|
|
return {
|
|
elements,
|
|
appState: { ...appState, ...data.appState },
|
|
commitToHistory,
|
|
syncHistory: true,
|
|
};
|
|
}
|
|
return { commitToHistory };
|
|
};
|
|
|
|
type ActionCreator = (history: History) => Action;
|
|
|
|
export const createUndoAction: ActionCreator = (history) => ({
|
|
name: "undo",
|
|
label: "buttons.undo",
|
|
icon: UndoIcon,
|
|
trackEvent: { category: "history" },
|
|
viewMode: false,
|
|
perform: (elements, appState) =>
|
|
writeData(elements, appState, () => history.undoOnce()),
|
|
keyTest: (event) =>
|
|
event[KEYS.CTRL_OR_CMD] &&
|
|
event.key.toLowerCase() === KEYS.Z &&
|
|
!event.shiftKey,
|
|
PanelComponent: ({ updateData, data }) => (
|
|
<ToolButton
|
|
type="button"
|
|
icon={UndoIcon}
|
|
aria-label={t("buttons.undo")}
|
|
onClick={updateData}
|
|
size={data?.size || "medium"}
|
|
/>
|
|
),
|
|
commitToHistory: () => false,
|
|
});
|
|
|
|
export const createRedoAction: ActionCreator = (history) => ({
|
|
name: "redo",
|
|
label: "buttons.redo",
|
|
icon: RedoIcon,
|
|
trackEvent: { category: "history" },
|
|
viewMode: false,
|
|
perform: (elements, appState) =>
|
|
writeData(elements, appState, () => history.redoOnce()),
|
|
keyTest: (event) =>
|
|
(event[KEYS.CTRL_OR_CMD] &&
|
|
event.shiftKey &&
|
|
event.key.toLowerCase() === KEYS.Z) ||
|
|
(isWindows && event.ctrlKey && !event.shiftKey && event.key === KEYS.Y),
|
|
PanelComponent: ({ updateData, data }) => (
|
|
<ToolButton
|
|
type="button"
|
|
icon={RedoIcon}
|
|
aria-label={t("buttons.redo")}
|
|
onClick={updateData}
|
|
size={data?.size || "medium"}
|
|
/>
|
|
),
|
|
commitToHistory: () => false,
|
|
});
|