Merge remote-tracking branch 'origin/release' into danieljgeiger-mathjax

2023-02-19 16:02:22 -06:00
parent fcde0ac3de b9ba407f96
commit 8f0d9f5230
18 changed files with 319 additions and 68 deletions
@@ -227,6 +227,7 @@ import {
  setEraserCursor,
  updateActiveTool,
  getShortcutKey,
+  isTransparent,
 } from "../utils";
 import {
  ContextMenu,
@@ -884,7 +885,7 @@ class App extends React.Component<AppProps, AppState> {
        },
      };
    }
-    const scene = restore(initialData, null, null);
+    const scene = restore(initialData, null, null, { repairBindings: true });
    scene.appState = {
      ...scene.appState,
      theme: this.props.theme || scene.appState.theme,
@@ -2827,7 +2828,15 @@ class App extends React.Component<AppProps, AppState> {
        sceneY,
      );
      if (container) {
-        if (isArrowElement(container) || hasBoundTextElement(container)) {
+        if (
+          isArrowElement(container) ||
+          hasBoundTextElement(container) ||
+          !isTransparent(container.backgroundColor) ||
+          isHittingElementNotConsideringBoundingBox(container, this.state, [
+            sceneX,
+            sceneY,
+          ])
+        ) {
          const midPoint = getContainerCenter(container, this.state);

          sceneX = midPoint.x;