Virtual whiteboard for sketching hand-drawn like diagrams
fix(editor): Hit cache soundness (#11630)
Márk Tolmács082b2eeb1eac
diff --git a/packages/element/src/collision.ts b/packages/element/src/collision.tsindex a29992713c..bbc5698f29 100644--- a/packages/element/src/collision.ts+++ b/packages/element/src/collision.ts@@ -115,6 +115,19 @@ let cachedElement: WeakRef<ExcalidrawElement> | null = null;let cachedThreshold: number = Infinity;let cachedHit: boolean = false;let cachedOverrideShouldTestInside = false;+let cachedFrameNameBound: FrameNameBounds | null = null;++const frameNameBoundsEqual = (+ a: FrameNameBounds | null,+ b: FrameNameBounds | null,+) =>+ a === b ||+ (!!a &&+ !!b &&+ a.x === b.x &&+ a.y === b.y &&+ a.width === b.width &&+ a.height === b.height);export const hitElementItself = ({point,@@ -124,12 +137,16 @@ export const hitElementItself = ({frameNameBound = null,overrideShouldTestInside = false,}: HitTestArgs) => {- // Return cached result if the same point and element version is tested again+ // Return cached result if the same point and element version is tested again.+ // A cached hit stays valid for any larger threshold, while a cached miss+ // stays valid only for a threshold no larger than the cached one (a larger+ // threshold could turn a miss into a hit).if (cachedPoint &&pointsEqual(point, cachedPoint) &&- cachedThreshold <= threshold &&- overrideShouldTestInside === cachedOverrideShouldTestInside+ (cachedHit ? cachedThreshold <= threshold : cachedThreshold >= threshold) &&+ overrideShouldTestInside === cachedOverrideShouldTestInside &&+ frameNameBoundsEqual(frameNameBound, cachedFrameNameBound)) {const derefElement = cachedElement?.deref();if (@@ -186,6 +203,7 @@ export const hitElementItself = ({cachedElement = new WeakRef(element);cachedThreshold = threshold;cachedOverrideShouldTestInside = overrideShouldTestInside;+ cachedFrameNameBound = frameNameBound;cachedHit = result;return result;diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsxindex 1432552dcb..223063e992 100644--- a/packages/excalidraw/components/App.tsx+++ b/packages/excalidraw/components/App.tsx@@ -1934,7 +1934,6 @@ class App extends React.Component<AppProps, AppState> {y: boxSceneTopLeft.y,width: boxSceneBottomRight.x - boxSceneTopLeft.x,height: boxSceneBottomRight.y - boxSceneTopLeft.y,- angle: 0,zoom: this.state.zoom.value,versionNonce: frameElement.versionNonce,};diff --git a/packages/excalidraw/types.ts b/packages/excalidraw/types.tsindex 0213780f02..bb0a322dc1 100644--- a/packages/excalidraw/types.ts+++ b/packages/excalidraw/types.ts@@ -1089,7 +1089,6 @@ export type FrameNameBounds = {y: number;width: number;height: number;- angle: number;};export type FrameNameBoundsCache = {