Merge pull request #439 from ONLYOFFICE/bugfix/fix-hotkeys-scrolling

Web: Hotkeys: fixed scroll focus
ONLYOFFICE · May 28, 2024 · d9b1ec3 · d9b1ec3
2 parents 015956d + 61b00dd
commit d9b1ec3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/client/src/store/AccountsHotkeysStore.ts b/packages/client/src/store/AccountsHotkeysStore.ts
@@ -255,7 +255,11 @@ class AccountsHotkeysStore {
       const scroll = document.getElementsByClassName(
         "section-scroll",
       ) as HTMLCollectionOf<HTMLElement>;
-      if (scroll && scroll[0]) scroll[0].focus();
+
+      if (scroll && scroll[0]) {
+        const scrollElem = scroll[0]?.firstChild as HTMLElement;
+        scrollElem?.focus();
+      }
     }
 
     if (!this.hotkeyCaret && selection.length) {

diff --git a/packages/client/src/store/HotkeyStore.js b/packages/client/src/store/HotkeyStore.js
@@ -135,7 +135,7 @@ class HotkeyStore {
 
     if (!hotkeyCaret) {
       const scroll = document.getElementsByClassName("section-scroll");
-      scroll && scroll[0] && scroll[0].focus();
+      scroll && scroll[0] && scroll[0]?.firstChild.focus();
     }
 
     if (!hotkeyCaret && selection.length) {