Add ContentMode for row and cell descriptions in Grid (#10282)

2 files changed, 28 insertions, 6 deletions

diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnState.java
index 82f6b77639..eb0e28dce9 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/ColumnState.java
@@ -16,6 +16,7 @@
 package com.vaadin.shared.ui.grid;
 
 import com.vaadin.shared.Connector;
+import com.vaadin.shared.ui.ContentMode;
 
 /**
  * Shared state for a Grid column.
@@ -74,4 +75,11 @@ public class ColumnState extends AbstractGridExtensionState {
      */
     public boolean minimumWidthFromContent = true;
 
+    /**
+     * The content mode for tooltips.
+     *
+     * @since 8.2
+     */
+    public ContentMode contentMode;
+
 }
diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
index 98508ad705..75f53d11d5 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/grid/GridState.java
@@ -22,6 +22,7 @@ import java.util.List;
 import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.shared.ui.AbstractSingleSelectState;
+import com.vaadin.shared.ui.ContentMode;
 
 /**
  * The shared state for the {@link com.vaadin.ui.Grid} component.
@@ -41,42 +42,48 @@ public class GridState extends AbstractSingleSelectState {
     /**
      * The key in which a row's data can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int,
+     *      elemental.json.JsonArray)
      */
     public static final String JSONKEY_DATA = "d";
 
     /**
      * The key in which a row's own key can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int,
+     *      elemental.json.JsonArray)
      */
     public static final String JSONKEY_ROWKEY = "k";
 
     /**
      * The key in which a row's generated style can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int,
+     *      elemental.json.JsonArray)
      */
     public static final String JSONKEY_ROWSTYLE = "rs";
 
     /**
      * The key in which a generated styles for a row's cells can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int,
+     *      elemental.json.JsonArray)
      */
     public static final String JSONKEY_CELLSTYLES = "cs";
 
     /**
      * The key in which a row's description can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int,
+     *      elemental.json.JsonArray)
      */
     public static final String JSONKEY_ROWDESCRIPTION = "rd";
 
     /**
      * The key in which a cell's description can be found.
      *
-     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, elemental.json.JsonArray)
+     * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int,
+     *      elemental.json.JsonArray)
      */
     public static final String JSONKEY_CELLDESCRIPTION = "cd";
 
@@ -167,4 +174,11 @@ public class GridState extends AbstractSingleSelectState {
      * @since 8.2
      */
     public double footerRowHeight = -1;
+
+    /**
+     * The content mode for row descriptions.
+     *
+     * @since 8.2
+     */
+    public ContentMode rowDescriptionContentMode;
 }