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

fix: start dragging grouped elements (#1818)

Browse Source 
Co-authored-by: dwelle <luzar.david@gmail.com>
This commit is contained in:
Daishi Kato 2020-06-24 20:38:42 +09:00 committed by GitHub
parent 159890860a
commit 9c89504b6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/App.tsx
View File

@ -2046,7 +2046,7 @@ class App extends React.Component<any, AppState> {
let resizeArrowDirection: "origin" | "end" = "origin"; let resizeArrowDirection: "origin" | "end" = "origin";
let isResizingElements = false; let isResizingElements = false;
let draggingOccurred = false; let draggingOccurred = false;
let dragOffsetXY: [number, number] = [0, 0]; let dragOffsetXY: [number, number] | null = null;
let hitElement: ExcalidrawElement | null = null; let hitElement: ExcalidrawElement | null = null;
let hitElementWasAddedToSelection = false; let hitElementWasAddedToSelection = false;
@ -2130,20 +2130,6 @@ class App extends React.Component<any, AppState> {
hitElement || hitElement ||
getElementAtPosition(elements, this.state, x, y, this.state.zoom); getElementAtPosition(elements, this.state, x, y, this.state.zoom);
if (hitElement && isNonDeletedElement(hitElement)) {
if (this.state.selectedElementIds[hitElement.id]) {
dragOffsetXY = getDragOffsetXY(selectedElements, x, y);
} else if (event.shiftKey) {
dragOffsetXY = getDragOffsetXY(
[...selectedElements, hitElement],
x,
y,
);
} else {
dragOffsetXY = getDragOffsetXY([hitElement], x, y);
}
}
// clear selection if shift is not clicked // clear selection if shift is not clicked
if ( if (
!(hitElement && this.state.selectedElementIds[hitElement.id]) && !(hitElement && this.state.selectedElementIds[hitElement.id]) &&
@ -2369,6 +2355,18 @@ class App extends React.Component<any, AppState> {
let selectedElementWasDuplicated = false; let selectedElementWasDuplicated = false;
const onPointerMove = withBatchedUpdates((event: PointerEvent) => { const onPointerMove = withBatchedUpdates((event: PointerEvent) => {
// We need to initialize dragOffsetXY only after we've updated
// `state.selectedElementIds` on pointerDown. Doing it here in pointerMove
// event handler should hopefully ensure we're already working with
// the updated state.
if (dragOffsetXY === null) {
dragOffsetXY = getDragOffsetXY(
getSelectedElements(globalSceneState.getElements(), this.state),
originX,
originY,
);
}
const target = event.target; const target = event.target;
if (!(target instanceof HTMLElement)) { if (!(target instanceof HTMLElement)) {
return; return;