smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restore input value and fix history

Browse source 
Signed-off-by: Mark Tolmacs <mark@lazycat.hu>
This commit is contained in:
Mark Tolmacs 2025-03-30 16:32:47 +02:00
parent 5cc5c626df
commit 3d40221dc1
4 changed files with 79 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

30
packages/excalidraw/components/Stats/Angle.tsx
View file

@ -117,6 +117,7 @@ const handleFinished: DragFinishedCallbackType<AngleProps["property"]> = ({
scene,
accumulatedChange,
setAppState,
setInputValue,
}) => {
const elementsMap = scene.getNonDeletedElementsMap();
const origElement = originalElements[0];
@ -125,19 +126,32 @@ const handleFinished: DragFinishedCallbackType<AngleProps["property"]> = ({
const latestElement = elementsMap.get(origElement.id);
if (latestElement) {
updateBindings(latestElement, elementsMap, originalAppState.zoom, () => {
const change = degreesToRadians(accumulatedChange as Degrees);
mutateElement(latestElement, {
angle: (latestElement.angle - change) as Radians,
});
});
setAppState({
suggestedBindings: [],
});
const success = updateBindings(
latestElement,
elementsMap,
originalAppState.zoom,
);
if (!success) {
const change = degreesToRadians(accumulatedChange as Degrees);
const angle = (latestElement.angle - change) as Radians;
mutateElement(latestElement, {
angle,
});
setInputValue(angle);
return false;
}
}
}
return true;
};
const Angle = ({ element, scene, appState, property }: AngleProps) => {

43
packages/excalidraw/components/Stats/DragInput.tsx
View file

@ -48,7 +48,8 @@ export type DragFinishedCallbackType<
originalAppState: AppState;
accumulatedChange: number;
setAppState: React.Component<any, AppState>["setState"];
}) => void;
setInputValue: (value: number) => void;
}) => boolean;
interface StatsDragInputProps<
T extends StatsInputProperty,
@ -155,7 +156,7 @@ const StatsDragInput = <
setInputValue: (value) => setInputValue(String(value)),
setAppState,
});
dragFinishedCallback?.({
const commit = dragFinishedCallback?.({
originalElements: elements,
originalElementsMap,
scene,
@ -163,10 +164,13 @@ const StatsDragInput = <
accumulatedChange: rounded,
property,
setAppState,
setInputValue: (value) => setInputValue(String(value)),
});
app.syncActionResult({
captureUpdate: CaptureUpdateAction.IMMEDIATELY,
});
if (commit) {
app.syncActionResult({
captureUpdate: CaptureUpdateAction.IMMEDIATELY,
});
}
}
};
@ -311,21 +315,26 @@ const StatsDragInput = <
false,
);
let commit = true;
if (originalElements !== null && originalElementsMap !== null) {
dragFinishedCallback?.({
originalElements,
originalElementsMap,
scene,
originalAppState,
property,
accumulatedChange,
setAppState,
});
commit =
dragFinishedCallback?.({
originalElements,
originalElementsMap,
scene,
originalAppState,
property,
accumulatedChange,
setAppState,
setInputValue: (value) => setInputValue(String(value)),
}) ?? true;
}
app.syncActionResult({
captureUpdate: CaptureUpdateAction.IMMEDIATELY,
});
if (commit) {
app.syncActionResult({
captureUpdate: CaptureUpdateAction.IMMEDIATELY,
});
}
lastPointer = null;
accumulatedChange = 0;

27
packages/excalidraw/components/Stats/Position.tsx
View file

@ -204,7 +204,8 @@ const handleFinished: DragFinishedCallbackType<"x" | "y"> = ({
accumulatedChange,
property,
setAppState,
}) => {
setInputValue,
}): boolean => {
const elementsMap = scene.getNonDeletedElementsMap();
const origElement = originalElements[0];
@ -212,17 +213,29 @@ const handleFinished: DragFinishedCallbackType<"x" | "y"> = ({
const latestElement = elementsMap.get(origElement.id);
if (latestElement) {
updateBindings(latestElement, elementsMap, originalAppState.zoom, () => {
mutateElement(latestElement, {
[property]: latestElement[property] - accumulatedChange,
});
});
setAppState({
suggestedBindings: [],
});
const success = updateBindings(
latestElement,
elementsMap,
originalAppState.zoom,
);
if (!success) {
mutateElement(latestElement, {
[property]: latestElement[property] - accumulatedChange,
});
setInputValue(latestElement[property] - accumulatedChange);
}
return false;
}
}
return true;
};
const Position = ({ property, element, scene, appState }: PositionProps) => {

21
packages/excalidraw/components/Stats/utils.ts
View file

@ -204,8 +204,7 @@ export const updateBindings = (
latestElement: ExcalidrawElement,
elementsMap: NonDeletedSceneElementsMap,
zoom?: AppState["zoom"],
bindingElementKeptOriginalBinding?: () => void,
) => {
): boolean => {
if (isBindingElement(latestElement)) {
const [start, end] = getOriginalBindingsIfStillCloseToArrowEnds(
latestElement,
@ -217,15 +216,17 @@ export const updateBindings = (
(latestElement.startBinding && start) ||
(latestElement.endBinding && end)
) {
bindingElementKeptOriginalBinding?.();
} else {
if (latestElement.startBinding && !start) {
unbindLinearElement(latestElement, "start");
}
return false;
}
if (latestElement.endBinding && !end) {
unbindLinearElement(latestElement, "end");
}
if (latestElement.startBinding && !start) {
unbindLinearElement(latestElement, "start");
}
if (latestElement.endBinding && !end) {
unbindLinearElement(latestElement, "end");
}
}
return true;
};