From 3af07ca21a3351dbac07cb9106350fc86af38a87 Mon Sep 17 00:00:00 2001
From: dragonwocky <thedragonring.bod@gmail.com>
Date: Sun, 12 Dec 2021 23:13:17 +1100
Subject: [PATCH] notion window helpers, pull submodules

---
 insert/api             |  2 +-
 insert/electronApi.cjs |  9 +++++++++
 insert/env/env.mjs     | 11 -----------
 insert/env/fs.mjs      |  4 ----
 insert/repo            |  2 +-
 insert/worker.cjs      | 21 +++++++++++++++++----
 6 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/insert/api b/insert/api
index 069a172..f5613ab 160000
--- a/insert/api
+++ b/insert/api
@@ -1 +1 @@
-Subproject commit 069a17207a45c6e13af7c884b5ff67fa9f195543
+Subproject commit f5613ab6b1ca4abffb597a81433a1557fc642533
diff --git a/insert/electronApi.cjs b/insert/electronApi.cjs
index 71de537..4efb25f 100644
--- a/insert/electronApi.cjs
+++ b/insert/electronApi.cjs
@@ -133,5 +133,14 @@ globalThis.__enhancerElectronApi = {
     return reload();
   },
 
+  getNotionWindows: () => {
+    const { getNotionWindows } = require('notion-enhancer/worker.cjs');
+    return getNotionWindows();
+  },
+  getFocusedNotionWindow: () => {
+    const { getFocusedNotionWindow } = require('notion-enhancer/worker.cjs');
+    return getFocusedNotionWindow();
+  },
+
   ipcRenderer,
 };
diff --git a/insert/env/env.mjs b/insert/env/env.mjs
index d65abc9..f5010b9 100644
--- a/insert/env/env.mjs
+++ b/insert/env/env.mjs
@@ -42,14 +42,3 @@ export const focusNotion = globalThis.__enhancerElectronApi.focusNotion;
  * @type {function}
  */
 export const reload = globalThis.__enhancerElectronApi.reload;
-
-/**
- * require() notion app files
- * @param {string} path - within notion/resources/app/ e.g. main/createWindow.js
- *
- * @env win32
- * @env linux
- * @env darwin
- * @runtime electron
- */
-export const notionRequire = globalThis.__enhancerElectronApi.notionRequire;
diff --git a/insert/env/fs.mjs b/insert/env/fs.mjs
index f5cc57f..79bf0ae 100644
--- a/insert/env/fs.mjs
+++ b/insert/env/fs.mjs
@@ -77,10 +77,6 @@ export const isFile = async (path) => {
 /**
  * get an absolute path to files within notion
  * @param {string} path - relative to the root notion/resources/app/ e.g. renderer/search.js
- *
- * @env win32
- * @env linux
- * @env darwin
  * @runtime electron
  */
 export const notionPath = globalThis.__enhancerElectronApi.notionPath;
diff --git a/insert/repo b/insert/repo
index 0298578..2f602a3 160000
--- a/insert/repo
+++ b/insert/repo
@@ -1 +1 @@
-Subproject commit 0298578df4d088dd4ad847b9311c72c8caa7aee8
+Subproject commit 2f602a34b3293a7ece50dfa2bc8d22997102e65f
diff --git a/insert/worker.cjs b/insert/worker.cjs
index 9434755..dbc5e4f 100644
--- a/insert/worker.cjs
+++ b/insert/worker.cjs
@@ -69,11 +69,24 @@ module.exports.focusMenu = async () => {
   });
 };
 
+module.exports.getNotionWindows = () => {
+  const { BrowserWindow } = require('electron'),
+    windows = BrowserWindow.getAllWindows();
+  if (enhancerMenu) return windows.filter((win) => win.id !== enhancerMenu.id);
+  return windows;
+};
+
+module.exports.getFocusedNotionWindow = () => {
+  const { BrowserWindow } = require('electron'),
+    focusedWindow = BrowserWindow.getFocusedWindow();
+  if (enhancerMenu && focusedWindow && focusedWindow.id === enhancerMenu.id) return null;
+  return focusedWindow;
+};
+
 module.exports.focusNotion = () => {
-  const { env } = require('notion-enhancer/api/index.cjs'),
-    { BrowserWindow } = require('electron'),
-    { createWindow } = env.notionRequire('main/createWindow.js');
-  let window = BrowserWindow.getAllWindows().find((win) => win.id !== enhancerMenu.id);
+  const api = require('notion-enhancer/api/index.cjs'),
+    { createWindow } = api.electron.notionRequire('main/createWindow.js');
+  let window = module.exports.getFocusedNotionWindow() || module.exports.getNotionWindows()[0];
   if (!window) window = createWindow('/');
   window.show();
 };