Ensure cell is focused after scrolling

Co-authored-by: ianhi <[email protected]>
jupyterlab-contrib · Feb 8, 2024 · be7c017 · be7c017
1 parent 6e9656a
commit be7c017
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/labCommands.ts b/src/labCommands.ts
@@ -237,7 +237,7 @@ export function addNotebookCommands(
     }),
     commands.addCommand('vim:select-first-cell', {
       label: 'Select First Cell',
-      execute: args => {
+      execute: async (args) => {
         const current = getCurrent(args);
 
         if (current) {
@@ -246,24 +246,26 @@ export function addNotebookCommands(
           content.deselectAll();
           if (content.activeCell !== null) {
             // note: using `scrollToItem` because `scrollToCell` changes mode (activate the cell)
-            content.scrollToItem(content.activeCellIndex, 'smart');
+            await content.scrollToItem(content.activeCellIndex, 'smart');
+            content.activeCell.node.focus();
           }
         }
       },
       isEnabled
     }),
     commands.addCommand('vim:select-last-cell', {
       label: 'Select Last Cell',
-      execute: args => {
+      execute: async (args) => {
         const current = getCurrent(args);
 
         if (current) {
           const { content } = current;
           content.activeCellIndex = current.content.widgets.length - 1;
           content.deselectAll();
           if (content.activeCell !== null) {
-            // note: using `scrollToItem` because `scrollToCell` changes mode (activate the cell)
-            content.scrollToItem(content.activeCellIndex, 'smart');
+            // note: using `scrollToItem` because `scrollToCell` changes mode (activates the cell)
+            await content.scrollToItem(content.activeCellIndex, 'smart');
+            content.activeCell.node.focus();
           }
         }
       },