Skip to content

fix: Flyout toolbar changes block position #10206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TannerGabriel wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −2
Open

fix: Flyout toolbar changes block position #10206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/blockly/core/toolbox/toolbox.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -722,13 +722,13 @@ export class Toolbox
this.toolboxPosition === toolbox.Position.LEFT
? workspace.scrollX +
rect.width +
(flyout?.isVisible() ? flyout.getWidth() : 0)
(flyout && !flyout.autoClose ? flyout.getWidth() : 0)
: workspace.scrollX;
const newY =
this.toolboxPosition === toolbox.Position.TOP
? workspace.scrollY +
rect.height +
(flyout?.isVisible() ? flyout.getHeight() : 0)
(flyout && !flyout.autoClose ? flyout.getHeight() : 0)
: workspace.scrollY;
workspace.translate(newX, newY);

Expand Down
17 changes: 17 additions & 0 deletions packages/blockly/tests/mocha/toolbox_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,23 @@ suite('Toolbox', function () {
assert.isFalse(this.parentCategory.isExpanded());
assert.isFalse(this.flyout.isVisible());
});
test('resizing a toolbox item with an auto-closing flyout visible should not offset the workspace by the flyout size', function () {
clickCategory(this.parentCategory);
assert.isTrue(this.flyout.isVisible());
assert.isAbove(this.flyout.getWidth(), 0);

const workspace = this.toolbox.workspace_;
const translateSpy = sinon.spy(workspace, 'translate');
this.toolbox.handleToolboxItemResize();

const expectedX =
workspace.scrollX +
this.toolbox.HtmlDiv.getBoundingClientRect().width;
assert.deepEqual(translateSpy.firstCall.args, [
expectedX,
workspace.scrollY,
]);
});
});
});

Expand Down
Loading