diff options
| author | monikahedman <monika_hedman@brown.edu> | 2019-08-15 16:51:49 -0400 |
|---|---|---|
| committer | monikahedman <monika_hedman@brown.edu> | 2019-08-15 16:51:49 -0400 |
| commit | 1f6f19388e081b856a3d2f7243bcfdca37a2f826 (patch) | |
| tree | ff8c75a96c56c021e4cc8bf2741f5fd3c4252d77 /src/client/views/collections/CollectionDockingView.tsx | |
| parent | 9d76e8c2f318b4c6a4f941e6d2c8e795bc93f372 (diff) | |
| parent | b6b18c2243fb6b6c0e0850962d433b0bb08753c9 (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); |