From ad7c43b0adac162f45db45f7e4567837eac6fd28 Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Wed, 25 Jun 2025 11:14:35 +0200
Subject: [PATCH 1/3] ezkeyword invalid state fix

---
 .../Resources/public/js/scripts/fieldType/ezkeyword.js     | 7 +++++--
 .../themes/admin/ui/field_type/edit/ezkeyword.html.twig    | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js b/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js
index 90b5588666..9494481f40 100644
--- a/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js
+++ b/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js
@@ -73,9 +73,12 @@
         class EzKeywordTaggify extends ibexa.core.Taggify {
             afterTagsUpdate() {
                 const tags = [...this.tags];
+                const tagsInputValue = tags.join();
 
-                keywordInput.value = tags.join();
-                keywordInput.dispatchEvent(new Event('change'));
+                if (keywordInput.value !== tagsInputValue) {
+                    keywordInput.value = tags.join();
+                    keywordInput.dispatchEvent(new Event('change'));
+                }
             }
         }
         const taggify = new EzKeywordTaggify({
diff --git a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezkeyword.html.twig b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezkeyword.html.twig
index 2c07235f6c..6409ccf822 100644
--- a/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezkeyword.html.twig
+++ b/src/bundle/Resources/views/themes/admin/ui/field_type/edit/ezkeyword.html.twig
@@ -1,6 +1,10 @@
 {%- block ezplatform_fieldtype_ezkeyword_widget -%}
     <div class="ibexa-data-source__taggify">
-        {% include '@ibexadesign/ui/component/taggify/taggify.html.twig' %}
+        {% embed '@ibexadesign/ui/component/taggify/taggify.html.twig' %}
+            {% block main_class %}
+                {{- form.vars.errors|length > 0 ? 'is-invalid' -}}
+            {% endblock %}
+        {% endembed %}
     </div>
     <div class="ibexa-data-source__input-wrapper" hidden>
         {{- block('form_widget') -}}

From 6f852d8b132c163e5ea2e84d5a009a11dc54f55f Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Jun 2025 09:24:21 +0200
Subject: [PATCH 2/3] small adjustment

---
 src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js b/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js
index 9494481f40..dbeaa493f0 100644
--- a/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js
+++ b/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js
@@ -76,7 +76,7 @@
                 const tagsInputValue = tags.join();
 
                 if (keywordInput.value !== tagsInputValue) {
-                    keywordInput.value = tags.join();
+                    keywordInput.value = tagsInputValue;
                     keywordInput.dispatchEvent(new Event('change'));
                 }
             }

From 0198915fbca1845b45b3a9fa83d875961a1d31af Mon Sep 17 00:00:00 2001
From: tischsoic <symfiz@gmail.com>
Date: Thu, 26 Jun 2025 15:45:43 +0200
Subject: [PATCH 3/3] addTags

---
 .../public/js/scripts/core/taggify.js         | 58 ++++++++++++++-----
 .../public/js/scripts/fieldType/ezkeyword.js  |  9 ++-
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/bundle/Resources/public/js/scripts/core/taggify.js b/src/bundle/Resources/public/js/scripts/core/taggify.js
index 38bb3526a2..2d0d77a9b4 100644
--- a/src/bundle/Resources/public/js/scripts/core/taggify.js
+++ b/src/bundle/Resources/public/js/scripts/core/taggify.js
@@ -47,30 +47,60 @@
             });
         }
 
-        addTag(name, value, attrs = {}, tooltipAttrs = {}) {
-            if (!value || this.tags.has(value)) {
+        addTags(tagsData) {
+            const newTagsData = tagsData.reduce((processedTags, tagData) => {
+                const { value } = tagData;
+                const processedTagsValues = new Set(processedTags.map((tag) => tag.value));
+
+                if (!value || this.tags.has(value) || processedTagsValues.has(value)) {
+                    return processedTags;
+                }
+
+                processedTags.push(tagData);
+
+                return processedTags;
+            }, []);
+
+            if (newTagsData.length === 0) {
                 return;
             }
 
             const tagTemplate = this.listNode.dataset.template;
-            const nameHtmlEscaped = escapeHTML(name);
-            const valueHtmlAttributeEscaped = escapeHTMLAttribute(value);
-            const renderedTemplate = tagTemplate.replace('{{ name }}', nameHtmlEscaped).replace('{{ value }}', valueHtmlAttributeEscaped);
-            const div = doc.createElement('div');
 
-            dangerouslyInsertAdjacentHTML(div, 'beforeend', renderedTemplate);
+            newTagsData.forEach(({ name, value, attrs = {}, tooltipAttrs = {} }) => {
+                const nameHtmlEscaped = escapeHTML(name);
+                const valueHtmlAttributeEscaped = escapeHTMLAttribute(value);
+                const renderedTemplate = tagTemplate
+                    .replace('{{ name }}', nameHtmlEscaped)
+                    .replace('{{ value }}', valueHtmlAttributeEscaped);
+                const div = doc.createElement('div');
 
-            const tag = div.querySelector('.ibexa-taggify__list-tag');
-            const tagNameNode = tag.querySelector('.ibexa-taggify__list-tag-name');
+                dangerouslyInsertAdjacentHTML(div, 'beforeend', renderedTemplate);
+
+                const tag = div.querySelector('.ibexa-taggify__list-tag');
+                const tagNameNode = tag.querySelector('.ibexa-taggify__list-tag-name');
+
+                this.addElementAttributes(tag, { ...attrs, dataset: { ...attrs.dataset, value } });
+                this.addElementAttributes(tagNameNode, tooltipAttrs);
+                this.attachEventsToTag(tag, value);
+                this.listNode.insertBefore(tag, this.inputNode);
+                this.tags.add(value);
+            });
 
-            this.addElementAttributes(tag, { ...attrs, dataset: { ...attrs.dataset, value } });
-            this.addElementAttributes(tagNameNode, tooltipAttrs);
-            this.attachEventsToTag(tag, value);
-            this.listNode.insertBefore(tag, this.inputNode);
-            this.tags.add(value);
             this.afterTagsUpdate();
         }
 
+        addTag(name, value, attrs = {}, tooltipAttrs = {}) {
+            this.addTags([
+                {
+                    name,
+                    value,
+                    attrs,
+                    tooltipAttrs,
+                },
+            ]);
+        }
+
         removeTagWithValue(value) {
             const tag = this.listNode.querySelector(`.ibexa-taggify__list-tag[data-value="${value}"]`);
 
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js b/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js
index dbeaa493f0..cd8123aa9e 100644
--- a/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js
+++ b/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js
@@ -96,9 +96,12 @@
         taggify.init();
 
         if (keywordInput.value.length) {
-            keywordInput.value.split(',').forEach((tag) => {
-                taggify.addTag(tag, tag);
-            });
+            const tagsData = keywordInput.value.split(',').map((tag) => ({
+                name: tag,
+                value: tag,
+            }));
+
+            taggify.addTags(tagsData);
         }
 
         taggifyContainer.addEventListener('tagsCreated', updateKeywords, false);