scratch-blocks 2.0.0-spork.5 → 2.0.0-spork.7

package/src/renderer/drawer.ts

@@ -6,10 +6,13 @@
 
 import * as Blockly from "blockly/core";
 import type { RenderInfo } from "./render_info";
+import { ConstantProvider } from "./constants";
 
 export class Drawer extends Blockly.zelos.Drawer {
+  constants_: ConstantProvider;
   info_: RenderInfo;
-  drawStatementInput_(row: Blockly.blockRendering.Row) {
+
+  override drawStatementInput_(row: Blockly.blockRendering.Row) {
     if (this.info_.isBowlerHatBlock()) {
       // Bowler hat blocks have straight sides with no C-shape/indentation for
       // statement blocks.
@@ -20,7 +23,7 @@ export class Drawer extends Blockly.zelos.Drawer {
     }
   }
 
-  drawRightSideRow_(row: Blockly.blockRendering.Row) {
+  override drawRightSideRow_(row: Blockly.blockRendering.Row) {
     if (
       this.info_.isBowlerHatBlock() &&
       Blockly.blockRendering.Types.isSpacer(row)
@@ -36,21 +39,25 @@ export class Drawer extends Blockly.zelos.Drawer {
     }
   }
 
-  drawTop_() {
+  override drawTop_() {
     super.drawTop_();
     // This is a horrible hack, but the superclass' implementation of drawTop_()
     // provides no way to cleanly override a hat's path without copying and
     // pasting the entire implementation here. We know that there will only be
     // one hat on a block, and its path is a known constant, so we just find and
     // replace it with the desired bowler hat path here.
-    // If https://github.com/google/blockly/issues/7292 is resolved, this should
-    // be revisited.
-    if (this.info_.isBowlerHatBlock()) {
+    // If https://github.com/RaspberryPiFoundation/blockly/issues/7292 is
+    // resolved, this should be revisited.
+    const replacementTop = this.makeReplacementTop_();
+    if (replacementTop) {
       const capHatPath = this.constants_.START_HAT.path;
-      const bowlerHatPath = `a20,20 0 0,1 20,-20 l ${
-        this.info_.width - 40
-      } 0 a20,20 0 0,1 20,20`;
-      this.outlinePath_ = this.outlinePath_.replace(capHatPath, bowlerHatPath);
+      this.outlinePath_ = this.outlinePath_.replace(capHatPath, replacementTop);
+    }
+  }
+
+  makeReplacementTop_() {
+    if (this.info_.isBowlerHatBlock()) {
+      return this.constants_.makeBowlerHatPath(this.info_.width);
     }
   }
 }

package/src/renderer/path_object.ts

@@ -17,7 +17,7 @@ export class PathObject extends Blockly.zelos.PathObject {
    *
    * @param block The source block.
    */
-  applyColour(block: Blockly.BlockSvg) {
+  override applyColour(block: Blockly.BlockSvg) {
     super.applyColour(block);
 
     // These blocks are special in that, while they are technically shadow

package/src/renderer/render_info.ts

@@ -5,12 +5,16 @@
  */
 
 import * as Blockly from "blockly/core";
+
 import { BowlerHat } from "./bowler_hat";
+import { ConstantProvider } from "./constants";
 
 export class RenderInfo extends Blockly.zelos.RenderInfo {
-  populateTopRow_() {
+  constants_: ConstantProvider;
+
+  override populateTopRow_() {
     if (this.isBowlerHatBlock()) {
-      const bowlerHat = new BowlerHat(this.constants_);
+      const bowlerHat = this.makeBowlerHat();
       this.topRow.elements.push(
         new Blockly.blockRendering.SquareCorner(this.constants_)
       );
@@ -25,14 +29,14 @@ export class RenderInfo extends Blockly.zelos.RenderInfo {
     }
   }
 
-  populateBottomRow_() {
+  override populateBottomRow_() {
     super.populateBottomRow_();
     if (this.isBowlerHatBlock()) {
       this.bottomRow.minHeight = this.constants_.MEDIUM_PADDING;
     }
   }
 
-  computeBounds_() {
+  override computeBounds_() {
     super.computeBounds_();
     if (this.isBowlerHatBlock()) {
       // Resize the render info to the same width as the widest part of a
@@ -55,7 +59,7 @@ export class RenderInfo extends Blockly.zelos.RenderInfo {
     }
   }
 
-  getInRowSpacing_(
+  override getInRowSpacing_(
     prev: Blockly.blockRendering.Measurable,
     next: Blockly.blockRendering.Measurable
   ): number {
@@ -71,7 +75,7 @@ export class RenderInfo extends Blockly.zelos.RenderInfo {
     return super.getInRowSpacing_(prev, next);
   }
 
-  getSpacerRowHeight_(
+  override getSpacerRowHeight_(
     prev: Blockly.blockRendering.Row,
     next: Blockly.blockRendering.Row
   ): number {
@@ -82,7 +86,7 @@ export class RenderInfo extends Blockly.zelos.RenderInfo {
     return super.getSpacerRowHeight_(prev, next);
   }
 
-  getElemCenterline_(
+  override getElemCenterline_(
     row: Blockly.blockRendering.Row,
     elem: Blockly.blockRendering.Measurable
   ): number {
@@ -107,4 +111,8 @@ export class RenderInfo extends Blockly.zelos.RenderInfo {
   isBowlerHatBlock() {
     return this.block_.hat === "bowler";
   }
+
+  makeBowlerHat() {
+    return new BowlerHat(this.constants_);
+  }
 }

package/src/renderer/renderer.ts

@@ -14,6 +14,16 @@ import { PathObject } from "./path_object";
  * Custom renderer for Scratch-style blocks.
  */
 export class ScratchRenderer extends Blockly.zelos.Renderer {
+  /**
+   * Get the CSS class name associated with this renderer.
+   * Note that all Scratch renderers share the same CSS class name.
+   *
+   * @returns The class name.
+   */
+  override getClassName(): string {
+    return "scratch-renderer";
+  }
+
   /**
    * Create a new instance of the renderer's drawer.
    *
@@ -22,7 +32,7 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
    *     block.
    * @returns The drawer.
    */
-  makeDrawer_(block: Blockly.BlockSvg, info: RenderInfo): Drawer {
+  override makeDrawer_(block: Blockly.BlockSvg, info: RenderInfo): Drawer {
     return new Drawer(block, info);
   }
 
@@ -32,7 +42,7 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
    * @param block The block to measure.
    * @returns The render info object.
    */
-  makeRenderInfo_(block: Blockly.BlockSvg): RenderInfo {
+  override makeRenderInfo_(block: Blockly.BlockSvg): RenderInfo {
     return new RenderInfo(this, block);
   }
 
@@ -41,7 +51,7 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
    *
    * @returns The constant provider.
    */
-  makeConstants_(): ConstantProvider {
+  override makeConstants_(): ConstantProvider {
     return new ConstantProvider();
   }
 
@@ -52,7 +62,7 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
    * @param style The style object to use for colouring.
    * @returns The renderer path object.
    */
-  makePathObject(
+  override makePathObject(
     root: SVGElement,
     style: Blockly.Theme.BlockStyle
   ): PathObject {
@@ -65,7 +75,7 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
    * @param connection The connection to determine whether or not to highlight.
    * @returns True if we should highlight the connection.
    */
-  shouldHighlightConnection(connection: Blockly.RenderedConnection): boolean {
+  override shouldHighlightConnection(connection: Blockly.RenderedConnection): boolean {
     return (
       connection.type === Blockly.ConnectionType.INPUT_VALUE &&
       connection.getCheck()?.includes("Boolean")
@@ -73,4 +83,4 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
   }
 }
 
-Blockly.blockRendering.register("scratch", ScratchRenderer);
+Blockly.blockRendering.register("scratch_classic", ScratchRenderer);