fix: Fix post-rebase null handling

Author: gonfunko

src/line_cursor.ts

@@ -591,13 +591,13 @@ export class LineCursor extends Marker {
       }
     }
 
-    if (this.isZelos && this.isValueInputConnection(oldNode)) {
+    if (this.isZelos && oldNode && this.isValueInputConnection(oldNode)) {
       this.hideAtInput(oldNode);
     }
 
     const curNodeType = curNode?.getType();
     const isZelosInputConnection =
-      this.isZelos && this.isValueInputConnection(curNode);
+      this.isZelos && curNode && this.isValueInputConnection(curNode);
 
     // If drawing can't be handled locally, just use the drawer.
     if (curNodeType !== ASTNode.types.BLOCK && !isZelosInputConnection) {
@@ -610,7 +610,7 @@ export class LineCursor extends Marker {
 
     if (isZelosInputConnection) {
       this.showAtInput(curNode);
-    } else if (curNodeType === ASTNode.types.BLOCK) {
+    } else if (curNode && curNodeType === ASTNode.types.BLOCK) {
       const block = curNode.getLocation() as Blockly.BlockSvg;
       if (!block.isShadow()) {
         // Selection should already be in sync.

src/navigation.ts

@@ -423,11 +423,12 @@ export class Navigation {
     this.setState(workspace, Constants.STATE.NOWHERE);
     const cursor = workspace.getCursor();
     if (cursor) {
-      if (cursor.getCurNode()) {
-        this.passiveFocusIndicator.show(cursor.getCurNode());
+      const curNode = cursor.getCurNode();
+      if (curNode) {
+        this.passiveFocusIndicator.show(curNode);
       }
       // It's initially null so this is a valid state despite the types.
-      cursor.setCurNode(null as never);
+      cursor.setCurNode(null);
     }
   }
 
@@ -544,20 +545,21 @@ export class Navigation {
     const flyoutCursor = this.getFlyoutCursor(workspace);
     if (!flyoutCursor) return;
 
-    if (
-      flyoutCursor.getCurNode() &&
-      !this.isFlyoutItemDisposed(flyoutCursor.getCurNode())
-    )
-      return;
+    const curNode = flyoutCursor.getCurNode();
+    if (curNode && !this.isFlyoutItemDisposed(curNode)) return;
 
     const flyoutContents = flyout.getContents();
     const firstFlyoutItem = flyoutContents[0];
     if (!firstFlyoutItem) return;
-    if (firstFlyoutItem.button) {
-      const astNode = Blockly.ASTNode.createButtonNode(firstFlyoutItem.button);
+    if (firstFlyoutItem.getElement() instanceof Blockly.FlyoutButton) {
+      const astNode = Blockly.ASTNode.createButtonNode(
+        firstFlyoutItem.getElement() as Blockly.FlyoutButton,
+      );
       flyoutCursor.setCurNode(astNode!);
-    } else if (firstFlyoutItem.block) {
-      const astNode = Blockly.ASTNode.createStackNode(firstFlyoutItem.block);
+    } else if (firstFlyoutItem.getElement() instanceof Blockly.BlockSvg) {
+      const astNode = Blockly.ASTNode.createStackNode(
+        firstFlyoutItem.getElement() as Blockly.BlockSvg,
+      );
       flyoutCursor.setCurNode(astNode!);
     }
   }