Merge pull request brave#9692 from brave/tabsbar--9511

Prevent Tab Close Button from allowing tab-tearoff
NejcZdovc · Jun 28, 2017 · c575303 · c575303
2 parents de20bc7 + 1500ecd
commit c575303
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/app/renderer/components/tabs/content/closeTabIcon.js b/app/renderer/components/tabs/content/closeTabIcon.js
@@ -32,6 +32,7 @@ class CloseTabIcon extends React.Component {
   constructor (props) {
     super(props)
     this.onClick = this.onClick.bind(this)
+    this.onDragStart = this.onDragStart.bind(this)
   }
 
   get frame () {
@@ -49,6 +50,10 @@ class CloseTabIcon extends React.Component {
     }
   }
 
+  onDragStart (event) {
+    event.preventDefault()
+  }
+
   mergeProps (state, ownProps) {
     const currentWindow = state.get('currentWindow')
     const isPinnedTab = frameStateUtil.isPinned(currentWindow, ownProps.frameKey)
@@ -77,6 +82,8 @@ class CloseTabIcon extends React.Component {
       className={css(this.props.showCloseIcon && styles.closeTab)}
       l10nId='closeTabButton'
       onClick={this.onClick}
+      onDragStart={this.onDragStart}
+      draggable='true'
     />
   }
 }

diff --git a/app/renderer/components/tabs/content/tabIcon.js b/app/renderer/components/tabs/content/tabIcon.js
@@ -33,6 +33,8 @@ class TabIcon extends ImmutableComponent {
     return <div
       className={this.props.className}
       data-test-favicon={this.props['data-test-favicon']}
+      onDragStart={this.props.onDragStart}
+      draggable={this.props.draggable}
       onClick={this.props.onClick}>
       {
         this.props.symbol