@jupyterlab/application 1.0.0-alpha.8 → 1.0.0

package/lib/connectionlost.js

@@ -5,25 +5,10 @@ import { showErrorMessage } from '@jupyterlab/apputils';
  * A default connection lost handler, which brings up an error dialog.
  */
 export const ConnectionLost = async function (manager, err) {
-    if (Private.showingError) {
-        return;
-    }
-    Private.showingError = true;
     const title = 'Server Connection Error';
     const networkMsg = 'A connection to the Jupyter server could not be established.\n' +
         'JupyterLab will continue trying to reconnect.\n' +
         'Check your network connection or Jupyter server configuration.\n';
-    return showErrorMessage(title, { message: networkMsg }).then(() => {
-        Private.showingError = false;
-    });
+    return showErrorMessage(title, { message: networkMsg });
 };
-/**
- * A namespace for module private functionality.
- */
-var Private;
-(function (Private) {
-    /**
-     * Whether the connection lost error is currently being shown.
-     */
-    Private.showingError = false;
-})(Private || (Private = {}));
+//# sourceMappingURL=connectionlost.js.map

package/lib/connectionlost.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connectionlost.js","sourceRoot":"","sources":["../src/connectionlost.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAMxD;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAoB,KAAK,WAClD,OAAgC,EAChC,GAAkC;IAElC,MAAM,KAAK,GAAG,yBAAyB,CAAC;IACxC,MAAM,UAAU,GACd,gEAAgE;QAChE,iDAAiD;QACjD,kEAAkE,CAAC;IAErE,OAAO,gBAAgB,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;AAC1D,CAAC,CAAC"}

package/lib/frontend.d.ts

@@ -146,14 +146,15 @@ export declare namespace JupyterFrontEnd {
          */
         readonly urls: {
             readonly base: string;
-            readonly defaultWorkspace: string;
             readonly notFound?: string;
-            readonly page: string;
-            readonly public: string;
+            readonly app: string;
+            readonly static: string;
             readonly settings: string;
             readonly themes: string;
             readonly tree: string;
             readonly workspaces: string;
+            readonly hubPrefix?: string;
+            readonly hubHost?: string;
         };
         /**
          * The server directories used by the application, for user information

package/lib/frontend.js

@@ -125,3 +125,4 @@ var Private;
      */
     Private.CONTEXT_MENU_INFO = '__internal:context-menu-info';
 })(Private || (Private = {}));
+//# sourceMappingURL=frontend.js.map

package/lib/frontend.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"frontend.js","sourceRoot":"","sources":["../src/frontend.ts"],"names":[],"mappings":"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"}

package/lib/index.d.ts

@@ -1,4 +1,3 @@
-import '../style/index.css';
 export { ConnectionLost } from './connectionlost';
 export { JupyterFrontEnd, JupyterFrontEndPlugin } from './frontend';
 export { JupyterLab } from './lab';

package/lib/index.js

@@ -1,7 +1,5 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-// Local CSS must be loaded prior to loading other libs.
-import '../style/index.css';
 export { ConnectionLost } from './connectionlost';
 export { JupyterFrontEnd } from './frontend';
 export { JupyterLab } from './lab';
@@ -11,3 +9,4 @@ export { Router } from './router';
 export { ILabShell, LabShell } from './shell';
 export { ILabStatus } from './status';
 export * from './tokens';
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAyB,MAAM,YAAY,CAAC;AAEpE,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAE9C,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEtC,cAAc,UAAU,CAAC"}

package/lib/lab.js

@@ -157,14 +157,15 @@ export class JupyterLab extends JupyterFrontEnd {
     JupyterLab.defaultPaths = {
         urls: {
             base: PageConfig.getOption('baseUrl'),
-            defaultWorkspace: PageConfig.getOption('defaultWorkspace'),
             notFound: PageConfig.getOption('notFoundUrl'),
-            page: PageConfig.getOption('pageUrl'),
-            public: PageConfig.getOption('publicUrl'),
+            app: PageConfig.getOption('appUrl'),
+            static: PageConfig.getOption('staticUrl'),
             settings: PageConfig.getOption('settingsUrl'),
             themes: PageConfig.getOption('themesUrl'),
             tree: PageConfig.getOption('treeUrl'),
-            workspaces: PageConfig.getOption('workspacesUrl')
+            workspaces: PageConfig.getOption('workspacesUrl'),
+            hubHost: PageConfig.getOption('hubHost') || undefined,
+            hubPrefix: PageConfig.getOption('hubPrefix') || undefined
         },
         directories: {
             appSettings: PageConfig.getOption('appSettingsDir'),
@@ -178,3 +179,4 @@ export class JupyterLab extends JupyterFrontEnd {
         }
     };
 })(JupyterLab || (JupyterLab = {}));
+//# sourceMappingURL=lab.js.map

package/lib/lab.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lab.js","sourceRoot":"","sources":["../src/lab.ts"],"names":[],"mappings":"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"}

package/lib/layoutrestorer.d.ts

@@ -1,7 +1,7 @@
-import { InstanceTracker } from '@jupyterlab/apputils';
-import { IStateDB } from '@jupyterlab/coreutils';
+import { WidgetTracker } from '@jupyterlab/apputils';
+import { IDataConnector, IRestorer } from '@jupyterlab/coreutils';
 import { CommandRegistry } from '@phosphor/commands';
-import { ReadonlyJSONObject, Token } from '@phosphor/coreutils';
+import { ReadonlyJSONValue, Token } from '@phosphor/coreutils';
 import { Widget } from '@phosphor/widgets';
 import { ILabShell } from './shell';
 /**
@@ -11,7 +11,7 @@ export declare const ILayoutRestorer: Token<ILayoutRestorer>;
 /**
  * A static class that restores the widgets of the application when it reloads.
  */
