Skip to content
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

Jump to bottom

Do not set the dockpanel as parent of the tabbar #606

Merged
merged 7 commits into from
Jul 19, 2023
Merged

Do not set the dockpanel as parent of the tabbar #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a43945d
Add a focusTrackable attribute to Widget, to disable the focusTracker
brichet Jul 5, 2023
9324ea6
Add tests on trackable attribute
brichet Jul 5, 2023
1d92d9e
Revert "Add tests on trackable attribute"
brichet Jul 17, 2023
9f467b1
Revert "Add a focusTrackable attribute to Widget, to disable the focu…
brichet Jul 17, 2023
a0fb627
Attach the tabbar to the dock panel without setting its parent
brichet Jul 17, 2023
63fa5e9
Add test on tabbar not parented to docklayout
brichet Jul 17, 2023
f0a3d33
Add comment in test
brichet Jul 19, 2023
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
3 changes: 1 addition & 2 deletions packages/widgets/src/docklayout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,9 +1128,8 @@ export class DockLayout extends Layout {
// Enforce necessary tab bar behavior.
tabBar.orientation = 'horizontal';

// Reparent and attach the tab bar to the parent if possible.
// Attach the tab bar to the parent if possible.
if (this.parent) {
tabBar.parent = this.parent;
this.attachWidget(tabBar);
}

Expand Down
10 changes: 10 additions & 0 deletions packages/widgets/tests/src/dockpanel.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ describe('@lumino/widgets', () => {
let panel = new DockPanel();
expect(panel.hasClass('lm-DockPanel')).to.equal(true);
});

it('should not have tabbar as child', () => {
let panel = new DockPanel();
// Adding a widget in the dock panel adds the DOM of a TabBar, but the TabBar
// widget should not be a in the children list of the DockPanel widget.
panel.addWidget(new Widget());
for (const tabBar of panel.tabBars()) {
expect(panel.contains(tabBar)).to.be.false;
}
});
});

describe('#dispose()', () => {
Expand Down