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

fix: collision regressions from vector geometry rewrite (#7902)

Browse source
This commit is contained in:
Ryan Di 2024-04-17 19:31:12 +08:00 • committed by GitHub
parent f92f04c13c
commit bbcca06b94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 49 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
packages/excalidraw/components/App.tsx
View file

@ -230,6 +230,7 @@ import {
getEllipseShape,
getFreedrawShape,
getPolygonShape,
getSelectionBoxShape,
} from "../../utils/geometry/shape";
import { isPointInShape } from "../../utils/collision";
import {
@ -416,7 +417,6 @@ import { withBatchedUpdates, withBatchedUpdatesThrottled } from "../reactUtils";
import { getRenderOpacity } from "../renderer/renderElement";
import {
hitElementBoundText,
hitElementBoundingBox,
hitElementBoundingBoxOnly,
hitElementItself,
shouldTestInside,
@ -4462,10 +4462,18 @@ class App extends React.Component<AppProps, AppState> {
// If we're hitting element with highest z-index only on its bounding box
// while also hitting other element figure, the latter should be considered.
return isPointInShape(
[x, y],
this.getElementShape(elementWithHighestZIndex),
)
return hitElementItself({
x,
y,
element: elementWithHighestZIndex,
shape: this.getElementShape(elementWithHighestZIndex),
// when overlapping, we would like to be more precise
// this also avoids the need to update past tests
threshold: this.getHitThreshold() / 2,
frameNameBound: isFrameLikeElement(elementWithHighestZIndex)
? this.frameNameBoundsCache.get(elementWithHighestZIndex)
: null,
})
? elementWithHighestZIndex
: allHitElements[allHitElements.length - 2];
}
@ -4540,13 +4548,13 @@ class App extends React.Component<AppProps, AppState> {
this.state.selectedElementIds[element.id] &&
shouldShowBoundingBox([element], this.state)
) {
return hitElementBoundingBox(
x,
y,
const selectionShape = getSelectionBoxShape(
element,
this.scene.getNonDeletedElementsMap(),
this.getHitThreshold(),
);
return isPointInShape([x, y], selectionShape);
}
// take bound text element into consideration for hit collision as well