diff options
| author | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-08-01 09:46:27 -0500 |
|---|---|---|
| committer | anika-ahluwalia <anika.ahluwalia@gmail.com> | 2020-08-01 09:46:27 -0500 |
| commit | 785e20b74d8917466df4fdd88e5f4a9de206b33f (patch) | |
| tree | ec0d4ac4fdf3bf2525b420d81c8dd89f40013994 /src/client/views/collections/CollectionDockingView.tsx | |
| parent | 78c037d1a6c3319dfb921bcdb04e2105afd552eb (diff) | |
| parent | 9ea6e9775a4a8f1512911e28140bb047e9e3d20c (diff) | |
Merge branch 'menu_restructure' of https://github.com/browngraphicslab/Dash-Web into menu_restructure
Diffstat (limited to 'src/client/views/collections/CollectionDockingView.tsx')
| -rw-r--r-- | src/client/views/collections/CollectionDockingView.tsx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx index 375df8786..7a0a06069 100644 --- a/src/client/views/collections/CollectionDockingView.tsx +++ b/src/client/views/collections/CollectionDockingView.tsx @@ -463,7 +463,6 @@ export class CollectionDockingView extends React.Component<SubCollectionViewProp if (className === "lm_drag_handle" || className === "lm_close" || className === "lm_maximise" || className === "lm_minimise" || className === "lm_close_tab") { this._flush = true; } - e.stopPropagation(); } updateDataField = async (json: string) => { @@ -522,7 +521,7 @@ export class CollectionDockingView extends React.Component<SubCollectionViewProp tab.element[0].onpointerdown = (e: any) => { const view = DocumentManager.Instance.getDocumentView(doc); view && SelectionManager.SelectDoc(view, false); - } + }; // shifts the focus to this tab when another tab is dragged over it tab.element[0].onmouseenter = (e: any) => { if (!this._isPointerDown || !SnappingManager.GetIsDragging()) return; @@ -748,10 +747,10 @@ export class DockedFrameRenderer extends React.Component<DockedFrameProps> { this.onActiveContentItemChanged(); this._tabReaction = reaction(() => ({ views: SelectionManager.SelectedDocuments(), color: StrCast(this._document?._backgroundColor, "white") }), (data) => { - const selected = data.views.some(v => Doc.AreProtosEqual(v.props.Document, this._document)) + const selected = data.views.some(v => Doc.AreProtosEqual(v.props.Document, this._document)); this._tab.style.backgroundColor = selected ? data.color : ""; } - ) + ); } componentWillUnmount() { |
