aboutsummaryrefslogtreecommitdiff
path: root/src/views/collections/CollectionViewBase.tsx
diff options
context:
space:
mode:
authortschicke-brown <tyler_schicke@brown.edu>2019-02-07 23:50:47 -0500
committerGitHub <noreply@github.com>2019-02-07 23:50:47 -0500
commit35574735a60fbc7b1c7051c59db56a8485f50a21 (patch)
tree42dc1f8fbe639d53e7c6d3db144bd30d984c21de /src/views/collections/CollectionViewBase.tsx
parent8d264be35a511204449c22d0a4b1754e241a3421 (diff)
parent90296f23320df43e73fb1bd936428f19f0f705a9 (diff)
Merge pull request #5 from browngraphicslab/schema
Schema
Diffstat (limited to 'src/views/collections/CollectionViewBase.tsx')
-rw-r--r--src/views/collections/CollectionViewBase.tsx9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/views/collections/CollectionViewBase.tsx b/src/views/collections/CollectionViewBase.tsx
index 4fce02ef6..35d938d43 100644
--- a/src/views/collections/CollectionViewBase.tsx
+++ b/src/views/collections/CollectionViewBase.tsx
@@ -1,7 +1,7 @@
import { action, computed } from "mobx";
import { observer } from "mobx-react";
import { Document } from "../../fields/Document";
-import { Opt, FieldWaiting } from "../../fields/Field";
+import { Opt } from "../../fields/Field";
import { Key, KeyStore } from "../../fields/Key";
import { ListField } from "../../fields/ListField";
import { SelectionManager } from "../../util/SelectionManager";
@@ -30,10 +30,9 @@ export class CollectionViewBase extends React.Component<CollectionViewProps> {
public get active(): boolean {
var isSelected = (this.props.ContainingDocumentView instanceof CollectionFreeFormDocumentView && SelectionManager.IsSelected(this.props.ContainingDocumentView));
var childSelected = SelectionManager.SelectedDocuments().some(view => view.props.ContainingCollectionView == this);
- var topMost = this.props.ContainingDocumentView != undefined &&
- this.props.ContainingDocumentView != FieldWaiting && this.props.ContainingDocumentView.props.ContainingCollectionView != FieldWaiting && (
- this.props.ContainingDocumentView.props.ContainingCollectionView == undefined ||
- this.props.ContainingDocumentView.props.ContainingCollectionView instanceof CollectionDockingView);
+ var topMost = this.props.ContainingDocumentView != undefined && (
+ this.props.ContainingDocumentView.props.ContainingCollectionView == undefined ||
+ this.props.ContainingDocumentView.props.ContainingCollectionView instanceof CollectionDockingView);
return isSelected || childSelected || topMost;
}
@action