Fix scrolling on g g and G (#137)

* Fix scrolling on `g g` and `G` * Ensure cell is focused after scrolling Co-authored-by: ianhi <[email protected]> * Lint --------- Co-authored-by: ianhi <[email protected]>
jupyterlab-contrib · Feb 8, 2024 · 7aa48c1 · 7aa48c1
1 parent a6520ef
commit 7aa48c1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/package.json b/package.json
@@ -67,7 +67,6 @@
         "@lumino/commands": "^2.0.1",
         "@lumino/coreutils": "^2.0.0",
         "@lumino/disposable": "^2.1.2",
-        "@lumino/domutils": "^2.0.0",
         "@replit/codemirror-vim": "^6.0.14",
         "react": "^18.2.0"
     },

diff --git a/src/labCommands.ts b/src/labCommands.ts
@@ -10,7 +10,6 @@ import {
 import { ReadonlyPartialJSONObject } from '@lumino/coreutils';
 
 import { IDisposable } from '@lumino/disposable';
-import { ElementExt } from '@lumino/domutils';
 
 export function addNotebookCommands(
   app: JupyterFrontEnd,
@@ -238,37 +237,35 @@ export function addNotebookCommands(
     }),
     commands.addCommand('vim:select-first-cell', {
       label: 'Select First Cell',
-      execute: args => {
+      execute: async args => {
         const current = getCurrent(args);
 
         if (current) {
           const { content } = current;
           content.activeCellIndex = 0;
           content.deselectAll();
           if (content.activeCell !== null) {
-            ElementExt.scrollIntoViewIfNeeded(
-              content.node,
-              content.activeCell.node
-            );
+            // note: using `scrollToItem` because `scrollToCell` changes mode (activate the cell)
+            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) {
-            ElementExt.scrollIntoViewIfNeeded(
-              content.node,
-              content.activeCell.node
-            );
+            // note: using `scrollToItem` because `scrollToCell` changes mode (activates the cell)
+            await content.scrollToItem(content.activeCellIndex, 'smart');
+            content.activeCell.node.focus();
           }
         }
       },

diff --git a/yarn.lock b/yarn.lock
@@ -31,7 +31,6 @@ __metadata:
     "@lumino/commands": ^2.0.1
     "@lumino/coreutils": ^2.0.0
     "@lumino/disposable": ^2.1.2
-    "@lumino/domutils": ^2.0.0
     "@replit/codemirror-vim": ^6.0.14
     "@types/codemirror": ^0.0.87
     "@types/json-schema": ^7.0.11