CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-02-09 17:10:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fix bug that prevented the first block change event in a flyout from being dispatched (#9539)

Browse Source 
* fix: Fix bug that prevented the first block change event in a flyout from being dispatched

* chore: Add test for flyout event listeners
This commit is contained in:
Aaron Dodson
2025-12-23 10:19:28 -08:00
committed by GitHub
parent b0dc1de0f9
commit 93056bc8ad
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/flyout_base.ts
View File

@@ -135,6 +135,12 @@ export abstract class Flyout
*/
private reflowWrapper: ((e: AbstractEvent) => void) | null = null;
/**
* If true, prevents the reflow wrapper from running. Used to prevent infinite
* recursion.
*/
private inhibitReflowWrapper = false;
/**
* List of flyout elements.
*/
@@ -649,6 +655,7 @@ export abstract class Flyout
// accommodates e.g. resizing a non-autoclosing flyout in response to the
// user typing long strings into fields on the blocks in the flyout.
this.reflowWrapper = (event) => {
if (this.inhibitReflowWrapper) return;
if (
event.type === EventType.BLOCK_CHANGE ||
event.type === EventType.BLOCK_FIELD_INTERMEDIATE_CHANGE
@@ -846,13 +853,9 @@ export abstract class Flyout
* Reflow flyout contents.
*/
reflow() {
if (this.reflowWrapper) {
this.workspace_.removeChangeListener(this.reflowWrapper);
}
this.inhibitReflowWrapper = true;
this.reflowInternal_();
if (this.reflowWrapper) {
this.workspace_.addChangeListener(this.reflowWrapper);
}
this.inhibitReflowWrapper = false;
}
/**

20
tests/mocha/flyout_test.js
View File

@@ -43,6 +43,26 @@ suite('Flyout', function () {
sharedTestTeardown.call(this);
});
suite('workspace change listeners', function () {
test('are triggered when a child block changes', function () {
let listenerTriggered = false;
const listener = (e) => {
if (e.type === Blockly.Events.BLOCK_CHANGE) {
listenerTriggered = true;
}
};
this.workspace.getFlyout().getWorkspace().addChangeListener(listener);
const boolBlock = this.workspace
.getFlyout()
.getWorkspace()
.getBlocksByType('logic_compare')[0];
boolBlock.getField('OP').setValue('LTE');
this.clock.tick(1000);
assert.isTrue(listenerTriggered);
this.workspace.getFlyout().getWorkspace().removeChangeListener(listener);
});
});
suite('position', function () {
suite('vertical flyout', function () {
suite('simple flyout', function () {