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

ctrl+click open in new tab

Browse Source
This commit is contained in:
dragonwocky 2020-10-16 22:15:14 +11:00
parent d6a95a77df
commit 91ab4a1547
Signed by: dragonwocky
GPG Key ID: C7A48B7846AA706D
4 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mods/core/client.js
View File

@ -230,6 +230,12 @@ module.exports = (store, __exports) => {
electron.ipcRenderer.sendToHost('enhancer:set-tab-title', title); 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) { } else if (store().frameless && !store().tiling_mode) {
let sidebar_width; let sidebar_width;
function setSidebarWidth(list) { function setSidebarWidth(list) {

1
mods/core/createWindow.js
View File

@ -79,7 +79,6 @@ module.exports = (store, __exports) => {
}); });
electron.app.on('before-quit', () => (intended_quit = true)); electron.app.on('before-quit', () => (intended_quit = true));
window.loadURL(__exports.getIndexUrl(relativeUrl)); window.loadURL(__exports.getIndexUrl(relativeUrl));
window.webContents.openDevTools();
return window; return window;
}; };
return __exports.createWindow; return __exports.createWindow;

1
mods/core/enhancerMenu.js
View File

@ -132,7 +132,6 @@ window['__start'] = async () => {
if (hotkey[prop] !== event[prop]) triggered = false; if (hotkey[prop] !== event[prop]) 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();
console.log(event.ctrlKey, event.key);
// focus search // focus search
const meta = const meta =
!(event.ctrlKey || event.metaKey) && !event.altKey && !event.shiftKey; !(event.ctrlKey || event.metaKey) && !event.altKey && !event.shiftKey;

66
mods/core/render.js
View File

@ -42,7 +42,7 @@ module.exports = (store, __exports) => {
searching: false, searching: false,
searchingPeekView: false, searchingPeekView: false,
zoomFactor: 1, zoomFactor: 1,
tabs: new Map([[0, ['notion.so', true]]]), tabs: new Map([[0, { title: 'notion.so', open: true }]]),
slideIn: new Set(), slideIn: new Set(),
slideOut: new Set(), slideOut: new Set(),
}; };
@ -119,9 +119,11 @@ module.exports = (store, __exports) => {
} else { } else {
const list = [...this.state.tabs], const list = [...this.state.tabs],
fromIndex = list.findIndex( 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( list.splice(
toIndex > fromIndex ? toIndex - 1 : toIndex, toIndex > fromIndex ? toIndex - 1 : toIndex,
0, 0,
@ -216,12 +218,12 @@ module.exports = (store, __exports) => {
}); });
} }
newTab() { newTab(url = '') {
let id = 0; let id = 0;
const list = new Map(this.state.tabs); 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); list.delete(id);
this.openTab(id, { state: list, load: true }); this.openTab(id, { state: list, load: url || true });
} }
openTab( openTab(
id, id,
@ -236,22 +238,25 @@ module.exports = (store, __exports) => {
} }
) { ) {
if (!id && id !== 0) { 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( const currentIndex = [...state].findIndex(
([id, [title, open]]) => id === this.views.current.id ([id, { title, open }]) => id === this.views.current.id
); );
id = ([...state].find( id = (
([id, [title, open]], tabIndex) => open && tabIndex > currentIndex [...state].find(
) || [...state].find(([id, [title, open]]) => open))[0]; ([id, { title, open }], tabIndex) =>
open && tabIndex > currentIndex
) || [...state].find(([id, { title, open }]) => open)
).title;
} }
const current_src = this.views.current.$el().src; const current_src = this.views.current.$el().src;
this.views.current.id = id; this.views.current.id = id;
this.setState( this.setState(
{ {
tabs: state.set(id, [ tabs: state.set(id, {
state.get(id) ? state.get(id)[0] : 'notion.so', title: state.get(id) ? state.get(id).title : 'notion.so',
true, open: true,
]), }),
slideIn: load ? this.state.slideIn.add(id) : this.state.slideIn, slideIn: load ? this.state.slideIn.add(id) : this.state.slideIn,
slideOut: slideOut, slideOut: slideOut,
}, },
@ -277,7 +282,9 @@ module.exports = (store, __exports) => {
}; };
this.views.html[id].addEventListener('did-stop-loading', unhide); this.views.html[id].addEventListener('did-stop-loading', unhide);
this.views.html[id].loadURL( this.views.html[id].loadURL(
store().default_page typeof load === 'string'
? load
: store().default_page
? idToNotionURL(store().default_page) ? idToNotionURL(store().default_page)
: current_src : current_src
); );
@ -292,8 +299,8 @@ module.exports = (store, __exports) => {
closeTab(id) { closeTab(id) {
if ((!id && id !== 0) || !this.state.tabs.get(id)) return; if ((!id && id !== 0) || !this.state.tabs.get(id)) return;
const list = new Map(this.state.tabs); const list = new Map(this.state.tabs);
list.set(id, [list.get(id)[0], false]); list.set(id, { ...list.get(id), open: false });
if (![...list].filter(([id, [title, open]]) => open).length) if (![...list].filter(([id, { title, open }]) => open).length)
return electron.remote.getCurrentWindow().close(); return electron.remote.getCurrentWindow().close();
this.openTab( this.openTab(
this.views.current.id === id ? null : this.views.current.id, this.views.current.id === id ? null : this.views.current.id,
@ -310,7 +317,7 @@ module.exports = (store, __exports) => {
const selected = const selected =
id == this.views.current.id && id == this.views.current.id &&
this.state.tabs.get(+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'; this.views.loaded[id].style.display = selected ? 'flex' : 'none';
if (selected) { if (selected) {
this.views.active = +id; this.views.active = +id;
@ -318,9 +325,9 @@ module.exports = (store, __exports) => {
const electronWindow = electron.remote.getCurrentWindow(); const electronWindow = electron.remote.getCurrentWindow();
if ( if (
electronWindow && 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)) { if (this.state.tabs.get(+event.target.id)) {
this.setState({ this.setState({
tabs: new Map( tabs: new Map(
this.state.tabs.set(+event.target.id, [ this.state.tabs.set(+event.target.id, {
event.args[0], ...this.state.tabs.get(+event.target.id),
this.state.tabs.get(+event.target.id)[1], title: event.args[0],
]) })
), ),
}); });
const electronWindow = electron.remote.getCurrentWindow(); const electronWindow = electron.remote.getCurrentWindow();
@ -380,7 +387,7 @@ module.exports = (store, __exports) => {
this.selectTab(event.args[0]); this.selectTab(event.args[0]);
break; break;
case 'enhancer:new-tab': case 'enhancer:new-tab':
this.newTab(); this.newTab(event.args[0]);
break; break;
case 'enhancer:close-tab': case 'enhancer:close-tab':
if (document.querySelector('.tab.current .close')) if (document.querySelector('.tab.current .close'))
@ -533,6 +540,7 @@ module.exports = (store, __exports) => {
Object.entries(this.views.html) Object.entries(this.views.html)
.filter(([id, $notion]) => !this.views.loaded[id] && $notion) .filter(([id, $notion]) => !this.views.loaded[id] && $notion)
.forEach(([id, $notion]) => { .forEach(([id, $notion]) => {
if (!$notion) return;
this.views.loaded[id] = $notion; this.views.loaded[id] = $notion;
$notion.addEventListener('did-fail-load', (error) => { $notion.addEventListener('did-fail-load', (error) => {
// logger.info('Failed to load:', error); // logger.info('Failed to load:', error);
@ -649,9 +657,9 @@ module.exports = (store, __exports) => {
{ id: 'tabs' }, { id: 'tabs' },
...[...this.state.tabs] ...[...this.state.tabs]
.filter( .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( React.createElement(
'button', 'button',
{ {
@ -700,7 +708,7 @@ module.exports = (store, __exports) => {
} }
renderNotionContainer() { renderNotionContainer() {
this.views.react = Object.fromEntries( this.views.react = Object.fromEntries(
[...this.state.tabs].map(([id, [title, open]]) => { [...this.state.tabs].map(([id, { title, open }]) => {
return [ return [
id, id,
this.views.react[id] || this.views.react[id] ||