Merge pull request #9618 from brave/9561

Show right number of tabs when closing with mouse on first tab in new…

Author: bsclifton

js/stores/windowStore.js

@@ -687,7 +687,8 @@ const doAction = (action) => {
       }
       break
     case windowConstants.WINDOW_TAB_CLOSED_WITH_MOUSE:
-      if (frameStateUtil.getNonPinnedFrameCount(windowState) % getSetting(settings.TABS_PER_PAGE) === 0) {
+      const frameCountAfterClose = frameStateUtil.getNonPinnedFrameCount(windowState) - 1
+      if (frameCountAfterClose % getSetting(settings.TABS_PER_PAGE) === 0) {
         windowState = windowState.deleteIn(['ui', 'tabs', 'fixTabWidth'])
       } else {
         windowState = windowState.setIn(['ui', 'tabs', 'fixTabWidth'], action.data.fixTabWidth)

test/lib/brave.js

@@ -535,6 +535,13 @@ var exports = {
       })
     })
 
+    this.app.client.addCommand('closeTabWithMouse', function () {
+      logVerbose('closeTabWithMouse()')
+      return this.execute(function () {
+        return devTools('electron').testData.windowActions.onTabClosedWithMouse()
+      })
+    })
+
     this.app.client.addCommand('waitForInputText', function (selector, input) {
       logVerbose('waitForInputText("' + selector + '", "' + input + '")')
       return this

test/tab-components/tabPagesTest.js

@@ -55,6 +55,18 @@ describe('tab pages', function () {
       yield this.app.client.waitForVisible('[data-test-active-tab]')
     })
 
+    it('shows the right number of tabs after closing with mouse', function * () {
+      const numTabsPerPage = appConfig.defaultSettings[settings.TABS_PER_PAGE]
+      const firstTabOfNewPageIndex = numTabsPerPage
+      yield this.app.client.click(newFrameButton)
+        .waitForElementCount(tabPage, 2)
+        .closeTabWithMouse()
+        .closeTabByIndex(firstTabOfNewPageIndex)
+        // No tab page indicator elements when 1 page
+        .waitForElementCount(tabPage, 0)
+        .waitForElementCount(tabsTabs, numTabsPerPage)
+    })
+
     describe('allows changing to tab pages', function () {
       beforeEach(function * () {
         // Make sure there are 2 tab pages