Merge branch 'main' into workflow-update-jupyterlab-dependencies

.github/workflows/buildutils.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install -U "jupyterlab>=4.2.0a2,<4.3" hatch
+          python -m pip install -U "jupyterlab>=4.2.0b1,<4.3" hatch
           jlpm
           jlpm run build
 
@@ -79,6 +79,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install -U "jupyterlab>=4.2.0a2,<4.3" pip
+          python -m pip install -U "jupyterlab>=4.2.0b1,<4.3" pip
           jlpm
           jlpm run build

.pre-commit-config.yaml

@@ -44,7 +44,7 @@ repos:
         files: "^notebook"
         stages: [manual]
         args: ["--install-types", "--non-interactive"]
-        additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.2.0a2,<4.3"]
+        additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.2.0b1,<4.3"]
 
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: 'v1.10.0'

CHANGELOG.md

@@ -108,6 +108,42 @@ increasing awareness of the notebook state and enabling users to quickly navigat
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 7.2.0b1
+
+([Full Changelog](https://github.com/jupyter/notebook/compare/@jupyter-notebook/application-extension@7.2.0-beta.0...b45d666d5ee1ee053b55ac9cb6e9aecde5d53945))
+
+### Enhancements made
+
+- Add `@jupyterlab/theme-dark-high-contrast-extension` [#7331](https://github.com/jupyter/notebook/pull/7331) ([@jtpio](https://github.com/jtpio))
+
+### Bugs fixed
+
+- Force notebook windowing mode to `defer` [#7335](https://github.com/jupyter/notebook/pull/7335) ([@jtpio](https://github.com/jtpio))
+- Fix scrollbar always showing up by default [#7327](https://github.com/jupyter/notebook/pull/7327) ([@jtpio](https://github.com/jtpio))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter/notebook/graphs/contributors?from=2024-04-12&to=2024-04-19&type=c))
+
+[@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Agithub-actions+updated%3A2024-04-12..2024-04-19&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ajtpio+updated%3A2024-04-12..2024-04-19&type=Issues) | [@RRosio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3ARRosio+updated%3A2024-04-12..2024-04-19&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
+## 7.2.0b0
+
+([Full Changelog](https://github.com/jupyter/notebook/compare/@jupyter-notebook/application-extension@7.2.0-alpha.0...09bcd99e6dfffce92acc9a7f9d11a2a2122131c0))
+
+### Maintenance and upkeep improvements
+
+- Update to JupyterLab `4.2.0b1` [#7319](https://github.com/jupyter/notebook/pull/7319) ([@jtpio](https://github.com/jtpio))
+- Update to JupyterLab 4.2.0b0 [#7312](https://github.com/jupyter/notebook/pull/7312) ([@jtpio](https://github.com/jtpio))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter/notebook/graphs/contributors?from=2024-03-29&to=2024-04-12&type=c))
+
+[@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Agithub-actions+updated%3A2024-03-29..2024-04-12&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ajtpio+updated%3A2024-03-29..2024-04-12&type=Issues) | [@krassowski](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Akrassowski+updated%3A2024-03-29..2024-04-12&type=Issues)
+
 ## 7.2.0a0
 
 ([Full Changelog](https://github.com/jupyter/notebook/compare/@jupyter-notebook/application-extension@7.1.2...80b582bce69e33e36e936af2ea981bcb22a4d285))
@@ -126,8 +162,6 @@ increasing awareness of the notebook state and enabling users to quickly navigat
 
 [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Agithub-actions+updated%3A2024-03-14..2024-03-29&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnotebook+involves%3Ajtpio+updated%3A2024-03-14..2024-03-29&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 7.1.2
 
 ([Full Changelog](https://github.com/jupyter/notebook/compare/@jupyter-notebook/application-extension@7.1.1...ca41222a9c8d75356c6d67d3bd36e34d71cce2d8))

buildutils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/buildutils",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-beta.1",
   "private": true,
   "description": "Jupyter Notebook - Build Utilities",
   "homepage": "https://github.com/jupyter/notebook",
@@ -29,7 +29,7 @@
     "watch": "tsc -w --listEmittedFiles"
   },
   "dependencies": {
-    "@jupyterlab/buildutils": "~4.2.0-alpha.2",
+    "@jupyterlab/buildutils": "~4.2.0-beta.1",
     "commander": "^6.2.0",
     "fs-extra": "^9.1.0",
     "typescript": "~5.0.2"

notebook/_version.py

@@ -5,7 +5,7 @@
 from collections import namedtuple
 
 # Use "hatch version xx.yy.zz" to handle version changes
-__version__ = "7.2.0a0"
+__version__ = "7.2.0b1"
 
 # PEP440 version parser
 _version_regex = re.compile(

package.json

@@ -49,7 +49,7 @@
     "yjs": "^13.5.40"
   },
   "devDependencies": {
-    "@jupyterlab/buildutils": "~4.2.0-alpha.2",
+    "@jupyterlab/buildutils": "~4.2.0-beta.1",
     "@typescript-eslint/eslint-plugin": "^5.55.0",
     "@typescript-eslint/parser": "^5.55.0",
     "eslint": "^8.36.0",

packages/_metapackage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/metapackage",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-beta.1",
   "private": true,
   "description": "Jupyter Notebook - Metapackage",
   "homepage": "https://github.com/jupyter/notebook",
@@ -20,18 +20,18 @@
     "watch": "tsc -b -w --preserveWatchOutput"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.2.0-alpha.0",
-    "@jupyter-notebook/application-extension": "^7.2.0-alpha.0",
-    "@jupyter-notebook/console-extension": "^7.2.0-alpha.0",
-    "@jupyter-notebook/docmanager-extension": "^7.2.0-alpha.0",
-    "@jupyter-notebook/documentsearch-extension": "^7.2.0-alpha.0",
-    "@jupyter-notebook/help-extension": "^7.2.0-alpha.0",
-    "@jupyter-notebook/lab-extension": "^7.2.0-alpha.0",
-    "@jupyter-notebook/notebook-extension": "^7.2.0-alpha.0",
-    "@jupyter-notebook/terminal-extension": "^7.2.0-alpha.0",
-    "@jupyter-notebook/tree": "^7.2.0-alpha.0",
-    "@jupyter-notebook/tree-extension": "^7.2.0-alpha.0",
-    "@jupyter-notebook/ui-components": "^7.2.0-alpha.0"
+    "@jupyter-notebook/application": "^7.2.0-beta.1",
+    "@jupyter-notebook/application-extension": "^7.2.0-beta.1",
+    "@jupyter-notebook/console-extension": "^7.2.0-beta.1",
+    "@jupyter-notebook/docmanager-extension": "^7.2.0-beta.1",
+    "@jupyter-notebook/documentsearch-extension": "^7.2.0-beta.1",
+    "@jupyter-notebook/help-extension": "^7.2.0-beta.1",
+    "@jupyter-notebook/lab-extension": "^7.2.0-beta.1",
+    "@jupyter-notebook/notebook-extension": "^7.2.0-beta.1",
+    "@jupyter-notebook/terminal-extension": "^7.2.0-beta.1",
+    "@jupyter-notebook/tree": "^7.2.0-beta.1",
+    "@jupyter-notebook/tree-extension": "^7.2.0-beta.1",
+    "@jupyter-notebook/ui-components": "^7.2.0-beta.1"
   },
   "devDependencies": {
     "typescript": "~5.0.2"

packages/application-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/application-extension",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-beta.1",
   "description": "Jupyter Notebook - Application Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -38,19 +38,19 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.2.0-alpha.0",
-    "@jupyter-notebook/ui-components": "^7.2.0-alpha.0",
-    "@jupyterlab/application": "~4.2.0-alpha.2",
-    "@jupyterlab/apputils": "~4.3.0-alpha.2",
-    "@jupyterlab/codeeditor": "~4.2.0-alpha.2",
-    "@jupyterlab/console": "~4.2.0-alpha.2",
-    "@jupyterlab/coreutils": "~6.2.0-alpha.2",
-    "@jupyterlab/docmanager": "~4.2.0-alpha.2",
-    "@jupyterlab/docregistry": "~4.2.0-alpha.2",
-    "@jupyterlab/mainmenu": "~4.2.0-alpha.2",
-    "@jupyterlab/rendermime": "~4.2.0-alpha.2",
-    "@jupyterlab/settingregistry": "~4.2.0-alpha.2",
-    "@jupyterlab/translation": "~4.2.0-alpha.2",
+    "@jupyter-notebook/application": "^7.2.0-beta.1",
+    "@jupyter-notebook/ui-components": "^7.2.0-beta.1",
+    "@jupyterlab/application": "~4.2.0-beta.1",
+    "@jupyterlab/apputils": "~4.3.0-beta.1",
+    "@jupyterlab/codeeditor": "~4.2.0-beta.1",
+    "@jupyterlab/console": "~4.2.0-beta.1",
+    "@jupyterlab/coreutils": "~6.2.0-beta.1",
+    "@jupyterlab/docmanager": "~4.2.0-beta.1",
+    "@jupyterlab/docregistry": "~4.2.0-beta.1",
+    "@jupyterlab/mainmenu": "~4.2.0-beta.1",
+    "@jupyterlab/rendermime": "~4.2.0-beta.1",
+    "@jupyterlab/settingregistry": "~4.2.0-beta.1",
+    "@jupyterlab/translation": "~4.2.0-beta.1",
     "@lumino/coreutils": "^2.1.2",
     "@lumino/disposable": "^2.1.2",
     "@lumino/widgets": "^2.3.2"

packages/application/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/application",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-beta.1",
   "description": "Jupyter Notebook - Application",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -42,11 +42,11 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "~4.2.0-alpha.2",
-    "@jupyterlab/coreutils": "~6.2.0-alpha.2",
-    "@jupyterlab/docregistry": "~4.2.0-alpha.2",
-    "@jupyterlab/rendermime-interfaces": "~3.10.0-alpha.2",
-    "@jupyterlab/ui-components": "~4.2.0-alpha.2",
+    "@jupyterlab/application": "~4.2.0-beta.1",
+    "@jupyterlab/coreutils": "~6.2.0-beta.1",
+    "@jupyterlab/docregistry": "~4.2.0-beta.1",
+    "@jupyterlab/rendermime-interfaces": "~3.10.0-beta.1",
+    "@jupyterlab/ui-components": "~4.2.0-beta.1",
     "@lumino/algorithm": "^2.0.1",
     "@lumino/coreutils": "^2.1.2",
     "@lumino/messaging": "^2.0.1",
@@ -57,7 +57,7 @@
   "devDependencies": {
     "@babel/core": "^7.11.6",
     "@babel/preset-env": "^7.12.1",
-    "@jupyterlab/testutils": "~4.2.0-alpha.2",
+    "@jupyterlab/testutils": "~4.2.0-beta.1",
     "@types/jest": "^29.2.5",
     "jest": "^29.3.1",
     "rimraf": "^3.0.2",

packages/application/src/shell.ts

@@ -9,7 +9,13 @@ import { find } from '@lumino/algorithm';
 import { JSONExt, PromiseDelegate, Token } from '@lumino/coreutils';
 import { ISignal, Signal } from '@lumino/signaling';
 
-import { BoxLayout, Panel, SplitPanel, Widget } from '@lumino/widgets';
+import {
+  BoxLayout,
+  FocusTracker,
+  Panel,
+  SplitPanel,
+  Widget,
+} from '@lumino/widgets';
 import { PanelHandler, SidePanelHandler } from './panelhandler';
 
 /**
@@ -163,7 +169,10 @@ export class NotebookShell extends Widget implements JupyterFrontEnd.IShell {
   /**
    * A signal emitted when the current widget changes.
    */
-  get currentChanged(): ISignal<NotebookShell, void> {
+  get currentChanged(): ISignal<
+    JupyterFrontEnd.IShell,
+    FocusTracker.IChangedArgs<Widget>
+  > {
     return this._currentChanged;
   }
 
@@ -314,16 +323,21 @@ export class NotebookShell extends Widget implements JupyterFrontEnd.IShell {
       case 'menu':
         return this._menuHandler.addWidget(widget, rank);
       case 'main':
-      case undefined:
+      case undefined: {
         if (this._main.widgets.length > 0) {
           // do not add the widget if there is already one
           return;
         }
+        const previousWidget = this.currentWidget;
         this._main.addWidget(widget);
         this._main.update();
-        this._currentChanged.emit(void 0);
+        this._currentChanged.emit({
+          newValue: widget,
+          oldValue: previousWidget,
+        });
         this._mainWidgetLoaded.resolve();
         break;
+      }
       case 'left':
         return this._leftHandler.addWidget(widget, rank);
       case 'right':
@@ -429,7 +443,9 @@ export class NotebookShell extends Widget implements JupyterFrontEnd.IShell {
   private _skipLinkWidgetHandler: Private.SkipLinkWidgetHandler;
   private _main: Panel;
   private _translator: ITranslator = nullTranslator;
-  private _currentChanged = new Signal<this, void>(this);
+  private _currentChanged = new Signal<this, FocusTracker.IChangedArgs<Widget>>(
+    this
+  );
   private _mainWidgetLoaded = new PromiseDelegate<void>();
   private _userLayout: INotebookShell.IUserLayout;
 }

packages/console-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/console-extension",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-beta.1",
   "description": "Jupyter Notebook - Console Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -38,10 +38,10 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.2.0-alpha.0",
-    "@jupyterlab/application": "~4.2.0-alpha.2",
-    "@jupyterlab/console": "~4.2.0-alpha.2",
-    "@jupyterlab/coreutils": "~6.2.0-alpha.2",
+    "@jupyter-notebook/application": "^7.2.0-beta.1",
+    "@jupyterlab/application": "~4.2.0-beta.1",
+    "@jupyterlab/console": "~4.2.0-beta.1",
+    "@jupyterlab/coreutils": "~6.2.0-beta.1",
     "@lumino/algorithm": "^2.0.1"
   },
   "devDependencies": {

packages/docmanager-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/docmanager-extension",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-beta.1",
   "description": "Jupyter Notebook - Document Manager Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -38,12 +38,12 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.2.0-alpha.0",
-    "@jupyterlab/application": "~4.2.0-alpha.2",
-    "@jupyterlab/coreutils": "~6.2.0-alpha.2",
-    "@jupyterlab/docmanager": "~4.2.0-alpha.2",
-    "@jupyterlab/docregistry": "~4.2.0-alpha.2",
-    "@jupyterlab/services": "~7.2.0-alpha.2",
+    "@jupyter-notebook/application": "^7.2.0-beta.1",
+    "@jupyterlab/application": "~4.2.0-beta.1",
+    "@jupyterlab/coreutils": "~6.2.0-beta.1",
+    "@jupyterlab/docmanager": "~4.2.0-beta.1",
+    "@jupyterlab/docregistry": "~4.2.0-beta.1",
+    "@jupyterlab/services": "~7.2.0-beta.1",
     "@lumino/algorithm": "^2.0.1",
     "@lumino/signaling": "^2.1.2"
   },

packages/documentsearch-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/documentsearch-extension",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-beta.1",
   "description": "Jupyter Notebook - Document Search Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -38,9 +38,9 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/application": "^7.2.0-alpha.0",
-    "@jupyterlab/application": "~4.2.0-alpha.2",
-    "@jupyterlab/documentsearch": "~4.2.0-alpha.2",
+    "@jupyter-notebook/application": "^7.2.0-beta.1",
+    "@jupyterlab/application": "~4.2.0-beta.1",
+    "@jupyterlab/documentsearch": "~4.2.0-beta.1",
     "@lumino/widgets": "^2.3.2"
   },
   "devDependencies": {

packages/help-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter-notebook/help-extension",
-  "version": "7.2.0-alpha.0",
+  "version": "7.2.0-beta.1",
   "description": "Jupyter Notebook - Help Extension",
   "homepage": "https://github.com/jupyter/notebook",
   "bugs": {
@@ -38,11 +38,11 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/ui-components": "^7.2.0-alpha.0",
-    "@jupyterlab/application": "~4.2.0-alpha.2",
-    "@jupyterlab/apputils": "~4.3.0-alpha.2",
-    "@jupyterlab/mainmenu": "~4.2.0-alpha.2",
-    "@jupyterlab/translation": "~4.2.0-alpha.2",
+    "@jupyter-notebook/ui-components": "^7.2.0-beta.1",
+    "@jupyterlab/application": "~4.2.0-beta.1",
+    "@jupyterlab/apputils": "~4.3.0-beta.1",
+    "@jupyterlab/mainmenu": "~4.2.0-beta.1",
+    "@jupyterlab/translation": "~4.2.0-beta.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },