From 76e179d65513998ac0e405f3ae0b9772a401c083 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Tue, 7 May 2024 20:34:15 +0200
Subject: [PATCH] Revert "fix: Don't record undo events for enable/disable"
 (#8069)

This reverts commit 1a8e4d9e691fd7ed8fb00295918f67c4c61937e6.
---
 blocks/loops.ts      | 15 +++++----------
 blocks/procedures.ts | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/blocks/loops.ts b/blocks/loops.ts
index 1b8e68f7c..02d9d34be 100644
--- a/blocks/loops.ts
+++ b/blocks/loops.ts
@@ -20,7 +20,6 @@ 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';
@@ -373,16 +372,12 @@ const CONTROL_FLOW_IN_LOOP_CHECK_MIXIN = {
     this.setWarningText(
       enabled ? null : Msg['CONTROLS_FLOW_STATEMENTS_WARNING'],
     );
-
     if (!this.isInFlyout) {
-      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);
-      }
+      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);
     }
   },
 };
diff --git a/blocks/procedures.ts b/blocks/procedures.ts
index 77efecb84..f7e3bd62d 100644
--- a/blocks/procedures.ts
+++ b/blocks/procedures.ts
@@ -25,7 +25,6 @@ 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';
@@ -1317,16 +1316,12 @@ const PROCEDURES_IFRETURN = {
     } else {
       this.setWarningText(Msg['PROCEDURES_IFRETURN_WARNING']);
     }
-
     if (!this.isInFlyout) {
-      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);
-      }
+      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);
     }
   },
   /**