fix: Speculative fixes for arrow invariant failures (#11241)

Co-authored-by: dwelle <5153846+dwelle@users.noreply.github.com>
2026-05-06 16:39:45 +02:00
parent 974b338b7e
commit 7f56cc0cf3
3 changed files with 31 additions and 14 deletions
@@ -10408,20 +10408,38 @@ class App extends React.Component<AppProps, AppState> {
          );

          let linearElementEditor = this.state.selectedLinearElement;
-          if (!linearElementEditor) {
+
+          if (
+            !linearElementEditor ||
+            linearElementEditor.elementId !== newElement.id
+          ) {
            linearElementEditor = new LinearElementEditor(
              newElement,
              this.scene.getNonDeletedElementsMap(),
            );
+          }
+
+          const lastClickedPointOutOfBounds =
+            linearElementEditor &&
+            (linearElementEditor.initialState.lastClickedPoint < 0 ||
+              linearElementEditor.initialState.lastClickedPoint >=
+                points.length);
+          if (lastClickedPointOutOfBounds) {
+            console.warn(
+              "Last clicked point is out of bounds. Attempting to fix it.",
+            );
            linearElementEditor = {
              ...linearElementEditor,
-              selectedPointsIndices: [1],
+              selectedPointsIndices: [points.length - 1],
              initialState: {
                ...linearElementEditor.initialState,
-                lastClickedPoint: 1,
+                prevSelectedPointsIndices: null,
+                lastClickedPoint: points.length - 1,
              },
+              hoverPointIndex: points.length - 1,
            };
          }
+
          this.setState({
            newElement,
            ...LinearElementEditor.handlePointDragging(