Merge pull request #10640 from brave/tab-strip-master

Use muon's tab_strip_model for driving index and active

Author: bbondy

.npmrc

@@ -1,7 +1,7 @@
 runtime = electron
 target_arch = x64
-brave_electron_version = 4.4.11
+brave_electron_version = 4.4.12
 chromedriver_version = 2.29
-target = v4.4.11
+target = v4.4.12
 disturl=https://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist/
 build_from_source = true

app/browser/reducers/tabsReducer.js

@@ -11,7 +11,6 @@ const windows = require('../windows')
 const {getWebContents} = require('../webContentsCache')
 const {BrowserWindow} = require('electron')
 const tabState = require('../../common/state/tabState')
-const windowState = require('../../common/state/windowState')
 const tabActions = require('../../common/actions/tabActions')
 const siteSettings = require('../../../js/state/siteSettings')
 const siteSettingsState = require('../../common/state/siteSettingsState')
@@ -22,63 +21,9 @@ const {getFlashResourceId} = require('../../../js/flash')
 const {l10nErrorText} = require('../../common/lib/httpUtil')
 const Immutable = require('immutable')
 const dragTypes = require('../../../js/constants/dragTypes')
-const getSetting = require('../../../js/settings').getSetting
-const settings = require('../../../js/constants/settings')
-const {tabCloseAction} = require('../../common/constants/settingsEnums')
 const {frameOptsFromFrame} = require('../../../js/state/frameStateUtil')
 const {isSourceAboutUrl, isTargetAboutUrl, isNavigatableAboutPage} = require('../../../js/lib/appUrlUtil')
 
-const updateActiveTab = (state, closeTabId) => {
-  if (!tabState.getByTabId(state, closeTabId)) {
-    return
-  }
-
-  const index = tabState.getIndex(state, closeTabId)
-  if (index === -1) {
-    return
-  }
-
-  const windowId = tabState.getWindowId(state, closeTabId)
-  if (windowId === windowState.WINDOW_ID_NONE) {
-    return
-  }
-
-  const lastActiveTabId = tabState.getTabsByLastActivated(state, windowId).last()
-  if (lastActiveTabId !== closeTabId && !tabState.isActive(state, closeTabId)) {
-    return
-  }
-
-  let nextTabId = tabState.TAB_ID_NONE
-  switch (getSetting(settings.TAB_CLOSE_ACTION)) {
-    case tabCloseAction.LAST_ACTIVE:
-      nextTabId = tabState.getLastActiveTabId(state, windowId)
-      break
-    case tabCloseAction.PARENT:
-      {
-        const openerTabId = tabState.getOpenerTabId(state, closeTabId)
-        if (openerTabId !== tabState.TAB_ID_NONE) {
-          nextTabId = openerTabId
-        }
-        break
-      }
-  }
-
-  // DEFAULT: always fall back to NEXT
-  if (nextTabId === tabState.TAB_ID_NONE) {
-    nextTabId = tabState.getNextTabIdByIndex(state, windowId, index)
-    if (nextTabId === tabState.TAB_ID_NONE) {
-      // no unpinned tabs so find the next pinned tab
-      nextTabId = tabState.getNextTabIdByIndex(state, windowId, index, true)
-    }
-  }
-
-  if (nextTabId !== tabState.TAB_ID_NONE) {
-    setImmediate(() => {
-      tabs.setActive(nextTabId)
-    })
-  }
-}
-
 const WEBRTC_DEFAULT = 'default'
 const WEBRTC_DISABLE_NON_PROXY = 'disable_non_proxied_udp'
 
