Active tab update issue master

.npmrc

@@ -1,7 +1,7 @@
 runtime = electron
 target_arch = x64
-brave_electron_version = 3.0.200
+brave_electron_version = 3.0.201
 chromedriver_version = 2.27
-target = v3.0.200
+target = v3.0.201
 disturl=https://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist/
 build_from_source = true

app/browser/reducers/tabsReducer.js

@@ -6,18 +6,79 @@
 
 const appConstants = require('../../../js/constants/appConstants')
 const tabs = require('../tabs')
+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 windowConstants = require('../../../js/constants/windowConstants')
 const windowAction = require('../../../js/actions/windowActions.js')
 const {makeImmutable} = require('../../common/state/immutableUtil')
 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 updateActiveTab = (state, closeTabId) => {
+  if (!tabState.getByTabId(state, closeTabId)) {
+    return
+  }
+
+  const index = tabState.getIndex(state, closeTabId)
+  if (index === -1) {
+    return
+  }
+
+  if (!tabState.isActive(state, closeTabId)) {
+    return
+  }
+
+  const windowId = tabState.getWindowId(state, closeTabId)
+  if (windowId === windowState.WINDOW_ID_NONE) {
+    return
+  }
+
+  let nextTabId = tabState.TAB_ID_NONE
+  switch (getSetting(settings.TAB_CLOSE_ACTION)) {
+    case tabCloseAction.LAST_ACTIVE:
+      nextTabId = tabState.getLastActiveTabId(state, windowId)
+      break
+    default:
+      {
+        const openerTabId = tabState.getOpenerTabId(state, closeTabId)
+        const lastActiveTabId = tabState.getLastActiveTabId(state, windowId)
+        if (openerTabId === lastActiveTabId) {
+          nextTabId = openerTabId
+        }
+        break
+      }
+  }
+
+  // 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 we can't find anything else just pick the first tab
+  if (nextTabId === tabState.TAB_ID_NONE) {
+    nextTabId = tabState.getTabIdByIndex(state, windowId, 0, true)
+  }
+
+  if (nextTabId !== tabState.TAB_ID_NONE) {
+    setImmediate(() => {
+      tabs.setActive(nextTabId)
+    })
+  }
+}
+
 const tabsReducer = (state, action, immutableAction) => {
   action = immutableAction || makeImmutable(action)
   switch (action.get('actionType')) {
@@ -71,15 +132,26 @@ const tabsReducer = (state, action, immutableAction) => {
           break
         }
 
-        setImmediate(() => {
-          if (tabId) {
-            if (tabs.isDevToolsFocused(tabId)) {
+        if (tabId) {
+          if (tabs.isDevToolsFocused(tabId)) {
+            setImmediate(() => {
               tabs.toggleDevTools(tabId)
+            })
+          } else {
+            const windowId = tabState.getWindowId(state, tabId)
+            const nonPinnedTabs = tabState.getNonPinnedTabsByWindowId(state, windowId)
+            const pinnedTabs = tabState.getPinnedTabsByWindowId(state, windowId)
+
+            if (nonPinnedTabs.size > 1 ||
+              (nonPinnedTabs.size > 0 && pinnedTabs.size > 0)) {
+              setImmediate(() => {
+                tabs.closeTab(tabId, action.get('forceClosePinned'))
+              })
             } else {
-              tabs.closeTab(tabId, action.get('forceClosePinned'))
+              state = windows.closeWindow(state, windowId)
             }
           }
-        })
+        }
       }
       break
     case appConstants.APP_TAB_CLOSED:
@@ -88,6 +160,7 @@ const tabsReducer = (state, action, immutableAction) => {
         if (tabId === tabState.TAB_ID_NONE) {
           break
         }
+        updateActiveTab(state, tabId)
         state = tabState.removeTabByTabId(state, tabId)
       }
       break

app/browser/reducers/urlBarSuggestionsReducer.js

@@ -32,7 +32,7 @@ const urlBarSuggestionsReducer = (state, action) => {
     case appConstants.APP_SEARCH_SUGGESTION_RESULTS_AVAILABLE:
       state = state.set('searchResults', makeImmutable(action.searchResults))
       if (action.query) {
-        const windowId = tabState.windowId(state, action.tabId)
+        const windowId = tabState.getWindowId(state, action.tabId)
         generateNewSuggestionsList(state, windowId, action.tabId, action.query)
       }
       break

app/browser/reducers/windowsReducer.js

@@ -27,7 +27,7 @@ const windowsReducer = (state, action, immutableAction) => {
       }
       break
     case appConstants.APP_CLOSE_WINDOW:
-      state = windows.closeWindow(state, action)
+      state = windows.closeWindow(state, action.get('windowId'))
       break
     case appConstants.APP_WINDOW_CLOSED:
       state = windowState.removeWindow(state, action)

app/browser/windows.js

@@ -324,9 +324,7 @@ const api = {
     })
   },
 
-  closeWindow: (state, action) => {
-    action = makeImmutable(action)
-    let windowId = action.get('windowId')
+  closeWindow: (state, windowId) => {
     let win = api.getWindow(windowId)
     try {
       setImmediate(() => {