Focus not set to active tab/tabset when second tabset is closed Fix #…

…3092
brave · Aug 10, 2016 · 9317fff · 9317fff
1 parent 316f4ec
commit 9317fff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -395,13 +395,16 @@ const doAction = (action) => {
     case WindowConstants.WINDOW_CLOSE_FRAME:
       // Use the frameProps we passed in, or default to the active frame
       const frameProps = action.frameProps || FrameStateUtil.getActiveFrame(windowState)
-      const closingActive = !action.frameProps || action.frameProps === FrameStateUtil.getActiveFrame(windowState)
       const index = FrameStateUtil.getFramePropsIndex(windowState.get('frames'), frameProps)
       const activeFrameKey = FrameStateUtil.getActiveFrame(windowState).get('key')
       windowState = windowState.merge(FrameStateUtil.removeFrame(windowState.get('frames'), windowState.get('tabs'),
         windowState.get('closedFrames'), frameProps.set('closedAtIndex', index),
         activeFrameKey))
-      if (closingActive) {
+      let totalOpenTabs = windowState.get('frames').filter((frame) => !frame.get('pinnedLocation')).size
+
+      // If we reach the limit of opened tabs per page while closing tabs, switch to 
+      // the active tab's page otherwise the user will hang on empty page
+      if ((totalOpenTabs % getSetting(settings.TABS_PER_PAGE)) === 0) {
         updateTabPageIndex(FrameStateUtil.getActiveFrame(windowState))
       }
       break

diff --git a/test/components/tabPagesTest.js b/test/components/tabPagesTest.js
@@ -46,6 +46,10 @@ describe('tab pages', function () {
         })
     })
 
+    it('focuses active tab\'s page when closing last tab on page', function * () {
+      yield this.app.client.waitForVisible('.tab.active')
+    })
+
     describe('allows changing to tab pages', function () {
       before(function * () {
         // Make sure there are 2 tab pages