experimental popup support

PalmerAL · PalmerAL · commit 12e2ae5499e3 · 2021-05-10T17:39:53.000-05:00
diff --git a/js/browserUI.js b/js/browserUI.js
@@ -167,8 +167,8 @@ function switchToTab (id, options) {
   })
 }
 
+/*
 webviews.bindEvent('new-window', function (tabId, url, frameName, disposition) {
-  /* disabled in focus mode */
   if (focusMode.enabled()) {
     focusMode.warn()
     return
@@ -183,6 +183,14 @@ webviews.bindEvent('new-window', function (tabId, url, frameName, disposition) {
     openInBackground: disposition === 'background-tab' && !settings.get('openTabsInForeground')
   })
 })
+*/
+
+webviews.bindEvent('did-create-popup', function (tabId, popupId) {
+  var popupTab = tabs.add()
+  tabBar.addTab(popupTab)
+  webviews.add(popupTab, popupId)
+  switchToTab(popupTab)
+})
 
 webviews.bindIPC('close-window', function (tabId, args) {
   closeTab(tabId)
diff --git a/js/preload/default.js b/js/preload/default.js
@@ -18,6 +18,7 @@ function cloneEvent (e) {
 setTimeout(function () {
   /* Used for swipe gestures */
   window.addEventListener('wheel', function (e) {
+    console.log(e)
     ipc.send('wheel-event', cloneEvent(e))
   })
 
diff --git a/js/webviews.js b/js/webviews.js
@@ -169,7 +169,7 @@ const webviews = {
       }
     }
   },
-  add: function (tabId) {
+  add: function (tabId, existingViewId) {
     var tabData = tabs.get(tabId)
 
     // needs to be called before the view is created to that its listeners can be registered
@@ -188,23 +188,10 @@ const webviews = {
     }
 
     ipc.send('createView', {
+      existingViewId,
       id: tabId,
       webPreferencesString: JSON.stringify({
-        webPreferences: {
-          nodeIntegration: false,
-          nodeIntegrationInSubFrames: true,
-          scrollBounce: true,
-          safeDialogs: true,
-          safeDialogsMessage: 'Prevent this page from creating additional dialogs',
-          preload: __dirname + '/dist/preload.js',
-          contextIsolation: true,
-          sandbox: true,
-          enableRemoteModule: false,
-          allowPopups: false,
-          partition: partition || 'persist:webcontent',
-          enableWebSQL: false,
-          autoplayPolicy: (settings.get('enableAutoplay') ? 'no-user-gesture-required' : 'user-gesture-required')
-        }
+        partition: partition || 'persist:webcontent'
       }),
       boundsString: JSON.stringify(webviews.getViewBounds()),
       events: webviews.events.map(e => e.event).filter((i, idx, arr) => arr.indexOf(i) === idx)
diff --git a/main/viewManager.js b/main/viewManager.js
@@ -1,10 +1,34 @@
+const BrowserView = electron.BrowserView
+
 var viewMap = {} // id: view
 var viewStateMap = {} // id: view state
 
-const BrowserView = electron.BrowserView
+var temporaryPopupViews = {} // id: view
+
+const defaultViewWebPreferences = {
+  nodeIntegration: false,
+  nodeIntegrationInSubFrames: true,
+  scrollBounce: true,
+  safeDialogs: true,
+  safeDialogsMessage: 'Prevent this page from creating additional dialogs',
+  preload: __dirname + '/dist/preload.js',
+  contextIsolation: true,
+  sandbox: true,
+  enableRemoteModule: false,
+  allowPopups: false,
+  // partition: partition || 'persist:webcontent',
+  enableWebSQL: false,
+  autoplayPolicy: (settings.get('enableAutoplay') ? 'no-user-gesture-required' : 'user-gesture-required')
+}
 
-function createView (id, webPreferencesString, boundsString, events) {
-  const view = new BrowserView(JSON.parse(webPreferencesString))
+function createView (existingViewId, id, webPreferencesString, boundsString, events) {
+  console.log(existingViewId)
+  let view
+  if (existingViewId) {
+    view = temporaryPopupViews[existingViewId]
+  } else {
+    view = new BrowserView({ webPreferences: Object.assign({}, defaultViewWebPreferences, JSON.parse(webPreferencesString)) })
+  }
 
   events.forEach(function (event) {
     view.webContents.on(event, function (e) {
@@ -29,6 +53,7 @@ function createView (id, webPreferencesString, boundsString, events) {
   Workaround for crashes when calling preventDefault() on the new-window event (https://github.com/electron/electron/issues/23859#issuecomment-650270680)
   Calling preventDefault also prevents the new-window event from occurring, so create a new event here instead
   */
+  /*
   view.webContents.on('-will-add-new-contents', function (e, url) {
     e.preventDefault()
     mainWindow.webContents.send('view-event', {
@@ -37,6 +62,30 @@ function createView (id, webPreferencesString, boundsString, events) {
       args: [url, '', 'new-window']
     })
   })
+  */
+
+  view.webContents.removeAllListeners('-add-new-contents')
+
+  view.webContents.on('-add-new-contents', function (e, webContents, disposition, _userGesture, _left, _top, _width, _height, url, frameName, referrer, rawFeatures, postData) {
+    console.log(arguments)
+    var view = new BrowserView({ webPreferences: defaultViewWebPreferences, webContents: webContents })
+
+    view.setBounds({
+      x: 0,
+      y: 0,
+      width: 500,
+      height: 500
+    })
+
+    var popupId = Math.random().toString()
+    temporaryPopupViews[popupId] = view
+
+    mainWindow.webContents.send('view-event', {
+      viewId: id,
+      event: 'did-create-popup',
+      args: [popupId]
+    })
+  })
 
   view.webContents.on('ipc-message', function (e, channel, data) {
     mainWindow.webContents.send('view-ipc', {
@@ -161,7 +210,7 @@ function getViewIDFromWebContents (contents) {
 }
 
 ipc.on('createView', function (e, args) {
-  createView(args.id, args.webPreferencesString, args.boundsString, args.events)
+  createView(args.existingViewId, args.id, args.webPreferencesString, args.boundsString, args.events)
 })
 
 ipc.on('destroyView', function (e, id) {