-export interface ILayoutRestorer {
+export interface ILayoutRestorer extends IRestorer {
     /**
      * A promise resolved when the layout restorer is ready to receive signals.
      */
@@ -21,43 +21,13 @@ export interface ILayoutRestorer {
      */
     add(widget: Widget, name: string): void;
     /**
-     * Restore the widgets of a particular instance tracker.
+     * Restore the widgets of a particular widget tracker.
      *
-     * @param tracker - The instance tracker whose widgets will be restored.
+     * @param tracker - The widget tracker whose widgets will be restored.
      *
      * @param options - The restoration options.
      */
-    restore(tracker: InstanceTracker<any>, options: ILayoutRestorer.IRestoreOptions<any>): void;
-}
-/**
- * A namespace for the layout restorer.
- */
-export declare namespace ILayoutRestorer {
-    /**
-     * The state restoration configuration options.
-     */
-    interface IRestoreOptions<T extends Widget> {
-        /**
-         * The command to execute when restoring instances.
-         */
-        command: string;
-        /**
-         * A function that returns the args needed to restore an instance.
-         */
-        args: (widget: T) => ReadonlyJSONObject;
-        /**
-         * A function that returns a unique persistent name for this instance.
-         */
-        name: (widget: T) => string;
-        /**
-         * The point after which it is safe to restore state.
-         *
-         * #### Notes
-         * By definition, this promise or promises will happen after the application
-         * has `started`.
-         */
-        when?: Promise<any> | Array<Promise<any>>;
-    }
+    restore<T extends Widget>(tracker: WidgetTracker<T>, options: IRestorer.IOptions<T>): Promise<any>;
 }
 /**
  * The default implementation of a layout restorer.
@@ -66,46 +36,47 @@ export declare namespace ILayoutRestorer {
  * The lifecycle for state restoration is subtle. The sequence of events is:
  *
  * 1. The layout restorer plugin is instantiated and makes a `fetch` call to
- *    the database that stores the layout restoration data. The `fetch` call
- *    returns a promise that resolves in step 6, below.
+ *    the data connector that stores the layout restoration data. The `fetch`
+ *    call returns a promise that resolves in step 6, below.
  *
  * 2. Other plugins that care about state restoration require the layout
  *    restorer as a dependency.
  *
- * 3. As each load-time plugin initializes (which happens before the lab
+ * 3. As each load-time plugin initializes (which happens before the front-end
  *    application has `started`), it instructs the layout restorer whether
- *    the restorer ought to `restore` its state by passing in its tracker.
- *    Alternatively, a plugin that does not require its own instance tracker
+ *    the restorer ought to `restore` its widgets by passing in its widget
+ *    tracker.
+ *    Alternatively, a plugin that does not require its own widget tracker
  *    (because perhaps it only creates a single widget, like a command palette),
  *    can simply `add` its widget along with a persistent unique name to the
  *    layout restorer so that its layout state can be restored when the lab
  *    application restores.
  *
- * 4. After all the load-time plugins have finished initializing, the lab
+ * 4. After all the load-time plugins have finished initializing, the front-end
  *    application `started` promise will resolve. This is the `first`
  *    promise that the layout restorer waits for. By this point, all of the
  *    plugins that care about restoration will have instructed the layout
- *    restorer to `restore` their state.
+ *    restorer to `restore` their widget trackers.
  *
- * 5. The layout restorer will then instruct each plugin's instance tracker
+ * 5. The layout restorer will then instruct each plugin's widget tracker
  *    to restore its state and reinstantiate whichever widgets it wants. The
  *    tracker returns a promise to the layout restorer that resolves when it
  *    has completed restoring the tracked widgets it cares about.
  *
- * 6. As each instance tracker finishes restoring the widget instances it cares
- *    about, it resolves the promise that was made to the layout restorer
+ * 6. As each widget tracker finishes restoring the widget instances it cares
+ *    about, it resolves the promise that was returned to the layout restorer
  *    (in step 5). After all of the promises that the restorer is awaiting have
- *    resolved, the restorer then resolves the outstanding `fetch` promise
+ *    settled, the restorer then resolves the outstanding `fetch` promise
  *    (from step 1) and hands off a layout state object to the application
  *    shell's `restoreLayout` method for restoration.
  *
  * 7. Once the application shell has finished restoring the layout, the
  *    JupyterLab application's `restored` promise is resolved.
  *
- * Of particular note are steps 5 and 6: since state restoration of plugins
+ * Of particular note are steps 5 and 6: since data restoration of plugins
  * is accomplished by executing commands, the command that is used to restore
- * the state of each plugin must return a promise that only resolves when the
- * widget has been created and added to the plugin's instance tracker.
+ * the data of each plugin must return a promise that only resolves when the
+ * widget has been created and added to the plugin's widget tracker.
  */
 export declare class LayoutRestorer implements ILayoutRestorer {
     /**
@@ -129,13 +100,13 @@ export declare class LayoutRestorer implements ILayoutRestorer {
      */
     fetch(): Promise<ILabShell.ILayout>;
     /**
-     * Restore the widgets of a particular instance tracker.
+     * Restore the widgets of a particular widget tracker.
      *
-     * @param tracker - The instance tracker whose widgets will be restored.
+     * @param tracker - The widget tracker whose widgets will be restored.
      *
      * @param options - The restoration options.
      */
-    restore(tracker: InstanceTracker<Widget>, options: ILayoutRestorer.IRestoreOptions<Widget>): Promise<any>;
+    restore(tracker: WidgetTracker, options: IRestorer.IOptions<Widget>): Promise<any>;
     /**
      * Save the layout state for the application.
      */
@@ -168,13 +139,13 @@ export declare class LayoutRestorer implements ILayoutRestorer {
      * Handle a widget disposal.
      */
     private _onWidgetDisposed;
+    private _connector;
     private _first;
     private _firstDone;
     private _promisesDone;
     private _promises;
     private _restored;
     private _registry;
-    private _state;
     private _trackers;
     private _widgets;
 }
@@ -186,6 +157,10 @@ export declare namespace LayoutRestorer {
      * The configuration options for layout restorer instantiation.
      */
     interface IOptions {
+        /**
+         * The data connector used for layout saving and fetching.
+         */
+        connector: IDataConnector<ReadonlyJSONValue>;
         /**
          * The initial promise that has to be resolved before restoration.
          *
@@ -197,9 +172,5 @@ export declare namespace LayoutRestorer {
          * The application command registry.
          */
         registry: CommandRegistry;
-        /**
-         * The state database instance.
-         */
-        state: IStateDB;
     }
 }

package/lib/layoutrestorer.js

@@ -2,7 +2,7 @@
 | Copyright (c) Jupyter Development Team.
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
-import { PromiseDelegate, Token } from '@phosphor/coreutils';
+import { JSONExt, PromiseDelegate, Token } from '@phosphor/coreutils';
 import { AttachedProperty } from '@phosphor/properties';
 /* tslint:disable */
 /**
@@ -10,7 +10,7 @@ import { AttachedProperty } from '@phosphor/properties';
  */
 export const ILayoutRestorer = new Token('@jupyterlab/application:ILayoutRestorer');
 /**
- * The state database key for restorer data.
+ * The data connector key for restorer data.
  */
 const KEY = 'layout-restorer:data';
 /**
@@ -20,46 +20,47 @@ const KEY = 'layout-restorer:data';
  * The lifecycle for state restoration is subtle. The sequence of events is:
  *
  * 1. The layout restorer plugin is instantiated and makes a `fetch` call to
- *    the database that stores the layout restoration data. The `fetch` call
- *    returns a promise that resolves in step 6, below.
+ *    the data connector that stores the layout restoration data. The `fetch`
+ *    call returns a promise that resolves in step 6, below.
  *
  * 2. Other plugins that care about state restoration require the layout
  *    restorer as a dependency.
  *
- * 3. As each load-time plugin initializes (which happens before the lab
+ * 3. As each load-time plugin initializes (which happens before the front-end
  *    application has `started`), it instructs the layout restorer whether
- *    the restorer ought to `restore` its state by passing in its tracker.
- *    Alternatively, a plugin that does not require its own instance tracker
+ *    the restorer ought to `restore` its widgets by passing in its widget
+ *    tracker.
+ *    Alternatively, a plugin that does not require its own widget tracker
  *    (because perhaps it only creates a single widget, like a command palette),
  *    can simply `add` its widget along with a persistent unique name to the
  *    layout restorer so that its layout state can be restored when the lab
  *    application restores.
  *
- * 4. After all the load-time plugins have finished initializing, the lab
+ * 4. After all the load-time plugins have finished initializing, the front-end
  *    application `started` promise will resolve. This is the `first`
  *    promise that the layout restorer waits for. By this point, all of the
  *    plugins that care about restoration will have instructed the layout
- *    restorer to `restore` their state.
+ *    restorer to `restore` their widget trackers.
  *
- * 5. The layout restorer will then instruct each plugin's instance tracker
+ * 5. The layout restorer will then instruct each plugin's widget tracker
  *    to restore its state and reinstantiate whichever widgets it wants. The
  *    tracker returns a promise to the layout restorer that resolves when it
  *    has completed restoring the tracked widgets it cares about.
  *
- * 6. As each instance tracker finishes restoring the widget instances it cares
- *    about, it resolves the promise that was made to the layout restorer
+ * 6. As each widget tracker finishes restoring the widget instances it cares
+ *    about, it resolves the promise that was returned to the layout restorer
  *    (in step 5). After all of the promises that the restorer is awaiting have
- *    resolved, the restorer then resolves the outstanding `fetch` promise
+ *    settled, the restorer then resolves the outstanding `fetch` promise
  *    (from step 1) and hands off a layout state object to the application
  *    shell's `restoreLayout` method for restoration.
  *
  * 7. Once the application shell has finished restoring the layout, the
  *    JupyterLab application's `restored` promise is resolved.
  *
- * Of particular note are steps 5 and 6: since state restoration of plugins
+ * Of particular note are steps 5 and 6: since data restoration of plugins
  * is accomplished by executing commands, the command that is used to restore
- * the state of each plugin must return a promise that only resolves when the
- * widget has been created and added to the plugin's instance tracker.
+ * the data of each plugin must return a promise that only resolves when the
+ * widget has been created and added to the plugin's widget tracker.
  */
 export class LayoutRestorer {
     /**
@@ -72,9 +73,9 @@ export class LayoutRestorer {
         this._restored = new PromiseDelegate();
         this._trackers = new Set();
         this._widgets = new Map();
-        this._registry = options.registry;
-        this._state = options.state;
+        this._connector = options.connector;
         this._first = options.first;
+        this._registry = options.registry;
         void this._first
             .then(() => {
             this._firstDone = true;
@@ -110,16 +111,16 @@ export class LayoutRestorer {
      * Fetching the layout relies on all widget restoration to be complete, so
      * calls to `fetch` are guaranteed to return after restoration is complete.
      */
-    fetch() {
+    async fetch() {
         const blank = {
             fresh: true,
             mainArea: null,
             leftArea: null,
             rightArea: null
         };
-        const layout = this._state.fetch(KEY);
-        return Promise.all([layout, this.restored])
-            .then(([data]) => {
+        const layout = this._connector.fetch(KEY);
+        try {
+            const [data] = await Promise.all([layout, this.restored]);
             if (!data) {
                 return blank;
             }
@@ -133,13 +134,15 @@ export class LayoutRestorer {
             // Rehydrate right area.
             const rightArea = this._rehydrateSideArea(right);
             return { fresh, mainArea, leftArea, rightArea };
-        })
-            .catch(() => blank); // Let fetch fail gracefully; return blank slate.
+        }
+        catch (error) {
+            return blank;
+        }
     }
     /**
-     * Restore the widgets of a particular instance tracker.
+     * Restore the widgets of a particular widget tracker.
      *
-     * @param tracker - The instance tracker whose widgets will be restored.
+     * @param tracker - The widget tracker whose widgets will be restored.
      *
      * @param options - The restoration options.
      */
@@ -151,7 +154,7 @@ export class LayoutRestorer {
         }
         const { namespace } = tracker;
         if (this._trackers.has(namespace)) {
-            let warning = `A tracker namespaced ${namespace} was already restored.`;
+            const warning = `A tracker namespaced ${namespace} was already restored.`;
             console.warn(warning);
             return Promise.reject(warning);
         }
@@ -159,17 +162,17 @@ export class LayoutRestorer {
         // Add the tracker to the private trackers collection.
         this._trackers.add(namespace);
         // Whenever a new widget is added to the tracker, record its name.
-        tracker.widgetAdded.connect((sender, widget) => {
+        tracker.widgetAdded.connect((_, widget) => {
             const widgetName = name(widget);
             if (widgetName) {
                 this.add(widget, `${namespace}:${widgetName}`);
             }
         }, this);
         // Whenever a widget is updated, get its new name.
-        tracker.widgetUpdated.connect((sender, widget) => {
+        tracker.widgetUpdated.connect((_, widget) => {
             const widgetName = name(widget);
             if (widgetName) {
-                let name = `${namespace}:${widgetName}`;
+                const name = `${namespace}:${widgetName}`;
                 Private.nameProperty.set(widget, name);
                 this._widgets.set(name, widget);
             }
@@ -177,11 +180,11 @@ export class LayoutRestorer {
         const first = this._first;
         const promise = tracker
             .restore({
-            args,
+            args: args || (() => JSONExt.emptyObject),
             command,
+            connector: this._connector,
             name,
             registry: this._registry,
-            state: this._state,
             when: when ? [first].concat(when) : first
         })
             .catch(error => {
@@ -207,7 +210,7 @@ export class LayoutRestorer {
         dehydrated.left = this._dehydrateSideArea(data.leftArea);
         // Dehydrate right area.
         dehydrated.right = this._dehydrateSideArea(data.rightArea);
-        return this._state.save(KEY, dehydrated);
+        return this._connector.save(KEY, dehydrated);
     }
     /**
      * Dehydrate a main area description into a serializable object.
@@ -295,7 +298,7 @@ export class LayoutRestorer {
 var Private;
 (function (Private) {
     /**
-     * An attached property for a widget's ID in the state database.
+     * An attached property for a widget's ID in the serialized restore data.
      */
     Private.nameProperty = new AttachedProperty({
         name: 'name',
@@ -418,3 +421,4 @@ var Private;
     }
     Private.deserializeMain = deserializeMain;
 })(Private || (Private = {}));
+//# sourceMappingURL=layoutrestorer.js.map

package/lib/layoutrestorer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"layoutrestorer.js","sourceRoot":"","sources":["../src/layoutrestorer.ts"],"names":[],"mappings":"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"}

package/lib/mimerenderers.d.ts

@@ -1,4 +1,4 @@
-import { IInstanceTracker, InstanceTracker } from '@jupyterlab/apputils';
+import { IWidgetTracker, WidgetTracker } from '@jupyterlab/apputils';
 import { MimeDocument } from '@jupyterlab/docregistry';
 import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
 import { Token } from '@phosphor/coreutils';
@@ -6,7 +6,7 @@ import { JupyterFrontEndPlugin } from './index';
 /**
  * A class that tracks mime documents.
  */
-export interface IMimeDocumentTracker extends IInstanceTracker<MimeDocument> {
+export interface IMimeDocumentTracker extends IWidgetTracker<MimeDocument> {
 }
 /**
  * The mime document tracker token.
@@ -19,4 +19,4 @@ export declare function createRendermimePlugins(extensions: IRenderMime.IExtensi
 /**
  * Create rendermime plugins for rendermime extension modules.
  */
-export declare function createRendermimePlugin(tracker: InstanceTracker<MimeDocument>, item: IRenderMime.IExtension): JupyterFrontEndPlugin<void>;
+export declare function createRendermimePlugin(tracker: WidgetTracker<MimeDocument>, item: IRenderMime.IExtension): JupyterFrontEndPlugin<void>;

package/lib/mimerenderers.js

@@ -1,6 +1,6 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
-import { InstanceTracker } from '@jupyterlab/apputils';
+import { WidgetTracker } from '@jupyterlab/apputils';
 import { MimeDocumentFactory } from '@jupyterlab/docregistry';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { Token } from '@phosphor/coreutils';
@@ -18,7 +18,7 @@ export const IMimeDocumentTracker = new Token('@jupyterlab/application:IMimeDocu
 export function createRendermimePlugins(extensions) {
     const plugins = [];
     const namespace = 'application-mimedocuments';
-    const tracker = new InstanceTracker({ namespace });
+    const tracker = new WidgetTracker({ namespace });
     extensions.forEach(mod => {
         let data = mod.default;
         // Handle CommonJS exports.
@@ -33,7 +33,7 @@ export function createRendermimePlugins(extensions) {
         });
     });
     // Also add a meta-plugin handling state restoration
-    // and exposing the mime document instance tracker.
+    // and exposing the mime document widget tracker.
     plugins.push({
         id: '@jupyterlab/application:mimedocument',
         optional: [ILayoutRestorer],
@@ -41,7 +41,7 @@ export function createRendermimePlugins(extensions) {
         autoStart: true,
         activate: (app, restorer) => {
             if (restorer) {
-                restorer.restore(tracker, {
+                void restorer.restore(tracker, {
                     command: 'docmanager:open',
                     args: widget => ({
                         path: widget.context.path,
@@ -109,7 +109,7 @@ export function createRendermimePlugin(tracker, item) {
                 registry.addWidgetFactory(factory);
                 factory.widgetCreated.connect((sender, widget) => {
                     Private.factoryNameProperty.set(widget, factory.name);
-                    // Notify the instance tracker if restore data needs to update.
+                    // Notify the widget tracker if restore data needs to update.
                     widget.context.pathChanged.connect(() => {
                         void tracker.save(widget);
                     });
@@ -133,3 +133,4 @@ var Private;
         create: () => undefined
     });
 })(Private || (Private = {}));
+//# sourceMappingURL=mimerenderers.js.map

package/lib/mimerenderers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mimerenderers.js","sourceRoot":"","sources":["../src/mimerenderers.ts"],"names":[],"mappings":"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"}

package/lib/router.js

@@ -51,18 +51,13 @@ export class Router {
     navigate(path, options = {}) {
         const { base } = this;
         const { history } = window;
-        const { hard, silent } = options;
+        const { hard } = options;
         const old = document.location.href;
         const url = path && path.indexOf(base) === 0 ? path : URLExt.join(base, path);
         if (url === old) {
             return hard ? this.reload() : undefined;
         }
-        if (silent) {
-            history.replaceState({}, '', url);
-        }
-        else {
-            history.pushState({}, '', url);
-        }
+        history.pushState({}, '', url);
         if (hard) {
             return this.reload();
         }
@@ -142,3 +137,4 @@ export class Router {
         return done.promise;
     }
 }
+//# sourceMappingURL=router.js.map

package/lib/router.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}

package/lib/shell.js

@@ -26,10 +26,6 @@ const ACTIVE_CLASS = 'jp-mod-active';
  * The default rank of items added to a sidebar.
  */
 const DEFAULT_RANK = 500;
-/**
- * The data attribute added to the document body indicating shell's mode.
- */
-const MODE_ATTRIBUTE = 'data-shell-mode';
 const ACTIVITY_CLASS = 'jp-Activity';
 /* tslint:disable */
 /**
@@ -220,8 +216,8 @@ export class LabShell extends Widget {
             if (this.currentWidget) {
                 dock.activateWidget(this.currentWidget);
             }
-            // Set the mode data attribute on the document body.
-            document.body.setAttribute(MODE_ATTRIBUTE, mode);
+            // Set the mode data attribute on the application shell node.
+            this.node.dataset.shellMode = mode;
             return;
         }
         // Cache a reference to every widget currently in the dock panel.
@@ -251,8 +247,8 @@ export class LabShell extends Widget {
         if (applicationCurrentWidget) {
             dock.activateWidget(applicationCurrentWidget);
         }
-        // Set the mode data attribute on the document body.
-        document.body.setAttribute(MODE_ATTRIBUTE, mode);
+        // Set the mode data attribute on the applications shell node.
+        this.node.dataset.shellMode = mode;
     }
     /**
      * Promise that resolves when state is first restored, returning layout
@@ -509,7 +505,7 @@ export class LabShell extends Widget {
      * Handle `after-attach` messages for the application shell.
      */
     onAfterAttach(msg) {
-        document.body.setAttribute(MODE_ATTRIBUTE, this.mode);
+        this.node.dataset.shellMode = this.mode;
     }
     /**
      * Add a widget to the left content area.
@@ -547,7 +543,7 @@ export class LabShell extends Widget {
         options = options || {};
         const dock = this._dockPanel;
         const mode = options.mode || 'tab-after';
-        let ref = null;
+        let ref = this.currentWidget;
         if (options.ref) {
             ref = find(dock.widgets(), value => value.id === options.ref) || null;
         }
@@ -733,7 +729,6 @@ var Private;
          */
         constructor(side) {
             this._items = new Array();
-            this._side = side;
             this._sideBar = new TabBar({
                 insertBehavior: 'none',
                 removeBehavior: 'none',
@@ -884,13 +879,6 @@ var Private;
                 newWidget.show();
             }
             this._lastCurrent = newWidget || oldWidget;
-            if (newWidget) {
-                const id = newWidget.id;
-                document.body.setAttribute(`data-${this._side}-sidebar-widget`, id);
-            }
-            else {
-                document.body.removeAttribute(`data-${this._side}-sidebar-widget`);
-            }
             this._refreshVisibility();
         }
         /**
@@ -913,3 +901,4 @@ var Private;
     }
     Private.SideBarHandler = SideBarHandler;
 })(Private || (Private = {}));
+//# sourceMappingURL=shell.js.map

package/lib/shell.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell.js","sourceRoot":"","sources":["../src/shell.ts"],"names":[],"mappings":"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"}

package/lib/status.js

@@ -84,3 +84,4 @@ export class LabStatus {
         });
     }
 }
+//# sourceMappingURL=status.js.map

package/lib/status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../src/status.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAE3D,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5C,OAAO,EAAE,kBAAkB,EAAe,MAAM,sBAAsB,CAAC;AAEvE,OAAO,EAAW,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAItD,oBAAoB;AACpB;;GAEG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,KAAK,CACjC,oCAAoC,CACrC,CAAC;AA0CF;;GAEG;AACH,MAAM,OAAO,SAAS;IACpB;;OAEG;IACH,YAAY,GAAoB;QAyExB,eAAU,GAAG,CAAC,CAAC;QAEf,gBAAW,GAAG,CAAC,CAAC;QA1EtB,IAAI,CAAC,WAAW,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED;;OAEG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED;;;;OAIG;IACH,QAAQ;QACN,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,WAAW,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE;YAC7B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACtC;QACD,OAAO,IAAI,kBAAkB,CAAC,GAAG,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;YAC9B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC;YACrD,IAAI,IAAI,CAAC,OAAO,KAAK,QAAQ,EAAE;gBAC7B,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aACtC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACH,OAAO;QACL,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE;YAC3B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACpC;QACD,OAAO,IAAI,kBAAkB,CAAC,GAAG,EAAE;YACjC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC;YAC5B,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE;gBAC3B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACpC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CAMF"}

package/lib/tokens.d.ts

@@ -115,10 +115,6 @@ export declare namespace IRouter {
          * history API change.
          */
         hard?: boolean;
-        /**
-         * Whether the navigation should be added to the browser's history.
-         */
-        silent?: boolean;
     }
     /**
      * The specification for registering a route with the router.

package/lib/tokens.js

@@ -10,3 +10,4 @@ export const IConnectionLost = new Token('@jupyterlab/apputils:IConnectionLost')
  * The URL Router token.
  */
 export const IRouter = new Token('@jupyterlab/application:IRouter');
+//# sourceMappingURL=tokens.js.map

package/lib/tokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../src/tokens.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,2DAA2D;AAM3D,OAAO,EAAsB,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAMhE;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,KAAK,CACtC,sCAAsC,CACvC,CAAC;AAeF;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,IAAI,KAAK,CAAU,iCAAiC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/application",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0",
   "description": "JupyterLab - Application",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -19,8 +19,12 @@
     "lib/*.js.map",
     "style/*.css"
   ],
+  "sideEffects": [
+    "style/*.css"
+  ],
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "style": "style/index.css",
   "directories": {
     "lib": "lib/"
   },
@@ -32,33 +36,38 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/apputils": "^1.0.0-alpha.8",
-    "@jupyterlab/coreutils": "^3.0.0-alpha.8",
-    "@jupyterlab/docregistry": "^1.0.0-alpha.8",
-    "@jupyterlab/rendermime": "^1.0.0-alpha.8",
-    "@jupyterlab/rendermime-interfaces": "^1.3.0-alpha.8",
-    "@jupyterlab/services": "^4.0.0-alpha.8",
-    "@phosphor/algorithm": "^1.1.2",
-    "@phosphor/application": "^1.6.0",
-    "@phosphor/commands": "^1.6.1",
-    "@phosphor/coreutils": "^1.3.0",
-    "@phosphor/disposable": "^1.1.2",
-    "@phosphor/messaging": "^1.2.2",
-    "@phosphor/properties": "^1.1.2",
-    "@phosphor/signaling": "^1.2.2",
-    "@phosphor/widgets": "^1.6.0",
+    "@jupyterlab/apputils": "^1.0.0",
+    "@jupyterlab/coreutils": "^3.0.0",
+    "@jupyterlab/docregistry": "^1.0.0",
+    "@jupyterlab/rendermime": "^1.0.0",
+    "@jupyterlab/rendermime-interfaces": "^1.3.0",
+    "@jupyterlab/services": "^4.0.0",
+    "@phosphor/algorithm": "^1.1.3",
+    "@phosphor/application": "^1.6.3",
+    "@phosphor/commands": "^1.6.3",
+    "@phosphor/coreutils": "^1.3.1",
+    "@phosphor/disposable": "^1.2.0",
+    "@phosphor/messaging": "^1.2.3",
+    "@phosphor/properties": "^1.1.3",
+    "@phosphor/signaling": "^1.2.3",
+    "@phosphor/widgets": "^1.8.0",
     "font-awesome": "~4.7.0"
   },
   "devDependencies": {
     "rimraf": "~2.6.2",
     "typedoc": "^0.14.2",
-    "typescript": "~3.4.3"
+    "typescript": "~3.5.1"
   },
   "publishConfig": {
     "access": "public"
   },
   "jupyterlab": {
-    "coreDependency": true
+    "coreDependency": true,
+    "extraStyles": {
+      "font-awesome": [
+        "css/font-awesome.min.css"
+      ]
+    }
   },
-  "gitHead": "ac27c477b689240fe0e3e11ff2e3b4984687a899"
+  "gitHead": "382da7c3efb2696a0ae26a4fea27aeeead99fbd9"
 }

package/style/base.css

@@ -0,0 +1,55 @@
+/*-----------------------------------------------------------------------------
+| Copyright (c) Jupyter Development Team.
+| Distributed under the terms of the Modified BSD License.
+|----------------------------------------------------------------------------*/
+
+.p-Widget.p-mod-hidden {
+  display: none !important;
+}
+
+body {
+  font-family: var(--jp-ui-font-family);
+  background: var(--jp-layout-color3);
+  margin: 0;
+  padding: 0;
+  overflow: hidden;
+}
+
+.jp-LabShell {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.jp-LabShell.jp-mod-devMode {
+  border-top: 4px solid red;
+}
+
+#jp-main-dock-panel {
+  padding: 5px;
+}
+
+#jp-top-panel {
+  border-bottom: var(--jp-border-width) solid var(--jp-border-color0);
+  background: var(--jp-layout-color1);
+  display: flex;
+  min-height: var(--jp-private-menubar-height);
+}
+
+#jp-bottom-panel {
+  background: var(--jp-layout-color1);
+  display: flex;
+}
+
+/* Sibling imports */
+@import './datagrid.css';
+@import './dockpanel.css';
+@import './images.css';
+@import './icons.css';
+@import './menus.css';
+@import './scrollbar.css';
+@import './tabs.css';
+@import './buttons.css';
+@import './sidepanel.css';

package/style/buttons.css

@@ -17,21 +17,45 @@ button {
 }
 
 button.jp-mod-styled.jp-mod-accept {
-  background: var(--jp-brand-color1);
+  background: var(--md-blue-500);
+  border: 0;
   color: white;
-  border: 1px solid var(--jp-brand-color1);
+}
+
+button.jp-mod-styled.jp-mod-accept:hover {
+  background: var(--md-blue-600);
+}
+
+button.jp-mod-styled.jp-mod-accept:active {
+  background: var(--md-blue-700);
 }
 
 button.jp-mod-styled.jp-mod-reject {
   background: var(--md-grey-500);
-  border: 1px solid var(--md-grey-500);
+  border: 0;
   color: white;
 }
 
+button.jp-mod-styled.jp-mod-reject:hover {
+  background: var(--md-grey-600);
+}
+
+button.jp-mod-styled.jp-mod-reject:active {
+  background: var(--md-grey-700);
+}
+
 button.jp-mod-styled.jp-mod-warn {
   background: var(--jp-error-color1);
+  border: 0;
   color: white;
-  border: 1px solid var(--jp-error-color1);
+}
+
+button.jp-mod-styled.jp-mod-warn:hover {
+  background: var(--md-red-600);
+}
+
+button.jp-mod-styled.jp-mod-warn:active {
+  background: var(--md-red-700);
 }
 
 .jp-Button-flat {

package/style/icons.css

@@ -51,10 +51,6 @@
   background-image: var(--jp-icon-build);
 }
 
-.jp-ChatIcon {
-  background-image: var(--jp-icon-chat);
-}
-
 .jp-CircleIcon {
   background-image: var(--jp-icon-kernel-running);
 }
@@ -99,14 +95,6 @@
   background-image: var(--jp-icon-ellipses);
 }
 
-.jp-ExpandLessIcon {
-  background-image: var(--jp-icon-expand-less);
-}
-
-.jp-ExpandMoreIcon {
-  background-image: var(--jp-icon-expand-more);
-}
-
 .jp-ExtensionIcon {
   background-image: var(--jp-icon-extension);
 }
@@ -119,6 +107,10 @@
   background-image: var(--jp-icon-circle);
 }
 
+.jp-FilterListIcon {
+  background-image: var(--jp-icon-filter-list);
+}
+
 .jp-FolderIcon {
   background-image: var(--jp-icon-folder);
 }
@@ -148,6 +140,14 @@
   padding-right: 0px;
 }
 
+.jp-KernelIcon {
+  background-image: var(--jp-icon-kernel);
+}
+
+.jp-KeyboardIcon {
+  background-image: var(--jp-icon-keyboard);
+}
+
 .jp-LauncherIcon {
   background-image: var(--jp-icon-launcher);
 }
@@ -182,11 +182,11 @@
 }
 
 .jp-NotebookIcon {
-  background-image: var(--jp-icon-book);
+  background-image: var(--jp-icon-notebook);
 }
 
-.jp-OpenFolderIcon {
-  background-image: var(--jp-icon-directory);
+.jp-FolderIcon {
+  background-image: var(--jp-icon-folder);
 }
 
 .jp-PaletteIcon {
@@ -253,14 +253,10 @@
   background-image: var(--jp-icon-file-upload);
 }
 
-.jp-YamlIcon {
+.jp-YAMLIcon {
   background-image: var(--jp-icon-yaml);
 }
 
 .jp-VegaIcon {
   background-image: var(--jp-icon-vega);
 }
-
-.jp-QuestionMarkIcon {
-  background-image: var(--jp-icon-question-mark);
-}

package/style/index.css

@@ -3,57 +3,10 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
-@import url('~font-awesome/css/font-awesome.min.css');
+/* This file was auto-generated by ensurePackage() in @jupyterlab/buildutils */
 @import url('~@phosphor/widgets/style/index.css');
 @import url('~@jupyterlab/apputils/style/index.css');
+@import url('~@jupyterlab/docregistry/style/index.css');
+@import url('~font-awesome/css/font-awesome.min.css');
 
-.p-Widget.p-mod-hidden {
-  display: none !important;
-}
-
-body {
-  font-family: var(--jp-ui-font-family);
-  background: var(--jp-layout-color3);
-  margin: 0;
-  padding: 0;
-  overflow: hidden;
-}
-
-.jp-LabShell {
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
-.jp-LabShell.jp-mod-devMode {
-  border-top: 4px solid red;
-}
-
-#jp-main-dock-panel {
-  padding: 5px;
-}
-
-#jp-top-panel {
-  border-bottom: var(--jp-border-width) solid var(--jp-border-color0);
-  background: var(--jp-layout-color1);
-  display: flex;
-  min-height: var(--jp-private-menubar-height);
-}
-
-#jp-bottom-panel {
-  background: var(--jp-layout-color1);
-  display: flex;
-}
-
-/* Sibling imports */
-@import './datagrid.css';
-@import './dockpanel.css';
-@import './images.css';
-@import './icons.css';
-@import './menus.css';
-@import './scrollbar.css';
-@import './tabs.css';
-@import './buttons.css';
-@import './sidepanel.css';
+@import url('./base.css');

package/style/scrollbar.css

@@ -8,14 +8,14 @@
  */
 
 /* use standard opaque scrollbars for most nodes */
-div.jp-LabShell[data-theme-scrollbars='true'] {
+div.jp-LabShell[data-jp-theme-scrollbars='true'] {
   scrollbar-color: rgb(var(--jp-scrollbar-thumb-color))
     var(--jp-scrollbar-background-color);
 }
 
 /* for code nodes, use a transparent style of scrollbar */
-[data-theme-scrollbars='true'] .CodeMirror-hscrollbar,
-[data-theme-scrollbars='true'] .CodeMirror-vscrollbar {
+[data-jp-theme-scrollbars='true'] .CodeMirror-hscrollbar,
+[data-jp-theme-scrollbars='true'] .CodeMirror-vscrollbar {
   scrollbar-color: rgba(var(--jp-scrollbar-thumb-color), 0.5) transparent;
 }
 
@@ -25,26 +25,26 @@ div.jp-LabShell[data-theme-scrollbars='true'] {
 
 /* use standard opaque scrollbars for most nodes */
 
-[data-theme-scrollbars='true'] ::-webkit-scrollbar,
-[data-theme-scrollbars='true'] ::-webkit-scrollbar-corner {
+[data-jp-theme-scrollbars='true'] ::-webkit-scrollbar,
+[data-jp-theme-scrollbars='true'] ::-webkit-scrollbar-corner {
   background: var(--jp-scrollbar-background-color);
 }
 
-[data-theme-scrollbars='true'] ::-webkit-scrollbar-thumb {
+[data-jp-theme-scrollbars='true'] ::-webkit-scrollbar-thumb {
   background: rgb(var(--jp-scrollbar-thumb-color));
   border: var(--jp-scrollbar-thumb-margin) solid transparent;
   background-clip: content-box;
   border-radius: var(--jp-scrollbar-thumb-radius);
 }
 
-[data-theme-scrollbars='true'] ::-webkit-scrollbar-track:horizontal {
+[data-jp-theme-scrollbars='true'] ::-webkit-scrollbar-track:horizontal {
   border-left: var(--jp-scrollbar-endpad) solid
     var(--jp-scrollbar-background-color);
   border-right: var(--jp-scrollbar-endpad) solid
     var(--jp-scrollbar-background-color);
 }
 
-[data-theme-scrollbars='true'] ::-webkit-scrollbar-track:vertical {
+[data-jp-theme-scrollbars='true'] ::-webkit-scrollbar-track:vertical {
   border-top: var(--jp-scrollbar-endpad) solid
     var(--jp-scrollbar-background-color);
   border-bottom: var(--jp-scrollbar-endpad) solid
@@ -53,29 +53,32 @@ div.jp-LabShell[data-theme-scrollbars='true'] {
 
 /* for code nodes, use a transparent style of scrollbar */
 
-[data-theme-scrollbars='true'] .CodeMirror-hscrollbar::-webkit-scrollbar,
-[data-theme-scrollbars='true'] .CodeMirror-vscrollbar::-webkit-scrollbar,
-[data-theme-scrollbars='true'] .CodeMirror-hscrollbar::-webkit-scrollbar-corner,
-[data-theme-scrollbars='true']
+[data-jp-theme-scrollbars='true'] .CodeMirror-hscrollbar::-webkit-scrollbar,
+[data-jp-theme-scrollbars='true'] .CodeMirror-vscrollbar::-webkit-scrollbar,
+[data-jp-theme-scrollbars='true']
+  .CodeMirror-hscrollbar::-webkit-scrollbar-corner,
+[data-jp-theme-scrollbars='true']
   .CodeMirror-vscrollbar::-webkit-scrollbar-corner {
   background-color: transparent;
 }
 
-[data-theme-scrollbars='true'] .CodeMirror-hscrollbar::-webkit-scrollbar-thumb,
-[data-theme-scrollbars='true'] .CodeMirror-vscrollbar::-webkit-scrollbar-thumb {
+[data-jp-theme-scrollbars='true']
+  .CodeMirror-hscrollbar::-webkit-scrollbar-thumb,
+[data-jp-theme-scrollbars='true']
+  .CodeMirror-vscrollbar::-webkit-scrollbar-thumb {
   background: rgba(var(--jp-scrollbar-thumb-color), 0.5);
   border: var(--jp-scrollbar-thumb-margin) solid transparent;
   background-clip: content-box;
   border-radius: var(--jp-scrollbar-thumb-radius);
 }
 
-[data-theme-scrollbars='true']
+[data-jp-theme-scrollbars='true']
   .CodeMirror-hscrollbar::-webkit-scrollbar-track:horizontal {
   border-left: var(--jp-scrollbar-endpad) solid transparent;
   border-right: var(--jp-scrollbar-endpad) solid transparent;
 }
 
-[data-theme-scrollbars='true']
+[data-jp-theme-scrollbars='true']
   .CodeMirror-vscrollbar::-webkit-scrollbar-track:vertical {
   border-top: var(--jp-scrollbar-endpad) solid transparent;
   border-bottom: var(--jp-scrollbar-endpad) solid transparent;

package/style/tabs.css

@@ -46,7 +46,7 @@
   min-height: calc(
     var(--jp-private-horizontal-tab-height) + var(--jp-border-width)
   );
-  min-width: 36px;
+  min-width: 0px;
   margin-left: calc(-1 * var(--jp-border-width));
   line-height: var(--jp-private-horizontal-tab-height);
   padding: 0px 8px;
@@ -54,7 +54,6 @@
   border: var(--jp-border-width) solid var(--jp-border-color1);
   border-bottom: none;
   position: relative;
-  overflow: visible;
 }
 
 .p-DockPanel-tabBar .p-TabBar-tab:hover:not(.p-mod-current) {