diff --git a/app/common/state/tabContentState.js b/app/common/state/tabContentState.js index 030de2fd514..d094dc6a202 100644 --- a/app/common/state/tabContentState.js +++ b/app/common/state/tabContentState.js @@ -152,7 +152,8 @@ const tabContentState = { // If closeIcon is fixed then there's no room for another icon !tabContentState.hasFixedCloseIcon(state, frameKey) && // completely hide it for small sizes - !hasBreakpoint(frame.get('breakpoint'), ['mediumSmall', 'small', 'extraSmall', 'smallest']) + !hasBreakpoint(frame.get('breakpoint'), + ['medium', 'mediumSmall', 'small', 'extraSmall', 'smallest']) ) } } diff --git a/app/renderer/components/tabs/tab.js b/app/renderer/components/tabs/tab.js index 3feb98ef552..50fd5dbf7e1 100644 --- a/app/renderer/components/tabs/tab.js +++ b/app/renderer/components/tabs/tab.js @@ -268,7 +268,7 @@ class Tab extends React.Component { props.partOfFullPageSet = ownProps.partOfFullPageSet props.showTitle = !props.isPinnedTab && !( - (hasBreakpoint(breakpoint, 'small') && props.isActive) || + (hasBreakpoint(breakpoint, ['mediumSmall', 'small']) && props.isActive) || hasBreakpoint(breakpoint, ['extraSmall', 'smallest']) ) diff --git a/test/unit/app/renderer/components/tabs/content/newSessionIconTest.js b/test/unit/app/renderer/components/tabs/content/newSessionIconTest.js index 1e84052ce61..ba2b99c6b63 100644 --- a/test/unit/app/renderer/components/tabs/content/newSessionIconTest.js +++ b/test/unit/app/renderer/components/tabs/content/newSessionIconTest.js @@ -119,19 +119,6 @@ describe('Tabs content - NewSessionIcon', function () { assert.equal(wrapper.find('NewSessionIcon').length, 1) }) - it('icon if tab is not active and breakpoint is medium', function () { - windowStore.state = defaultWindowStore.merge({ - activeFrameKey: 0, - frames: [{ - partitionNumber: 1, - hoverState: false, - breakpoint: 'medium' - }] - }) - const wrapper = mount() - assert.equal(wrapper.find('NewSessionIcon').length, 1) - }) - it('partition number for new sessions', function () { windowStore.state = defaultWindowStore.mergeIn(['frames', 0], { partitionNumber: 3, @@ -199,10 +186,10 @@ describe('Tabs content - NewSessionIcon', function () { assert.equal(wrapper.find('NewSessionIcon').length, 0) }) - it('if tab is active and breakpoint is medium', function () { + it('if breakpoint is medium', function () { windowStore.state = defaultWindowStore.mergeIn(['frames', 0], { partitionNumber: 1, - hoverState: true, + hoverState: false, breakpoint: 'medium' }) const wrapper = mount() diff --git a/test/unit/app/renderer/components/tabs/content/privateIconTest.js b/test/unit/app/renderer/components/tabs/content/privateIconTest.js index 210dde4d042..3b037d86246 100644 --- a/test/unit/app/renderer/components/tabs/content/privateIconTest.js +++ b/test/unit/app/renderer/components/tabs/content/privateIconTest.js @@ -108,19 +108,6 @@ describe('Tabs content - PrivateIcon', function () { assert.equal(wrapper.find('PrivateIcon').length, 1) }) - it('if tab is not active and breakpoint is medium', function () { - windowStore.state = defaultWindowStore.merge({ - activeFrameKey: 0, - frames: [{ - isPrivate: true, - hoverState: false, - breakpoint: 'medium' - }] - }) - const wrapper = mount() - assert.equal(wrapper.find('PrivateIcon').length, 1) - }) - it('if mouse is not over tab and breakpoint is default', function () { windowStore.state = defaultWindowStore.mergeIn(['frames', 0], { isPrivate: true, @@ -171,10 +158,10 @@ describe('Tabs content - PrivateIcon', function () { assert.equal(wrapper.find('PrivateIcon').length, 0) }) - it('if tab is active and breakpoint is medium', function () { + it('if breakpoint is medium', function () { windowStore.state = defaultWindowStore.mergeIn(['frames', 0], { isPrivate: true, - hoverState: true, + hoverState: false, breakpoint: 'medium' }) const wrapper = mount() diff --git a/test/unit/app/renderer/components/tabs/content/tabTitleTest.js b/test/unit/app/renderer/components/tabs/content/tabTitleTest.js index 603355b1376..8479bb44aa2 100644 --- a/test/unit/app/renderer/components/tabs/content/tabTitleTest.js +++ b/test/unit/app/renderer/components/tabs/content/tabTitleTest.js @@ -114,11 +114,14 @@ describe('Tabs content - Title', function () { const wrapper = mount() assert.equal(wrapper.find('TabTitle div').text(), pageTitle1) }) - it('if breakpoint is mediumSmall', function () { - windowStore.state = defaultWindowStore.mergeIn(['frames', 0], { - location: url1, - title: pageTitle1, - breakpoint: 'mediumSmall' + it('if breakpoint is mediumSmall and tab is not active', function () { + windowStore.state = defaultWindowStore.merge({ + activeFrameKey: 0, + frames: [{ + location: url1, + title: pageTitle1, + breakpoint: 'mediumSmall' + }] }) const wrapper = mount() assert.equal(wrapper.find('TabTitle div').text(), pageTitle1) @@ -147,7 +150,15 @@ describe('Tabs content - Title', function () { const wrapper = mount() assert.equal(wrapper.find('TabTitle').length, 0) }) - + it('if breakpoint is mediumSmall and tab is active', function () { + windowStore.state = defaultWindowStore.mergeIn(['frames', 0], { + location: url1, + title: pageTitle1, + breakpoint: 'mediumSmall' + }) + const wrapper = mount() + assert.equal(wrapper.find('TabTitle').length, 0) + }) it('if breakpoint is small and tab is active', function () { windowStore.state = defaultWindowStore.mergeIn(['frames', 0], { location: url1,