Merge pull request #7859 from BeksOmega/fix/previewer-disposing

maribethb · maribethb · commit f4961f602edb · 2024-02-15T15:48:04.000-08:00
fix: connection previewer disposing too early (cherry picked from commit da3ec25)
diff --git a/core/block_dragger.ts b/core/block_dragger.ts
@@ -382,7 +382,6 @@ export class BlockDragger implements IBlockDragger {
 
     blockAnimation.disconnectUiStop();
     this.connectionPreviewer.hidePreview();
-    this.connectionPreviewer.dispose();
 
     const preventMove =
       !!this.dragTarget_ &&
@@ -417,6 +416,9 @@ export class BlockDragger implements IBlockDragger {
         );
       }
     }
+    // Must dispose after `updateBlockAfterMove_` is called to not break the
+    // dynamic connections plugin.
+    this.connectionPreviewer.dispose();
     this.workspace_.setResizesEnabled(true);
 
     eventUtils.setGroup(false);

Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,6 @@ export class BlockDragger implements IBlockDragger {`
`382`	`382`
`383`	`383`	`blockAnimation.disconnectUiStop();`
`384`	`384`	`this.connectionPreviewer.hidePreview();`
`385`		`- this.connectionPreviewer.dispose();`
`386`	`385`
`387`	`386`	`const preventMove =`
`388`	`387`	`!!this.dragTarget_ &&`
`@@ -417,6 +416,9 @@ export class BlockDragger implements IBlockDragger {`
`417`	`416`	`);`
`418`	`417`	`}`
`419`	`418`	`}`
	`419`	+ // Must dispose after `updateBlockAfterMove_` is called to not break the
	`420`	`+ // dynamic connections plugin.`
	`421`	`+ this.connectionPreviewer.dispose();`
`420`	`422`	`this.workspace_.setResizesEnabled(true);`
`421`	`423`
`422`	`424`	`eventUtils.setGroup(false);`