@jupyterlab/apputils-extension 4.0.0-beta.0 → 4.0.0-beta.1

package/lib/index.js

@@ -24,6 +24,7 @@ import { kernelStatus, runningSessionsStatus } from './statusbarplugin';
 import { themesPaletteMenuPlugin, themesPlugin } from './themesplugins';
 import { toolbarRegistry } from './toolbarregistryplugin';
 import { workspacesPlugin } from './workspacesplugin';
+import { displayShortcuts } from './shortcuts';
 /**
  * The interval in milliseconds before recover options appear during splash.
  */
@@ -40,6 +41,7 @@ var CommandIDs;
     CommandIDs.runFirstEnabled = 'apputils:run-first-enabled';
     CommandIDs.runAllEnabled = 'apputils:run-all-enabled';
     CommandIDs.toggleHeader = 'apputils:toggle-header';
+    CommandIDs.displayShortcuts = 'apputils:display-shortcuts';
 })(CommandIDs || (CommandIDs = {}));
 /**
  * The default command palette extension.
@@ -455,8 +457,9 @@ const sessionDialogs = {
 const utilityCommands = {
     id: '@jupyterlab/apputils-extension:utilityCommands',
     requires: [ITranslator],
+    optional: [ICommandPalette],
     autoStart: true,
-    activate: (app, translator) => {
+    activate: (app, translator, palette) => {
         const trans = translator.load('jupyterlab');
         const { commands } = app;
         commands.addCommand(CommandIDs.runFirstEnabled, {
@@ -497,6 +500,24 @@ const utilityCommands = {
                 }
             }
         });
+        commands.addCommand(CommandIDs.displayShortcuts, {
+            label: trans.__('Show Keyboard Shortcuts'),
+            caption: trans.__('Show relevant keyboard shortcuts for the current active widget'),
+            execute: args => {
+                var _a, _b, _c, _d;
+                const included = (_a = app.shell.currentWidget) === null || _a === void 0 ? void 0 : _a.node.contains(document.activeElement);
+                if (!included) {
+                    const currentNode = (_c = (_b = app.shell.currentWidget) === null || _b === void 0 ? void 0 : _b.content.node) !== null && _c !== void 0 ? _c : (_d = app.shell.currentWidget) === null || _d === void 0 ? void 0 : _d.node;
+                    currentNode === null || currentNode === void 0 ? void 0 : currentNode.focus();
+                }
+                const options = { commands, trans };
+                return displayShortcuts(options);
+            }
+        });
+        if (palette) {
+            const category = trans.__('Help');
+            palette.addItem({ command: CommandIDs.displayShortcuts, category });
+        }
     }
 };
 /**

package/lib/index.js.map

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

package/lib/settingconnector.d.ts

@@ -16,7 +16,10 @@ export declare class SettingConnector extends DataConnector<ISettingRegistry.IPl
      * The REST API requests are throttled at one request per plugin per 100ms.
      */
     fetch(id: string): Promise<ISettingRegistry.IPlugin | undefined>;
