Skip to content

Commit

Permalink
Don't sort context menu items by selector
Browse files Browse the repository at this point in the history
Update lumino

Remove eslint warning

Upgrade lumino

Reorder context items

Upload new ui reference screenshots

Fix UI tests

Correct console context menu

Update label for new notebook on context menu
  • Loading branch information
fcollonval committed Aug 13, 2021
1 parent 292d43b commit e41cff6
Show file tree
Hide file tree
Showing 81 changed files with 167 additions and 149 deletions.
4 changes: 2 additions & 2 deletions builder/package.json
Expand Up @@ -35,7 +35,7 @@
"dependencies": {
"@jupyterlab/buildutils": "^3.3.0-alpha.3",
"@lumino/algorithm": "^1.3.3",
"@lumino/application": "^1.16.0",
"@lumino/application": "^1.23.0",
"@lumino/commands": "^1.12.0",
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable": "^1.4.3",
Expand All @@ -45,7 +45,7 @@
"@lumino/properties": "^1.2.3",
"@lumino/signaling": "^1.4.3",
"@lumino/virtualdom": "^1.8.0",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"ajv": "^6.12.3",
"commander": "~6.0.0",
"css-loader": "^5.0.1",
Expand Down
4 changes: 2 additions & 2 deletions dev_mode/package.json
Expand Up @@ -108,7 +108,7 @@
"@jupyterlab/vdom-extension": "~3.3.0-alpha.3",
"@jupyterlab/vega5-extension": "~3.3.0-alpha.3",
"@lumino/algorithm": "^1.3.3",
"@lumino/application": "^1.16.0",
"@lumino/application": "^1.23.0",
"@lumino/commands": "^1.12.0",
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable": "^1.4.3",
Expand All @@ -118,7 +118,7 @@
"@lumino/properties": "^1.2.3",
"@lumino/signaling": "^1.4.3",
"@lumino/virtualdom": "^1.8.0",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"yjs": "^13.5.6"
Expand Down
2 changes: 1 addition & 1 deletion examples/cell/package.json
Expand Up @@ -16,7 +16,7 @@
"@jupyterlab/services": "^6.3.0-alpha.3",
"@jupyterlab/theme-light-extension": "^3.3.0-alpha.3",
"@lumino/commands": "^1.12.0",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/console/package.json
Expand Up @@ -14,7 +14,7 @@
"@jupyterlab/services": "^6.3.0-alpha.3",
"@jupyterlab/theme-light-extension": "^3.3.0-alpha.3",
"@lumino/commands": "^1.12.0",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions examples/federated/core_package/package.json
Expand Up @@ -95,7 +95,7 @@
"@jupyterlab/vdom-extension": "~3.1.0-alpha.3",
"@jupyterlab/vega5-extension": "~3.1.0-alpha.3",
"@lumino/algorithm": "^1.3.3",
"@lumino/application": "^1.13.1",
"@lumino/application": "^1.22.0",
"@lumino/commands": "^1.12.0",
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable": "^1.4.3",
Expand All @@ -105,7 +105,7 @@
"@lumino/properties": "^1.2.3",
"@lumino/signaling": "^1.4.3",
"@lumino/virtualdom": "^1.8.0",
"@lumino/widgets": "^1.18.0",
"@lumino/widgets": "^1.26.0",
"react": "^17.0.1",
"react-dom": "^17.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion examples/federated/md_package/package.json
Expand Up @@ -12,7 +12,7 @@
"@jupyterlab/application": "^3.3.0-alpha.3",
"@jupyterlab/example-federated-middle": "^2.4.0-alpha.3",
"@jupyterlab/markdownviewer-extension": "^3.3.0-alpha.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"@jupyterlab/builder": "^3.3.0-alpha.3",
Expand Down
2 changes: 1 addition & 1 deletion examples/filebrowser/package.json
Expand Up @@ -18,7 +18,7 @@
"@jupyterlab/theme-light-extension": "^3.3.0-alpha.3",
"@lumino/algorithm": "^1.3.3",
"@lumino/commands": "^1.12.0",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/notebook/package.json
Expand Up @@ -19,7 +19,7 @@
"@jupyterlab/services": "^6.3.0-alpha.3",
"@jupyterlab/theme-light-extension": "^3.3.0-alpha.3",
"@lumino/commands": "^1.12.0",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/terminal/package.json
Expand Up @@ -11,7 +11,7 @@
"@jupyterlab/services": "^6.3.0-alpha.3",
"@jupyterlab/terminal": "^3.3.0-alpha.3",
"@jupyterlab/theme-light-extension": "^3.3.0-alpha.3",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jupyterlab/tests/mock_packages/mimeextension/package.json
Expand Up @@ -3,7 +3,7 @@
"version": "0.3.0",
"private": true,
"dependencies": {
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"jupyterlab": {
"mimeExtension": true
Expand Down
2 changes: 1 addition & 1 deletion packages/application-extension/package.json
Expand Up @@ -49,7 +49,7 @@
"@lumino/algorithm": "^1.3.3",
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable": "^1.4.3",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"react": "^17.0.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/application/package.json
Expand Up @@ -53,15 +53,15 @@
"@jupyterlab/translation": "^3.3.0-alpha.3",
"@jupyterlab/ui-components": "^3.3.0-alpha.3",
"@lumino/algorithm": "^1.3.3",
"@lumino/application": "^1.16.0",
"@lumino/application": "^1.23.0",
"@lumino/commands": "^1.12.0",
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable": "^1.4.3",
"@lumino/messaging": "^1.4.3",
"@lumino/polling": "^1.3.3",
"@lumino/properties": "^1.2.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"@jupyterlab/testutils": "^3.3.0-alpha.3",
Expand Down
6 changes: 4 additions & 2 deletions packages/application/src/frontend.ts
Expand Up @@ -50,7 +50,9 @@ export abstract class JupyterFrontEnd<
// render context menu/submenus with inline svg icon tweaks
this.contextMenu = new ContextMenuSvg({
commands: this.commands,
renderer: options.contextMenuRenderer
renderer: options.contextMenuRenderer,
groupByTarget: false,
sortBySelector: false
});

// The default restored promise if one does not exist in the options.
Expand Down Expand Up @@ -289,7 +291,7 @@ export namespace JupyterFrontEnd {
* @param path - Full URL of JupyterLab
* @param paths - The current IPaths object hydrated from PageConfig.
*/
export function inDocMode(path: string, paths: IPaths) {
export function inDocMode(path: string, paths: IPaths): boolean {
const docPattern = new RegExp(`^${paths.urls.doc}`);
const match = path.match(docPattern);
if (match) {
Expand Down
2 changes: 1 addition & 1 deletion packages/apputils-extension/package.json
Expand Up @@ -54,7 +54,7 @@
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable": "^1.4.3",
"@lumino/polling": "^1.3.3",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"es6-promise": "~4.2.8"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/apputils/package.json
Expand Up @@ -60,7 +60,7 @@
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/virtualdom": "^1.8.0",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"@types/react": "^17.0.0",
"react": "^17.0.1",
"sanitize-html": "~2.3.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/cells/package.json
Expand Up @@ -64,7 +64,7 @@
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/virtualdom": "^1.8.0",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"marked": "^2.0.0",
"react": "^17.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/celltags/package.json
Expand Up @@ -46,7 +46,7 @@
"@jupyterlab/translation": "^3.3.0-alpha.3",
"@jupyterlab/ui-components": "^3.3.0-alpha.3",
"@lumino/algorithm": "^1.3.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"@types/node": "^14.6.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/codeeditor/package.json
Expand Up @@ -53,7 +53,7 @@
"@lumino/dragdrop": "^1.7.1",
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"@jupyterlab/testutils": "^3.3.0-alpha.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/codemirror/package.json
Expand Up @@ -55,7 +55,7 @@
"@lumino/disposable": "^1.4.3",
"@lumino/polling": "^1.3.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"codemirror": "~5.61.0",
"react": "^17.0.1",
"y-codemirror": "^2.1.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/completer-extension/package.json
Expand Up @@ -45,7 +45,7 @@
"@jupyterlab/notebook": "^3.3.0-alpha.3",
"@jupyterlab/services": "^6.3.0-alpha.3",
"@lumino/algorithm": "^1.3.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/completer/package.json
Expand Up @@ -54,7 +54,7 @@
"@lumino/domutils": "^1.2.3",
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"@jupyterlab/testutils": "^3.3.0-alpha.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/console-extension/package.json
Expand Up @@ -54,7 +54,7 @@
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable": "^1.4.3",
"@lumino/properties": "^1.2.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/console-extension/schema/foreign.json
Expand Up @@ -5,7 +5,8 @@
"context": [
{
"command": "console:toggle-show-all-kernel-activity",
"selector": ".jp-CodeConsole"
"selector": ".jp-CodeConsole",
"rank": 20
}
]
},
Expand Down
6 changes: 4 additions & 2 deletions packages/console-extension/schema/tracker.json
Expand Up @@ -61,11 +61,13 @@
"context": [
{
"command": "console:clear",
"selector": ".jp-CodeConsole-content"
"selector": ".jp-CodeConsole-content",
"rank": 10
},
{
"command": "console:restart-kernel",
"selector": ".jp-CodeConsole"
"selector": ".jp-CodeConsole",
"rank": 30
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion packages/console/package.json
Expand Up @@ -59,7 +59,7 @@
"@lumino/dragdrop": "^1.7.1",
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"@jupyterlab/testutils": "^3.3.0-alpha.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/csvviewer-extension/package.json
Expand Up @@ -46,9 +46,9 @@
"@jupyterlab/mainmenu": "^3.3.0-alpha.3",
"@jupyterlab/settingregistry": "^3.3.0-alpha.3",
"@jupyterlab/translation": "^3.3.0-alpha.3",
"@lumino/datagrid": "^0.20.0",
"@lumino/datagrid": "^0.28.0",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/csvviewer/package.json
Expand Up @@ -48,11 +48,11 @@
"@jupyterlab/ui-components": "^3.3.0-alpha.3",
"@lumino/algorithm": "^1.3.3",
"@lumino/coreutils": "^1.5.3",
"@lumino/datagrid": "^0.20.0",
"@lumino/datagrid": "^0.28.0",
"@lumino/disposable": "^1.4.3",
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"@jupyterlab/testutils": "^3.3.0-alpha.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/debugger/package.json
Expand Up @@ -67,11 +67,11 @@
"@lumino/algorithm": "^1.3.3",
"@lumino/commands": "^1.12.0",
"@lumino/coreutils": "^1.5.3",
"@lumino/datagrid": "^0.20.0",
"@lumino/datagrid": "^0.28.0",
"@lumino/disposable": "^1.4.3",
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"codemirror": "~5.61.0",
"react": "^17.0.1",
"vscode-debugprotocol": "^1.37.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/docmanager-extension/package.json
Expand Up @@ -54,7 +54,7 @@
"@lumino/coreutils": "^1.5.3",
"@lumino/disposable": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"react": "^17.0.1"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions packages/docmanager-extension/schema/plugin.json
Expand Up @@ -73,22 +73,22 @@
{
"command": "docmanager:rename",
"selector": "[data-type=\"document-title\"]",
"rank": 1
"rank": 20
},
{
"command": "docmanager:delete",
"selector": "[data-type=\"document-title\"]",
"rank": 2
"rank": 21
},
{
"command": "docmanager:clone",
"selector": "[data-type=\"document-title\"]",
"rank": 3
"rank": 22
},
{
"command": "docmanager:show-in-file-browser",
"selector": "[data-type=\"document-title\"]",
"rank": 4
"rank": 23
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion packages/docmanager/package.json
Expand Up @@ -56,7 +56,7 @@
"@lumino/messaging": "^1.4.3",
"@lumino/properties": "^1.2.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"react": "^17.0.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/docregistry/package.json
Expand Up @@ -59,7 +59,7 @@
"@lumino/disposable": "^1.4.3",
"@lumino/messaging": "^1.4.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"yjs": "^13.5.6"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/documentsearch-extension/package.json
Expand Up @@ -38,7 +38,7 @@
"@jupyterlab/apputils": "^3.3.0-alpha.3",
"@jupyterlab/documentsearch": "^3.3.0-alpha.3",
"@jupyterlab/translation": "^3.3.0-alpha.3",
"@lumino/widgets": "^1.19.0"
"@lumino/widgets": "^1.26.0"
},
"devDependencies": {
"rimraf": "~3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/documentsearch/package.json
Expand Up @@ -51,7 +51,7 @@
"@lumino/disposable": "^1.4.3",
"@lumino/polling": "^1.3.3",
"@lumino/signaling": "^1.4.3",
"@lumino/widgets": "^1.19.0",
"@lumino/widgets": "^1.26.0",
"codemirror": "~5.61.0",
"react": "^17.0.1"
},
Expand Down

0 comments on commit e41cff6

Please sign in to comment.