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.

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

Manual backport of #10720, #10790, #11108 #11178

Merged
merged 2 commits into from Sep 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/apputils/package.json
Expand Up @@ -58,6 +58,7 @@
"@lumino/disposable": "^1.4.3",
"@lumino/domutils": "^1.2.3",
"@lumino/messaging": "^1.4.3",
"@lumino/polling": "^1.3.3",
"@lumino/properties": "^1.2.3",
"@lumino/signaling": "^1.4.3",
"@lumino/virtualdom": "^1.8.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/apputils/src/mainareawidget.ts
Expand Up @@ -7,7 +7,7 @@ import { BoxLayout, BoxPanel, Widget } from '@lumino/widgets';
import { DOMUtils } from './domutils';
import { Printing } from './printing';
import { Spinner } from './spinner';
import { Toolbar } from './toolbar';
import { ReactiveToolbar, Toolbar } from './toolbar';

/**
* A widget meant to be contained in the JupyterLab main area.
Expand Down Expand Up @@ -40,7 +40,7 @@ export class MainAreaWidget<T extends Widget = Widget>
const content = (this._content = options.content);
content.node.setAttribute('role', 'region');
content.node.setAttribute('aria-label', trans.__('notebook content'));
const toolbar = (this._toolbar = options.toolbar || new Toolbar());
const toolbar = (this._toolbar = options.toolbar || new ReactiveToolbar());
toolbar.node.setAttribute('role', 'navigation');
toolbar.node.setAttribute('aria-label', trans.__('notebook actions'));
const contentHeader = (this._contentHeader =
Expand Down