From ee969fed3292e5d031c2c4dbea014905037966c1 Mon Sep 17 00:00:00 2001
From: Jeremy Tuloup <jeremy.tuloup@gmail.com>
Date: Sun, 3 Apr 2022 12:05:57 +0200
Subject: [PATCH] Switch to create new dropdown

---
 packages/tree-extension/schema/widget.json | 12 ++--
 packages/tree-extension/src/index.ts       | 67 +++++++++++-----------
 packages/tree-extension/style/base.css     | 21 ++-----
 3 files changed, 44 insertions(+), 56 deletions(-)

diff --git a/packages/tree-extension/schema/widget.json b/packages/tree-extension/schema/widget.json
index 10a91e729..e62f7c358 100644
--- a/packages/tree-extension/schema/widget.json
+++ b/packages/tree-extension/schema/widget.json
@@ -3,14 +3,10 @@
   "description": "File Browser widget settings.",
   "jupyter.lab.toolbars": {
     "FileBrowser": [
-      { "name": "spacer", "type": "spacer", "rank": 0 },
-      {
-        "name": "new-directory",
-        "command": "filebrowser:create-new-directory",
-        "rank": 10
-      },
-      { "name": "uploader", "rank": 20 },
-      { "name": "refresh", "command": "filebrowser:refresh", "rank": 30 }
+      { "name": "spacer", "type": "spacer", "rank": 900 },
+      { "name": "new-dropdown", "rank": 1000 },
+      { "name": "uploader", "rank": 1010 },
+      { "name": "refresh", "command": "filebrowser:refresh", "rank": 1020 }
     ]
   },
   "jupyter.lab.transform": true,
diff --git a/packages/tree-extension/src/index.ts b/packages/tree-extension/src/index.ts
index bd5b58bff..feb1151a1 100644
--- a/packages/tree-extension/src/index.ts
+++ b/packages/tree-extension/src/index.ts
@@ -24,15 +24,9 @@ import { IRunningSessionManagers, RunningSessions } from '@jupyterlab/running';
 
 import { ITranslator } from '@jupyterlab/translation';
 
-import {
-  consoleIcon,
-  folderIcon,
-  notebookIcon,
-  runningIcon,
-  terminalIcon
-} from '@jupyterlab/ui-components';
+import { folderIcon, runningIcon } from '@jupyterlab/ui-components';
 
-import { TabPanel } from '@lumino/widgets';
+import { Menu, MenuBar, TabPanel } from '@lumino/widgets';
 
 const FILE_BROWSER_FACTORY = 'FileBrowser';
 
@@ -43,36 +37,45 @@ const FILE_BROWSER_FACTORY = 'FileBrowser';
 const createNew: JupyterFrontEndPlugin<void> = {
   id: '@jupyter-notebook/tree-extension:new',
   requires: [ITranslator],
+  optional: [IToolbarWidgetRegistry],
   autoStart: true,
-  activate: (app: JupyterFrontEnd, translator: ITranslator) => {
+  activate: (
+    app: JupyterFrontEnd,
+    translator: ITranslator,
+    toolbarRegistry: IToolbarWidgetRegistry | null
+  ) => {
     const { commands } = app;
     const trans = translator.load('notebook');
 
-    // wrapper commands to be able to override the label
-    const newNotebookCommand = 'tree:new-notebook';
-    commands.addCommand(newNotebookCommand, {
-      label: trans.__('New Notebook'),
-      icon: notebookIcon,
-      execute: () => {
-        return commands.execute('notebook:create-new');
-      }
+    const menubar = new MenuBar();
+    const newMenu = new Menu({ commands });
+    newMenu.title.label = trans.__('New');
+    menubar.addMenu(newMenu);
+
+    const newCommands = [
+      'notebook:create-new',
+      'filebrowser:create-new-file',
+      'filebrowser:create-new-directory',
+      'terminal:create-new',
+      'console:create'
+    ];
+
+    newCommands.forEach(command => {
+      newMenu.addItem({ command });
     });
 
-    commands.addCommand('tree:new-terminal', {
-      label: trans.__('New Terminal'),
-      icon: terminalIcon,
-      execute: () => {
-        return commands.execute('terminal:create-new');
-      }
-    });
-
-    commands.addCommand('tree:new-console', {
-      label: trans.__('New Console'),
-      icon: consoleIcon,
-      execute: () => {
-        return commands.execute('console:create');
-      }
-    });
+    if (toolbarRegistry) {
+      toolbarRegistry.registerFactory(
+        FILE_BROWSER_FACTORY,
+        'new-dropdown',
+        (browser: FileBrowser) => {
+          const menubar = new MenuBar();
+          menubar.addMenu(newMenu);
+          menubar.addClass('jp-DropdownMenu');
+          return menubar;
+        }
+      );
+    }
   }
 };
 
diff --git a/packages/tree-extension/style/base.css b/packages/tree-extension/style/base.css
index a22925be4..5dd890d1d 100644
--- a/packages/tree-extension/style/base.css
+++ b/packages/tree-extension/style/base.css
@@ -29,22 +29,11 @@
   padding-right: 5px;
 }
 
-/* Override the style from upstream JupyterLab */
-.jp-FileBrowser-toolbar.jp-Toolbar
-  .jp-Toolbar-item:first-child
-  .jp-ToolbarButtonComponent {
-  width: auto;
-  background: unset;
-  padding-left: 5px;
-  padding-right: 5px;
-}
-
-.jp-FileBrowser-toolbar.jp-Toolbar
-  .jp-Toolbar-item:first-child
-  .jp-ToolbarButtonComponent:hover {
-  background-color: var(--jp-layout-color2);
-}
-
 .jp-FileBrowser-toolbar.jp-Toolbar .jp-ToolbarButtonComponent {
   width: unset;
 }
+
+.jp-FileBrowser-toolbar > .jp-Toolbar-item {
+  flex-direction: column;
+  justify-content: center;
+}