TagPicker styleName attribute removes tag-picker styles #671

Reworked get/set/remove style name methods to work the same as other components
jmix-projects · Oct 18, 2021 · 8a4539d · 8a4539d
1 parent 016a929
commit 8a4539d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/ui/src/main/java/io/jmix/ui/widget/JmixComboBoxPickerField.java b/ui/src/main/java/io/jmix/ui/widget/JmixComboBoxPickerField.java
@@ -22,6 +22,7 @@
 import com.vaadin.ui.IconGenerator;
 import com.vaadin.ui.ItemCaptionGenerator;
 import com.vaadin.ui.StyleGenerator;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
 import java.util.Collection;
@@ -62,12 +63,7 @@ public void setStyleName(String style) {
 
     @Override
     public String getStyleName() {
-        return removeComponentStyles(super.getStyleName());
-    }
-
-    @Override
-    public void removeStyleName(String style) {
-        super.removeStyleName(removeComponentStyles(style));
+        return StringUtils.normalizeSpace(super.getStyleName().replace(COMBOBOX_PICKERFIELD_STYLENAME, ""));
     }
 
     @Override
@@ -188,8 +184,4 @@ public void setNewItemHandler(@Nullable ComboBox.NewItemHandler newItemHandler)
     public void setStyleGenerator(StyleGenerator<T> generateItemStylename) {
         getFieldInternal().setStyleGenerator(generateItemStylename);
     }
-
-    protected String removeComponentStyles(String styleName) {
-        return styleName.replaceAll(COMBOBOX_PICKERFIELD_STYLENAME, "");
-    }
 }
diff --git a/ui/src/main/java/io/jmix/ui/widget/JmixTagPicker.java b/ui/src/main/java/io/jmix/ui/widget/JmixTagPicker.java
@@ -20,6 +20,7 @@
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
 import java.util.*;
@@ -147,7 +148,14 @@ public void setReadOnly(boolean readOnly) {
     public void setStyleName(String style) {
         super.setStyleName(TAGPICKER_STYLENAME
                 + " " + getTagContainerPositionStyle(getTagContainerPosition())
-                + " " + removeComponentStyles(style));
+                + " " + style);
+    }
+
+    @Override
+    public String getStyleName() {
+        return StringUtils.normalizeSpace(super.getStyleName()
+                .replace(TAGPICKER_STYLENAME, "")
+                .replace(getTagContainerPositionStyle(getTagContainerPosition()), ""));
     }
 
     public boolean isInlineTags() {
@@ -265,13 +273,4 @@ protected String getTagContainerPositionStyle(TagContainerPosition containerPosi
             return TAGS_BOTTOM_STYLENAME;
         }
     }
-
-    protected String removeComponentStyles(String styleName) {
-        String style = super.removeComponentStyles(styleName);
-        return style.replaceAll(TAGPICKER_STYLENAME
-                + "|" + TAGS_TOP_STYLENAME
-                + "|" + TAGS_RIGHT_STYLENAME
-                + "|" + TAGS_BOTTOM_STYLENAME
-                + "|" + TAGS_LEFT_STYLENAME, "");
-    }
 }