From c0eed7dae87cdbed392699f9b400c8659a5188ca Mon Sep 17 00:00:00 2001 From: bobzel Date: Wed, 21 Feb 2024 16:16:39 -0500 Subject: got rid of dropdown for fieldValue views of a tag since tags have no values. fixed populating collection with tag docs to not create duplicates. --- src/client/views/nodes/DocumentView.tsx | 10 ++++++---- src/client/views/nodes/formattedText/DashFieldView.tsx | 12 +++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index 73c13b5dd..e8b0fc4ba 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -1500,7 +1500,8 @@ ScriptingGlobals.add(function updateTagsCollection(collection: Doc) { let created = false; const matchedDocs = matchedTags .filter(tagDoc => !Doc.AreProtosEqual(collection, tagDoc)) - .map(tagDoc => { + .reduce((aset, tagDoc) => { + if (Array.from(aset).find(doc => Doc.AreProtosEqual(tagDoc, doc))) return aset; let embedding = collectionDocs.find(doc => Doc.AreProtosEqual(tagDoc, doc)); if (!embedding) { embedding = Doc.MakeEmbedding(tagDoc); @@ -1510,9 +1511,10 @@ ScriptingGlobals.add(function updateTagsCollection(collection: Doc) { wid += NumCast(tagDoc._width); created = true; } - return embedding; - }); + aset.add(embedding); + return aset; + }, new Set()); - created && (collection[DocData].data = new List(matchedDocs)); + created && (collection[DocData].data = new List(Array.from(matchedDocs))); return true; }); diff --git a/src/client/views/nodes/formattedText/DashFieldView.tsx b/src/client/views/nodes/formattedText/DashFieldView.tsx index ec0b76aa8..b49e7dcf0 100644 --- a/src/client/views/nodes/formattedText/DashFieldView.tsx +++ b/src/client/views/nodes/formattedText/DashFieldView.tsx @@ -210,11 +210,13 @@ export class DashFieldViewInternal extends ObservableReactComponent )} {this._props.fieldKey.startsWith('#') ? null : this.fieldValueContent} - + {!this.values.length ? null : ( + + )} ); } -- cgit v1.2.3-70-g09d2