Compare commits

..

1 Commits

Author SHA1 Message Date
dwelle
b9fee5cf9c wip 2025-05-21 22:17:54 +02:00
7 changed files with 49 additions and 35 deletions

View File

@@ -34,13 +34,9 @@
<a href="https://discord.gg/UexuTaE">
<img alt="Chat on Discord" src="https://img.shields.io/discord/723672430744174682?color=738ad6&label=Chat%20on%20Discord&logo=discord&logoColor=ffffff&widge=false"/>
</a>
<a href="https://deepwiki.com/excalidraw/excalidraw">
<img alt="Ask DeepWiki" src="https://deepwiki.com/badge.svg" />
</a>
<a href="https://twitter.com/excalidraw">
<img alt="Follow Excalidraw on Twitter" src="https://img.shields.io/twitter/follow/excalidraw.svg?label=follow+@excalidraw&style=social&logo=twitter"/>
</a>
<img alt"CodeRabbit Reviews" src="https://img.shields.io/coderabbit/prs/github/excalidraw/excalidraw?utm_source=oss&utm_medium=github&utm_campaign=excalidraw%2Fexcalidraw&labelColor=171717&color=FF570A&link=https%3A%2F%2Fcoderabbit.ai&label=CodeRabbit+Reviews"/>
</p>
<div align="center">

View File

@@ -974,25 +974,6 @@ export const updateElbowArrowPoints = (
),
"Elbow arrow segments must be either horizontal or vertical",
);
invariant(
updates.fixedSegments?.find(
(segment) =>
segment.index === 1 &&
pointsEqual(segment.start, (updates.points ?? arrow.points)[0]),
) == null &&
updates.fixedSegments?.find(
(segment) =>
segment.index === (updates.points ?? arrow.points).length - 1 &&
pointsEqual(
segment.end,
(updates.points ?? arrow.points)[
(updates.points ?? arrow.points).length - 1
],
),
) == null,
"The first and last segments cannot be fixed",
);
}
const fixedSegments = updates.fixedSegments ?? arrow.fixedSegments ?? [];

View File

@@ -1483,13 +1483,13 @@ const getArrowheadOptions = (flip: boolean) => {
value: "crowfoot_one",
text: t("labels.arrowhead_crowfoot_one"),
icon: <ArrowheadCrowfootOneIcon flip={flip} />,
keyBinding: "x",
keyBinding: "c",
},
{
value: "crowfoot_many",
text: t("labels.arrowhead_crowfoot_many"),
icon: <ArrowheadCrowfootIcon flip={flip} />,
keyBinding: "c",
keyBinding: "x",
},
{
value: "crowfoot_one_or_many",

View File

@@ -564,7 +564,7 @@ export const convertElementTypes = (
continue;
}
const fixedSegments: FixedSegment[] = [];
for (let i = 1; i < nextPoints.length - 2; i++) {
for (let i = 0; i < nextPoints.length - 1; i++) {
fixedSegments.push({
start: nextPoints[i],
end: nextPoints[i + 1],
@@ -581,7 +581,6 @@ export const convertElementTypes = (
);
mutateElement(element, app.scene.getNonDeletedElementsMap(), {
...updates,
endArrowhead: "arrow",
});
} else {
// if we're converting to non-elbow linear element, check if

View File

@@ -39,6 +39,7 @@ const handleDimensionChange: DragInputCallbackType<
shouldKeepAspectRatio,
shouldChangeByStepSize,
nextValue,
ratio,
property,
originalAppState,
instantChange,
@@ -154,6 +155,12 @@ const handleDimensionChange: DragInputCallbackType<
}
if (nextValue !== undefined) {
if (ratio) {
ratio = property === "width" ? ratio : [ratio[1], ratio[0]];
nextValue = (origElement[property] / ratio[0]) * ratio[1];
property = property === "width" ? "height" : "width";
}
const nextWidth = Math.max(
property === "width"
? nextValue

View File

@@ -33,6 +33,7 @@ export type DragInputCallbackType<
shouldChangeByStepSize: boolean;
scene: Scene;
nextValue?: number;
ratio?: [number, number] | null;
property: P;
originalAppState: AppState;
setInputValue: (value: number) => void;
@@ -109,10 +110,21 @@ const StatsDragInput = <
}
stateRef.current.updatePending = false;
const ratioMatch = updatedValue
.trim()
.match(/^(\d+(?:\.\d+)?):(\d+(?:\.\d+)?)$/);
let ratio: [number, number] | null = null;
if (ratioMatch) {
ratio = [Number(ratioMatch[1]), Number(ratioMatch[2])];
}
const parsed = Number(updatedValue);
if (isNaN(parsed)) {
setInputValue(value.toString());
return;
if (!ratio) {
return;
}
}
const rounded = Number(parsed.toFixed(2));
@@ -123,7 +135,11 @@ const StatsDragInput = <
// 2. original was not "Mixed" and the difference between a new value and previous value is greater
// than the smallest delta allowed, which is 0.01
// reason: idempotent to avoid unnecessary
if (isNaN(original) || Math.abs(rounded - original) >= SMALLEST_DELTA) {
if (
isNaN(original) ||
ratio ||
Math.abs(rounded - original) >= SMALLEST_DELTA
) {
stateRef.current.lastUpdatedValue = updatedValue;
dragInputCallback({
accumulatedChange: 0,
@@ -134,6 +150,7 @@ const StatsDragInput = <
shouldChangeByStepSize: false,
scene,
nextValue: rounded,
ratio,
property,
originalAppState: appState,
setInputValue: (value) => setInputValue(String(value)),

View File

@@ -151,6 +151,7 @@ const handleDimensionChange: DragInputCallbackType<
originalAppState,
shouldChangeByStepSize,
nextValue,
ratio,
scene,
property,
}) => {
@@ -202,9 +203,22 @@ const handleDimensionChange: DragInputCallbackType<
origElement &&
isPropertyEditable(latestElement, property)
) {
let _nextValue = nextValue;
let _property = property;
if (ratio) {
let _ratio = ratio;
if (ratio) {
_ratio = _property === "width" ? _ratio : [_ratio[1], _ratio[0]];
_nextValue = (origElement[_property] / _ratio[0]) * _ratio[1];
_property = _property === "width" ? "height" : "width";
}
}
let nextWidth =
property === "width" ? Math.max(0, nextValue) : latestElement.width;
if (property === "width") {
_property === "width"
? Math.max(0, _nextValue)
: latestElement.width;
if (_property === "width") {
if (shouldChangeByStepSize) {
nextWidth = getStepSizedValue(nextWidth, STEP_SIZE);
} else {
@@ -213,10 +227,10 @@ const handleDimensionChange: DragInputCallbackType<
}
let nextHeight =
property === "height"
? Math.max(0, nextValue)
_property === "height"
? Math.max(0, _nextValue)
: latestElement.height;
if (property === "height") {
if (_property === "height") {
if (shouldChangeByStepSize) {
nextHeight = getStepSizedValue(nextHeight, STEP_SIZE);
} else {
@@ -234,7 +248,7 @@ const handleDimensionChange: DragInputCallbackType<
origElement,
originalElementsMap,
scene,
property === "width" ? "e" : "s",
_property === "width" ? "e" : "s",
{
shouldInformMutation: false,
},