release: v11.0.0

Merge pull request #8164 from google/rc/v11.0.0

Author: maribethb

.github/workflows/appengine_deploy.yml

@@ -42,7 +42,7 @@ jobs:
           path: _deploy/
 
       - name: Deploy to App Engine
-        uses: google-github-actions/deploy-appengine@v2.0.0
+        uses: google-github-actions/deploy-appengine@v2.1.0
         # For parameters see:
         # https://github.com/google-github-actions/deploy-appengine#inputs
         with:

appengine/add_timestamps.py

@@ -62,8 +62,8 @@ def run_query():
     while more:
       results, cursor, more = query.fetch_page(PAGE_SIZE, start_cursor=cursor)
       handle_results(results)
-      page_count = page_count + 1
-      result_count = result_count + len(results)
+      page_count += 1
+      result_count += len(results)
       print(f'{datetime.datetime.now().strftime("%I:%M:%S %p")} : page {page_count} : {result_count}')
 
 run_query()

blocks/blocks.ts

@@ -6,7 +6,6 @@
 
 // Former goog.module ID: Blockly.libraryBlocks
 
-import * as colour from './colour.js';
 import * as lists from './lists.js';
 import * as logic from './logic.js';
 import * as loops from './loops.js';
@@ -18,8 +17,8 @@ import * as variablesDynamic from './variables_dynamic.js';
 import type {BlockDefinition} from '../core/blocks.js';
 
 export {
-  colour,
   lists,
+  logic,
   loops,
   math,
   procedures,
@@ -34,12 +33,12 @@ export {
  */
 export const blocks: {[key: string]: BlockDefinition} = Object.assign(
   {},
-  colour.blocks,
   lists.blocks,
   logic.blocks,
   loops.blocks,
   math.blocks,
   procedures.blocks,
+  texts.blocks,
   variables.blocks,
   variablesDynamic.blocks,
 );

blocks/colour.ts

@@ -227,7 +227,7 @@ const LISTS_CREATE_WITH = {
     // Disconnect any children that don't belong.
     for (let i = 0; i < this.itemCount_; i++) {
       const connection = this.getInput('ADD' + i)!.connection!.targetConnection;
-      if (connection && connections.indexOf(connection) === -1) {
+      if (connection && !connections.includes(connection)) {
         connection.disconnect();
       }
     }

blocks/lists.ts

@@ -20,6 +20,7 @@ import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
+import * as eventUtils from '../core/events/utils.js';
 import '../core/field_dropdown.js';
 import '../core/field_label.js';
 import '../core/field_number.js';
@@ -334,6 +335,11 @@ export type ControlFlowInLoopBlock = Block & ControlFlowInLoopMixin;
 interface ControlFlowInLoopMixin extends ControlFlowInLoopMixinType {}
 type ControlFlowInLoopMixinType = typeof CONTROL_FLOW_IN_LOOP_CHECK_MIXIN;
 
+/**
+ * The language-neutral ID for when the reason why a block is disabled is
+ * because the block is only valid inside of a loop.
+ */
+const CONTROL_FLOW_NOT_IN_LOOP_DISABLED_REASON = 'CONTROL_FLOW_NOT_IN_LOOP';
 /**
  * This mixin adds a check to make sure the 'controls_flow_statements' block
  * is contained in a loop. Otherwise a warning is added to the block.
@@ -365,19 +371,30 @@ const CONTROL_FLOW_IN_LOOP_CHECK_MIXIN = {
     // Don't change state if:
     //   * It's at the start of a drag.
     //   * It's not a move event.
-    if (!ws.isDragging || ws.isDragging() || e.type !== Events.BLOCK_MOVE) {
+    if (
+      !ws.isDragging ||
+      ws.isDragging() ||
+      (e.type !== Events.BLOCK_MOVE && e.type !== Events.BLOCK_CREATE)
+    ) {
       return;
     }
     const enabled = !!this.getSurroundLoop();
     this.setWarningText(
       enabled ? null : Msg['CONTROLS_FLOW_STATEMENTS_WARNING'],
     );
+
     if (!this.isInFlyout) {
-      const group = Events.getGroup();
-      // Makes it so the move and the disable event get undone together.
-      Events.setGroup(e.group);
-      this.setEnabled(enabled);
-      Events.setGroup(group);
+      try {
+        // There is no need to record the enable/disable change on the undo/redo
+        // list since the change will be automatically recreated when replayed.
+        eventUtils.setRecordUndo(false);
+        this.setDisabledReason(
+          !enabled,
+          CONTROL_FLOW_NOT_IN_LOOP_DISABLED_REASON,
+        );
+      } finally {
+        eventUtils.setRecordUndo(true);
+      }
     }
   },
 };