IBX-5950: Fixed last value from one custom class appears in another (#93

)
ibexa · Jun 22, 2023 · 43cf506 · 43cf506
1 parent 5f2a436
commit 43cf506
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/bundle/Resources/public/js/CKEditor/custom-attributes/custom-attributes-command.js b/src/bundle/Resources/public/js/CKEditor/custom-attributes/custom-attributes-command.js
@@ -23,7 +23,15 @@ class IbexaCustomAttributesCommand extends Command {
 
     cleanClasses(modelElement, classes) {
         Object.keys(classes).forEach((elementName) => {
-            if (elementName === modelElement.name || classes[modelElement.name]) {
+            const selectedCustomClasses = modelElement.getAttribute('custom-classes') ?? '';
+            const elementCustomClassesConfig = classes[modelElement.name];
+            const hasOwnCustomClasses =
+                elementCustomClassesConfig &&
+                selectedCustomClasses
+                    .split()
+                    .every((selectedCustomClass) => elementCustomClassesConfig.choices.includes(selectedCustomClass));
+
+            if (elementName === modelElement.name || hasOwnCustomClasses) {
                 return;
             }