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

Fix corner resize for multi-point arrows (#1105)

Browse Source 
The logic to support it was not implemented. This is not the prettiest way to solve it in the world but it does work. Some more refactoring here is probably warranted.

Fixes #1039
This commit is contained in:
Christopher Chedeau 2020-03-28 18:08:21 -07:00 committed by GitHub
parent 24fa657093
commit 8e6d55cf75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/components/App.tsx
View File

@ -1964,15 +1964,26 @@ export class App extends React.Component<any, AppState> {
} }
resizeArrowFn(element, 1, deltaX, deltaY, x, y, event.shiftKey); resizeArrowFn(element, 1, deltaX, deltaY, x, y, event.shiftKey);
} else { } else {
const width = element.width - deltaX;
const height = event.shiftKey
? element.width
: element.height - deltaY;
mutateElement(element, { mutateElement(element, {
x: element.x + deltaX, x: element.x + deltaX,
y: event.shiftKey y: event.shiftKey
? element.y + element.height - element.width ? element.y + element.height - element.width
: element.y + deltaY, : element.y + deltaY,
width: element.width - deltaX, width,
height: event.shiftKey height,
? element.width ...(isLinearElement(element) && width >= 0 && height >= 0
: element.height - deltaY, ? {
points: rescalePoints(
0,
width,
rescalePoints(1, height, element.points),
),
}
: {}),
}); });
} }
break; break;
@ -1988,13 +1999,23 @@ export class App extends React.Component<any, AppState> {
} }
resizeArrowFn(element, 1, deltaX, deltaY, x, y, event.shiftKey); resizeArrowFn(element, 1, deltaX, deltaY, x, y, event.shiftKey);
} else { } else {
const nextWidth = element.width + deltaX; const width = element.width + deltaX;
const height = event.shiftKey ? width : element.height - deltaY;
mutateElement(element, { mutateElement(element, {
y: event.shiftKey y: event.shiftKey
? element.y + element.height - nextWidth ? element.y + element.height - width
: element.y + deltaY, : element.y + deltaY,
width: nextWidth, width,
height: event.shiftKey ? nextWidth : element.height - deltaY, height,
...(isLinearElement(element) && width >= 0 && height >= 0
? {
points: rescalePoints(
0,
width,
rescalePoints(1, height, element.points),
),
}
: {}),
}); });
} }
break; break;
@ -2010,12 +2031,23 @@ export class App extends React.Component<any, AppState> {
} }
resizeArrowFn(element, 1, deltaX, deltaY, x, y, event.shiftKey); resizeArrowFn(element, 1, deltaX, deltaY, x, y, event.shiftKey);
} else { } else {
const width = element.width - deltaX;
const height = event.shiftKey
? element.width
: element.height + deltaY;
mutateElement(element, { mutateElement(element, {
x: element.x + deltaX, x: element.x + deltaX,
width: element.width - deltaX, width,
height: event.shiftKey height,
? element.width ...(isLinearElement(element) && width >= 0 && height >= 0
: element.height + deltaY, ? {
points: rescalePoints(
0,
width,
rescalePoints(1, height, element.points),
),
}
: {}),
}); });
} }
break; break;
@ -2031,11 +2063,22 @@ export class App extends React.Component<any, AppState> {
} }
resizeArrowFn(element, 1, deltaX, deltaY, x, y, event.shiftKey); resizeArrowFn(element, 1, deltaX, deltaY, x, y, event.shiftKey);
} else { } else {
const width = element.width + deltaX;
const height = event.shiftKey
? element.width
: element.height + deltaY;
mutateElement(element, { mutateElement(element, {
width: element.width + deltaX, width,
height: event.shiftKey height,
? element.width ...(isLinearElement(element) && width >= 0 && height >= 0
: element.height + deltaY, ? {
points: rescalePoints(
0,
width,
rescalePoints(1, height, element.points),
),
}
: {}),
}); });
} }
break; break;

7
src/element/handlerRectangles.ts
View File

@ -131,13 +131,6 @@ export function handlerRectangles(
} as typeof handlers; } as typeof handlers;
} }
} }
return {
n: handlers.n,
s: handlers.s,
w: handlers.w,
e: handlers.e,
} as typeof handlers;
} }
return handlers; return handlers;