fix: don't keep cursor on disposed blocks (#271)

microbit-matt-hillsdon · web-flow · commit 4c7d6a6fe13b · 2025-03-04T18:38:18.000-08:00
* fix: don't keep cursor on disposed blocks Perhaps this should be cleared earlier, but this scenario happens in MakeCode when switching back to Blocks mode from JavaScript. One approach to #146 * chore: improve comments and naming
diff --git a/src/navigation.ts b/src/navigation.ts
@@ -511,8 +511,10 @@ export class Navigation {
       return;
     }
 
-    if (cursor.getCurNode() && keepPosition) {
-      // Retain the cursor's previous position since it's set.
+    const disposed = cursor.getCurNode()?.getSourceBlock()?.disposed;
+    if (cursor.getCurNode() && !disposed && keepPosition) {
+      // Retain the cursor's previous position since it's set, but only if not
+      // disposed (which can happen when blocks are reloaded).
       return;
     }
     const wsCoordinates = new Blockly.utils.Coordinate(

Original file line number	Diff line number	Diff line change
`@@ -511,8 +511,10 @@ export class Navigation {`
`511`	`511`	`return;`
`512`	`512`	`}`
`513`	`513`
`514`		`- if (cursor.getCurNode() && keepPosition) {`
`515`		`- // Retain the cursor's previous position since it's set.`
	`514`	`+ const disposed = cursor.getCurNode()?.getSourceBlock()?.disposed;`
	`515`	`+ if (cursor.getCurNode() && !disposed && keepPosition) {`
	`516`	`+ // Retain the cursor's previous position since it's set, but only if not`
	`517`	`+ // disposed (which can happen when blocks are reloaded).`
`516`	`518`	`return;`
`517`	`519`	`}`
`518`	`520`	`const wsCoordinates = new Blockly.utils.Coordinate(`