scratch-blocks 2.0.0-spork.2 → 2.0.0-spork.4

package/src/{constants.js → constants.ts}

@@ -1,3 +1,9 @@
+/**
+ * @license
+ * Copyright 2024 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 /**
  * String representing the variable type of scalar variables.
  * This string, for use in differentiating between types of variables,
@@ -32,6 +38,13 @@ export { LIST_VARIABLE_TYPE };
 const PROCEDURES_DEFINITION_BLOCK_TYPE = "procedures_definition";
 export { PROCEDURES_DEFINITION_BLOCK_TYPE };
 
+/*
+ * The type of all procedure declaration blocks.
+ * @const {string}
+ */
+const PROCEDURES_DECLARATION_BLOCK_TYPE = "procedures_declaration";
+export { PROCEDURES_DECLARATION_BLOCK_TYPE };
+
 /**
  * The type of all procedure prototype blocks.
  * @const {string}

package/src/{context_menu_items.js → context_menu_items.ts}

@@ -11,19 +11,19 @@ import * as Blockly from "blockly/core";
  */
 export function registerDeleteBlock() {
   const deleteOption = {
-    displayText(scope) {
+    displayText(scope: Blockly.ContextMenuRegistry.Scope) {
       const descendantCount = getDeletableBlocksInStack(scope.block).length;
       return descendantCount === 1
         ? Blockly.Msg["DELETE_BLOCK"]
         : Blockly.Msg["DELETE_X_BLOCKS"].replace("%1", `${descendantCount}`);
     },
-    preconditionFn(scope) {
+    preconditionFn(scope: Blockly.ContextMenuRegistry.Scope) {
       if (!scope.block.isInFlyout && scope.block.isDeletable()) {
         return "enabled";
       }
       return "hidden";
     },
-    callback(scope) {
+    callback(scope: Blockly.ContextMenuRegistry.Scope) {
       Blockly.Events.setGroup(true);
       scope.block.dispose(true, true);
       Blockly.Events.setGroup(false);
@@ -35,7 +35,9 @@ export function registerDeleteBlock() {
   Blockly.ContextMenuRegistry.registry.register(deleteOption);
 }
 
-function getDeletableBlocksInStack(block) {
+function getDeletableBlocksInStack(
+  block: Blockly.BlockSvg
+): Blockly.BlockSvg[] {
   let descendants = block.getDescendants(false).filter(isDeletable);
   if (block.getNextBlock()) {
     // Next blocks are not deleted.
@@ -48,7 +50,7 @@ function getDeletableBlocksInStack(block) {
   return descendants;
 }
 
-function isDeletable(block) {
+function isDeletable(block: Blockly.BlockSvg): boolean {
   return block.isDeletable() && !block.isShadow();
 }
 
@@ -57,7 +59,7 @@ function isDeletable(block) {
  */
 export function registerDeleteAll() {
   const deleteOption = {
-    displayText(scope) {
+    displayText(scope: Blockly.ContextMenuRegistry.Scope) {
       if (!scope.workspace) {
         return "";
       }
@@ -72,7 +74,7 @@ export function registerDeleteAll() {
         `${deletableBlocksLength}`
       );
     },
-    preconditionFn(scope) {
+    preconditionFn(scope: Blockly.ContextMenuRegistry.Scope) {
       if (!scope.workspace) {
         return "disabled";
       }
@@ -81,7 +83,7 @@ export function registerDeleteAll() {
       ).length;
       return deletableBlocksLength > 0 ? "enabled" : "disabled";
     },
-    callback(scope) {
+    callback(scope: Blockly.ContextMenuRegistry.Scope) {
       if (!scope.workspace) {
         return;
       }
@@ -95,7 +97,7 @@ export function registerDeleteAll() {
             "%1",
             String(deletableBlocks.length)
           ),
-          function (ok) {
+          function (ok: boolean) {
             if (ok) {
               deleteNext(deletableBlocks);
             }
@@ -116,10 +118,14 @@ export function registerDeleteAll() {
  * @param workspace to delete all blocks from.
  * @returns list of blocks to delete.
  */
-function getDeletableBlocksInWorkspace(workspace) {
+function getDeletableBlocksInWorkspace(
+  workspace: Blockly.WorkspaceSvg
+): Blockly.BlockSvg[] {
   return workspace
     .getTopBlocks(true)
-    .flatMap((b) => b.getDescendants(false).filter(isDeletable));
+    .flatMap((b: Blockly.BlockSvg) =>
+      b.getDescendants(false).filter(isDeletable)
+    );
 }
 
 /**
@@ -129,7 +135,7 @@ function getDeletableBlocksInWorkspace(workspace) {
  * @param eventGroup Event group ID with which all delete events should be
  *     associated.  If not specified, create a new group.
  */
-function deleteNext(deleteList, eventGroup) {
+function deleteNext(deleteList: Blockly.BlockSvg[], eventGroup?: string) {
   const DELAY = 10;
   if (eventGroup) {
     Blockly.Events.setGroup(eventGroup);

package/src/{css.js → css.ts}

@@ -751,8 +751,9 @@ const styles = `
   }
 
   /* Category tree in Toolbox. */
-  .blocklyToolboxDiv {
+  .blocklyToolbox {
     background-color: var(--colour-toolbox);
+    border-right: 1px solid #ddd;
     color: var(--colour-toolboxText);
     overflow-x: visible;
     overflow-y: auto;
@@ -763,6 +764,11 @@ const styles = `
     padding: 0;
   }
 
+  .blocklyToolbox[dir="RTL"] {
+    border-right: none;
+    border-left: 1px solid #ddd;
+  }
+
   .blocklyTreeRoot {
     padding: 4px 0;
   }
@@ -771,7 +777,7 @@ const styles = `
     outline: none;
   }
 
-  .blocklyToolboxDiv .blocklyTreeRow {
+  .blocklyToolbox .blocklyToolboxCategory {
     line-height: 22px;
     margin: 0;
     padding: 0.375rem 0px;
@@ -789,11 +795,11 @@ const styles = `
     margin: 1px 0 8px 5px;
   }
 
-  .blocklyToolboxDiv[dir="RTL"] .blocklyTreeRow {
-    margin-left: 8px;
+  .blocklyToolbox[dir="RTL"] .blocklyToolboxCategory {
+    margin-left: 0px;
   }
 
-  .blocklyTreeRow:hover {
+  .blocklyToolboxCategory:hover {
     color: var(--colour-toolboxHover);
   }
 
@@ -844,7 +850,7 @@ const styles = `
     background-position: -48px -1px;
   }
 
-  .blocklyTreeLabel {
+  .blocklyToolboxCategoryLabel {
     cursor: default;
     font-family: "Helvetica Neue", Helvetica, sans-serif;
     font-size: .65rem;
@@ -855,7 +861,7 @@ const styles = `
     text-wrap: wrap;
   }
 
-  .blocklyTreeSelected .blocklyTreeLabel {
+  .blocklyToolboxSelected .blocklyToolboxCategoryLabel {
     color: inherit;
   }