${mod.name}`
: `class="toggle">
+ `notion://www.notion.so/${
+ url.parse(id).pathname.split('/').reverse()[0] || ''
+ }/${url.parse(id).search || ''}`;
module.exports = (store, __exports) => {
- if (store().tabs) {
+ if ((store('mods')['e1692c29-475e-437b-b7ff-3eee872e1a42'] || {}).enabled) {
class Index extends React.PureComponent {
constructor() {
super(...arguments);
@@ -157,22 +161,39 @@ module.exports = (store, __exports) => {
const list = new Map(this.state.tabs);
while (this.state.tabs.get(id)) id++;
list.delete(id);
- if (this.views.html[id]) {
- this.views.html[id].style.opacity = '0';
- let unhide;
- unhide = () => {
- this.views.html[id].style.opacity = '';
- this.views.html[id].removeEventListener('did-stop-loading', unhide);
- };
- this.views.html[id].addEventListener('did-stop-loading', unhide);
- this.views.html[id].loadURL(this.views.current.$el().src);
- }
- this.openTab(id, list);
+ this.openTab(id, list, true);
}
- openTab(id, state = new Map(this.state.tabs)) {
+ openTab(id, state = new Map(this.state.tabs), load) {
if (!id && id !== 0) return;
this.views.current.id = id;
- this.setState({ tabs: state.set(id, true) }, this.focusTab.bind(this));
+ this.setState({ tabs: state.set(id, true) }, async () => {
+ this.focusTab();
+ if (load) {
+ await new Promise((res, rej) => {
+ let attempt;
+ attempt = setInterval(() => {
+ if (!document.body.contains(this.views.html[id])) return;
+ clearInterval(attempt);
+ res();
+ }, 50);
+ });
+ this.views.html[id].style.opacity = '0';
+ let unhide;
+ unhide = () => {
+ this.views.html[id].style.opacity = '';
+ this.views.html[id].removeEventListener(
+ 'did-stop-loading',
+ unhide
+ );
+ };
+ this.views.html[id].addEventListener('did-stop-loading', unhide);
+ this.views.html[id].loadURL(
+ store().default_page
+ ? idToNotionURL(store().default_page)
+ : this.views.current.$el().src
+ );
+ }
+ });
}
closeTab(id) {
if ((!id && id !== 0) || !this.state.tabs.get(id)) return;
@@ -219,11 +240,12 @@ module.exports = (store, __exports) => {
) {
this.views.tabs[event.target.id].children[0].innerText =
event.args[0];
+ const electronWindow = electron.remote.getCurrentWindow();
if (
event.target.id == this.views.current.id &&
- browserWindow.getTitle() !== event.args[0]
+ electronWindow.getTitle() !== event.args[0]
)
- browserWindow.setTitle(event.args[0]);
+ electronWindow.setTitle(event.args[0]);
}
}
startSearch(isPeekView) {
@@ -426,25 +448,41 @@ module.exports = (store, __exports) => {
this.setState({ zoomFactor });
}
);
+ let electronWindow;
+ try {
+ electronWindow = electron.remote.getCurrentWindow();
+ } catch (error) {
+ notionIpc.sendToMain('notion:log-error', {
+ level: 'error',
+ from: 'index',
+ type: 'GetCurrentWindowError',
+ error: error.message,
+ });
+ }
+ if (!electronWindow) {
+ this.setState({ error: true });
+ this.handleReload();
+ return;
+ }
const sendFullScreenChangeEvent = () => {
notionIpc.sendIndexToNotion(
$notion,
'notion:full-screen-changed'
);
};
- browserWindow.addListener(
+ electronWindow.addListener(
'enter-full-screen',
sendFullScreenChangeEvent
);
- browserWindow.addListener(
+ electronWindow.addListener(
'leave-full-screen',
sendFullScreenChangeEvent
);
- browserWindow.addListener(
+ electronWindow.addListener(
'enter-html-full-screen',
sendFullScreenChangeEvent
);
- browserWindow.addListener(
+ electronWindow.addListener(
'leave-html-full-screen',
sendFullScreenChangeEvent
);
@@ -717,13 +755,24 @@ module.exports = (store, __exports) => {
window['__start'] = () => {
document.head.innerHTML += ``;
+ // open menu on hotkey toggle
+ document.addEventListener('keyup', (event) => {
+ const hotkey = toKeyEvent(store().menu_toggle);
+ let triggered = true;
+ for (let prop in hotkey)
+ if (hotkey[prop] !== event[prop]) triggered = false;
+ if (triggered) electron.ipcRenderer.send('enhancer:open-menu');
+ });
+
const parsed = url.parse(window.location.href, true),
notionUrl =
parsed.query.path ||
- schemeHelpers.getSchemeUrl({
- httpUrl: config.default.baseURL,
- protocol: config.default.protocol,
- });
+ (store().default_page
+ ? idToNotionURL(store().default_page)
+ : schemeHelpers.getSchemeUrl({
+ httpUrl: config.default.baseURL,
+ protocol: config.default.protocol,
+ }));
delete parsed.search;
delete parsed.query;
const plainUrl = url.format(parsed);
@@ -753,6 +802,31 @@ module.exports = (store, __exports) => {
const __start = window['__start'];
window['__start'] = () => {
__start();
+
+ if (store().default_page) {
+ new Promise((res, rej) => {
+ let attempt;
+ attempt = setInterval(() => {
+ if (
+ !document.getElementById('notion') ||
+ !document.getElementById('notion').loadURL
+ )
+ return;
+ clearInterval(attempt);
+ res();
+ }, 50);
+ }).then(() => {
+ if (
+ document.getElementById('notion').getAttribute('src') ===
+ 'notion://www.notion.so'
+ ) {
+ document
+ .getElementById('notion')
+ .loadURL(idToNotionURL(store().default_page));
+ }
+ });
+ }
+
const dragarea = document.querySelector(
'#root [style*="-webkit-app-region: drag"]'
),
diff --git a/mods/tabs/mod.js b/mods/tabs/mod.js
new file mode 100644
index 0000000..1585c43
--- /dev/null
+++ b/mods/tabs/mod.js
@@ -0,0 +1,19 @@
+/*
+ * tabs
+ * (c) 2020 dragonwocky (https://dragonwocky.me/)
+ * under the MIT license
+ */
+
+'use strict';
+
+// this is just a pseudo mod to "separate" the options
+// from the core module - the core still handles actually
+// making it work.
+module.exports = {
+ id: 'e1692c29-475e-437b-b7ff-3eee872e1a42',
+ tags: ['core', 'extension'],
+ name: 'tabs',
+ desc: 'have multiple notion pages open in a single window.',
+ version: '0.1.0',
+ author: 'dragonwocky',
+};
diff --git a/pkg/helpers.js b/pkg/helpers.js
index 325433f..d64c628 100644
--- a/pkg/helpers.js
+++ b/pkg/helpers.js
@@ -130,6 +130,11 @@ function getEnhancements() {
))
)
throw Error;
+ mod.defaults = {};
+ for (let opt of mod.options || [])
+ mod.defaults[opt.key] = Array.isArray(opt.value)
+ ? opt.value[0]
+ : opt.value;
modules.IDs.push(mod.id);
modules.loaded.push({
...mod,
diff --git a/pkg/loader.js b/pkg/loader.js
index 00c7d27..93a92ef 100644
--- a/pkg/loader.js
+++ b/pkg/loader.js
@@ -60,7 +60,7 @@ module.exports = function (__file, __exports) {
...modules.loaded.filter((m) => !m.tags.includes('core')).reverse(),
]) {
if (
- (mod.tags || []).includes('core') ||
+ mod.id === '0f0bf8b6-eae6-4273-b307-8fc43f2ee082' ||
store('mods', { [mod.id]: { enabled: false } })[mod.id].enabled
) {
if (
@@ -84,20 +84,16 @@ module.exports = function (__file, __exports) {
});
}
if (mod.hacks && mod.hacks[__file]) {
- mod.defaults = {};
- for (let opt of mod.options || [])
- mod.defaults[opt.key] = Array.isArray(opt.value)
- ? opt.value[0]
- : opt.value;
- mod.hacks[__file](
- (...args) =>
- !args.length
- ? store(mod.id, mod.defaults)
- : args.length === 1 && typeof args[0] === 'object'
- ? store(mod.id, { ...mod.defaults, ...args[0] })
- : store(args[0], { ...mod.defaults, ...args[1] }),
- __exports
- );
+ mod.hacks[__file]((...args) => {
+ if (!args.length) return store(mod.id, mod.defaults);
+ if (args.length === 1 && typeof args[0] === 'object')
+ return store(mod.id, { ...mod.defaults, ...args[0] });
+ const other_mod = modules.loaded.find((m) => m.id === args[0]);
+ return store(args[0], {
+ ...(other_mod ? other_mod.defaults : {}),
+ ...args[1],
+ });
+ }, __exports);
}
}
}