@@ -126,7 +71,23 @@ const tabsReducer = (state, action, immutableAction) => {
     case appConstants.APP_TAB_CREATED:
       state = tabState.maybeCreateTab(state, action)
       break
-    case appConstants.APP_TAB_MOVED: {
+    case appConstants.APP_TAB_ATTACHED:
+      state = tabs.updateTabsStateForAttachedTab(state, action.get('tabId'))
+      break
+    case appConstants.APP_TAB_WILL_ATTACH: {
+      const tabId = action.get('tabId')
+      const tabValue = tabState.getByTabId(state, tabId)
+      if (!tabValue) {
+        break
+      }
+      const oldWindowId = tabState.getWindowId(state, tabId)
+      state = tabs.updateTabsStateForWindow(state, oldWindowId)
+      break
+    }
+    case appConstants.APP_TAB_MOVED:
+      state = tabs.updateTabsStateForAttachedTab(state, action.get('tabId'))
+      break
+    case appConstants.APP_TAB_DETACH_MENU_ITEM_CLICKED: {
       setImmediate(() => {
         const tabId = action.get('tabId')
         const frameOpts = frameOptsFromFrame(action.get('frameOpts'))
@@ -158,6 +119,7 @@ const tabsReducer = (state, action, immutableAction) => {
       break
     case appConstants.APP_TAB_UPDATED:
       state = tabState.maybeCreateTab(state, action)
+      // tabs.debugTabs(state)
       break
     case appConstants.APP_TAB_CLOSE_REQUESTED:
       {
@@ -194,7 +156,7 @@ const tabsReducer = (state, action, immutableAction) => {
                 tabs.closeTab(tabId, action.get('forceClosePinned'))
               })
             } else {
-              state = windows.closeWindow(state, windowId)
+              windows.closeWindow(windowId)
             }
           }
         }
@@ -206,8 +168,21 @@ const tabsReducer = (state, action, immutableAction) => {
         if (tabId === tabState.TAB_ID_NONE) {
           break
         }
-        updateActiveTab(state, tabId)
+        const nextActiveTabId = tabs.getNextActiveTab(state, tabId)
+
+        // Must be called before tab is removed
+        // But still check for no tabId because on tab detach there's a dummy tabId
+        const tabValue = tabState.getByTabId(state, tabId)
+        if (tabValue) {
+          const windowIdOfTabBeingRemoved = tabState.getWindowId(state, tabId)
+          state = tabs.updateTabsStateForWindow(state, windowIdOfTabBeingRemoved)
+        }
         state = tabState.removeTabByTabId(state, tabId)
+        setImmediate(() => {
+          if (nextActiveTabId !== tabState.TAB_ID_NONE) {
+            tabs.setActive(nextActiveTabId)
+          }
+        })
       }
       break
     case appConstants.APP_ALLOW_FLASH_ONCE:
@@ -225,9 +200,7 @@ const tabsReducer = (state, action, immutableAction) => {
       })
       break
     case appConstants.APP_TAB_PINNED:
-      setImmediate(() => {
-        tabs.pin(state, action.get('tabId'), action.get('pinned'))
-      })
+      state = tabs.pin(state, action.get('tabId'), action.get('pinned'))
       break
     case windowConstants.WINDOW_SET_AUDIO_MUTED:
       setImmediate(() => {
@@ -372,10 +345,15 @@ const tabsReducer = (state, action, immutableAction) => {
       const dragData = state.get('dragData')
       if (dragData && dragData.get('type') === dragTypes.TAB) {
         const frame = dragData.get('data')
-        const frameOpts = frameOptsFromFrame(frame).toJS()
+        let frameOpts = frameOptsFromFrame(frame)
         const browserOpts = { positionByMouseCursor: true, checkMaximized: true }
-        frameOpts.indexByFrameKey = dragData.getIn(['dragOverData', 'draggingOverKey'])
-        frameOpts.prependIndexByFrameKey = dragData.getIn(['dragOverData', 'draggingOverLeftHalf'])
+        const tabIdForIndex = dragData.getIn(['dragOverData', 'draggingOverKey'])
+        const tabForIndex = tabState.getByTabId(state, tabIdForIndex)
+        const dropWindowId = dragData.get('dropWindowId')
+        if (dropWindowId != null && dropWindowId !== -1 && tabForIndex) {
+          const prependIndexByTabId = dragData.getIn(['dragOverData', 'draggingOverLeftHalf'])
+          frameOpts = frameOpts.set('index', tabForIndex.get('index') + (prependIndexByTabId ? 0 : 1))
+        }
         tabs.moveTo(state, frame.get('tabId'), frameOpts, browserOpts, dragData.get('dropWindowId'))
       }
       break

app/browser/reducers/windowsReducer.js

@@ -324,15 +324,20 @@ const windowsReducer = (state, action, immutableAction) => {
       }
       break
     case appConstants.APP_CLOSE_WINDOW:
-      state = windows.closeWindow(state, action.get('windowId'))
+      windows.closeWindow(action.get('windowId'))
       break
     case appConstants.APP_WINDOW_CLOSED:
       state = windowState.removeWindow(state, action)
-      sessionStoreShutdown.removeWindowFromCache(action.getIn(['windowValue', 'windowId']))
+      const windowId = action.getIn(['windowValue', 'windowId'])
+      sessionStoreShutdown.removeWindowFromCache(windowId)
+      windows.cleanupWindow(windowId)
       break
     case appConstants.APP_WINDOW_CREATED:
       state = windowState.maybeCreateWindow(state, action)
       break
+    case appConstants.APP_TAB_STRIP_EMPTY:
+      windows.closeWindow(action.get('windowId'))
+      break
     case appConstants.APP_WINDOW_UPDATED:
       state = windowState.maybeCreateWindow(state, action)
       if (action.get('updateDefault')) {