simplify implementation

openstreetmap · Feb 26, 2025 · 3ca9886 · 3ca9886
1 parent 8b058cb
commit 3ca9886
Showing 1 changed file with 17 additions and 34 deletions.
diff --git a/modules/ui/changeset_editor.js b/modules/ui/changeset_editor.js
@@ -14,7 +14,6 @@ export function uiChangesetEditor(context) {
     var dispatch = d3_dispatch('change');
     var formFields = uiFormFields(context);
     var commentCombo = uiCombobox(context, 'comment').caseSensitive(true);
-    var hashtagsCombo = uiCombobox(context, 'hashtags').caseSensitive(true);
     var _fieldsArr;
     var _tags;
     var _changesetID;
@@ -35,7 +34,7 @@ export function uiChangesetEditor(context) {
             _fieldsArr = [
                 uiField(context, presets.field('comment'), null, { show: true, revert: false }),
                 uiField(context, presets.field('source'), null, { show: true, revert: false }),
-                uiField(context, presets.field('hashtags'), null, { show: false, revert: false }),
+                uiField(context, { ...presets.field('hashtags'), options: [], autoSuggestions: false }, null, { show: false, revert: false }), // todo: remove temporary override when tagging schema v6.10 is released (see https://github.com/openstreetmap/id-tagging-schema/commit/d7bede7c7f444925d3293ffdf029915065529a7f)
             ];
 
             _fieldsArr.forEach(function(field) {
@@ -59,9 +58,9 @@ export function uiChangesetEditor(context) {
         if (initial) {
             var commentField = selection.select('.form-field-comment textarea');
             const sourceField = _fieldsArr.find(field => field.id === 'source');
-            const hashtagField = _fieldsArr.find(field => field.id === 'hashtags');
-            var commentNode = commentField.node();
+            const hashtagsField = _fieldsArr.find(field => field.id === 'hashtags');
 
+            var commentNode = commentField.node();
             if (commentNode) {
                 commentNode.focus();
                 commentNode.select();
@@ -89,41 +88,25 @@ export function uiChangesetEditor(context) {
                     // add extra dropdown options to the `source` field
                     // based on the values used in recent changesets.
                     const recentSources = changesets
-                        .flatMap((changeset) => changeset.tags.source?.split(';'))
+                        .flatMap(changeset => changeset.tags.source?.split(';'))
+                        .filter(value => !sourceField.options.includes(value))
                         .filter(Boolean)
                         .map(title => ({ title, value: title, klass: 'raw-option' }));
 
                     sourceField.impl.setCustomOptions(utilArrayUniqBy(recentSources, 'title'));
 
-                    // Add hashtags dropdown
-                    // Extract unique hashtags from recent changesets
-                    var recentHashtags = changesets
-                        .flatMap((changeset) => changeset.tags.hashtags?.split(';'))
-                        .filter(Boolean)
-                        .map(hashtag => ({
-                            value: hashtag.replace('#', ''),
-                            title: hashtag,
-                            klass: 'tag-option'
-                        }));
-
-                    // Set up the combobox when field is shown
-                    var origShow = hashtagField.show;
-                    hashtagField.show = function() {  
-                        origShow.call(this);
-
-                        // Set up the combobox when field becomes visible
-                        if (hashtagField.impl) {
-                            hashtagField.impl.setCustomOptions(utilArrayUniqBy(recentHashtags, 'title'));
-
-                            // Wait for the next tick to ensure the input is rendered
-                            setTimeout(function() {
-                                selection.select('.form-field-hashtags input')
-                                    .call(hashtagsCombo
-                                        .data(utilArrayUniqBy(recentHashtags, 'title'))
-                                    );
-                            }, 0);
-                        }
-                    };
+                    // add extra dropdown options to the `hashtags` field
+                    // based on the values used in recent changesets.
+                    const recentHashtags = changesets
+                        .flatMap(changeset => changeset.tags.hashtags?.split(';'))
+                        .filter(Boolean);
+                    if (!hashtagsField.impl) {
+                        hashtagsField.options = recentHashtags;
+                    } else {
+                        hashtagsField.impl.setCustomOptions(utilArrayUniqBy(recentHashtags.map(title => (
+                            { title, value: title, klass: 'raw-option' }
+                        )), 'title'));
+                    }
                 });
             }
         }