-    list(query?: 'active' | 'all'): Promise<{
+    list(query: 'ids'): Promise<{
+        ids: string[];
+    }>;
+    list(query: 'active' | 'all'): Promise<{
         ids: string[];
         values: ISettingRegistry.IPlugin[];
     }>;

package/lib/settingconnector.js

@@ -33,10 +33,13 @@ export class SettingConnector extends DataConnector {
     }
     async list(query = 'all') {
         const { isDeferred, isDisabled } = PageConfig.Extension;
-        const { ids, values } = await this._connector.list();
+        const { ids, values } = await this._connector.list(query === 'ids' ? 'ids' : undefined);
         if (query === 'all') {
             return { ids, values };
         }
+        if (query === 'ids') {
+            return { ids };
+        }
         return {
             ids: ids.filter(id => !isDeferred(id) && !isDisabled(id)),
             values: values.filter(({ id }) => !isDeferred(id) && !isDisabled(id))

package/lib/settingconnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"settingconnector.js","sourceRoot":"","sources":["../src/settingconnector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,OAAO,gBAAiB,SAAQ,aAGrC;IACC,YAAY,SAA2D;QACrE,KAAK,EAAE,CAAC;QAwCF,gBAAW,GAAiC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAvCtE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,EAAU;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,CAAC,EAAE,IAAI,UAAU,CAAC,EAAE;YACvB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,IAAI,CACR,QAA0B,KAAK;QAE/B,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QACxD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAErD,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;SACxB;QAED,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACzD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SACtE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAU,EAAE,GAAW;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;CAIF"}
+{"version":3,"file":"settingconnector.js","sourceRoot":"","sources":["../src/settingconnector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAkB,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C;;;;;GAKG;AACH,MAAM,OAAO,gBAAiB,SAAQ,aAGrC;IACC,YAAY,SAA2D;QACrE,KAAK,EAAE,CAAC;QAkDF,gBAAW,GAAiC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAjDtE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC9B,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,EAAU;QACd,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,CAAC,EAAE,IAAI,UAAU,CAAC,EAAE;YACvB,UAAU,CAAC,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC;SACtE;QACD,OAAO,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAMD,KAAK,CAAC,IAAI,CACR,QAAkC,KAAK;QAEvC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QACxD,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAChD,KAAK,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CACpC,CAAC;QAEF,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC;SACxB;QAED,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,EAAE,GAAG,EAAE,CAAC;SAChB;QAED,OAAO;YACL,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACzD,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;SACtE,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAU,EAAE,GAAW;QAChC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;IACtC,CAAC;CAIF"}

package/lib/settingsplugin.js

@@ -28,8 +28,8 @@ export const settingsPlugin = {
         // because otherwise, its settings will never become available in the
         // setting registry.
         void app.restored.then(async () => {
-            const plugins = await connector.list('all');
-            plugins.ids.forEach(async (id, index) => {
+            const plugins = await connector.list('ids');
+            plugins.ids.forEach(async (id) => {
                 if (!app.hasPlugin(id) || isDisabled(id) || id in registry.plugins) {
                     return;
                 }
@@ -38,9 +38,10 @@ export const settingsPlugin = {
                 }
                 catch (error) {
                     console.warn(`Settings failed to load for (${id})`, error);
-                    if (plugins.values[index].schema['jupyter.lab.transform']) {
-                        console.warn(`This may happen if {autoStart: false} in (${id}) ` +
-                            `or if it is one of the deferredExtensions in page config.`);
+                    if (!app.isPluginActivated(id)) {
+                        console.warn(`If 'jupyter.lab.transform=true' in the plugin schema, this ` +
+                            `may happen if {autoStart: false} in (${id}) or if it is ` +
+                            `one of the deferredExtensions in page config.`);
                     }
                 }
             });

package/lib/settingsplugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"settingsplugin.js","sourceRoot":"","sources":["../src/settingsplugin.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAM/E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAA4C;IACrE,EAAE,EAAE,yCAAyC;IAC7C,QAAQ,EAAE,KAAK,EAAE,GAAoB,EAA6B,EAAE;QAClE,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAEpE,iEAAiE;QACjE,0EAA0E;QAC1E,qFAAqF;QACrF,0EAA0E;QAC1E,yFAAyF;QACzF,uFAAuF;QACvF,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC;YACnC,SAAS;YACT,OAAO,EAAE,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC9D,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CACxB;SACF,CAAC,CAAC;QAEH,qEAAqE;QACrE,yEAAyE;QACzE,qEAAqE;QACrE,oBAAoB;QACpB,KAAK,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAChC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE;gBACtC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,QAAQ,CAAC,OAAO,EAAE;oBAClE,OAAO;iBACR;gBAED,IAAI;oBACF,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACzB;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;oBAC3D,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,uBAAuB,CAAC,EAAE;wBACzD,OAAO,CAAC,IAAI,CACV,6CAA6C,EAAE,IAAI;4BACjD,2DAA2D,CAC9D,CAAC;qBACH;iBACF;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,gBAAgB;CAC3B,CAAC"}
+{"version":3,"file":"settingsplugin.js","sourceRoot":"","sources":["../src/settingsplugin.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAM/E,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAA4C;IACrE,EAAE,EAAE,yCAAyC;IAC7C,QAAQ,EAAE,KAAK,EAAE,GAAoB,EAA6B,EAAE;QAClE,MAAM,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,SAAS,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAEpE,iEAAiE;QACjE,0EAA0E;QAC1E,qFAAqF;QACrF,0EAA0E;QAC1E,yFAAyF;QACzF,uFAAuF;QACvF,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC;YACnC,SAAS;YACT,OAAO,EAAE,CAAC,MAAM,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC9D,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CACxB;SACF,CAAC,CAAC;QAEH,qEAAqE;QACrE,yEAAyE;QACzE,qEAAqE;QACrE,oBAAoB;QACpB,KAAK,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAChC,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBAC7B,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,QAAQ,CAAC,OAAO,EAAE;oBAClE,OAAO;iBACR;gBAED,IAAI;oBACF,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACzB;gBAAC,OAAO,KAAK,EAAE;oBACd,OAAO,CAAC,IAAI,CAAC,gCAAgC,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;oBAC3D,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE;wBAC9B,OAAO,CAAC,IAAI,CACV,6DAA6D;4BAC3D,wCAAwC,EAAE,gBAAgB;4BAC1D,+CAA+C,CAClD,CAAC;qBACH;iBACF;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,gBAAgB;CAC3B,CAAC"}

package/lib/shortcuts.d.ts

@@ -0,0 +1,21 @@
+import { CommandRegistry } from '@lumino/commands';
+import { Dialog } from '@jupyterlab/apputils';
+import { TranslationBundle } from '@jupyterlab/translation';
+/**
+ * Display shortcuts options
+ */
+export interface IOptions {
+    /**
+     * Application commands registry
+     */
+    commands: CommandRegistry;
+    /**
+     * Translation object
+     */
+    trans: TranslationBundle;
+    /**
+     * Element on which to display the keyboard shortcuts help
+     */
+    activeElement?: Element;
+}
+export declare function displayShortcuts(options: IOptions): Promise<Dialog.IResult<unknown>>;

package/lib/shortcuts.js

@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
+import { CommandRegistry } from '@lumino/commands';
+import { Selector } from '@lumino/domutils';
+import * as React from 'react';
+import { Dialog, showDialog } from '@jupyterlab/apputils';
+/**
+ * The class name for each row of ContextShortcutTable
+ */
+const SHORTCUT_TABLE_ROW_CLASS = 'jp-ContextualShortcut-TableRow';
+/**
+ * The class name for the last row of ContextShortcutTable
+ */
+const SHORTCUT_TABLE_LAST_ROW_CLASS = 'jp-ContextualShortcut-TableLastRow';
+/**
+ * The class name for each item of ContextShortcutTable
+ */
+const SHORTCUT_TABLE_ITEM_CLASS = 'jp-ContextualShortcut-TableItem';
+/**
+ * The class name for each button-like symbol representing a key used in a shortcut in the ContextShortcutTable
+ */
+const SHORTCUT_KEY_CLASS = 'jp-ContextualShortcut-Key';
+export function displayShortcuts(options) {
+    const { commands, trans, activeElement } = options;
+    const elt = activeElement !== null && activeElement !== void 0 ? activeElement : document.activeElement;
+    /**
+     * Find the distance from the target node to the first matching node.
+     *
+     * Based on Lumino private function commands.Private.targetDistance
+     * This traverses the DOM path from `elt` to the root
+     * computes the distance from `elt` to the first node which matches
+     * the CSS selector. If no match is found, `-1` is returned.
+     *
+     * It also stops traversal if the `data-lm-suppress-shortcuts` or
+     * `data-p-suppress-shortcuts` attributes are found.
+     */
+    function formatKeys(keys) {
+        const topContainer = [];
+        for (const key of keys) {
+            const container = [];
+            for (const ch of key.split(' ')) {
+                container.push(React.createElement("span", { className: SHORTCUT_KEY_CLASS },
+                    React.createElement("kbd", null, ch)), React.createElement(React.Fragment, null, " + "));
+            }
+            /*topContainer.push(<span>{container.slice(0, -1)}</span>, <>,</>);*/
+            topContainer.push(React.createElement("span", null, container.slice(0, -1)), React.createElement(React.Fragment, null, " + "));
+        }
+        return React.createElement("span", null, topContainer.slice(0, -1));
+    }
+    function capitalizeString(str) {
+        const capitalizedStr = str.charAt(0).toUpperCase() + str.slice(1);
+        return capitalizedStr;
+    }
+    function formatLabel(b) {
+        const label = commands.label(b.command);
+        const commandID = b.command.split(':')[1];
+        const automaticLabel = commandID.split('-');
+        let capitalizedLabel = '';
+        for (let i = 0; i < automaticLabel.length; i++) {
+            const str = capitalizeString(automaticLabel[i]);
+            capitalizedLabel = capitalizedLabel + ' ' + str;
+        }
+        if (label.length > 0) {
+            return label;
+        }
+        else {
+            return capitalizedLabel;
+        }
+    }
+    function matchDistance(selector, elt) {
+        let targ = elt;
+        for (let dist = 0; targ !== null && targ !== targ.parentElement; targ = targ.parentElement, ++dist) {
+            if (targ.hasAttribute('data-lm-suppress-shortcuts')) {
+                return -1;
+            }
+            if (targ.matches(selector)) {
+                return dist;
+            }
+        }
+        return -1;
+    }
+    // Find active keybindings for target element
+    const activeBindings = new Map();
+    for (let i = 0; i < commands.keyBindings.length; i++) {
+        const kb = commands.keyBindings[i];
+        let distance = matchDistance(kb.selector, elt);
+        if (distance < 0) {
+            continue;
+        }
+        let formatted = CommandRegistry.formatKeystroke(kb.keys);
+        if (activeBindings.has(formatted)) {
+            let oldBinding = activeBindings.get(formatted);
+            // if the existing binding takes precedence, ignore this binding by continuing
+            if (oldBinding[0] < distance ||
+                (oldBinding[0] === distance &&
+                    Selector.calculateSpecificity(oldBinding[1].selector) >
+                        Selector.calculateSpecificity(kb.selector))) {
+                continue;
+            }
+        }
+        activeBindings.set(formatted, [distance, kb]);
+    }
+    // Group shortcuts by distance
+    let maxDistance = -1;
+    const groupedBindings = new Map();
+    for (let [distance, binding] of activeBindings.values()) {
+        maxDistance = Math.max(distance, maxDistance);
+        if (!groupedBindings.has(distance)) {
+            groupedBindings.set(distance, []);
+        }
+        groupedBindings.get(distance).push(binding);
+    }
+    // Display shortcuts by group
+    const bindingTable = [];
+    for (let d = 0; d <= maxDistance; d++) {
+        if (groupedBindings.has(d)) {
+            bindingTable.push(groupedBindings.get(d).map(b => (React.createElement("tr", { className: SHORTCUT_TABLE_ROW_CLASS, key: b.command },
+                React.createElement("td", { className: SHORTCUT_TABLE_ITEM_CLASS }, formatLabel(b)),
+                React.createElement("td", { className: SHORTCUT_TABLE_ITEM_CLASS }, formatKeys([...b.keys]))))));
+            bindingTable.push(React.createElement("tr", { className: SHORTCUT_TABLE_LAST_ROW_CLASS }));
+        }
+    }
+    const body = (React.createElement("table", null,
+        React.createElement("tbody", null, bindingTable)));
+    return showDialog({
+        title: trans.__('Keyboard Shortcuts'),
+        body,
+        buttons: [
+            Dialog.cancelButton({
+                label: trans.__('Close')
+            })
+        ]
+    });
+}
+//# sourceMappingURL=shortcuts.js.map

package/lib/shortcuts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shortcuts.js","sourceRoot":"","sources":["../src/shortcuts.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAG1D;;GAEG;AACH,MAAM,wBAAwB,GAAG,gCAAgC,CAAC;AAClE;;GAEG;AACH,MAAM,6BAA6B,GAAG,oCAAoC,CAAC;AAC3E;;GAEG;AACH,MAAM,yBAAyB,GAAG,iCAAiC,CAAC;AACpE;;GAEG;AACH,MAAM,kBAAkB,GAAG,2BAA2B,CAAC;AAoBvD,MAAM,UAAU,gBAAgB,CAAC,OAAiB;IAChD,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IACnD,MAAM,GAAG,GAAG,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,QAAQ,CAAC,aAAa,CAAC;IAEpD;;;;;;;;;;OAUG;IAEH,SAAS,UAAU,CAAC,IAAc;QAChC,MAAM,YAAY,GAAkB,EAAE,CAAC;QACvC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,MAAM,SAAS,GAAkB,EAAE,CAAC;YACpC,KAAK,MAAM,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBAC/B,SAAS,CAAC,IAAI,CACZ,8BAAM,SAAS,EAAE,kBAAkB;oBACjC,iCAAM,EAAE,CAAO,CACV,EACP,gDAAQ,CACT,CAAC;aACH;YACD,qEAAqE;YACrE,YAAY,CAAC,IAAI,CAAC,kCAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAQ,EAAE,gDAAQ,CAAC,CAAC;SACpE;QACD,OAAO,kCAAO,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAQ,CAAC;IAClD,CAAC;IAED,SAAS,gBAAgB,CAAC,GAAW;QACnC,MAAM,cAAc,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAClE,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,SAAS,WAAW,CAAC,CAA8B;QACjD,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAC9C,MAAM,GAAG,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,gBAAgB,GAAG,gBAAgB,GAAG,GAAG,GAAG,GAAG,CAAC;SACjD;QAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;aAAM;YACL,OAAO,gBAAgB,CAAC;SACzB;IACH,CAAC;IAED,SAAS,aAAa,CAAC,QAAgB,EAAE,GAAmB;QAC1D,IAAI,IAAI,GAAG,GAAG,CAAC;QACf,KACE,IAAI,IAAI,GAAG,CAAC,EACZ,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI,CAAC,aAAa,EAC5C,IAAI,GAAG,IAAI,CAAC,aAAa,EAAE,EAAE,IAAI,EACjC;YACA,IAAI,IAAI,CAAC,YAAY,CAAC,4BAA4B,CAAC,EAAE;gBACnD,OAAO,CAAC,CAAC,CAAC;aACX;YACD,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAC1B,OAAO,IAAI,CAAC;aACb;SACF;QACD,OAAO,CAAC,CAAC,CAAC;IACZ,CAAC;IAED,6CAA6C;IAC7C,MAAM,cAAc,GAAG,IAAI,GAAG,EAG3B,CAAC;IACJ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACpD,MAAM,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QACnC,IAAI,QAAQ,GAAG,aAAa,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC/C,IAAI,QAAQ,GAAG,CAAC,EAAE;YAChB,SAAS;SACV;QACD,IAAI,SAAS,GAAG,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,cAAc,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;YACjC,IAAI,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YAChD,8EAA8E;YAC9E,IACE,UAAU,CAAC,CAAC,CAAC,GAAG,QAAQ;gBACxB,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,QAAQ;oBACzB,QAAQ,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;wBACnD,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,EAC/C;gBACA,SAAS;aACV;SACF;QACD,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;KAC/C;IAED,8BAA8B;IAC9B,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC;IACrB,MAAM,eAAe,GAAG,IAAI,GAAG,EAAyC,CAAC;IACzE,KAAK,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,cAAc,CAAC,MAAM,EAAE,EAAE;QACvD,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9C,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAClC,eAAe,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SACnC;QACD,eAAe,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;KAC9C;IAED,6BAA6B;IAC7B,MAAM,YAAY,GAAQ,EAAE,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,WAAW,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC1B,YAAY,CAAC,IAAI,CACf,eAAe,CAAC,GAAG,CAAC,CAAC,CAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAC/B,4BAAI,SAAS,EAAE,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC,OAAO;gBACrD,4BAAI,SAAS,EAAE,yBAAyB,IAAG,WAAW,CAAC,CAAC,CAAC,CAAM;gBAC/D,4BAAI,SAAS,EAAE,yBAAyB,IACrC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CACrB,CACF,CACN,CAAC,CACH,CAAC;YACF,YAAY,CAAC,IAAI,CAAC,4BAAI,SAAS,EAAE,6BAA6B,GAAO,CAAC,CAAC;SACxE;KACF;IAED,MAAM,IAAI,GAAG,CACX;QACE,mCAAQ,YAAY,CAAS,CACvB,CACT,CAAC;IAEF,OAAO,UAAU,CAAC;QAChB,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAAC;QACrC,IAAI;QACJ,OAAO,EAAE;YACP,MAAM,CAAC,YAAY,CAAC;gBAClB,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC;aACzB,CAAC;SACH;KACF,CAAC,CAAC;AACL,CAAC"}

package/lib/themesplugins.js

@@ -8,6 +8,7 @@ import { PageConfig, URLExt } from '@jupyterlab/coreutils';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITranslator } from '@jupyterlab/translation';
+import scrollbarStyleText from '../style/scrollbar.raw.css';
 var CommandIDs;
 (function (CommandIDs) {
     CommandIDs.changeTheme = 'apputils:change-theme';
@@ -16,6 +17,12 @@ var CommandIDs;
     CommandIDs.incrFontSize = 'apputils:incr-font-size';
     CommandIDs.decrFontSize = 'apputils:decr-font-size';
 })(CommandIDs || (CommandIDs = {}));
+function createStyleSheet(text) {
+    const style = document.createElement('style');
+    style.setAttribute('type', 'text/css');
+    style.appendChild(document.createTextNode(text));
+    return style;
+}
 /**
  * The default theme manager provider.
  */
@@ -36,6 +43,7 @@ export const themesPlugin = {
             splash: splash !== null && splash !== void 0 ? splash : undefined,
             url
         });
+        let scrollbarsStyleElement = null;
         // Keep a synchronously set reference to the current theme,
         // since the asynchronous setting of the theme in `changeTheme`
         // can lead to an incorrect toggle on the currently used theme.
@@ -48,6 +56,19 @@ export const themesPlugin = {
             if (document.body.dataset.jpThemeScrollbars !==
                 String(manager.themeScrollbars(currentTheme))) {
                 document.body.dataset.jpThemeScrollbars = String(manager.themeScrollbars(currentTheme));
+                if (manager.themeScrollbars(currentTheme)) {
+                    if (!scrollbarsStyleElement) {
+                        scrollbarsStyleElement = createStyleSheet(scrollbarStyleText);
+                    }
+                    if (!scrollbarsStyleElement.parentElement) {
+                        document.body.appendChild(scrollbarsStyleElement);
+                    }
+                }
+                else {
+                    if (scrollbarsStyleElement && scrollbarsStyleElement.parentElement) {
+                        scrollbarsStyleElement.parentElement.removeChild(scrollbarsStyleElement);
+                    }
+                }
             }
             commands.notifyCommandChanged(CommandIDs.changeTheme);
         });

package/lib/themesplugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"themesplugins.js","sourceRoot":"","sources":["../src/themesplugins.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"themesplugins.js","sourceRoot":"","sources":["../src/themesplugins.ts"],"names":[],"mappings":"AAAA;;;+EAG+E;AAE/E,OAAO,EACL,eAAe,EAEhB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,eAAe,EACf,aAAa,EACb,aAAa,EACb,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAE5D,IAAU,UAAU,CAUnB;AAVD,WAAU,UAAU;IACL,sBAAW,GAAG,uBAAuB,CAAC;IAEtC,0BAAe,GAAG,2BAA2B,CAAC;IAE9C,qBAAU,GAAG,sBAAsB,CAAC;IAEpC,uBAAY,GAAG,yBAAyB,CAAC;IAEzC,uBAAY,GAAG,yBAAyB,CAAC;AACxD,CAAC,EAVS,UAAU,KAAV,UAAU,QAUnB;AAED,SAAS,gBAAgB,CAAC,IAAY;IACpC,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAC9C,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IACvC,KAAK,CAAC,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAyC;IAChE,EAAE,EAAE,uCAAuC;IAC3C,QAAQ,EAAE,CAAC,gBAAgB,EAAE,eAAe,CAAC,MAAM,EAAE,WAAW,CAAC;IACjE,QAAQ,EAAE,CAAC,aAAa,CAAC;IACzB,QAAQ,EAAE,CACR,GAAoB,EACpB,QAA0B,EAC1B,KAA6B,EAC7B,UAAuB,EACvB,MAA4B,EACb,EAAE;QACjB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC;QACvB,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC;QAC9B,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpE,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAI,YAAY,CAAC;YAC/B,GAAG;YACH,IAAI;YACJ,QAAQ;YACR,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,SAAS;YAC3B,GAAG;SACJ,CAAC,CAAC;QACH,IAAI,sBAAsB,GAA4B,IAAI,CAAC;QAE3D,2DAA2D;QAC3D,+DAA+D;QAC/D,+DAA+D;QAC/D,IAAI,YAAoB,CAAC;QAEzB,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YAC5C,sEAAsE;YACtE,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC7B,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CACzC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAC9B,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,YAAY,CAAC;YACjD,IACE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB;gBACvC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC,EAC7C;gBACA,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,MAAM,CAC9C,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,CACtC,CAAC;gBACF,IAAI,OAAO,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE;oBACzC,IAAI,CAAC,sBAAsB,EAAE;wBAC3B,sBAAsB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;qBAC/D;oBACD,IAAI,CAAC,sBAAsB,CAAC,aAAa,EAAE;wBACzC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,CAAC;qBACnD;iBACF;qBAAM;oBACL,IAAI,sBAAsB,IAAI,sBAAsB,CAAC,aAAa,EAAE;wBAClE,sBAAsB,CAAC,aAAa,CAAC,WAAW,CAC9C,sBAAsB,CACvB,CAAC;qBACH;iBACF;aACF;YAED,QAAQ,CAAC,oBAAoB,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,WAAW,EAAE;YAC1C,KAAK,EAAE,IAAI,CAAC,EAAE;gBACZ,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,EAAE;oBAC5B,OAAO,KAAK,CAAC,EAAE,CAAC,iCAAiC,CAAC,CAAC;iBACpD;gBACD,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAW,CAAC;gBACtC,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBAClD,OAAO,IAAI,CAAC,WAAW,CAAC;oBACtB,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,EAAE,WAAW,CAAC;oBACxC,CAAC,CAAC,WAAW,CAAC;YAClB,CAAC;YACD,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,YAAY;YACjD,OAAO,EAAE,IAAI,CAAC,EAAE;gBACd,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAW,CAAC;gBACtC,IAAI,KAAK,KAAK,OAAO,CAAC,KAAK,EAAE;oBAC3B,OAAO;iBACR;gBACD,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC;SACF,CAAC,CAAC;QAEH,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,EAAE;YAC9C,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAAC;YACnC,SAAS,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,wBAAwB,EAAE;YACnD,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,qBAAqB,EAAE;SAC/C,CAAC,CAAC;QAEH,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,EAAE;YACzC,KAAK,EAAE,IAAI,CAAC,EAAE,CACZ,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,mBAAmB,CAAC;YACrE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAY;YAC7C,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAW,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC;YACzE,OAAO,EAAE,IAAI,CAAC,EAAE,CACd,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAW,EAAE,IAAI,CAAC,MAAM,CAAW,CAAC;SACxE,CAAC,CAAC;QAEH,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,EAAE;YAC3C,KAAK,EAAE,IAAI,CAAC,EAAE;gBACZ,QAAQ,IAAI,CAAC,GAAG,EAAE;oBAChB,KAAK,gBAAgB;wBACnB,OAAO,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC;oBAC7C,KAAK,oBAAoB;wBACvB,OAAO,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC;oBAChD,KAAK,eAAe;wBAClB,OAAO,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC;oBAC3C;wBACE,OAAO,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;iBACzC;YACH,CAAC;YACD,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAW,CAAC;SAC7D,CAAC,CAAC;QAEH,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,YAAY,EAAE;YAC3C,KAAK,EAAE,IAAI,CAAC,EAAE;gBACZ,QAAQ,IAAI,CAAC,GAAG,EAAE;oBAChB,KAAK,gBAAgB;wBACnB,OAAO,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC;oBAC7C,KAAK,oBAAoB;wBACvB,OAAO,KAAK,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC;oBAChD,KAAK,eAAe;wBAClB,OAAO,KAAK,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC;oBAC3C;wBACE,OAAO,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;iBACzC;YACH,CAAC;YACD,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAW,CAAC;SAC7D,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,SAAS,EAAE,IAAI;IACf,QAAQ,EAAE,aAAa;CACxB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAgC;IAClE,EAAE,EAAE,oDAAoD;IACxD,QAAQ,EAAE,CAAC,aAAa,EAAE,WAAW,CAAC;IACtC,QAAQ,EAAE,CAAC,eAAe,EAAE,SAAS,CAAC;IACtC,QAAQ,EAAE,CACR,GAAoB,EACpB,OAAsB,EACtB,UAAuB,EACvB,OAA+B,EAC/B,QAA0B,EACpB,EAAE;QACR,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE5C,sEAAsE;QACtE,IAAI,QAAQ,EAAE;YACZ,KAAK,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE;;gBAC1B,MAAM,SAAS,GAAG,KAAK,CAAC;gBAExB,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAChD,IAAI,CAAC,EAAE;;oBACL,OAAA,IAAI,CAAC,IAAI,KAAK,SAAS;wBACvB,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,EAAE,MAAK,oCAAoC,CAAA;iBAAA,CAC5D,0CAAE,OAAO,CAAC;gBAEX,iBAAiB;gBACjB,IAAI,SAAS,EAAE;oBACb,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;wBACtC,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE;4BAC1B,OAAO,EAAE,UAAU,CAAC,WAAW;4BAC/B,IAAI,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;yBAC3B,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;SACJ;QAED,mEAAmE;QACnE,IAAI,OAAO,EAAE;YACX,KAAK,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;gBACnC,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC;gBACvC,MAAM,SAAS,GAAG,IAAI,CAAC;gBAEvB,iBAAiB;gBACjB,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBAC7B,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;gBACrE,CAAC,CAAC,CAAC;gBAEH,2BAA2B;gBAC3B,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,eAAe,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAEnE,mCAAmC;gBACnC,OAAO,CAAC,OAAO,CAAC;oBACd,OAAO,EAAE,UAAU,CAAC,YAAY;oBAChC,IAAI,EAAE;wBACJ,GAAG,EAAE,gBAAgB;qBACtB;oBACD,QAAQ;iBACT,CAAC,CAAC;gBACH,OAAO,CAAC,OAAO,CAAC;oBACd,OAAO,EAAE,UAAU,CAAC,YAAY;oBAChC,IAAI,EAAE;wBACJ,GAAG,EAAE,gBAAgB;qBACtB;oBACD,QAAQ;iBACT,CAAC,CAAC;gBACH,sCAAsC;gBACtC,OAAO,CAAC,OAAO,CAAC;oBACd,OAAO,EAAE,UAAU,CAAC,YAAY;oBAChC,IAAI,EAAE;wBACJ,GAAG,EAAE,oBAAoB;qBAC1B;oBACD,QAAQ;iBACT,CAAC,CAAC;gBACH,OAAO,CAAC,OAAO,CAAC;oBACd,OAAO,EAAE,UAAU,CAAC,YAAY;oBAChC,IAAI,EAAE;wBACJ,GAAG,EAAE,oBAAoB;qBAC1B;oBACD,QAAQ;iBACT,CAAC,CAAC;gBACH,iCAAiC;gBACjC,OAAO,CAAC,OAAO,CAAC;oBACd,OAAO,EAAE,UAAU,CAAC,YAAY;oBAChC,IAAI,EAAE;wBACJ,GAAG,EAAE,eAAe;qBACrB;oBACD,QAAQ;iBACT,CAAC,CAAC;gBACH,OAAO,CAAC,OAAO,CAAC;oBACd,OAAO,EAAE,UAAU,CAAC,YAAY;oBAChC,IAAI,EAAE;wBACJ,GAAG,EAAE,eAAe;qBACrB;oBACD,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IACD,SAAS,EAAE,IAAI;CAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/apputils-extension",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0-beta.1",
   "description": "JupyterLab - Application Utilities Extension",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -38,25 +38,26 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.0.0-beta.0",
-    "@jupyterlab/apputils": "^4.0.0-beta.0",
-    "@jupyterlab/coreutils": "^6.0.0-beta.0",
-    "@jupyterlab/docregistry": "^4.0.0-beta.0",
-    "@jupyterlab/filebrowser": "^4.0.0-beta.0",
-    "@jupyterlab/mainmenu": "^4.0.0-beta.0",
-    "@jupyterlab/rendermime-interfaces": "^3.8.0-beta.0",
-    "@jupyterlab/services": "^7.0.0-beta.0",
-    "@jupyterlab/settingregistry": "^4.0.0-beta.0",
-    "@jupyterlab/statedb": "^4.0.0-beta.0",
-    "@jupyterlab/statusbar": "^4.0.0-beta.0",
-    "@jupyterlab/translation": "^4.0.0-beta.0",
-    "@jupyterlab/ui-components": "^4.0.0-beta.0",
+    "@jupyterlab/application": "^4.0.0-beta.1",
+    "@jupyterlab/apputils": "^4.0.0-beta.1",
+    "@jupyterlab/coreutils": "^6.0.0-beta.1",
+    "@jupyterlab/docregistry": "^4.0.0-beta.1",
+    "@jupyterlab/filebrowser": "^4.0.0-beta.1",
+    "@jupyterlab/mainmenu": "^4.0.0-beta.1",
+    "@jupyterlab/rendermime-interfaces": "^3.8.0-beta.1",
+    "@jupyterlab/services": "^7.0.0-beta.1",
+    "@jupyterlab/settingregistry": "^4.0.0-beta.1",
+    "@jupyterlab/statedb": "^4.0.0-beta.1",
+    "@jupyterlab/statusbar": "^4.0.0-beta.1",
+    "@jupyterlab/translation": "^4.0.0-beta.1",
+    "@jupyterlab/ui-components": "^4.0.0-beta.1",
     "@lumino/algorithm": "^2.0.0",
-    "@lumino/commands": "^2.0.0",
+    "@lumino/commands": "^2.0.1",
     "@lumino/coreutils": "^2.0.0",
     "@lumino/disposable": "^2.0.0",
+    "@lumino/domutils": "^2.0.0",
     "@lumino/polling": "^2.0.0",
-    "@lumino/widgets": "^2.0.0",
+    "@lumino/widgets": "^2.0.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-toastify": "^9.0.8"

package/schema/utilityCommands.json

@@ -0,0 +1,35 @@
+{
+  "title": "Shortcuts Help",
+  "description": "Shortcut help settings.",
+  "jupyter.lab.menus": {
+    "main": [
+      {
+        "id": "jp-mainmenu-help",
+        "items": [
+          {
+            "type": "separator",
+            "rank": 0.1
+          },
+          {
+            "command": "apputils:display-shortcuts",
+            "rank": 0.1
+          },
+          {
+            "type": "separator",
+            "rank": 0.1
+          }
+        ]
+      }
+    ]
+  },
+  "jupyter.lab.shortcuts": [
+    {
+      "command": "apputils:display-shortcuts",
+      "keys": ["Accel Shift H"],
+      "selector": "body"
+    }
+  ],
+  "properties": {},
+  "type": "object",
+  "additionalProperties": false
+}

package/src/index.ts

@@ -43,6 +43,7 @@ import { themesPaletteMenuPlugin, themesPlugin } from './themesplugins';
 import { toolbarRegistry } from './toolbarregistryplugin';
 import { workspacesPlugin } from './workspacesplugin';
 import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
+import { displayShortcuts } from './shortcuts';
 
 /**
  * The interval in milliseconds before recover options appear during splash.
@@ -66,6 +67,8 @@ namespace CommandIDs {
   export const runAllEnabled = 'apputils:run-all-enabled';
 
   export const toggleHeader = 'apputils:toggle-header';
+
+  export const displayShortcuts = 'apputils:display-shortcuts';
 }
 
 /**
@@ -570,8 +573,13 @@ const sessionDialogs: JupyterFrontEndPlugin<ISessionContextDialogs> = {
 const utilityCommands: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab/apputils-extension:utilityCommands',
   requires: [ITranslator],
+  optional: [ICommandPalette],
   autoStart: true,
-  activate: (app: JupyterFrontEnd, translator: ITranslator) => {
+  activate: (
+    app: JupyterFrontEnd,
+    translator: ITranslator,
+    palette: ICommandPalette | null
+  ) => {
     const trans = translator.load('jupyterlab');
     const { commands } = app;
     commands.addCommand(CommandIDs.runFirstEnabled, {
@@ -612,6 +620,32 @@ const utilityCommands: JupyterFrontEndPlugin<void> = {
         }
       }
     });
+
+    commands.addCommand(CommandIDs.displayShortcuts, {
+      label: trans.__('Show Keyboard Shortcuts'),
+      caption: trans.__(
+        'Show relevant keyboard shortcuts for the current active widget'
+      ),
+      execute: args => {
+        const included = app.shell.currentWidget?.node.contains(
+          document.activeElement
+        );
+
+        if (!included) {
+          const currentNode =
+            (app.shell.currentWidget as MainAreaWidget)?.content.node ??
+            app.shell.currentWidget?.node;
+          currentNode?.focus();
+        }
+        const options = { commands, trans };
+        return displayShortcuts(options);
+      }
+    });
+
+    if (palette) {
+      const category: string = trans.__('Help');
+      palette.addItem({ command: CommandIDs.displayShortcuts, category });
+    }
   }
 };
 

package/src/settingconnector.ts

@@ -38,16 +38,26 @@ export class SettingConnector extends DataConnector<
     return throttlers[id].invoke();
   }
 
+  async list(query: 'ids'): Promise<{ ids: string[] }>;
   async list(
-    query: 'active' | 'all' = 'all'
-  ): Promise<{ ids: string[]; values: ISettingRegistry.IPlugin[] }> {
+    query: 'active' | 'all'
+  ): Promise<{ ids: string[]; values: ISettingRegistry.IPlugin[] }>;
+  async list(
+    query: 'active' | 'all' | 'ids' = 'all'
+  ): Promise<{ ids: string[]; values?: ISettingRegistry.IPlugin[] }> {
     const { isDeferred, isDisabled } = PageConfig.Extension;
-    const { ids, values } = await this._connector.list();
+    const { ids, values } = await this._connector.list(
+      query === 'ids' ? 'ids' : undefined
+    );
 
     if (query === 'all') {
       return { ids, values };
     }
 
+    if (query === 'ids') {
+      return { ids };
+    }
+
     return {
       ids: ids.filter(id => !isDeferred(id) && !isDisabled(id)),
       values: values.filter(({ id }) => !isDeferred(id) && !isDisabled(id))

package/src/settingsplugin.ts

@@ -38,8 +38,8 @@ export const settingsPlugin: JupyterFrontEndPlugin<ISettingRegistry> = {
     // because otherwise, its settings will never become available in the
     // setting registry.
     void app.restored.then(async () => {
-      const plugins = await connector.list('all');
-      plugins.ids.forEach(async (id, index) => {
+      const plugins = await connector.list('ids');
+      plugins.ids.forEach(async id => {
         if (!app.hasPlugin(id) || isDisabled(id) || id in registry.plugins) {
           return;
         }
@@ -48,10 +48,11 @@ export const settingsPlugin: JupyterFrontEndPlugin<ISettingRegistry> = {
           await registry.load(id);
         } catch (error) {
           console.warn(`Settings failed to load for (${id})`, error);
-          if (plugins.values[index].schema['jupyter.lab.transform']) {
+          if (!app.isPluginActivated(id)) {
             console.warn(
-              `This may happen if {autoStart: false} in (${id}) ` +
-                `or if it is one of the deferredExtensions in page config.`
+              `If 'jupyter.lab.transform=true' in the plugin schema, this ` +
+                `may happen if {autoStart: false} in (${id}) or if it is ` +
+                `one of the deferredExtensions in page config.`
             );
           }
         }

package/src/shortcuts.tsx

@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
+
+import { CommandRegistry } from '@lumino/commands';
+import { Selector } from '@lumino/domutils';
+import * as React from 'react';
+import { Dialog, showDialog } from '@jupyterlab/apputils';
+import { TranslationBundle } from '@jupyterlab/translation';
+
+/**
+ * The class name for each row of ContextShortcutTable
+ */
+const SHORTCUT_TABLE_ROW_CLASS = 'jp-ContextualShortcut-TableRow';
+/**
+ * The class name for the last row of ContextShortcutTable
+ */
+const SHORTCUT_TABLE_LAST_ROW_CLASS = 'jp-ContextualShortcut-TableLastRow';
+/**
+ * The class name for each item of ContextShortcutTable
+ */
+const SHORTCUT_TABLE_ITEM_CLASS = 'jp-ContextualShortcut-TableItem';
+/**
+ * The class name for each button-like symbol representing a key used in a shortcut in the ContextShortcutTable
+ */
+const SHORTCUT_KEY_CLASS = 'jp-ContextualShortcut-Key';
+
+/**
+ * Display shortcuts options
+ */
+export interface IOptions {
+  /**
+   * Application commands registry
+   */
+  commands: CommandRegistry;
+  /**
+   * Translation object
+   */
+  trans: TranslationBundle;
+  /**
+   * Element on which to display the keyboard shortcuts help
+   */
+  activeElement?: Element;
+}
+
+export function displayShortcuts(options: IOptions) {
+  const { commands, trans, activeElement } = options;
+  const elt = activeElement ?? document.activeElement;
+
+  /**
+   * Find the distance from the target node to the first matching node.
+   *
+   * Based on Lumino private function commands.Private.targetDistance
+   * This traverses the DOM path from `elt` to the root
+   * computes the distance from `elt` to the first node which matches
+   * the CSS selector. If no match is found, `-1` is returned.
+   *
+   * It also stops traversal if the `data-lm-suppress-shortcuts` or
+   * `data-p-suppress-shortcuts` attributes are found.
+   */
+
+  function formatKeys(keys: string[]): JSX.Element {
+    const topContainer: JSX.Element[] = [];
+    for (const key of keys) {
+      const container: JSX.Element[] = [];
+      for (const ch of key.split(' ')) {
+        container.push(
+          <span className={SHORTCUT_KEY_CLASS}>
+            <kbd>{ch}</kbd>
+          </span>,
+          <> + </>
+        );
+      }
+      /*topContainer.push(<span>{container.slice(0, -1)}</span>, <>,</>);*/
+      topContainer.push(<span>{container.slice(0, -1)}</span>, <> + </>);
+    }
+    return <span>{topContainer.slice(0, -1)}</span>;
+  }
+
+  function capitalizeString(str: string) {
+    const capitalizedStr = str.charAt(0).toUpperCase() + str.slice(1);
+    return capitalizedStr;
+  }
+
+  function formatLabel(b: CommandRegistry.IKeyBinding) {
+    const label = commands.label(b.command);
+    const commandID = b.command.split(':')[1];
+    const automaticLabel = commandID.split('-');
+    let capitalizedLabel = '';
+    for (let i = 0; i < automaticLabel.length; i++) {
+      const str = capitalizeString(automaticLabel[i]);
+      capitalizedLabel = capitalizedLabel + ' ' + str;
+    }
+
+    if (label.length > 0) {
+      return label;
+    } else {
+      return capitalizedLabel;
+    }
+  }
+
+  function matchDistance(selector: string, elt: Element | null): number {
+    let targ = elt;
+    for (
+      let dist = 0;
+      targ !== null && targ !== targ.parentElement;
+      targ = targ.parentElement, ++dist
+    ) {
+      if (targ.hasAttribute('data-lm-suppress-shortcuts')) {
+        return -1;
+      }
+      if (targ.matches(selector)) {
+        return dist;
+      }
+    }
+    return -1;
+  }
+
+  // Find active keybindings for target element
+  const activeBindings = new Map<
+    string,
+    [number, CommandRegistry.IKeyBinding]
+  >();
+  for (let i = 0; i < commands.keyBindings.length; i++) {
+    const kb = commands.keyBindings[i];
+    let distance = matchDistance(kb.selector, elt);
+    if (distance < 0) {
+      continue;
+    }
+    let formatted = CommandRegistry.formatKeystroke(kb.keys);
+    if (activeBindings.has(formatted)) {
+      let oldBinding = activeBindings.get(formatted)!;
+      // if the existing binding takes precedence, ignore this binding by continuing
+      if (
+        oldBinding[0] < distance ||
+        (oldBinding[0] === distance &&
+          Selector.calculateSpecificity(oldBinding[1].selector) >
+            Selector.calculateSpecificity(kb.selector))
+      ) {
+        continue;
+      }
+    }
+    activeBindings.set(formatted, [distance, kb]);
+  }
+
+  // Group shortcuts by distance
+  let maxDistance = -1;
+  const groupedBindings = new Map<number, CommandRegistry.IKeyBinding[]>();
+  for (let [distance, binding] of activeBindings.values()) {
+    maxDistance = Math.max(distance, maxDistance);
+    if (!groupedBindings.has(distance)) {
+      groupedBindings.set(distance, []);
+    }
+    groupedBindings.get(distance)!.push(binding);
+  }
+
+  // Display shortcuts by group
+  const bindingTable: any = [];
+  for (let d = 0; d <= maxDistance; d++) {
+    if (groupedBindings.has(d)) {
+      bindingTable.push(
+        groupedBindings.get(d)!.map(b => (
+          <tr className={SHORTCUT_TABLE_ROW_CLASS} key={b.command}>
+            <td className={SHORTCUT_TABLE_ITEM_CLASS}>{formatLabel(b)}</td>
+            <td className={SHORTCUT_TABLE_ITEM_CLASS}>
+              {formatKeys([...b.keys])}
+            </td>
+          </tr>
+        ))
+      );
+      bindingTable.push(<tr className={SHORTCUT_TABLE_LAST_ROW_CLASS}></tr>);
+    }
+  }
+
+  const body = (
+    <table>
+      <tbody>{bindingTable}</tbody>
+    </table>
+  );
+
+  return showDialog({
+    title: trans.__('Keyboard Shortcuts'),
+    body,
+    buttons: [
+      Dialog.cancelButton({
+        label: trans.__('Close')
+      })
+    ]
+  });
+}

package/src/themesplugins.ts

@@ -18,6 +18,8 @@ import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITranslator } from '@jupyterlab/translation';
 
+import scrollbarStyleText from '../style/scrollbar.raw.css';
+
 namespace CommandIDs {
   export const changeTheme = 'apputils:change-theme';
 
@@ -30,6 +32,13 @@ namespace CommandIDs {
   export const decrFontSize = 'apputils:decr-font-size';
 }
 
+function createStyleSheet(text: string): HTMLStyleElement {
+  const style = document.createElement('style');
+  style.setAttribute('type', 'text/css');
+  style.appendChild(document.createTextNode(text));
+  return style;
+}
+
 /**
  * The default theme manager provider.
  */
@@ -56,6 +65,7 @@ export const themesPlugin: JupyterFrontEndPlugin<IThemeManager> = {
       splash: splash ?? undefined,
       url
     });
+    let scrollbarsStyleElement: HTMLStyleElement | null = null;
 
     // Keep a synchronously set reference to the current theme,
     // since the asynchronous setting of the theme in `changeTheme`
@@ -76,6 +86,20 @@ export const themesPlugin: JupyterFrontEndPlugin<IThemeManager> = {
         document.body.dataset.jpThemeScrollbars = String(
           manager.themeScrollbars(currentTheme)
         );
+        if (manager.themeScrollbars(currentTheme)) {
+          if (!scrollbarsStyleElement) {
+            scrollbarsStyleElement = createStyleSheet(scrollbarStyleText);
+          }
+          if (!scrollbarsStyleElement.parentElement) {
+            document.body.appendChild(scrollbarsStyleElement);
+          }
+        } else {
+          if (scrollbarsStyleElement && scrollbarsStyleElement.parentElement) {
+            scrollbarsStyleElement.parentElement.removeChild(
+              scrollbarsStyleElement
+            );
+          }
+        }
       }
 
       commands.notifyCommandChanged(CommandIDs.changeTheme);

package/src/typings.d.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
+
+declare module '*.raw.css' {
+  const script: string;
+  export default script;
+}

package/style/base.css

@@ -6,3 +6,4 @@
 
 @import './notification.css';
 @import './splash.css';
+@import './contextualhelp.css';

package/style/contextualhelp.css

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
+
+:root {
+  --jp-private-shortcuts-key-padding-horizontal: 0.47em;
+  --jp-private-shortcuts-key-padding-vertical: 0.28em;
+  --jp-private-shortcuts-label-padding-horizontal: 0.47em;
+}
+
+.jp-ContextualShortcut-TableRow {
+  font-size: var(--jp-ui-font-size1);
+  font-family: var(--jp-ui-font-family);
+}
+
+.jp-ContextualShortcut-TableItem {
+  margin-left: auto;
+  margin-right: auto;
+  color: var(--jp-inverse-layout-color0);
+  font-size: var(--jp-ui-font-size1);
+  line-height: 2em;
+  padding-right: var(--jp-private-shortcuts-label-padding-horizontal);
+}
+
+.jp-ContextualShortcut-TableLastRow {
+  height: 2em;
+}
+
+.jp-ContextualShortcut-Key {
+  font-family: var(--jp-code-font-family);
+  border-width: var(--jp-border-width);
+  border-radius: var(--jp-border-radius);
+  border-style: solid;
+  border-color: var(--jp-border-color1);
+  color: var(--jp-ui-font-color1);
+  background: var(--jp-layout-color1);
+  padding-left: var(--jp-private-shortcuts-key-padding-horizontal);
+  padding-right: var(--jp-private-shortcuts-key-padding-horizontal);
+  padding-top: var(--jp-private-shortcuts-key-padding-vertical);
+  padding-bottom: var(--jp-private-shortcuts-key-padding-vertical);
+}

package/style/scrollbar.raw.css

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Jupyter Development Team.
+ * Distributed under the terms of the Modified BSD License.
+ */
+
+/*
+ * Webkit scrollbar styling.
+ * Separate file which is dynamically loaded based on user/theme settings.
+ */
+
+/* use standard opaque scrollbars for most nodes */
+
+::-webkit-scrollbar,
+::-webkit-scrollbar-corner {
+  background: var(--jp-scrollbar-background-color);
+}
+
+::-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);
+}
+
+::-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);
+}
+
+::-webkit-scrollbar-track:vertical {
+  border-top: var(--jp-scrollbar-endpad) solid
+    var(--jp-scrollbar-background-color);
+  border-bottom: var(--jp-scrollbar-endpad) solid
+    var(--jp-scrollbar-background-color);
+}
+
+/* for code nodes, use a transparent style of scrollbar */
+
+.CodeMirror-hscrollbar::-webkit-scrollbar,
+.CodeMirror-vscrollbar::-webkit-scrollbar,
+.CodeMirror-hscrollbar::-webkit-scrollbar-corner,
+.CodeMirror-vscrollbar::-webkit-scrollbar-corner {
+  background-color: transparent;
+}
+
+.CodeMirror-hscrollbar::-webkit-scrollbar-thumb,
+.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);
+}
+
+.CodeMirror-hscrollbar::-webkit-scrollbar-track:horizontal {
+  border-left: var(--jp-scrollbar-endpad) solid transparent;
+  border-right: var(--jp-scrollbar-endpad) solid transparent;
+}
+
+.CodeMirror-vscrollbar::-webkit-scrollbar-track:vertical {
+  border-top: var(--jp-scrollbar-endpad) solid transparent;
+  border-bottom: var(--jp-scrollbar-endpad) solid transparent;
+}