fix: Don't record undo events for enable/disable

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,7 +17,6 @@ import * as variablesDynamic from './variables_dynamic.js';
 import type {BlockDefinition} from '../core/blocks.js';
 
 export {
-  colour,
   lists,
   logic,
   loops,
@@ -35,7 +33,6 @@ export {
  */
 export const blocks: {[key: string]: BlockDefinition} = Object.assign(
   {},
-  colour.blocks,
   lists.blocks,
   logic.blocks,
   loops.blocks,

blocks/loops.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';
@@ -372,12 +373,16 @@ const CONTROL_FLOW_IN_LOOP_CHECK_MIXIN = {
     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.setEnabled(enabled);
+      } finally {
+        eventUtils.setRecordUndo(true);
+      }
     }
   },
 };

blocks/procedures.ts

@@ -14,7 +14,7 @@ import * as Xml from '../core/xml.js';
 import * as fieldRegistry from '../core/field_registry.js';
 import * as xmlUtils from '../core/utils/xml.js';
 import type {Abstract as AbstractEvent} from '../core/events/events_abstract.js';
-import {Align} from '../core/inputs/input.js';
+import {Align} from '../core/inputs/align.js';
 import type {Block} from '../core/block.js';
 import type {BlockSvg} from '../core/block_svg.js';
 import type {BlockCreate} from '../core/events/events_block_create.js';
@@ -25,6 +25,7 @@ import type {
   ContextMenuOption,
   LegacyContextMenuOption,
 } from '../core/contextmenu_registry.js';
+import * as eventUtils from '../core/events/utils.js';
 import {FieldCheckbox} from '../core/field_checkbox.js';
 import {FieldLabel} from '../core/field_label.js';
 import {FieldTextInput} from '../core/field_textinput.js';
@@ -921,10 +922,9 @@ const PROCEDURE_CALL_COMMON = {
           type: 'field_label',
           text: this.arguments_[i],
         }) as FieldLabel;
-        const input = this.appendValueInput('ARG' + i)
+        this.appendValueInput('ARG' + i)
           .setAlign(Align.RIGHT)
           .appendField(newField, 'ARGNAME' + i);
-        input.init();
       }
     }
     // Remove deleted inputs.
@@ -937,7 +937,6 @@ const PROCEDURE_CALL_COMMON = {
       if (this.arguments_.length) {
         if (!this.getField('WITH')) {
           topRow.appendField(Msg['PROCEDURES_CALL_BEFORE_PARAMS'], 'WITH');
-          topRow.init();
         }
       } else {
         if (this.getField('WITH')) {
@@ -1316,12 +1315,16 @@ const PROCEDURES_IFRETURN = {
     } else {
       this.setWarningText(Msg['PROCEDURES_IFRETURN_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(legal);
-      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.setEnabled(legal);
+      } finally {
+        eventUtils.setRecordUndo(true);
+      }
     }
   },
   /**

blocks/text.ts

@@ -23,7 +23,6 @@ import {
   createBlockDefinitionsFromJsonArray,
   defineBlocks,
 } from '../core/common.js';
-import '../core/field_multilineinput.js';
 import '../core/field_variable.js';
 import {ValueInput} from '../core/inputs/value_input.js';
 
@@ -48,38 +47,6 @@ export const blocks = createBlockDefinitionsFromJsonArray([
     'tooltip': '%{BKY_TEXT_TEXT_TOOLTIP}',
     'extensions': ['text_quotes', 'parent_tooltip_when_inline'],
   },
-  {
-    'type': 'text_multiline',
-    'message0': '%1 %2',
-    'args0': [
-      {
-        'type': 'field_image',
-        'src':
-          'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAARCAYAAADpP' +
-          'U2iAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAdhgAAHYYBXaITgQAAABh0RVh0' +
-          'U29mdHdhcmUAcGFpbnQubmV0IDQuMS42/U4J6AAAAP1JREFUOE+Vks0KQUEYhjm' +
-          'RIja4ABtZ2dm5A3t3Ia6AUm7CylYuQRaUhZSlLZJiQbFAyRnPN33y01HOW08z88' +
-          '73zpwzM4F3GWOCruvGIE4/rLaV+Nq1hVGMBqzhqlxgCys4wJA65xnogMHsQ5luj' +
-          'nYHTejBBCK2mE4abjCgMGhNxHgDFWjDSG07kdfVa2pZMf4ZyMAdWmpZMfYOsLiD' +
-          'MYMjlMB+K613QISRhTnITnsYg5yUd0DETmEoMlkFOeIT/A58iyK5E18BuTBfgYX' +
-          'fwNJv4P9/oEBerLylOnRhygmGdPpTTBZAPkde61lbQe4moWUvYUZYLfUNftIY4z' +
-          'wA5X2Z9AYnQrEAAAAASUVORK5CYII=',
-        'width': 12,
-        'height': 17,
-        'alt': '\u00B6',
-      },
-      {
-        'type': 'field_multilinetext',
-        'name': 'TEXT',
-        'text': '',
-      },
-    ],
-    'output': 'String',
-    'style': 'text_blocks',
-    'helpUrl': '%{BKY_TEXT_TEXT_HELPURL}',
-    'tooltip': '%{BKY_TEXT_TEXT_TOOLTIP}',
-    'extensions': ['parent_tooltip_when_inline'],
-  },
   {
     'type': 'text_join',
     'message0': '',