Merge branch 'master' into fix/1274

plugins/discord/back.ts

@@ -4,7 +4,7 @@ import { dev } from 'electron-is';
 
 import { SetActivity } from '@xhayper/discord-rpc/dist/structures/ClientUser';
 
-import registerCallback from '../../providers/song-info';
+import registerCallback, { type SongInfoCallback, type SongInfo } from '../../providers/song-info';
 
 import type { ConfigType } from '../../config/dynamic';
 
@@ -15,7 +15,7 @@ export interface Info {
   rpc: DiscordClient;
   ready: boolean;
   autoReconnect: boolean;
-  lastSongInfo?: import('../../providers/song-info').SongInfo;
+  lastSongInfo?: SongInfo;
 }
 
 const info: Info = {
@@ -39,36 +39,14 @@ const resetInfo = () => {
     console.log('discord disconnected');
   }
 
-  for (const cb of refreshCallbacks) {
-    cb();
-  }
+  setTimeout(() => {
+    for (const cb of refreshCallbacks) {
+      cb();
+    }
+  }, 100);
+
 };
 
-info.rpc.on('connected', () => {
-  if (dev()) {
-    console.log('discord connected');
-  }
-
-  for (const cb of refreshCallbacks) {
-    cb();
-  }
-});
-
-info.rpc.on('ready', () => {
-  info.ready = true;
-  if (info.lastSongInfo) {
-    updateActivity(info.lastSongInfo);
-  }
-});
-
-info.rpc.on('disconnected', () => {
-  resetInfo();
-
-  if (info.autoReconnect) {
-    connectTimeout();
-  }
-});
-
 const connectTimeout = () => new Promise((resolve, reject) => setTimeout(() => {
   if (!info.autoReconnect || info.rpc.isConnected) {
     return;
@@ -117,7 +95,7 @@ export const connect = (showError = false) => {
 };
 
 let clearActivity: NodeJS.Timeout | undefined;
-let updateActivity: import('../../providers/song-info').SongInfoCallback;
+let updateActivity: SongInfoCallback;
 
 type DiscordOptions = ConfigType<'discord'>;
 
@@ -125,6 +103,31 @@ export default (
   win: Electron.BrowserWindow,
   options: DiscordOptions,
 ) => {
+  info.rpc.on('connected', () => {
+    if (dev()) {
+      console.log('discord connected');
+    }
+
+    for (const cb of refreshCallbacks) {
+      cb();
+    }
+  });
+
+  info.rpc.on('ready', () => {
+    info.ready = true;
+    if (info.lastSongInfo) {
+      updateActivity(info.lastSongInfo);
+    }
+  });
+
+  info.rpc.on('disconnected', () => {
+    resetInfo();
+
+    if (info.autoReconnect) {
+      connectTimeout();
+    }
+  });
+
   info.autoReconnect = options.autoReconnect;
 
   window = win;

plugins/in-app-menu/menu/panel.ts

@@ -101,6 +101,15 @@ export const createPanel = (
     }
 
     panel.setAttribute('open', 'true');
+
+    // Children are placed below their parent item, which can cause
+    // long lists to squeeze their children at the bottom of the screen
+    // (This needs to be done *after* setAttribute)
+    panel.classList.remove('position-by-bottom');
+    if (options.placement === 'right' && panel.scrollHeight > panel.clientHeight ) {
+      panel.style.setProperty('--y', `${rect.y + rect.height}px`);
+      panel.classList.add('position-by-bottom');
+    }
   };
 
   anchor.addEventListener('click', () => {

plugins/in-app-menu/titlebar.css

@@ -80,6 +80,11 @@ menu-panel[open="true"] {
   opacity: 1;
   transform: scale(1);
 }
+menu-panel.position-by-bottom {
+  top: unset;
+  bottom: calc(100vh - var(--y, 100%));
+  max-height: calc(var(--y, 0) - var(--menu-bar-height, 36px) - 16px);
+}
 
 menu-item {
   -webkit-app-region: none;