fix: scroll into view used the wrong position

It used the position from positionNewTopLevelBlock, not the initial insert
position. Delay the setting of current node until the position is correct.

Author: microbit-matt-hillsdon

src/actions/enter.ts

@@ -146,8 +146,6 @@ export class EnterAction {
 
     workspace.setResizesEnabled(true);
 
-    getFocusManager().focusTree(workspace);
-    workspace.getCursor()?.setCurNode(newBlock);
     this.mover.startMove(workspace, newBlock, insertStartPoint);
 
     const isStartBlock =

src/actions/mover.ts

@@ -143,8 +143,9 @@ export class Mover {
     dragger.onDragStart(info.fakePointerEvent('pointerdown'));
     info.updateTotalDelta();
     // In case the block is detached, ensure that it still retains focus
-    // (otherwise dragging will break).
-    getFocusManager().focusNode(block);
+    // (otherwise dragging will break). This is also the point a new block's
+    // initial insert position is scrolled into view.
+    workspace.getCursor()?.setCurNode(block);
     block.getFocusableElement().addEventListener('blur', blurListener);
 
     // Register a keyboard shortcut under the key combos of all existing

test/webdriverio/test/scroll_test.ts

@@ -53,6 +53,7 @@ suite('Scrolling into view', function () {
     await this.browser.keys(Key.Enter);
 
     // Asset new block has been scrolled into the viewport.
+    await this.browser.pause(PAUSE_TIME);
     const inViewport = await this.browser.execute(() => {
       const workspace = Blockly.getMainWorkspace() as Blockly.WorkspaceSvg;
       const block = workspace.getBlocksByType(
@@ -68,7 +69,6 @@ suite('Scrolling into view', function () {
       );
       return viewport.contains(blockBounds.left, blockBounds.top);
     });
-    // FIXME: actually scrolls the wrong bounds into view
-    chai.assert.isFalse(inViewport);
+    chai.assert.isTrue(inViewport);
   });
 });