feat: add Aura variants (#8145)

* feat: add base variants

* test: update tests to use base variants

* feat: update base variants based on web component styles

* fix: fix compilation errors and cleanup

* fix: fix compilation

* fix: fix compilation and remove duplicate tests

* fix: update incorrect variants

* feat: use both horizontal and vertical in group variants

* feat: add primary variant and deprecate lumo version

* refactor: remove icon base variant

* refactor: add missing deprecation

* feat: remove base variants and add aura variants

* feat: add aura variants for grid and gridpro

* refactor: revert changes and cleanup

* fix: remove variants instead of adding

* feat: add missing variants

* refactor: add missing button variants to drawer toggle variants

* refactor: remove drawer toggle variants

* refactor: add theme specific variants for details

* chore: revert newline change

* test: remove unnecessary test

* add missing layout spacing variants

* refactor: add missing menu bar variants

* refactor: remove redundant group orientation variants

* Update vaadin-button-flow-parent/vaadin-button-flow/src/main/java/com/vaadin/flow/component/button/ButtonVariant.java

Co-authored-by: Jouni Koivuviita <jouni@vaadin.com>

---------

Co-authored-by: web-padawan <iamkulykov@gmail.com>
Co-authored-by: Jouni Koivuviita <jouni@vaadin.com>

Author: 3 people

vaadin-avatar-flow-parent/vaadin-avatar-flow/src/main/java/com/vaadin/flow/component/avatar/AvatarVariant.java

@@ -24,7 +24,9 @@ public enum AvatarVariant implements ThemeVariant {
     LUMO_XLARGE("xlarge"),
     LUMO_LARGE("large"),
     LUMO_SMALL("small"),
-    LUMO_XSMALL("xsmall");
+    LUMO_XSMALL("xsmall"),
+    LUMO_REVERSE("reverse"),
+    AURA_REVERSE("reverse");
 
     private final String variant;
 

vaadin-avatar-flow-parent/vaadin-avatar-flow/src/test/java/com/vaadin/flow/component/avatar/tests/AvatarGroupTest.java

@@ -16,16 +16,13 @@
 package com.vaadin.flow.component.avatar.tests;
 
 import java.util.List;
-import java.util.Set;
 
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.flow.component.avatar.AvatarGroup;
 import com.vaadin.flow.component.avatar.AvatarGroup.AvatarGroupItem;
-import com.vaadin.flow.component.avatar.AvatarGroupVariant;
-import com.vaadin.flow.component.avatar.AvatarVariant;
 
 public class AvatarGroupTest {
 
@@ -136,25 +133,6 @@ public void getMaxItemsVisible_returnsNull() {
         Assert.assertNull(avatarGroup.getMaxItemsVisible());
     }
 
-    @Test
-    public void addThemeVariant_themeAttributeContainsThemeVariant() {
-        avatarGroup.addThemeVariants(AvatarGroupVariant.LUMO_LARGE);
-
-        Set<String> themeNames = avatarGroup.getThemeNames();
-        Assert.assertTrue(
-                themeNames.contains(AvatarVariant.LUMO_LARGE.getVariantName()));
-    }
-
-    @Test
-    public void addThemeVariant_removeThemeVariant_doesNotContainThemeVariant() {
-        avatarGroup.addThemeVariants(AvatarGroupVariant.LUMO_LARGE);
-        avatarGroup.removeThemeVariants(AvatarGroupVariant.LUMO_LARGE);
-
-        Set<String> themeNames = avatarGroup.getThemeNames();
-        Assert.assertFalse(
-                themeNames.contains(AvatarVariant.LUMO_LARGE.getVariantName()));
-    }
-
     @Test
     public void setI18n() {
         AvatarGroup.AvatarGroupI18n i18n = new AvatarGroup.AvatarGroupI18n()

vaadin-avatar-flow-parent/vaadin-avatar-flow/src/test/java/com/vaadin/flow/component/avatar/tests/AvatarGroupVariantTest.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2025 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.flow.component.avatar.tests;
+
+import org.junit.Test;
+
+import com.vaadin.flow.component.avatar.AvatarGroup;
+import com.vaadin.flow.component.avatar.AvatarGroupVariant;
+import com.vaadin.tests.ThemeVariantTestHelper;
+
+public class AvatarGroupVariantTest {
+
+    @Test
+    public void addThemeVariant_themeNamesContainsThemeVariant() {
+        ThemeVariantTestHelper.addThemeVariant_themeNamesContainsThemeVariant(
+                new AvatarGroup(), AvatarGroupVariant.LUMO_SMALL);
+    }
+
+    @Test
+    public void addThemeVariant_removeThemeVariant_themeNamesDoesNotContainThemeVariant() {
+        ThemeVariantTestHelper
+                .addThemeVariant_removeThemeVariant_themeNamesDoesNotContainThemeVariant(
+                        new AvatarGroup(), AvatarGroupVariant.LUMO_SMALL);
+    }
+}

vaadin-avatar-flow-parent/vaadin-avatar-flow/src/test/java/com/vaadin/flow/component/avatar/tests/AvatarTest.java

@@ -15,14 +15,11 @@
  */
 package com.vaadin.flow.component.avatar.tests;
 
-import java.util.Set;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.flow.component.avatar.Avatar;
-import com.vaadin.flow.component.avatar.AvatarVariant;
 
 public class AvatarTest {
 
@@ -73,25 +70,6 @@ public void constructAvatarWithNameAndImage() {
         Assert.assertEquals(avatar.getImage(), "https://vaadin.com/");
     }
 
-    @Test
-    public void addThemeVariant_themeAttributeContainsThemeVariant() {
-        avatar.addThemeVariants(AvatarVariant.LUMO_LARGE);
-
-        Set<String> themeNames = avatar.getThemeNames();
-        Assert.assertTrue(
-                themeNames.contains(AvatarVariant.LUMO_LARGE.getVariantName()));
-    }
-
-    @Test
-    public void addThemeVariant_removeThemeVariant_doesNotContainThemeVariant() {
-        avatar.addThemeVariants(AvatarVariant.LUMO_LARGE);
-        avatar.removeThemeVariants(AvatarVariant.LUMO_LARGE);
-
-        Set<String> themeNames = avatar.getThemeNames();
-        Assert.assertFalse(
-                themeNames.contains(AvatarVariant.LUMO_LARGE.getVariantName()));
-    }
-
     @Test
     public void setI18n() {
         Avatar.AvatarI18n i18n = new Avatar.AvatarI18n()

vaadin-avatar-flow-parent/vaadin-avatar-flow/src/test/java/com/vaadin/flow/component/avatar/tests/AvatarVariantTest.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2025 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.flow.component.avatar.tests;
+
+import org.junit.Test;
+
+import com.vaadin.flow.component.avatar.Avatar;
+import com.vaadin.flow.component.avatar.AvatarVariant;
+import com.vaadin.tests.ThemeVariantTestHelper;
+
+public class AvatarVariantTest {
+
+    @Test
+    public void addThemeVariant_themeNamesContainsThemeVariant() {
+        ThemeVariantTestHelper.addThemeVariant_themeNamesContainsThemeVariant(
+                new Avatar(), AvatarVariant.LUMO_SMALL);
+    }
+
+    @Test
+    public void addThemeVariant_removeThemeVariant_themeNamesDoesNotContainThemeVariant() {
+        ThemeVariantTestHelper
+                .addThemeVariant_removeThemeVariant_themeNamesDoesNotContainThemeVariant(
+                        new Avatar(), AvatarVariant.LUMO_SMALL);
+    }
+}

vaadin-button-flow-parent/vaadin-button-flow/src/main/java/com/vaadin/flow/component/button/ButtonVariant.java

@@ -30,7 +30,11 @@ public enum ButtonVariant implements ThemeVariant {
     LUMO_WARNING("warning"),
     LUMO_ERROR("error"),
     LUMO_CONTRAST("contrast"),
-    LUMO_ICON("icon");
+    LUMO_ICON("icon"),
+    AURA_PRIMARY("primary"),
+    AURA_TERTIARY("tertiary"),
+    AURA_ACCENT("accent"),
+    AURA_DANGER("danger");
 
     private final String variant;
 

vaadin-button-flow-parent/vaadin-button-flow/src/test/java/com/vaadin/flow/component/button/tests/ButtonTest.java

@@ -15,7 +15,6 @@
  */
 package com.vaadin.flow.component.button.tests;
 
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Assert;
@@ -24,7 +23,6 @@
 import com.vaadin.flow.component.HasAriaLabel;
 import com.vaadin.flow.component.Text;
 import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.icon.Icon;
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.component.shared.HasTooltip;
@@ -36,10 +34,6 @@ public class ButtonTest {
 
     private static final String TEST_STRING = "lorem ipsum";
 
-    private static final String THEME_ATTRIBUTE = "theme";
-    private static final String THEME_ATTRIBUTE_ICON = "icon";
-    private static final String THEME_ATTRIBUTE_PRIMARY = "primary";
-
     @Test
     public void emptyCtor() {
         button = new Button();
@@ -139,55 +133,6 @@ public void changeOrder_setIcon_setText_changeOrder() {
         assertIconBeforeText();
     }
 
-    @Test
-    public void updatingThemeAttribute() {
-        button = new Button();
-        assertButtonHasNoThemeAttribute();
-
-        button.setIcon(new Icon());
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_ICON);
-
-        button.setText("foo");
-        assertButtonHasNoThemeAttribute();
-
-        button.setIcon(null);
-        assertButtonHasNoThemeAttribute();
-
-        button = new Button("foo", new Icon());
-        assertButtonHasNoThemeAttribute();
-
-        button.setText("");
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_ICON);
-
-        button = new Button("foo", new Icon());
-        button.setText(null);
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_ICON);
-
-        // should ignore tooltips when determining theme
-        button = new Button();
-        button.setTooltipText("foo");
-        button.setIcon(new Icon());
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_ICON);
-
-        button = new Button(new Icon());
-        button.setTooltipText("foo");
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_ICON);
-
-        // don't override explicitly set theme-attribute
-        button = new Button();
-        button.getElement().setAttribute(THEME_ATTRIBUTE,
-                THEME_ATTRIBUTE_PRIMARY);
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_PRIMARY);
-        button.setIcon(new Icon());
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_PRIMARY);
-        button.setText("foo");
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_PRIMARY);
-        button.setIcon(null);
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_PRIMARY);
-        button.setText(null);
-        assertButtonHasThemeAttribute(THEME_ATTRIBUTE_PRIMARY);
-    }
-
     @Test
     public void setEnabled() {
         button = new Button();
@@ -237,63 +182,6 @@ public void testFireClickDisabled() {
         Assert.assertFalse(clicked.get());
     }
 
-    @Test
-    public void addThemeVariant_themeNamesContainsThemeVariant() {
-        button = new Button();
-        button.addThemeVariants(ButtonVariant.LUMO_SMALL);
-
-        Set<String> themeNames = button.getThemeNames();
-        Assert.assertTrue(
-                themeNames.contains(ButtonVariant.LUMO_SMALL.getVariantName()));
-    }
-
-    @Test
-    public void addThemeVariant_removeThemeVariant_themeNamesDoesNotContainThemeVariant() {
-        button = new Button();
-        button.addThemeVariants(ButtonVariant.LUMO_SMALL);
-        button.removeThemeVariants(ButtonVariant.LUMO_SMALL);
-
-        Set<String> themeNames = button.getThemeNames();
-        Assert.assertFalse(
-                themeNames.contains(ButtonVariant.LUMO_SMALL.getVariantName()));
-    }
-
-    @Test
-    public void addThemeVariant_setIcon_themeAttributeContainsThemeVariantAndIcon() {
-        button = new Button();
-        button.addThemeVariants(ButtonVariant.LUMO_SUCCESS);
-        button.setIcon(new Icon(VaadinIcon.ARROW_RIGHT));
-
-        Set<String> themeNames = button.getThemeNames();
-        Assert.assertTrue(themeNames.contains("icon"));
-        Assert.assertTrue(themeNames
-                .contains(ButtonVariant.LUMO_SUCCESS.getVariantName()));
-    }
-
-    @Test
-    public void setIcon_addThemeVariant_themeAttributeContiansThemeVariantAndIcon() {
-        button = new Button();
-        button.setIcon(new Icon(VaadinIcon.ARROW_RIGHT));
-        button.addThemeVariants(ButtonVariant.LUMO_SUCCESS);
-
-        Set<String> themeNames = button.getThemeNames();
-        Assert.assertTrue(themeNames.contains("icon"));
-        Assert.assertTrue(themeNames
-                .contains(ButtonVariant.LUMO_SUCCESS.getVariantName()));
-    }
-
-    @Test
-    public void changeIcon_iconThemeIsPreserved() {
-        button = new Button();
-        button.setIcon(new Icon(VaadinIcon.ARROW_RIGHT));
-
-        Assert.assertEquals("icon", button.getThemeName());
-
-        button.setIcon(new Icon(VaadinIcon.ALARM));
-
-        Assert.assertEquals("icon", button.getThemeName());
-    }
-
     @Test
     public void disableOnClick_click_componentIsDisabled() {
         AtomicBoolean buttonIsEnabled = new AtomicBoolean(true);
@@ -337,15 +225,6 @@ public void setAriaLabel() {
         Assert.assertEquals("Aria label", button.getAriaLabel().get());
     }
 
-    private void assertButtonHasThemeAttribute(String theme) {
-        Assert.assertTrue("Expected " + theme + " to be in the theme attribute",
-                button.getThemeNames().contains(theme));
-    }
-
-    private void assertButtonHasNoThemeAttribute() {
-        Assert.assertNull(button.getElement().getAttribute("theme"));
-    }
-
     private void assertIconBeforeText() {
         Assert.assertTrue("Icon should be child of button",
                 button.getElement().getChildren()