From 8ed42836cf081abd5ea8b1cec0ce00a0a243a0c9 Mon Sep 17 00:00:00 2001 From: Iwona Just Date: Mon, 12 Feb 2024 11:37:54 +0000 Subject: [PATCH 1/6] handle spacing differently --- src/templates/_components/fieldtypes/Tags/input.twig | 2 ++ src/web/assets/cp/src/css/_main.scss | 1 + 2 files changed, 3 insertions(+) diff --git a/src/templates/_components/fieldtypes/Tags/input.twig b/src/templates/_components/fieldtypes/Tags/input.twig index bbdc7a3a6a4..fe1da87a011 100644 --- a/src/templates/_components/fieldtypes/Tags/input.twig +++ b/src/templates/_components/fieldtypes/Tags/input.twig @@ -10,12 +10,14 @@
+ {%- apply spaceless %} {% for element in elements %} {{ elementChip(element, { context: 'field', inputName: (name ?? false) ? "#{name}[]" : null, }) }} {% endfor %} + {% endapply -%}
diff --git a/src/web/assets/cp/src/css/_main.scss b/src/web/assets/cp/src/css/_main.scss index fd94b9b1b9e..18724c48c20 100644 --- a/src/web/assets/cp/src/css/_main.scss +++ b/src/web/assets/cp/src/css/_main.scss @@ -6577,6 +6577,7 @@ $min2ColWidth: 400px; .chip.small { clear: none; + @include margin-right(7px); } .add { From 44b0898782d0a253de78f8d2203f50822ab86249 Mon Sep 17 00:00:00 2001 From: Iwona Just Date: Mon, 12 Feb 2024 11:51:45 +0000 Subject: [PATCH 2/6] don't error when using tags field --- src/web/assets/cp/src/js/TagSelectInput.js | 39 ++++++++++++---------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/web/assets/cp/src/js/TagSelectInput.js b/src/web/assets/cp/src/js/TagSelectInput.js index 9988e52cfaa..968ad3548f1 100644 --- a/src/web/assets/cp/src/js/TagSelectInput.js +++ b/src/web/assets/cp/src/js/TagSelectInput.js @@ -142,7 +142,9 @@ Craft.TagSelectInput = Craft.BaseElementSelectInput.extend( }, // No "add" button - getAddElementsBtn: $.noop, + getAddElementsBtn: function () { + return []; + }, getElementSortAxis: function () { return null; @@ -245,36 +247,39 @@ Craft.TagSelectInput = Craft.BaseElementSelectInput.extend( var title = $option.text(); var $element = $('
', { - class: 'element small removable', + class: 'chip element small removable', 'data-id': id, 'data-site-id': this.settings.targetSiteId, 'data-label': title, 'data-editable': '1', }).appendTo(this.$elementsContainer); - var $input = $('', { - type: 'hidden', - name: this.settings.name + '[]', - value: id, - }).appendTo($element); - - $('