Merge branch 'master' into feat/math2

This commit is contained in:
Mark Tolmacs 2025-01-07 14:56:24 +01:00
commit a12334e20d
No known key found for this signature in database
2 changed files with 21 additions and 2 deletions

View file

@ -7038,6 +7038,22 @@ class App extends React.Component<AppProps, AppState> {
this.finishImageCropping(); this.finishImageCropping();
} }
this.hitLinkElement = this.getElementLinkAtPosition(
pointerDownState.origin,
pointerDownState.hit.element,
);
if (this.hitLinkElement) {
return true;
}
if (
this.state.croppingElementId &&
pointerDownState.hit.element?.id !== this.state.croppingElementId
) {
this.finishImageCropping();
}
if (pointerDownState.hit.element) { if (pointerDownState.hit.element) {
// Early return if pointer is hitting link icon // Early return if pointer is hitting link icon
const hitLinkElement = this.getElementLinkAtPosition( const hitLinkElement = this.getElementLinkAtPosition(

View file

@ -158,5 +158,8 @@ const createESMRawBuild = async () => {
await buildProd(rawConfigChunks); await buildProd(rawConfigChunks);
}; };
createESMRawBuild(); // otherwise throws "ERROR: Could not resolve "./subset-worker.chunk"
createESMBrowserBuild(); (async () => {
await createESMRawBuild();
await createESMBrowserBuild();
})();