Bring back merge of pull request #11958

Auditors: @bsclifton
fixes #11632
-
This reverts the revert. More information in
#11632

This reverts commit b12d8bd.

app/renderer/components/tabs/tab.js

@@ -159,6 +159,9 @@ class Tab extends React.Component {
     // if mouse entered a tab we only trigger a new preview
     // if user is in previewMode, which is defined by mouse move
     windowActions.setTabHoverState(this.props.frameKey, true, this.props.previewMode)
+    // In case there's a tab preview happening, cancel the preview
+    // when mouse is over a tab
+    windowActions.setTabPageHoverState(this.props.tabPageIndex, false)
   }
 
   onMouseMove () {
@@ -262,6 +265,7 @@ class Tab extends React.Component {
     props.tabWidth = currentWindow.getIn(['ui', 'tabs', 'fixTabWidth'])
     props.themeColor = tabUIState.getThemeColor(currentWindow, frameKey)
     props.title = frame.get('title')
+    props.tabPageIndex = frameStateUtil.getTabPageIndex(currentWindow)
     props.partOfFullPageSet = partOfFullPageSet
     props.showAudioTopBorder = audioState.showAudioTopBorder(currentWindow, frameKey, isPinned)
     props.centralizeTabIcons = tabUIState.centralizeTabIcons(currentWindow, frameKey, isPinned)

app/renderer/components/tabs/tabPage.js

@@ -76,6 +76,9 @@ class TabPage extends React.Component {
   }
 
   onCloseTabPage () {
+    // if a tab page is closed, cancel the tab preview
+    windowActions.setTabPageHoverState(this.props.index, false)
+
     return this.props.tabPageFrames
       .map(frame => appActions.tabCloseRequested(frame.get('tabId')))
   }
@@ -92,12 +95,13 @@ class TabPage extends React.Component {
         return
       case 1:
         // Close tab page with middle click
-        // and eventually cancel the hover state
         this.onCloseTabPage()
-        windowActions.setTabPageHoverState(this.props.index, false)
         break
       default:
+        // Setting the new active tab page
+        // should also cancel tab preview
         windowActions.setTabPageIndex(this.props.index)
+        windowActions.setTabPageHoverState(this.props.index, false)
     }
   }