dragonwocky/notion-enhancer
1
0
Fork 0
mirror of https://github.com/notion-enhancer/notion-enhancer.git synced 2025-04-09 23:19:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix menu hotkey + tab title emojis on macOS

Browse Source
This commit is contained in:
dragonwocky 2020-11-01 12:04:04 +11:00
parent eeea1c6b53
commit dccef7815f
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repo/core/client.js
View File

@ -25,7 +25,11 @@ module.exports = (store, __exports) => {
const hotkey = toKeyEvent(store().menu_toggle); const hotkey = toKeyEvent(store().menu_toggle);
let triggered = true; let triggered = true;
for (let prop in hotkey) for (let prop in hotkey)
if (hotkey[prop] !== event[prop]) triggered = false; if (
hotkey[prop] !== event[prop] &&
!(prop === 'key' && event[prop] === 'Dead')
)
triggered = false;
if (triggered) electron.ipcRenderer.send('enhancer:open-menu'); if (triggered) electron.ipcRenderer.send('enhancer:open-menu');
if (tabsEnabled) { if (tabsEnabled) {
// switch between tabs via key modifier // switch between tabs via key modifier
@ -214,6 +218,10 @@ module.exports = (store, __exports) => {
if (tabsEnabled) { if (tabsEnabled) {
let tab_title = ''; let tab_title = '';
if (process.platform === 'darwin')
document
.querySelector('.notion-sidebar [style*="37px"]:empty')
.remove();
const TITLE_OBSERVER = new MutationObserver(() => const TITLE_OBSERVER = new MutationObserver(() =>
__electronApi.setWindowTitle('notion.so') __electronApi.setWindowTitle('notion.so')
); );
@ -232,7 +240,11 @@ module.exports = (store, __exports) => {
), ),
text = $container.querySelector('[placeholder="Untitled"]'); text = $container.querySelector('[placeholder="Untitled"]');
title = title =
(icon ? `<img src="${icon.getAttribute('src')}">` : '') + (icon
? icon.getAttribute('src')
? `<img src="${icon.getAttribute('src')}">`
: `${icon.getAttribute('aria-label')} `
: '') +
(text (text
? text.innerText ? text.innerText
: [ : [

6
repo/core/enhancerMenu.js
View File

@ -131,7 +131,11 @@ window['__start'] = async () => {
const hotkey = toKeyEvent(coreStore().menu_toggle); const hotkey = toKeyEvent(coreStore().menu_toggle);
let triggered = true; let triggered = true;
for (let prop in hotkey) for (let prop in hotkey)
if (hotkey[prop] !== event[prop]) triggered = false; if (
hotkey[prop] !== event[prop] &&
!(prop === 'key' && event[prop] === 'Dead')
)
triggered = false;
if (triggered || ((event.ctrlKey || event.metaKey) && event.key === 'w')) if (triggered || ((event.ctrlKey || event.metaKey) && event.key === 'w'))
electron.remote.getCurrentWindow().close(); electron.remote.getCurrentWindow().close();
// focus search // focus search

6
repo/core/render.js
View File

@ -994,7 +994,11 @@ module.exports = (store, __exports) => {
const hotkey = toKeyEvent(store().menu_toggle); const hotkey = toKeyEvent(store().menu_toggle);
let triggered = true; let triggered = true;
for (let prop in hotkey) for (let prop in hotkey)
if (hotkey[prop] !== event[prop]) triggered = false; if (
hotkey[prop] !== event[prop] &&
!(prop === 'key' && event[prop] === 'Dead')
)
triggered = false;
if (triggered) electron.ipcRenderer.send('enhancer:open-menu'); if (triggered) electron.ipcRenderer.send('enhancer:open-menu');
}); });