smueller/youtube-music
1
0
Fork 0
mirror of https://github.com/th-ch/youtube-music.git synced 2026-01-11 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1025 from Araxeus/fix-PiP-hotkey-active-in-search

Browse Source 
[PiP] fix hotkey activating when typing in the search box
This commit is contained in:
th-ch
2023-02-12 18:34:29 +01:00
committed by GitHub
parent 7df7b32eea d9f1c589e9
commit 735fd39c3c
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -116,6 +116,8 @@
"filenamify": "^4.3.0",
"howler": "^2.2.3",
"html-to-text": "^9.0.3",
"keyboardevent-from-electron-accelerator": "^2.0.0",
"keyboardevents-areequal": "^0.2.2",
"md5": "^2.3.0",
"mpris-service": "^2.1.2",
"node-fetch": "^2.6.8",

3
plugins/picture-in-picture/back.js
View File

@ -92,9 +92,6 @@ module.exports = (_win, _options) => {
ipcMain.on("picture-in-picture", async () => {
await togglePiP();
});
if (options.hotkey) {
electronLocalshortcut.register(win, options.hotkey, togglePiP);
}
};
module.exports.setOptions = setLocalOptions;

18
plugins/picture-in-picture/front.js
View File

@ -1,5 +1,8 @@
const { ipcRenderer } = require("electron");
const { toKeyEvent } = require('keyboardevent-from-electron-accelerator');
const keyEventAreEqual = require('keyboardevents-areequal');
const { getSongMenu } = require("../../providers/dom-elements");
const { ElementFromFile, templatePath } = require("../utils");
@ -78,7 +81,7 @@ const listenForToggle = () => {
});
}
function observeMenu(options) {
function observeMenu() {
document.addEventListener(
"apiLoaded",
() => {
@ -101,4 +104,15 @@ function observeMenu(options) {
);
}
module.exports = observeMenu;
module.exports = (options) => {
observeMenu();
if (options.hotkey) {
const hotkeyEvent = toKeyEvent(options.hotkey);
window.addEventListener('keydown', (event) => {
if (keyEventAreEqual(event, hotkeyEvent) && !$('ytmusic-search-box').opened) {
togglePictureInPicture();
}
});
}
};

4
yarn.lock
View File

@ -5518,7 +5518,7 @@ __metadata:
languageName: node
linkType: hard
"keyboardevents-areequal@npm:^0.2.1":
"keyboardevents-areequal@npm:^0.2.1, keyboardevents-areequal@npm:^0.2.2":
version: 0.2.2
resolution: "keyboardevents-areequal@npm:0.2.2"
checksum: 05d846f75170238bbb9ed45d13ca9c6cd3e68ea8ba6b7727971790fa55b44c3386ec8b9c321ae72dae0d0944678d0dc2b922148fe67d3f9720bf30a23999dd65
@ -8979,6 +8979,8 @@ __metadata:
filenamify: ^4.3.0
howler: ^2.2.3
html-to-text: ^9.0.3
keyboardevent-from-electron-accelerator: ^2.0.0
keyboardevents-areequal: ^0.2.2
md5: ^2.3.0
mpris-service: ^2.1.2
node-fetch: ^2.6.8