From 91ab4a15479151de249c2565af3a43d5d58793d5 Mon Sep 17 00:00:00 2001 From: dragonwocky Date: Fri, 16 Oct 2020 22:15:14 +1100 Subject: [PATCH] ctrl+click open in new tab --- mods/core/client.js | 6 ++++ mods/core/createWindow.js | 1 - mods/core/enhancerMenu.js | 1 - mods/core/render.js | 66 ++++++++++++++++++++++----------------- 4 files changed, 43 insertions(+), 31 deletions(-) diff --git a/mods/core/client.js b/mods/core/client.js index 29f6b6b..2d8d458 100644 --- a/mods/core/client.js +++ b/mods/core/client.js @@ -230,6 +230,12 @@ module.exports = (store, __exports) => { electron.ipcRenderer.sendToHost('enhancer:set-tab-title', title); } }; + __electronApi.openInNewWindow = (urlPath) => { + electron.ipcRenderer.sendToHost( + 'enhancer:new-tab', + `notion://www.notion.so${urlPath}` + ); + }; } else if (store().frameless && !store().tiling_mode) { let sidebar_width; function setSidebarWidth(list) { diff --git a/mods/core/createWindow.js b/mods/core/createWindow.js index fb37b5a..47165d0 100644 --- a/mods/core/createWindow.js +++ b/mods/core/createWindow.js @@ -79,7 +79,6 @@ module.exports = (store, __exports) => { }); electron.app.on('before-quit', () => (intended_quit = true)); window.loadURL(__exports.getIndexUrl(relativeUrl)); - window.webContents.openDevTools(); return window; }; return __exports.createWindow; diff --git a/mods/core/enhancerMenu.js b/mods/core/enhancerMenu.js index 7a4829d..cdea17f 100644 --- a/mods/core/enhancerMenu.js +++ b/mods/core/enhancerMenu.js @@ -132,7 +132,6 @@ window['__start'] = async () => { if (hotkey[prop] !== event[prop]) triggered = false; if (triggered || ((event.ctrlKey || event.metaKey) && event.key === 'w')) electron.remote.getCurrentWindow().close(); - console.log(event.ctrlKey, event.key); // focus search const meta = !(event.ctrlKey || event.metaKey) && !event.altKey && !event.shiftKey; diff --git a/mods/core/render.js b/mods/core/render.js index a6ffa30..12cf0b5 100644 --- a/mods/core/render.js +++ b/mods/core/render.js @@ -42,7 +42,7 @@ module.exports = (store, __exports) => { searching: false, searchingPeekView: false, zoomFactor: 1, - tabs: new Map([[0, ['notion.so', true]]]), + tabs: new Map([[0, { title: 'notion.so', open: true }]]), slideIn: new Set(), slideOut: new Set(), }; @@ -119,9 +119,11 @@ module.exports = (store, __exports) => { } else { const list = [...this.state.tabs], fromIndex = list.findIndex( - ([id, [title, open]]) => id === from[0] + ([id, { title, open }]) => id === from[0] ), - toIndex = list.findIndex(([id, [title, open]]) => id === to[0]); + toIndex = list.findIndex( + ([id, { title, open }]) => id === to[0] + ); list.splice( toIndex > fromIndex ? toIndex - 1 : toIndex, 0, @@ -216,12 +218,12 @@ module.exports = (store, __exports) => { }); } - newTab() { + newTab(url = '') { let id = 0; const list = new Map(this.state.tabs); - while (this.state.tabs.get(id) && this.state.tabs.get(id)[1]) id++; + while (this.state.tabs.get(id) && this.state.tabs.get(id).open) id++; list.delete(id); - this.openTab(id, { state: list, load: true }); + this.openTab(id, { state: list, load: url || true }); } openTab( id, @@ -236,22 +238,25 @@ module.exports = (store, __exports) => { } ) { if (!id && id !== 0) { - if (state.get(this.views.current.id)[1]) return; + if (state.get(this.views.current.id).open) return; const currentIndex = [...state].findIndex( - ([id, [title, open]]) => id === this.views.current.id + ([id, { title, open }]) => id === this.views.current.id ); - id = ([...state].find( - ([id, [title, open]], tabIndex) => open && tabIndex > currentIndex - ) || [...state].find(([id, [title, open]]) => open))[0]; + id = ( + [...state].find( + ([id, { title, open }], tabIndex) => + open && tabIndex > currentIndex + ) || [...state].find(([id, { title, open }]) => open) + ).title; } const current_src = this.views.current.$el().src; this.views.current.id = id; this.setState( { - tabs: state.set(id, [ - state.get(id) ? state.get(id)[0] : 'notion.so', - true, - ]), + tabs: state.set(id, { + title: state.get(id) ? state.get(id).title : 'notion.so', + open: true, + }), slideIn: load ? this.state.slideIn.add(id) : this.state.slideIn, slideOut: slideOut, }, @@ -277,7 +282,9 @@ module.exports = (store, __exports) => { }; this.views.html[id].addEventListener('did-stop-loading', unhide); this.views.html[id].loadURL( - store().default_page + typeof load === 'string' + ? load + : store().default_page ? idToNotionURL(store().default_page) : current_src ); @@ -292,8 +299,8 @@ module.exports = (store, __exports) => { closeTab(id) { if ((!id && id !== 0) || !this.state.tabs.get(id)) return; const list = new Map(this.state.tabs); - list.set(id, [list.get(id)[0], false]); - if (![...list].filter(([id, [title, open]]) => open).length) + list.set(id, { ...list.get(id), open: false }); + if (![...list].filter(([id, { title, open }]) => open).length) return electron.remote.getCurrentWindow().close(); this.openTab( this.views.current.id === id ? null : this.views.current.id, @@ -310,7 +317,7 @@ module.exports = (store, __exports) => { const selected = id == this.views.current.id && this.state.tabs.get(+id) && - this.state.tabs.get(+id)[1]; + this.state.tabs.get(+id).open; this.views.loaded[id].style.display = selected ? 'flex' : 'none'; if (selected) { this.views.active = +id; @@ -318,9 +325,9 @@ module.exports = (store, __exports) => { const electronWindow = electron.remote.getCurrentWindow(); if ( electronWindow && - electronWindow.getTitle() !== this.state.tabs.get(+id)[0] + electronWindow.getTitle() !== this.state.tabs.get(+id).title ) { - electronWindow.setTitle(this.state.tabs.get(+id)[0]); + electronWindow.setTitle(this.state.tabs.get(+id).title); } } } @@ -362,10 +369,10 @@ module.exports = (store, __exports) => { if (this.state.tabs.get(+event.target.id)) { this.setState({ tabs: new Map( - this.state.tabs.set(+event.target.id, [ - event.args[0], - this.state.tabs.get(+event.target.id)[1], - ]) + this.state.tabs.set(+event.target.id, { + ...this.state.tabs.get(+event.target.id), + title: event.args[0], + }) ), }); const electronWindow = electron.remote.getCurrentWindow(); @@ -380,7 +387,7 @@ module.exports = (store, __exports) => { this.selectTab(event.args[0]); break; case 'enhancer:new-tab': - this.newTab(); + this.newTab(event.args[0]); break; case 'enhancer:close-tab': if (document.querySelector('.tab.current .close')) @@ -533,6 +540,7 @@ module.exports = (store, __exports) => { Object.entries(this.views.html) .filter(([id, $notion]) => !this.views.loaded[id] && $notion) .forEach(([id, $notion]) => { + if (!$notion) return; this.views.loaded[id] = $notion; $notion.addEventListener('did-fail-load', (error) => { // logger.info('Failed to load:', error); @@ -649,9 +657,9 @@ module.exports = (store, __exports) => { { id: 'tabs' }, ...[...this.state.tabs] .filter( - ([id, [title, open]]) => open || this.state.slideOut.has(id) + ([id, { title, open }]) => open || this.state.slideOut.has(id) ) - .map(([id, [title, open]]) => + .map(([id, { title, open }]) => React.createElement( 'button', { @@ -700,7 +708,7 @@ module.exports = (store, __exports) => { } renderNotionContainer() { this.views.react = Object.fromEntries( - [...this.state.tabs].map(([id, [title, open]]) => { + [...this.state.tabs].map(([id, { title, open }]) => { return [ id, this.views.react[id] ||