chore: merge develop into v11.0.0

Merge pull request #7929 from BeksOmega/merge-dev-v11

blocks/blocks.ts

@@ -20,6 +20,7 @@ import type {BlockDefinition} from '../core/blocks.js';
 export {
   colour,
   lists,
+  logic,
   loops,
   math,
   procedures,
@@ -40,6 +41,7 @@ export const blocks: {[key: string]: BlockDefinition} = Object.assign(
   loops.blocks,
   math.blocks,
   procedures.blocks,
+  texts.blocks,
   variables.blocks,
   variablesDynamic.blocks,
 );

core/block_dragger.ts

@@ -69,8 +69,18 @@ export class BlockDragger implements IBlockDragger {
 
   /** Whether the block would be deleted if dropped immediately. */
   protected wouldDeleteBlock_ = false;
+
   protected startXY_: Coordinate;
 
+  /** The parent block at the start of the drag. */
+  private startParentConn: RenderedConnection | null = null;
+
+  /**
+   * The child block at the start of the drag. Only gets set if
+   * `healStack` is true.
+   */
+  private startChildConn: RenderedConnection | null = null;
+
   /**
    * @param block The block to drag.
    * @param workspace The workspace to drag on.
@@ -126,6 +136,13 @@ export class BlockDragger implements IBlockDragger {
     blockAnimation.disconnectUiStop();
 
     if (this.shouldDisconnect_(healStack)) {
+      this.startParentConn =
+        this.draggingBlock_.outputConnection?.targetConnection ??
+        this.draggingBlock_.previousConnection?.targetConnection;
+      if (healStack) {
+        this.startChildConn =
+          this.draggingBlock_.nextConnection?.targetConnection;
+      }
       this.disconnectBlock_(healStack, currentDragDeltaXY);
     }
     this.draggingBlock_.setDragging(true);
@@ -413,17 +430,10 @@ export class BlockDragger implements IBlockDragger {
         .getLayerManager()
         ?.moveOffDragLayer(this.draggingBlock_, layers.BLOCK);
       this.draggingBlock_.setDragging(false);
-      if (delta) {
-        // !preventMove
+      if (preventMove) {
+        this.moveToOriginalPosition();
+      } else if (delta) {
         this.updateBlockAfterMove_();
-      } else {
-        // Blocks dragged directly from a flyout may need to be bumped into
-        // bounds.
-        bumpObjects.bumpIntoBounds(
-          this.draggingBlock_.workspace,
-          this.workspace_.getMetricsManager().getScrollMetrics(true),
-          this.draggingBlock_,
-        );
       }
     }
     // Must dispose after `updateBlockAfterMove_` is called to not break the
@@ -434,6 +444,32 @@ export class BlockDragger implements IBlockDragger {
     eventUtils.setGroup(false);
   }
 
+  /**
+   * Moves the dragged block back to its original position before the start of
+   * the drag. Reconnects any parent and child blocks.
+   */
+  private moveToOriginalPosition() {
+    this.startChildConn?.connect(this.draggingBlock_.nextConnection);
+    if (this.startParentConn) {
+      switch (this.startParentConn.type) {
+        case ConnectionType.INPUT_VALUE:
+          this.startParentConn.connect(this.draggingBlock_.outputConnection);
+          break;
+        case ConnectionType.NEXT_STATEMENT:
+          this.startParentConn.connect(this.draggingBlock_.previousConnection);
+      }
+    } else {
+      this.draggingBlock_.moveTo(this.startXY_, ['drag']);
+      // Blocks dragged directly from a flyout may need to be bumped into
+      // bounds.
+      bumpObjects.bumpIntoBounds(
+        this.draggingBlock_.workspace,
+        this.workspace_.getMetricsManager().getScrollMetrics(true),
+        this.draggingBlock_,
+      );
+    }
+  }
+
   /**
    * Calculates the drag delta and new location values after a block is dragged.
    *

core/common.ts

@@ -282,7 +282,9 @@ export function defineBlocks(blocks: {[key: string]: BlockDefinition}) {
   for (const type of Object.keys(blocks)) {
     const definition = blocks[type];
     if (type in Blocks) {
-      console.warn(`Block definiton "${type}" overwrites previous definition.`);
+      console.warn(
+        `Block definition "${type}" overwrites previous definition.`,
+      );
     }
     Blocks[type] = definition;
   }

core/grid.ts

@@ -66,12 +66,26 @@ export class Grid {
     this.update(this.scale);
   }
 
+  /**
+   * Get the spacing of the grid points (in px).
+   *
+   * @returns The spacing of the grid points.
+   */
+  getSpacing(): number {
+    return this.spacing;
+  }
+
   /** Sets the length of the grid lines. */
   setLength(length: number) {
     this.length = length;
     this.update(this.scale);
   }
 
+  /** Get the length of the grid lines (in px). */
+  getLength(): number {
+    return this.length;
+  }
+
   /**
    * Sets whether blocks should snap to the grid or not.
    *
@@ -85,25 +99,14 @@ export class Grid {
   }
 
   /**
-   * Whether blocks should snap to the grid, based on the initial configuration.
+   * Whether blocks should snap to the grid.
    *
    * @returns True if blocks should snap, false otherwise.
-   * @internal
    */
   shouldSnap(): boolean {
     return this.snapToGrid;
   }
 
-  /**
-   * Get the spacing of the grid points (in px).
-   *
-   * @returns The spacing of the grid points.
-   * @internal
-   */
-  getSpacing(): number {
-    return this.spacing;
-  }
-
   /**
    * Get the ID of the pattern element, which should be randomized to avoid
    * conflicts with other Blockly instances on the page.

core/insertion_marker_previewer.ts

@@ -12,6 +12,8 @@ import * as blocks from './serialization/blocks.js';
 import * as eventUtils from './events/utils.js';
 import * as renderManagement from './render_management.js';
 import * as registry from './registry.js';
+import {Renderer as ZelosRenderer} from './renderers/zelos/renderer.js';
+import {ConnectionType} from './connection_type.js';
 
 /**
  * An error message to throw if the block created by createMarkerBlock_ is
@@ -97,41 +99,72 @@ export class InsertionMarkerPreviewer implements IConnectionPreviewer {
         throw Error(DUPLICATE_BLOCK_ERROR);
       }
 
-      // Render disconnected from everything else so that we have a valid
-      // connection location.
-      marker.queueRender();
-      renderManagement.triggerQueuedRenders();
-
-      // Connect() also renders the insertion marker.
-      markerConn.connect(staticConn);
-
-      const originalOffsetToTarget = {
-        x: staticConn.x - markerConn.x,
-        y: staticConn.y - markerConn.y,
-      };
-      const originalOffsetInBlock = markerConn.getOffsetInBlock().clone();
-      renderManagement.finishQueuedRenders().then(() => {
-        // Position so that the existing block doesn't move.
-        marker?.positionNearConnection(
-          markerConn,
-          originalOffsetToTarget,
-          originalOffsetInBlock,
-        );
-        marker?.getSvgRoot().setAttribute('visibility', 'visible');
-      });
+      // TODO(7898): Instead of special casing, we should change the dragger to
+      //   track the change in distance between the dragged connection and the
+      //   static connection, so that it doesn't disconnect  unless that
+      //   (+ a bit) has been exceeded.
+      if (this.shouldUseMarkerPreview(draggedConn, staticConn)) {
+        this.markerConn = this.previewMarker(draggedConn, staticConn);
+      }
 
       if (this.workspace.getRenderer().shouldHighlightConnection(staticConn)) {
         staticConn.highlight();
       }
 
-      this.markerConn = markerConn;
       this.draggedConn = draggedConn;
       this.staticConn = staticConn;
     } finally {
       eventUtils.enable();
     }
   }
 
+  private shouldUseMarkerPreview(
+    _draggedConn: RenderedConnection,
+    staticConn: RenderedConnection,
+  ): boolean {
+    return (
+      staticConn.type === ConnectionType.PREVIOUS_STATEMENT ||
+      staticConn.type === ConnectionType.NEXT_STATEMENT ||
+      !(this.workspace.getRenderer() instanceof ZelosRenderer)
+    );
+  }
+
+  private previewMarker(
+    draggedConn: RenderedConnection,
+    staticConn: RenderedConnection,
+  ): RenderedConnection {
+    const dragged = draggedConn.getSourceBlock();
+    const marker = this.createInsertionMarker(dragged);
+    const markerConn = this.getMatchingConnection(dragged, marker, draggedConn);
+    if (!markerConn) {
+      throw Error('Could not create insertion marker to preview connection');
+    }
+
+    // Render disconnected from everything else so that we have a valid
+    // connection location.
+    marker.queueRender();
+    renderManagement.triggerQueuedRenders();
+
+    // Connect() also renders the insertion marker.
+    markerConn.connect(staticConn);
+
+    const originalOffsetToTarget = {
+      x: staticConn.x - markerConn.x,
+      y: staticConn.y - markerConn.y,
+    };
+    const originalOffsetInBlock = markerConn.getOffsetInBlock().clone();
+    renderManagement.finishQueuedRenders().then(() => {
+      // Position so that the existing block doesn't move.
+      marker?.positionNearConnection(
+        markerConn,
+        originalOffsetToTarget,
+        originalOffsetInBlock,
+      );
+      marker?.getSvgRoot().setAttribute('visibility', 'visible');
+    });
+    return markerConn;
+  }
+
   private createInsertionMarker(origBlock: BlockSvg) {
     const blockJson = blocks.save(origBlock, {
       addCoordinates: false,