aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2020-08-03 11:55:09 -0400
committerbobzel <zzzman@gmail.com>2020-08-03 11:55:09 -0400
commit642be6f52df6484f25fd7c1940e4e290a5b6d118 (patch)
tree7e21751c40af133fc032893365d2d4fe3d9e0bb4 /src
parent4758868d0d24f91f95c9396a4135fb6319814aca (diff)
fixed novice toolbar not to have buttonizablecommands for non-collections.
Diffstat (limited to 'src')
-rw-r--r--src/client/views/collections/CollectionMenu.tsx11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/client/views/collections/CollectionMenu.tsx b/src/client/views/collections/CollectionMenu.tsx
index 8c4118e89..660b9f4df 100644
--- a/src/client/views/collections/CollectionMenu.tsx
+++ b/src/client/views/collections/CollectionMenu.tsx
@@ -344,9 +344,11 @@ export class CollectionViewBaseChrome extends React.Component<CollectionMenuProp
} else { return undefined; }
}
@computed get selectedDoc() { return this.selectedDocumentView?.rootDoc; }
- @computed get isText() {
+ @computed get notACollection() {
if (this.selectedDoc) {
- return this.selectedDoc[Doc.LayoutFieldKey(this.selectedDoc)] instanceof RichTextField;
+ const layoutField = Doc.LayoutField(this.selectedDoc);
+ return this.props.type === CollectionViewType.Docking ||
+ typeof (layoutField) === "string" && !layoutField?.includes("CollectionView");
}
else return false;
}
@@ -356,9 +358,8 @@ export class CollectionViewBaseChrome extends React.Component<CollectionMenuProp
<div className="collectionMenu-cont" >
<div className="collectionMenu">
<div className="collectionViewBaseChrome">
- {this.props.type === CollectionViewType.Invalid ||
- this.props.type === CollectionViewType.Docking || this.isText ? (null) : this.viewModes}
- {this.props.type === CollectionViewType.Docking || (this.isText && Doc.UserDoc().noviceMode) ? (null) : this.templateChrome}
+ {this.notACollection || this.props.type === CollectionViewType.Invalid ? (null) : this.viewModes}
+ {this.notACollection && Doc.UserDoc().noviceMode ? (null) : this.templateChrome}
{Doc.UserDoc().noviceMode ? (null) :
<Tooltip title={<div className="dash-tooltip">filter documents to show</div>} placement="bottom">
<div className="collectionViewBaseChrome-viewSpecs" style={{ display: "grid" }}>