1 files changed, 45 insertions, 7 deletions

diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index bdc95127b..50ff0e2b3 100644
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -9,6 +9,7 @@ import { AuthService, AuthStatus, AuthUser, MenuService, RedirectService, Screen
 import { LanguageChooserComponent } from '@app/menu/language-chooser.component'
 import { QuickSettingsModalComponent } from '@app/modal/quick-settings-modal.component'
 import { ServerConfig, UserRight, VideoConstant } from '@shared/models'
+import { NgbDropdown, NgbDropdownConfig } from '@ng-bootstrap/ng-bootstrap'
 
 const logger = debug('peertube:menu:MenuComponent')
 
@@ -20,6 +21,7 @@ const logger = debug('peertube:menu:MenuComponent')
 export class MenuComponent implements OnInit {
   @ViewChild('languageChooserModal', { static: true }) languageChooserModal: LanguageChooserComponent
   @ViewChild('quickSettingsModal', { static: true }) quickSettingsModal: QuickSettingsModalComponent
+  @ViewChild('dropdown') dropdown: NgbDropdown
 
   user: AuthUser
   isLoggedIn: boolean
@@ -30,8 +32,6 @@ export class MenuComponent implements OnInit {
   videoLanguages: string[] = []
   nsfwPolicy: string
 
-  loggedInMorePlacement: string
-
   currentInterfaceLanguage: string
 
   private languages: VideoConstant<string>[] = []
@@ -54,8 +54,27 @@ export class MenuComponent implements OnInit {
     private hotkeysService: HotkeysService,
     private screenService: ScreenService,
     private menuService: MenuService,
+    private dropdownConfig: NgbDropdownConfig,
     private router: Router
-  ) { }
+  ) {
+    this.dropdownConfig.container = 'body'
+  }
+
+  get isInMobileView () {
+    return this.screenService.isInMobileView()
+  }
+
+  get dropdownContainer () {
+    if (this.isInMobileView) {
+      return null
+    } else {
+      return this.dropdownConfig.container
+    }
+  }
+
+  get language () {
+    return this.languageChooserModal.getCurrentLanguage()
+  }
 
   get instanceName () {
     return this.serverConfig.instance.name
@@ -76,10 +95,6 @@ export class MenuComponent implements OnInit {
 
     this.computeAdminAccess()
 
-    this.loggedInMorePlacement = this.screenService.isInMobileView()
-      ? 'left-top auto'
-      : 'right-top auto'
-
     this.currentInterfaceLanguage = this.languageChooserModal.getCurrentLanguage()
 
     this.authService.loginChangedSource.subscribe(
@@ -203,6 +218,29 @@ export class MenuComponent implements OnInit {
     }
   }
 
+  // Lock menu scroll when menu scroll to avoid fleeing / detached dropdown
+  onMenuScrollEvent () {
+    document.querySelector('menu').scrollTo(0, 0)
+  }
+
+  onDropdownOpenChange (opened: boolean) {
+    if (this.screenService.isInMobileView()) return
+
+    // Close dropdown when window scroll to avoid dropdown quick jump for re-position
+    const onWindowScroll = () => {
+      this.dropdown.close()
+      window.removeEventListener('scroll', onWindowScroll)
+    }
+
+    if (opened) {
+      window.addEventListener('scroll', onWindowScroll)
+      document.querySelector('menu').scrollTo(0, 0) // Reset menu scroll to easy lock
+      document.querySelector('menu').addEventListener('scroll', this.onMenuScrollEvent)
+    } else {
+      document.querySelector('menu').removeEventListener('scroll', this.onMenuScrollEvent)
+    }
+  }
+
   private buildUserLanguages () {
     if (!this.user) {
       this.videoLanguages = []