Bring back merge of pull request #11958

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

This reverts commit d2708a0.

app/renderer/components/tabs/tab.js

@@ -139,6 +139,9 @@ class Tab extends React.Component {
 
   onMouseEnter (e) {
     windowActions.setTabHoverState(this.props.frameKey, true)
+    // In case there's a tab preview happening, cancel the preview
+    // when mouse is over a tab
+    windowActions.setTabPageHoverState(this.props.tabPageIndex, false)
   }
 
   onAuxClick (e) {
@@ -245,6 +248,7 @@ class Tab extends React.Component {
     props.isNarrowestView = tabContentState.isNarrowestView(currentWindow, props.frameKey)
     props.isPlayIndicatorBreakpoint = tabContentState.isMediumView(currentWindow, props.frameKey) || props.isNarrowView
     props.title = frame.get('title')
+    props.tabPageIndex = currentWindow.getIn(['ui', 'tabs', 'tabPageIndex'])
     props.showSessionIcon = partition && hasSeconardImage
     props.showPrivateIcon = props.isPrivateTab && hasSeconardImage
     props.showFavIcon = !((hasBreakpoint(breakpoint, 'extraSmall') && props.isActive) || frame.get('location') === 'about:newtab')

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)
     }
   }