diff options
| author | monikahedman <monika_hedman@brown.edu> | 2019-08-15 16:31:48 -0400 |
|---|---|---|
| committer | monikahedman <monika_hedman@brown.edu> | 2019-08-15 16:31:48 -0400 |
| commit | 753c61c852aa17e6125f568fe0db394328765c7f (patch) | |
| tree | 918d27dbfe9248c547a7796dc7142993f7cbb48a /src/client/views/collections/CollectionDockingView.tsx | |
| parent | b9f0c3d05eab364911007beb3c85d6d942097dab (diff) | |
| parent | 13a377a36b0d93f931f57a6417fe920419a56026 (diff) | |
pulled from master
Diffstat (limited to 'src/client/views/collections/CollectionDockingView.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionDockingView.tsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx index 13bb34037..7332a490a 100644 --- a/src/client/views/collections/CollectionDockingView.tsx +++ b/src/client/views/collections/CollectionDockingView.tsx @@ -389,7 +389,7 @@ export class CollectionDockingView extends React.Component<SubCollectionViewProp const stack = tab.contentItem.parent; // shifts the focus to this tab when another tab is dragged over it tab.element[0].onmouseenter = (e: any) => { - if (!this._isPointerDown) return; + if (!this._isPointerDown || !SelectionManager.GetIsDragging()) return; var activeContentItem = tab.header.parent.getActiveContentItem(); if (tab.contentItem !== activeContentItem) { tab.header.parent.setActiveContentItem(tab.contentItem); |