chore: mark the Material theme as deprecated (#7111)

* chore: mark the Material theme as deprecated * chore: deprecate Material values in enum theme variants --------- Co-authored-by: web-padawan <[email protected]> Co-authored-by: Sascha Ißbrücker <[email protected]>
vaadin · Feb 11, 2025 · a8d4389 · a8d4389
1 parent b2bee76
commit a8d4389
Show file tree

Hide file tree

Showing 22 changed files with 146 additions and 1 deletion.
diff --git a/...rent/vaadin-button-flow/src/main/java/com/vaadin/flow/component/button/ButtonVariant.java b/...rent/vaadin-button-flow/src/main/java/com/vaadin/flow/component/button/ButtonVariant.java
@@ -31,7 +31,17 @@ public enum ButtonVariant implements ThemeVariant {
     LUMO_ERROR("error"),
     LUMO_CONTRAST("contrast"),
     LUMO_ICON("icon"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_CONTAINED("contained"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_OUTLINED("outlined");
 
     private final String variant;

diff --git a/...low-parent/vaadin-card-flow/src/main/java/com/vaadin/flow/component/card/CardVariant.java b/...low-parent/vaadin-card-flow/src/main/java/com/vaadin/flow/component/card/CardVariant.java
@@ -23,7 +23,17 @@
 public enum CardVariant implements ThemeVariant {
     LUMO_ELEVATED("elevated"),
     LUMO_OUTLINED("outlined"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_ELEVATED("elevated"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_OUTLINED("outlined");
 
     private final String variant;

diff --git a/...arent/vaadin-charts-flow/src/main/java/com/vaadin/flow/component/charts/ChartVariant.java b/...arent/vaadin-charts-flow/src/main/java/com/vaadin/flow/component/charts/ChartVariant.java
@@ -15,8 +15,23 @@ public enum ChartVariant {
     LUMO_GRADIENT("gradient"),
     LUMO_MONOTONE("monotone"),
     LUMO_CLASSIC("classic"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_GRADIENT("gradient"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_MONOTONE("monotone"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_CLASSIC("classic");
 
     private final String variant;

diff --git a/...-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroupVariant.java b/...-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroupVariant.java
@@ -23,6 +23,11 @@
 public enum CheckboxGroupVariant implements ThemeVariant {
     LUMO_VERTICAL("vertical"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_VERTICAL("vertical");
 
     private final String variant;

diff --git a/...adin-combo-box-flow/src/main/java/com/vaadin/flow/component/combobox/ComboBoxVariant.java b/...adin-combo-box-flow/src/main/java/com/vaadin/flow/component/combobox/ComboBoxVariant.java
@@ -26,6 +26,11 @@ public enum ComboBoxVariant implements ThemeVariant {
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
 
     private final String variant;

diff --git a/...box-flow/src/main/java/com/vaadin/flow/component/combobox/MultiSelectComboBoxVariant.java b/...box-flow/src/main/java/com/vaadin/flow/component/combobox/MultiSelectComboBoxVariant.java
@@ -27,6 +27,11 @@ public enum MultiSelectComboBoxVariant implements ThemeVariant {
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
 
     private final String variant;

diff --git a/...ate-picker-flow/src/main/java/com/vaadin/flow/component/datepicker/DatePickerVariant.java b/...ate-picker-flow/src/main/java/com/vaadin/flow/component/datepicker/DatePickerVariant.java
@@ -26,6 +26,11 @@ public enum DatePickerVariant implements ThemeVariant {
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
 
     private final String variant;

diff --git a/...er-flow/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerVariant.java b/...er-flow/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerVariant.java
@@ -27,6 +27,11 @@ public enum DateTimePickerVariant implements ThemeVariant {
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
 
     private final String variant;

diff --git a/...rent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/DialogVariant.java b/...rent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/DialogVariant.java
@@ -21,7 +21,13 @@
  * Set of theme variants applicable for {@code vaadin-dialog} component.
  */
 public enum DialogVariant implements ThemeVariant {
-    LUMO_NO_PADDING("no-padding"), MATERIAL_NO_PADDING("no-padding");
+    LUMO_NO_PADDING("no-padding"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
+    MATERIAL_NO_PADDING("no-padding");
 
     private final String variant;
 

diff --git a/...low-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/GridVariant.java b/...low-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/GridVariant.java
@@ -25,6 +25,11 @@ public enum GridVariant {
     LUMO_ROW_STRIPES("row-stripes"),
     LUMO_COMPACT("compact"),
     LUMO_WRAP_CELL_CONTENT("wrap-cell-content"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_COLUMN_DIVIDERS("column-dividers");
 
     private final String variant;

diff --git a/.../vaadin-grid-pro-flow/src/main/java/com/vaadin/flow/component/gridpro/GridProVariant.java b/.../vaadin-grid-pro-flow/src/main/java/com/vaadin/flow/component/gridpro/GridProVariant.java
@@ -18,6 +18,11 @@ public enum GridProVariant {
     LUMO_ROW_STRIPES("row-stripes"),
     LUMO_COMPACT("compact"),
     LUMO_WRAP_CELL_CONTENT("wrap-cell-content"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_COLUMN_DIVIDERS("column-dividers"),
     LUMO_HIGHLIGHT_EDITABLE_CELLS("highlight-editable-cells"),
     LUMO_HIGHLIGHT_READ_ONLY_CELLS("highlight-read-only-cells");

diff --git a/...ent/vaadin-material-theme-flow/src/main/java/com/vaadin/flow/theme/material/Material.java b/...ent/vaadin-material-theme-flow/src/main/java/com/vaadin/flow/theme/material/Material.java
@@ -26,13 +26,17 @@
 
 /**
  * Material component theme class implementation.
+ *
+ * @deprecated Since 24.7, the Material theme is deprecated and will be removed
+ *             in Vaadin 25.
  */
 @NpmPackage(value = "@vaadin/vaadin-themable-mixin", version = "24.7.0-alpha8")
 @NpmPackage(value = "@vaadin/polymer-legacy-adapter", version = "24.7.0-alpha8")
 @NpmPackage(value = "@vaadin/vaadin-material-styles", version = "24.7.0-alpha8")
 @JsModule("@vaadin/polymer-legacy-adapter/style-modules.js")
 @JsModule("@vaadin/vaadin-material-styles/color-global.js")
 @JsModule("@vaadin/vaadin-material-styles/typography-global.js")
+@Deprecated
 public class Material implements AbstractTheme {
     public static final String LIGHT = "light";
     public static final String DARK = "dark";

diff --git a/.../vaadin-menu-bar-flow/src/main/java/com/vaadin/flow/component/menubar/MenuBarVariant.java b/.../vaadin-menu-bar-flow/src/main/java/com/vaadin/flow/component/menubar/MenuBarVariant.java
@@ -30,8 +30,23 @@ public enum MenuBarVariant implements ThemeVariant {
     LUMO_ICON("icon"),
     LUMO_END_ALIGNED("end-aligned"),
     LUMO_DROPDOWN_INDICATORS("dropdown-indicators"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_CONTAINED("contained"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_OUTLINED("outlined"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_END_ALIGNED("end-aligned");
 
     private final String variant;

diff --git a/...t/vaadin-popover-flow/src/main/java/com/vaadin/flow/component/popover/PopoverVariant.java b/...t/vaadin-popover-flow/src/main/java/com/vaadin/flow/component/popover/PopoverVariant.java
@@ -23,6 +23,11 @@
 public enum PopoverVariant implements ThemeVariant {
     ARROW("arrow"),
     LUMO_NO_PADDING("no-padding"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_NO_PADDING("no-padding");
 
     private final String variant;

diff --git a/...io-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioGroupVariant.java b/...io-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioGroupVariant.java
@@ -23,6 +23,11 @@
 public enum RadioGroupVariant implements ThemeVariant {
     LUMO_VERTICAL("vertical"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_VERTICAL("vertical");
 
     private final String variant;

diff --git a/...or-flow/src/main/java/com/vaadin/flow/component/richtexteditor/RichTextEditorVariant.java b/...or-flow/src/main/java/com/vaadin/flow/component/richtexteditor/RichTextEditorVariant.java
@@ -17,6 +17,11 @@
 public enum RichTextEditorVariant implements ThemeVariant {
     LUMO_NO_BORDER("no-border"),
     LUMO_COMPACT("compact"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_NO_BORDER("no-border");
 
     private final String variant;

diff --git a/...rent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/SelectVariant.java b/...rent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/SelectVariant.java
@@ -26,6 +26,11 @@ public enum SelectVariant implements ThemeVariant {
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
 
     private final String variant;

diff --git a/...parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheetVariant.java b/...parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheetVariant.java
@@ -34,7 +34,17 @@ public enum TabSheetVariant implements ThemeVariant {
     LUMO_TABS_EQUAL_WIDTH_TABS("equal-width-tabs"),
     LUMO_BORDERED("bordered"),
     LUMO_NO_PADDING("no-padding"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_TABS_FIXED("fixed"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_BORDERED("bordered");
 
     private final String variant;

diff --git a/...low-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabsVariant.java b/...low-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabsVariant.java
@@ -32,6 +32,11 @@ public enum TabsVariant implements ThemeVariant {
     LUMO_MINIMAL("minimal"),
     LUMO_HIDE_SCROLL_BUTTONS("hide-scroll-buttons"),
     LUMO_EQUAL_WIDTH_TABS("equal-width-tabs"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_FIXED("fixed");
 
     private final String variant;

diff --git a/...in-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextAreaVariant.java b/...in-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextAreaVariant.java
@@ -25,6 +25,11 @@ public enum TextAreaVariant implements ThemeVariant {
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
 
     private final String variant;

diff --git a/...n-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextFieldVariant.java b/...n-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextFieldVariant.java
@@ -26,6 +26,11 @@ public enum TextFieldVariant implements ThemeVariant {
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
 
     private final String variant;

diff --git a/...ime-picker-flow/src/main/java/com/vaadin/flow/component/timepicker/TimePickerVariant.java b/...ime-picker-flow/src/main/java/com/vaadin/flow/component/timepicker/TimePickerVariant.java
@@ -26,6 +26,11 @@ public enum TimePickerVariant implements ThemeVariant {
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
     LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
+    /**
+     * @deprecated Since 24.7, the Material theme is deprecated and will be
+     *             removed in Vaadin 25.
+     */
+    @Deprecated
     MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
 
     private final String variant;