diff options
| author | bobzel <zzzman@gmail.com> | 2021-02-16 20:48:29 -0500 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2021-02-16 20:48:29 -0500 |
| commit | 05b87c394731fbed21f9b358967c337ce294272d (patch) | |
| tree | fef4ccd0b46bada647f03eb7f6ffb57a4aba1e06 /src/client/views/collections | |
| parent | 3dae4d3d8ac10f6f3c9f937282dbfa5882584aad (diff) | |
added doubel tap on links button to enter portal for document + links
Diffstat (limited to 'src/client/views/collections')
| -rw-r--r-- | src/client/views/collections/CollectionTimeView.tsx | 4 | ||||
| -rw-r--r-- | src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/client/views/collections/CollectionTimeView.tsx b/src/client/views/collections/CollectionTimeView.tsx index 426eced1d..53eb6e0be 100644 --- a/src/client/views/collections/CollectionTimeView.tsx +++ b/src/client/views/collections/CollectionTimeView.tsx @@ -81,8 +81,8 @@ export class CollectionTimeView extends CollectionSubView(doc => doc) { } else if (anchor.pivotField !== undefined) { // otherwise set document's fields based on anchor view spec this.layoutDoc._prevFilterIndex = 1; this.layoutDoc._pivotField = StrCast(anchor.pivotField); - this.layoutDoc._docFilters = new List<string>(this.pivotDocFilters()); - this.layoutDoc._docRangeFilters = new List<string>(this.pivotDocRangeFilters()); + this.layoutDoc._docFilters = new List<string>(StrListCast(anchor.docFilters)); + this.layoutDoc._docRangeFilters = new List<string>(StrListCast(anchor.docRangeFilters)); } return 0; } diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx index c54596a9e..a5d7489bd 100644 --- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx +++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx @@ -116,6 +116,7 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P @observable _timelineRef = React.createRef<Timeline>(); @observable _marqueeRef = React.createRef<HTMLDivElement>(); @observable _focusFilters: Opt<string[]>; // fields that get overriden by focus anchor + @observable _focusRangeFilters: Opt<string[]>; // fields that get overriden by focus anchor @computed get backgroundActive() { return this.props.layerProvider?.(this.layoutDoc) === false && (this.props.ContainingCollectionView?.active() || this.props.active()); } @computed get fitToContentVals() { @@ -1027,7 +1028,7 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P PanelWidth: childLayout[WidthSym], PanelHeight: childLayout[HeightSym], docFilters: this.freeformDocFilters, - docRangeFilters: this.docRangeFilters, + docRangeFilters: this.freeformRangeDocFilters, searchFilterDocs: this.searchFilterDocs, focus: this.focusDocument, styleProvider: this.getClusterColor, @@ -1207,12 +1208,15 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P } freeformDocFilters = () => this._focusFilters || this.docFilters(); + freeformRangeDocFilters = () => this._focusRangeFilters || this.docRangeFilters(); @action setViewSpec = (anchor: Doc, preview: boolean) => { if (preview) { this._focusFilters = StrListCast(Doc.GetProto(anchor).docFilters); + this._focusRangeFilters = StrListCast(Doc.GetProto(anchor).docRangeFilters); } else if (anchor.pivotField !== undefined) { - this.layoutDoc._docFilters = ObjectField.MakeCopy(Doc.GetProto(anchor).docFilters as ObjectField); + this.layoutDoc._docFilters = new List<string>(StrListCast(anchor.docFilters)); + this.layoutDoc._docRangeFilters = new List<string>(StrListCast(anchor.docRangeFilters)); } return 0; } |
