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

better tab picking on close: find closest/next instead of jumping to first

Browse Source
This commit is contained in:
dragonwocky 2020-10-15 23:59:18 +11:00
parent b10ec8f136
commit ed5ededcbe
Signed by: dragonwocky
GPG Key ID: C7A48B7846AA706D
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mods/core/render.js
View File

@ -225,7 +225,12 @@ module.exports = (store, __exports) => {
openTab(id, state = new Map(this.state.tabs), load) { openTab(id, state = new Map(this.state.tabs), load) {
if (!id && id !== 0) { if (!id && id !== 0) {
if (state.get(this.views.current.id)[1]) return; if (state.get(this.views.current.id)[1]) return;
id = [...state].find(([id, [title, open]]) => open)[0]; const currentIndex = [...state].findIndex(
([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];
} }
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;
@ -280,9 +285,7 @@ module.exports = (store, __exports) => {
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 this.views.current.id === id ? null : this.views.current.id,
? null
: [...list].find(([id, [title, open]]) => open)[0],
list list
); );
} }