From 96ca34e6843c839c60d4a97b963e516de1ddfb5a Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Thu, 9 Feb 2023 10:56:50 -0300
Subject: [PATCH 01/21] ci: upgrade Vaadin 24 version to 24.0.0.beta1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e783473..9a7b4bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,7 +322,7 @@
 			<properties>
 				<maven.compiler.source>17</maven.compiler.source>
 				<maven.compiler.target>17</maven.compiler.target>
-				<vaadin.version>24.0.0.alpha6</vaadin.version>
+				<vaadin.version>24.0.0.beta1</vaadin.version>
 				<jetty.version>11.0.12</jetty.version>
 			</properties>
 			<repositories>

From 5b046840e11ca22174bb0812b661c10ef32c0215 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Wed, 15 Feb 2023 10:07:43 -0300
Subject: [PATCH 02/21] ci: add conventional-commits and SemVer check

---
 .github/workflows/commits.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .github/workflows/commits.yml

diff --git a/.github/workflows/commits.yml b/.github/workflows/commits.yml
new file mode 100644
index 0000000..d096e00
--- /dev/null
+++ b/.github/workflows/commits.yml
@@ -0,0 +1,8 @@
+name: Check Commits
+
+on: 
+  pull_request:
+
+jobs:
+  check-commits:    
+    uses: FlowingCode/GithubActions/.github/workflows/check-commits.yml@main

From 5491673308079fb8d23e618267451c3a53b7b0af Mon Sep 17 00:00:00 2001
From: Felipe Lang <felipe.lang@ext.vaadin.com>
Date: Tue, 7 Mar 2023 12:52:59 -0300
Subject: [PATCH 03/21] ci: upgrade to Vaadin 14.8.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9a7b4bd..bde955b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<version>2.9.3-SNAPSHOT</version>
 	<name>TwinColGrid add-on</name>
     <properties>
-        <vaadin.version>14.8.1</vaadin.version>
+        <vaadin.version>14.8.3</vaadin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From d5643d5a27a9d979669c00ef7a11d2e806630aa5 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:10:21 -0300
Subject: [PATCH 04/21] fix(demo): avoid use of deprecated constructor

Close #133
---
 .../flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
index c8b4a01..cff4758 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
@@ -56,7 +56,8 @@ public OrientationDemo() {
     twinColGrid.setValue(selectedBooks);
 
     FormLayout formLayout = new FormLayout();
-    Select<TwinColGrid.Orientation> orientationField = new Select<>(Orientation.values());
+    Select<TwinColGrid.Orientation> orientationField = new Select<>();
+    orientationField.setItems(Orientation.values());
     orientationField.addValueChangeListener(ev -> twinColGrid.withOrientation(ev.getValue()));
     orientationField.setValue(twinColGrid.getOrientation());
     orientationField.setWidth("225px");

From bb67f82a21f6cd4ada8cac214fd6a18b15fa148f Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:45:53 -0300
Subject: [PATCH 05/21] ci: use jetty.version from property

---
 pom.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bde955b..b08e5b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <jetty.version>9.4.36.v20210114</jetty.version>
     </properties>
     <organization>
 	   <name>Flowing Code</name>
@@ -161,10 +162,23 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-maven-plugin</artifactId>
+                <version>${vaadin.version}</version>
+                <executions>
+                    <execution>
+                            <goals>
+                            <goal>prepare-frontend</goal>
+                            </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.4.36.v20210114</version>
+                <version>${jetty.version}</version>
                 <configuration>
                     <scanIntervalSeconds>3</scanIntervalSeconds>
                     <!-- Use test scope because the UI/demo classes are in 

From 7ea2e0698c357e8273cd3fe6d7ea4a82b13a6329 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:46:40 -0300
Subject: [PATCH 06/21] build: set vaadin version to 14.9.7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b08e5b7..de7eb05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<version>2.9.3-SNAPSHOT</version>
 	<name>TwinColGrid add-on</name>
     <properties>
-        <vaadin.version>14.8.3</vaadin.version>
+        <vaadin.version>14.9.7</vaadin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 817ec466e8d810dceb0c41c40a02eeeea46f23d3 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:47:12 -0300
Subject: [PATCH 07/21] build(demo): upgrade commons-demo to 3.6.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index de7eb05..e375227 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
 		<dependency>
 			<groupId>com.flowingcode.vaadin.addons.demo</groupId>
 			<artifactId>commons-demo</artifactId>
-			<version>3.5.0</version>
+			<version>3.6.0</version>
 			<scope>test</scope>
 		</dependency>
     </dependencies>

From c5a5260f666ebddd9cb67e28f2febb609c344e5e Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Fri, 14 Apr 2023 15:48:14 -0300
Subject: [PATCH 08/21] fix(demo): fix Vaadin 24 runtime error in demo

Close #139
---
 .../twincolgrid/CompatibilityExtension.java   | 28 +++++++++++++++++++
 .../addons/twincolgrid/OrientationDemo.java   |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 src/test/java/com/flowingcode/vaadin/addons/twincolgrid/CompatibilityExtension.java

diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/CompatibilityExtension.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/CompatibilityExtension.java
new file mode 100644
index 0000000..73b56fd
--- /dev/null
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/CompatibilityExtension.java
@@ -0,0 +1,28 @@
+package com.flowingcode.vaadin.addons.twincolgrid;
+
+import com.vaadin.flow.component.select.Select;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/** Binary compatibility utils for Vaadin 14-24 */
+public class CompatibilityExtension {
+
+  private static final Method setItems = lookupSetItems();
+
+  private static Method lookupSetItems() {
+    try {
+      return Select.class.getMethod("setItems", Object[].class);
+    } catch (NoSuchMethodException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public static <T> void setItems(Select<T> select, T[] items) {    
+    try {
+      setItems.invoke(select, (Object) items);
+    } catch (IllegalAccessException | InvocationTargetException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+}
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
index cff4758..b8cc773 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
@@ -31,11 +31,13 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import lombok.experimental.ExtensionMethod;
 
 @SuppressWarnings("serial")
 @PageTitle("Orientation")
 @DemoSource
 @Route(value = "twincolgrid/orientation", layout = TwincolDemoView.class)
+@ExtensionMethod(CompatibilityExtension.class) // hide-source
 public class OrientationDemo extends VerticalLayout {
 
   private final Set<Book> selectedBooks = new HashSet<>();

From 68bc40defd9ad72cd4fca2c9ffe906a4eae9abce Mon Sep 17 00:00:00 2001
From: Martin Lopez <mlopez@flowingcode.com>
Date: Wed, 5 Jul 2023 17:35:54 -0300
Subject: [PATCH 09/21] fix: define a min-height to avoid confusion

Define a min-height based on lumo variable to avoid confusion when the parent height is relative (items are not rendered)
---
 .../META-INF/resources/frontend/styles/twincol-grid.css        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/META-INF/resources/frontend/styles/twincol-grid.css b/src/main/resources/META-INF/resources/frontend/styles/twincol-grid.css
index 53d603e..b7fd347 100644
--- a/src/main/resources/META-INF/resources/frontend/styles/twincol-grid.css
+++ b/src/main/resources/META-INF/resources/frontend/styles/twincol-grid.css
@@ -18,6 +18,9 @@
  * #L%
  */
 
+.twincol-grid {
+  min-height: calc(var(--lumo-space-m) * 13);
+}
 .twincol-grid .twincol-grid-label {
   color: var(--lumo-secondary-text-color);
   font-weight: 500;

From 7e2a2f04a9e33a9c3dd894bfcc741150ee531765 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 26 Dec 2022 15:31:46 -0300
Subject: [PATCH 10/21] refactor(demo): avoid use of deprecated constructor

---
 .../com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java | 5 +++--
 .../vaadin/addons/twincolgrid/DoubleClickDemo.java           | 2 +-
 .../vaadin/addons/twincolgrid/FilterableDemo.java            | 3 ++-
 .../vaadin/addons/twincolgrid/OrientationDemo.java           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java
index 6f6fd09..41b46d2 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java
@@ -47,8 +47,7 @@ public BoundDemo() {
 
     // Binded
     final TwinColGrid<Book> twinColGrid =
-        new TwinColGrid<>(
-                availableBooks, "TwinColGrid demo with Binder and row select without checkbox")
+        new TwinColGrid<>(availableBooks)
             .addSortableColumn(Book::getIsbn, Comparator.comparing(Book::getIsbn), "ISBN")
             .addSortableColumn(Book::getTitle, Comparator.comparing(Book::getTitle), "Title")
             .withAvailableGridCaption("Available books")
@@ -57,6 +56,8 @@ public BoundDemo() {
             .withSizeFull()
             .selectRowOnClick();
 
+    twinColGrid.setCaption("TwinColGrid demo with Binder and row select without checkbox");
+
     final Binder<Library> binder = new Binder<>();
     binder.forField(twinColGrid.asList()).asRequired().bind(Library::getBooks, Library::setBooks);
     binder.setBean(library);
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java
index e6bc74f..3617945 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java
@@ -43,7 +43,7 @@ public DoubleClickDemo() {
     initializeData();
 
     final TwinColGrid<Book> twinColGrid =
-        new TwinColGrid<>(availableBooks, null)
+        new TwinColGrid<>(availableBooks)
             .addSortableColumn(Book::getIsbn, Comparator.comparing(Book::getIsbn), "ISBN")
             .addSortableColumn(Book::getTitle, Comparator.comparing(Book::getTitle), "Title")
             .withAvailableGridCaption("Available books")
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java
index 779dae3..e450f6b 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java
@@ -42,13 +42,14 @@ public FilterableDemo() {
     initializeData();
 
     final TwinColGrid<Book> twinColGrid =
-        new TwinColGrid<>(availableBooks, "TwinColGrid demo with filtering support")
+        new TwinColGrid<>(availableBooks)
             .addFilterableColumn(Book::getIsbn, Book::getIsbn, "ISBN", "ISBN Filter", true)
             .addFilterableColumn(Book::getTitle, "Title", "Title filter", false)
             .withAvailableGridCaption("Available books")
             .withSelectionGridCaption("Added books")
             .withoutAddAllButton()
             .withSizeFull();
+    twinColGrid.setCaption("TwinColGrid demo with filtering support");
     twinColGrid.setValue(selectedBooks);
 
     add(twinColGrid);
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
index b8cc773..d1e7366 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
@@ -47,7 +47,7 @@ public OrientationDemo() {
     initializeData();
 
     final TwinColGrid<Book> twinColGrid =
-        new TwinColGrid<>(availableBooks, null)
+        new TwinColGrid<>(availableBooks)
             .addSortableColumn(Book::getIsbn, Comparator.comparing(Book::getIsbn), "ISBN")
             .addSortableColumn(Book::getTitle, Comparator.comparing(Book::getTitle), "Title")
             .withAvailableGridCaption("Available books")

From af9216caaad2cd532b8166d0620f92d8f187649b Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Thu, 20 Oct 2022 16:34:41 -0300
Subject: [PATCH 11/21] feat!: remove deprecated methods

Close #108
---
 .../addons/twincolgrid/LegacyTwinColGrid.java | 283 ++++++++++++++++++
 .../addons/twincolgrid/TwinColGrid.java       | 207 +------------
 2 files changed, 285 insertions(+), 205 deletions(-)
 create mode 100644 src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java

diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
new file mode 100644
index 0000000..22ae1f6
--- /dev/null
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
@@ -0,0 +1,283 @@
+package com.flowingcode.vaadin.addons.twincolgrid;
+
+import com.vaadin.flow.component.grid.Grid;
+import com.vaadin.flow.data.provider.ListDataProvider;
+import com.vaadin.flow.data.selection.SelectionListener;
+import java.util.Collection;
+import java.util.function.Supplier;
+import lombok.NonNull;
+
+/** Implementation of {@code TwinColGrid} with deprecated methods from version 2.9.0. */
+@SuppressWarnings("serial")
+@Deprecated
+public class LegacyTwinColGrid<T> extends TwinColGrid<T> {
+
+  /** @deprecated Use getAvailableGrid() */
+  @Deprecated protected final Grid<T> leftGrid;
+
+  /** @deprecated Use getSelectionGrid() */
+  @Deprecated protected final Grid<T> rightGrid;
+
+  /** @deprecated Use getAvailableGrid().getDataProvider() */
+  @Deprecated protected ListDataProvider<T> leftGridDataProvider;
+
+  /** @deprecated Use getSelectionGrid().getDataProvider() */
+  @Deprecated protected ListDataProvider<T> rightGridDataProvider;
+
+  /** Constructs a new TwinColGrid with an empty {@link ListDataProvider}. */
+  @SuppressWarnings("unchecked")
+  public LegacyTwinColGrid() {
+    super();
+    leftGrid = getAvailableGrid();
+    rightGrid = getSelectionGrid();
+    leftGridDataProvider = (ListDataProvider<T>) getAvailableGrid().getDataProvider();
+    rightGridDataProvider = (ListDataProvider<T>) getSelectionGrid().getDataProvider();
+  }
+
+  /**
+   * Constructs a new empty TwinColGrid, using the specified supplier for instantiating both grids.
+   *
+   * @param gridSupplier a supplier for instantiating both grids
+   */
+  @SuppressWarnings("unchecked")
+  public LegacyTwinColGrid(Supplier<Grid<T>> gridSupplier) {
+    super(gridSupplier);
+    leftGrid = getAvailableGrid();
+    rightGrid = getSelectionGrid();
+    leftGridDataProvider = (ListDataProvider<T>) getAvailableGrid().getDataProvider();
+    rightGridDataProvider = (ListDataProvider<T>) getSelectionGrid().getDataProvider();
+  }
+
+  /**
+   * Constructs a new empty TwinColGrid, using the specified grids for each side.
+   *
+   * @param availableGrid the grid that contains the available items
+   * @param selectionGrid the grid that contains the selected items
+   */
+  @SuppressWarnings("unchecked")
+  public LegacyTwinColGrid(@NonNull Grid<T> availableGrid, @NonNull Grid<T> selectionGrid) {
+    super(availableGrid, selectionGrid);
+    leftGrid = getAvailableGrid();
+    rightGrid = getSelectionGrid();
+    leftGridDataProvider = (ListDataProvider<T>) getAvailableGrid().getDataProvider();
+    rightGridDataProvider = (ListDataProvider<T>) getSelectionGrid().getDataProvider();
+  }
+
+  /**
+   * Constructs a new empty TwinColGrid with caption
+   *
+   * @param caption the component caption
+   * @deprecated Use {@link TwinColGrid#TwinColGrid()} and {{@link #setCaption(String)}
+   */
+  @Deprecated
+  @SuppressWarnings("unchecked")
+  public LegacyTwinColGrid(String caption) {
+    super(Grid::new);
+    setCaption(caption);
+    leftGrid = getAvailableGrid();
+    rightGrid = getSelectionGrid();
+    leftGridDataProvider = (ListDataProvider<T>) getAvailableGrid().getDataProvider();
+    rightGridDataProvider = (ListDataProvider<T>) getSelectionGrid().getDataProvider();
+  }
+
+  /**
+   * Constructs a new TwinColGrid with data provider for options.
+   *
+   * @param dataProvider the data provider, not {@code null}
+   * @param caption the component caption
+   * @deprecated Use {@link #TwinColGrid()} and {@link #setDataProvider(ListDataProvider)}, {@link
+   *     #setCaption(String)}
+   */
+  @Deprecated
+  @SuppressWarnings("unchecked")
+  public LegacyTwinColGrid(final ListDataProvider<T> dataProvider, String caption) {
+    super(Grid::new);
+    setDataProvider(dataProvider);
+    setCaption(caption);
+    leftGrid = getAvailableGrid();
+    rightGrid = getSelectionGrid();
+    leftGridDataProvider = (ListDataProvider<T>) getAvailableGrid().getDataProvider();
+    rightGridDataProvider = (ListDataProvider<T>) getSelectionGrid().getDataProvider();
+  }
+
+  /**
+   * Constructs a new empty TwinColGrid, using the specified supplier for instantiating both grids.
+   *
+   * @param caption the component caption
+   * @param gridSupplier a supplier for instantiating both grids
+   * @deprecated Use {@link TwinColGrid#TwinColGrid(Supplier)} and {@link #setCaption(String)}
+   */
+  @Deprecated
+  @SuppressWarnings("unchecked")
+  public LegacyTwinColGrid(String caption, Supplier<Grid<T>> gridSupplier) {
+    super(gridSupplier.get(), gridSupplier.get());
+    setCaption(caption);
+    leftGrid = getAvailableGrid();
+    rightGrid = getSelectionGrid();
+    leftGridDataProvider = (ListDataProvider<T>) getAvailableGrid().getDataProvider();
+    rightGridDataProvider = (ListDataProvider<T>) getSelectionGrid().getDataProvider();
+  }
+
+  /**
+   * Constructs a new empty TwinColGrid, using the specified grids for each side.
+   *
+   * @param caption the component caption
+   * @param availableGrid the grid that contains the available items
+   * @param selectionGrid the grid that contains the selected items
+   * @deprecated Use {@link TwinColGrid#TwinColGrid(Grid, Grid)} and {@link #setCaption(String)}
+   */
+  @Deprecated
+  @SuppressWarnings("unchecked")
+  public LegacyTwinColGrid(
+      String caption, @NonNull Grid<T> availableGrid, @NonNull Grid<T> selectionGrid) {
+    super(availableGrid, selectionGrid);
+    setCaption(caption);
+    leftGrid = getAvailableGrid();
+    rightGrid = getSelectionGrid();
+    leftGridDataProvider = (ListDataProvider<T>) getAvailableGrid().getDataProvider();
+    rightGridDataProvider = (ListDataProvider<T>) getSelectionGrid().getDataProvider();
+  }
+
+  /**
+   * Constructs a new TwinColGrid with caption and the given options.
+   *
+   * @param caption the caption to set, can be {@code null}
+   * @param options the options, cannot be {@code null}
+   * @deprecated Use {@link #TwinColGrid(Collection)} and {{@link #setCaption(String)}
+   */
+  @Deprecated
+  @SuppressWarnings("unchecked")
+  public LegacyTwinColGrid(final Collection<T> options, final String caption) {
+    super(options);
+    setCaption(caption);
+    leftGrid = getAvailableGrid();
+    rightGrid = getSelectionGrid();
+    leftGridDataProvider = (ListDataProvider<T>) getAvailableGrid().getDataProvider();
+    rightGridDataProvider = (ListDataProvider<T>) getSelectionGrid().getDataProvider();
+  }
+
+  /** @deprecated Use {@code getAvailableGrid().setClassName(classname)} */
+  @Deprecated
+  public void setLeftGridClassName(String classname) {
+    getAvailableGrid().setClassName(classname);
+  }
+
+  /** @deprecated Use {@code getAvailableGrid().addClassName(classname)} */
+  @Deprecated
+  public void addLeftGridClassName(String classname) {
+    getAvailableGrid().addClassName(classname);
+  }
+
+  /** @deprecated Use {@code getAvailableGrid().removeClassName(classname)} */
+  @Deprecated
+  public void removeLeftGridClassName(String classname) {
+    getAvailableGrid().removeClassName(classname);
+  }
+
+  /** @deprecated Use {@code getSelectionGrid().setClassName(classname)} */
+  @Deprecated
+  public void setRightGridClassName(String classname) {
+    getSelectionGrid().setClassName(classname);
+  }
+
+  /** @deprecated Use {@code getSelectionGrid().addClassName(classname)} */
+  @Deprecated
+  public void addRightGridClassName(String classname) {
+    getSelectionGrid().addClassName(classname);
+  }
+
+  /** @deprecated Use {@code getSelectionGrid().removeClassName(classname)} */
+  @Deprecated
+  public void removeRightGridClassName(String classname) {
+    getSelectionGrid().removeClassName(classname);
+  }
+
+  /**
+   * Sets the text shown above the grid with the available items. {@code null} clears the caption.
+   *
+   * @param caption The text to show, {@code null} to clear
+   * @return this instance
+   * @deprecated Use {@link #withAvailableGridCaption(String)}
+   */
+  @Deprecated
+  public LegacyTwinColGrid<T> withRightColumnCaption(final String caption) {
+    withSelectionGridCaption(caption);
+    return this;
+  }
+
+  /**
+   * Sets the text shown above the grid with the available items. {@code null} clears the caption.
+   *
+   * @param caption The text to show, {@code null} to clear
+   * @return this instance
+   * @deprecated Use {@link #withSelectionGridCaption(String)}
+   */
+  @Deprecated
+  public LegacyTwinColGrid<T> withLeftColumnCaption(final String caption) {
+    withAvailableGridCaption(caption);
+    return this;
+  }
+
+  /**
+   * Returns the text shown above the right column.
+   *
+   * @return The text shown or {@code null} if not set.
+   * @deprecated Use {@link #getSelectionGridCaption()}
+   */
+  @Deprecated
+  public String getRightColumnCaption() {
+    return getSelectionGridCaption();
+  }
+
+  /**
+   * Returns the text shown above the left column.
+   *
+   * @return The text shown or {@code null} if not set.
+   * @deprecated Use {@link #getAvailableGridCaption()}
+   */
+  @Deprecated
+  public String getLeftColumnCaption() {
+    return getAvailableGridCaption();
+  }
+
+  /** @deprecated Use {@code getAvailableGrid().addSelectionListener(listener);} */
+  @Deprecated
+  public void addLeftGridSelectionListener(SelectionListener<Grid<T>, T> listener) {
+    getAvailableGrid().addSelectionListener(listener);
+  }
+
+  /** @deprecated Use {@code getSelectionGrid().addSelectionListener(listener);} */
+  @Deprecated
+  public void addRightGridSelectionListener(SelectionListener<Grid<T>, T> listener) {
+    getSelectionGrid().addSelectionListener(listener);
+  }
+
+  /**
+   * Return the left grid component.
+   *
+   * @deprecated Use {@link #getAvailableGrid()}. Depending on the orientation, the "left grid" may
+   *     not be located at the left side.
+   */
+  @Deprecated
+  public Grid<T> getLeftGrid() {
+    return leftGrid;
+  }
+
+  /**
+   * Return the right grid component.
+   *
+   * @deprecated Use {@link #getSelectionGrid()}. Depending on the orientation, the "right grid" may
+   *     not be located at the right side.
+   */
+  @Deprecated
+  public Grid<T> getRightGrid() {
+    return rightGrid;
+  }
+
+  @Override
+  protected void setDataProvider(ListDataProvider<T> dataProvider) {
+    leftGridDataProvider = dataProvider;
+    super.setDataProvider(dataProvider);
+  }
+
+}
diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
index 2045bdc..255e5e4 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -47,7 +47,6 @@
 import com.vaadin.flow.data.provider.ListDataProvider;
 import com.vaadin.flow.data.provider.Query;
 import com.vaadin.flow.data.renderer.TextRenderer;
-import com.vaadin.flow.data.selection.SelectionListener;
 import com.vaadin.flow.data.value.ValueChangeMode;
 import com.vaadin.flow.function.SerializableComparator;
 import com.vaadin.flow.function.SerializableFunction;
@@ -124,18 +123,6 @@ public enum Orientation {
 
   private final TwinColModel<T> selection;
 
-  /** @deprecated Use getAvailableGrid() */
-  @Deprecated protected final Grid<T> leftGrid;
-
-  /** @deprecated Use getSelectionGrid() */
-  @Deprecated protected final Grid<T> rightGrid;
-
-  /** @deprecated Use getAvailableGrid().getDataProvider() */
-  @Deprecated protected ListDataProvider<T> leftGridDataProvider;
-
-  /** @deprecated Use getSelectionGrid().getDataProvider() */
-  @Deprecated protected ListDataProvider<T> rightGridDataProvider;
-
   private Label captionLabel;
 
   private final Button addAllButton = createActionButton();
@@ -167,46 +154,6 @@ public TwinColGrid() {
     this(Grid::new);
   }
 
-  /**
-   * Constructs a new empty TwinColGrid with caption
-   *
-   * @param caption the component caption
-   * @deprecated Use {@link TwinColGrid#TwinColGrid()} and {{@link #setCaption(String)}
-   */
-  @Deprecated
-  public TwinColGrid(String caption) {
-    this(Grid::new);
-    setCaption(caption);
-  }
-
-  /**
-   * Constructs a new TwinColGrid with data provider for options.
-   *
-   * @param dataProvider the data provider, not {@code null}
-   * @param caption the component caption
-   * @deprecated Use {@link #TwinColGrid()} and {@link #setDataProvider(ListDataProvider)},
-   *             {@link #setCaption(String)}
-   */
-  @Deprecated
-  public TwinColGrid(final ListDataProvider<T> dataProvider, String caption) {
-    this(Grid::new);
-    setDataProvider(dataProvider);
-    setCaption(caption);
-  }
-
-  /**
-   * Constructs a new empty TwinColGrid, using the specified supplier for instantiating both grids.
-   *
-   * @param caption the component caption
-   * @param gridSupplier a supplier for instantiating both grids
-   * @deprecated Use {@link TwinColGrid#TwinColGrid(Supplier)} and {@link #setCaption(String)}
-   */
-  @Deprecated
-  public TwinColGrid(String caption, Supplier<Grid<T>> gridSupplier) {
-    this(gridSupplier.get(), gridSupplier.get());
-    setCaption(caption);
-  }
-
   /**
    * Constructs a new empty TwinColGrid, using the specified supplier for instantiating both grids.
    *
@@ -216,22 +163,6 @@ public TwinColGrid(Supplier<Grid<T>> gridSupplier) {
     this(gridSupplier.get(), gridSupplier.get());
   }
 
-  /**
-   * Constructs a new empty TwinColGrid, using the specified grids for each side.
-   *
-   * @param caption the component caption
-   * @param availableGrid the grid that contains the available items
-   * @param selectionGrid the grid that contains the selected items
-   *
-   * @deprecated Use {@link TwinColGrid#TwinColGrid(Grid, Grid)} and {@link #setCaption(String)}
-   */
-  @Deprecated
-  public TwinColGrid(String caption, @NonNull Grid<T> availableGrid,
-      @NonNull Grid<T> selectionGrid) {
-    this(availableGrid, selectionGrid);
-    setCaption(caption);
-  }
-
   /**
    * Constructs a new empty TwinColGrid, using the specified grids for each side.
    *
@@ -247,16 +178,13 @@ public TwinColGrid(@NonNull Grid<T> availableGrid, @NonNull Grid<T> selectionGri
     available = new TwinColModel<>(availableGrid, "twincol-grid-available");
     selection = new TwinColModel<>(selectionGrid, "twincol-grid-selection");
 
-    leftGrid = available.grid;
-    rightGrid = selection.grid;
-
     setClassName("twincol-grid");
 
     setMargin(false);
     setPadding(false);
 
     setDataProvider(emptyDataProvider());
-    rightGridDataProvider = DataProvider.ofCollection(new LinkedHashSet<>());
+    ListDataProvider<T> rightGridDataProvider = DataProvider.ofCollection(new LinkedHashSet<>());
     getSelectionGrid().setDataProvider(rightGridDataProvider);
 
     getAvailableGrid().setWidth("100%");
@@ -448,28 +376,6 @@ public Grid<T> getSelectionGrid() {
     return selection.grid;
   }
 
-  /**
-   * Return the left grid component.
-   *
-   * @deprecated Use {@link #getAvailableGrid()}. Depending on the orientation, the "left grid" may
-   *             not be located at the left side.
-   */
-  @Deprecated
-  public Grid<T> getLeftGrid() {
-    return leftGrid;
-  }
-
-  /**
-   * Return the right grid component.
-   *
-   * @deprecated Use {@link #getSelectionGrid()}. Depending on the orientation, the "right grid" may
-   *             not be located at the right side.
-   */
-  @Deprecated
-  public Grid<T> getRightGrid() {
-    return rightGrid;
-  }
-
   private void forEachSide(Consumer<TwinColModel<T>> consumer) {
     consumer.accept(available);
     consumer.accept(selection);
@@ -488,48 +394,11 @@ public void setItems(Stream<T> items) {
     setDataProvider(DataProvider.fromStream(items));
   }
 
-  /** @deprecated Use {@code getAvailableGrid().setClassName(classname)} */
-  @Deprecated
-  public void setLeftGridClassName(String classname) {
-    getAvailableGrid().setClassName(classname);
-  }
-
-  /** @deprecated Use {@code getAvailableGrid().addClassName(classname)} */
-  @Deprecated
-  public void addLeftGridClassName(String classname) {
-    getAvailableGrid().addClassName(classname);
-  }
-
-  /** @deprecated Use {@code getAvailableGrid().removeClassName(classname)} */
-  @Deprecated
-  public void removeLeftGridClassName(String classname) {
-    getAvailableGrid().removeClassName(classname);
-  }
-
-  /** @deprecated Use {@code getSelectionGrid().setClassName(classname)} */
-  @Deprecated
-  public void setRightGridClassName(String classname) {
-    getSelectionGrid().setClassName(classname);
-  }
-
-  /** @deprecated Use {@code getSelectionGrid().addClassName(classname)} */
-  @Deprecated
-  public void addRightGridClassName(String classname) {
-    getSelectionGrid().addClassName(classname);
-  }
-
-  /** @deprecated Use {@code getSelectionGrid().removeClassName(classname)} */
-  @Deprecated
-  public void removeRightGridClassName(String classname) {
-    getSelectionGrid().removeClassName(classname);
-  }
-
   public void clearAll() {
     updateSelection(new HashSet<>(), new HashSet<>(selection.getItems()), false);
   }
 
-  private void setDataProvider(ListDataProvider<T> dataProvider) {
-    leftGridDataProvider = dataProvider;
+  protected void setDataProvider(ListDataProvider<T> dataProvider) {
     getAvailableGrid().setDataProvider(dataProvider);
     if (selection.getDataProvider() != null) {
       selection.getItems().clear();
@@ -547,20 +416,6 @@ public TwinColGrid(final Collection<T> options) {
     setDataProvider(DataProvider.ofCollection(new LinkedHashSet<>(options)));
   }
 
-  /**
-   * Constructs a new TwinColGrid with caption and the given options.
-   *
-   * @param caption the caption to set, can be {@code null}
-   * @param options the options, cannot be {@code null}
-   *
-   * @deprecated Use {@link #TwinColGrid(Collection)} and {{@link #setCaption(String)}
-   */
-  @Deprecated
-  public TwinColGrid(final Collection<T> options, final String caption) {
-    this(options);
-    setCaption(caption);
-  }
-
   /**
    * Sets the text shown above the grid with the available items. {@code null} clears the caption.
    *
@@ -587,30 +442,6 @@ public TwinColGrid<T> withSelectionGridCaption(final String caption) {
     return this;
   }
 
-  /**
-   * Sets the text shown above the grid with the available items. {@code null} clears the caption.
-   *
-   * @param caption The text to show, {@code null} to clear
-   * @return this instance
-   * @deprecated Use {@link #withAvailableGridCaption(String)}
-   */
-  @Deprecated
-  public TwinColGrid<T> withRightColumnCaption(final String caption) {
-    return withSelectionGridCaption(caption);
-  }
-
-  /**
-   * Sets the text shown above the grid with the available items. {@code null} clears the caption.
-   *
-   * @param caption The text to show, {@code null} to clear
-   * @return this instance
-   * @deprecated Use {@link #withSelectionGridCaption(String)}
-   */
-  @Deprecated
-  public TwinColGrid<T> withLeftColumnCaption(final String caption) {
-    return withAvailableGridCaption(caption);
-  }
-
   /**
    * Adds a new text column to this {@link Grid} with a value provider. The column will use a {@link
    * TextRenderer}. The value is converted to a String using the provided {@code
@@ -742,28 +573,6 @@ public String getSelectionGridCaption() {
     return selection.columnLabel.getText();
   }
 
-  /**
-   * Returns the text shown above the right column.
-   *
-   * @return The text shown or {@code null} if not set.
-   * @deprecated Use {@link #getSelectionGridCaption()}
-   */
-  @Deprecated
-  public String getRightColumnCaption() {
-    return getSelectionGridCaption();
-  }
-
-  /**
-   * Returns the text shown above the left column.
-   *
-   * @return The text shown or {@code null} if not set.
-   * @deprecated Use {@link #getAvailableGridCaption()}
-   */
-  @Deprecated
-  public String getLeftColumnCaption() {
-    return getAvailableGridCaption();
-  }
-
   /**
    * Set {@code value} to grid
    *
@@ -975,18 +784,6 @@ public boolean isSelectionGridReorderingAllowed() {
     return selection.allowReordering;
   }
 
-  /** @deprecated Use {@code getAvailableGrid().addSelectionListener(listener);} */
-  @Deprecated
-  public void addLeftGridSelectionListener(SelectionListener<Grid<T>, T> listener) {
-    getAvailableGrid().addSelectionListener(listener);
-  }
-
-  /** @deprecated Use {@code getSelectionGrid().addSelectionListener(listener);} */
-  @Deprecated
-  public void addRightGridSelectionListener(SelectionListener<Grid<T>, T> listener) {
-    getSelectionGrid().addSelectionListener(listener);
-  }
-
   public TwinColGrid<T> addFilterableColumn(
       final ItemLabelGenerator<T> itemLabelGenerator,
       SerializableFunction<T, String> filterableValue,

From f87dc76aaf7abc61083e6715ddecedc3f3544105 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Thu, 20 Oct 2022 16:14:57 -0300
Subject: [PATCH 12/21] feat!: enable move items by doubleclick by default

---
 .../flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java   | 5 +++++
 .../vaadin/addons/twincolgrid/DoubleClickDemo.java           | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
index 255e5e4..dd12281 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -223,10 +223,15 @@ public TwinColGrid(@NonNull Grid<T> availableGrid, @NonNull Grid<T> selectionGri
           side.layout.setSpacing(false);
         });
 
+    initMoveItemsByDoubleClick();
     add(createContainerLayout());
     setSizeUndefined();
   }
 
+  @SuppressWarnings("deprecation")
+  private void initMoveItemsByDoubleClick() {
+    setMoveItemsByDoubleClick(!(this instanceof LegacyTwinColGrid));
+  }
 
   /**
    * Sets the component caption.
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java
index 3617945..d693885 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java
@@ -51,7 +51,6 @@ public DoubleClickDemo() {
             .withSizeFull()
             .selectRowOnClick();
     twinColGrid.setValue(selectedBooks);
-    twinColGrid.setMoveItemsByDoubleClick(true);
 
     add(new Span("Move items by double click"), twinColGrid);
     setSizeFull();

From 3a8fba996c01127bb539a60e94e678495dcfe6be Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Thu, 20 Oct 2022 16:37:13 -0300
Subject: [PATCH 13/21] style: apply code formatting

---
 .../addons/twincolgrid/TwinColGrid.java       | 188 ++++++++++--------
 .../twincolgrid/TwinColGridListAdapter.java   |  32 +--
 .../vaadin/addons/twincolgrid/BoundDemo.java  |  27 ++-
 .../addons/twincolgrid/DragAndDropDemo.java   |  38 ++--
 .../addons/twincolgrid/FilterableDemo.java    |   6 +-
 5 files changed, 168 insertions(+), 123 deletions(-)

diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
index dd12281..ccda964 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -192,22 +192,31 @@ public TwinColGrid(@NonNull Grid<T> availableGrid, @NonNull Grid<T> selectionGri
 
     addAllButton.addClickListener(
         e -> {
-          List<T> filteredItems = available.getDataProvider().withConfigurableFilter()
-              .fetch(new Query<>()).collect(Collectors.toList());
+          List<T> filteredItems =
+              available
+                  .getDataProvider()
+                  .withConfigurableFilter()
+                  .fetch(new Query<>())
+                  .collect(Collectors.toList());
           updateSelection(new LinkedHashSet<>(filteredItems), new HashSet<>(), true);
         });
 
     addButton.addClickListener(
         e ->
             updateSelection(
-            new LinkedHashSet<>(getAvailableGrid().getSelectedItems()), new HashSet<>(), true));
+                new LinkedHashSet<>(getAvailableGrid().getSelectedItems()), new HashSet<>(), true));
 
     removeButton.addClickListener(
         e -> updateSelection(new HashSet<>(), getSelectionGrid().getSelectedItems(), true));
 
     removeAllButton.addClickListener(
         e -> {
-          List<T> filteredItems= selection.getDataProvider().withConfigurableFilter().fetch(new Query<>()).collect(Collectors.toList());
+          List<T> filteredItems =
+              selection
+                  .getDataProvider()
+                  .withConfigurableFilter()
+                  .fetch(new Query<>())
+                  .collect(Collectors.toList());
           updateSelection(new HashSet<>(), new HashSet<>(filteredItems), true);
         });
 
@@ -364,8 +373,7 @@ private VerticalLayout getVerticalButtonContainer() {
 
   private HorizontalLayout getHorizontalButtonContainer() {
     HorizontalLayout hButtonContainer =
-        new HorizontalLayout(
-            addAllButton, addButton, removeButton, removeAllButton);
+        new HorizontalLayout(addAllButton, addButton, removeButton, removeAllButton);
     hButtonContainer.setPadding(false);
     hButtonContainer.setSizeUndefined();
     return hButtonContainer;
@@ -477,8 +485,9 @@ public TwinColGrid<T> addSortableColumn(
       final ItemLabelGenerator<T> itemLabelGenerator,
       Comparator<T> comparator,
       final String header) {
-    forEachGrid(grid -> grid
-                .addColumn(new TextRenderer<>(itemLabelGenerator))
+    forEachGrid(
+        grid ->
+            grid.addColumn(new TextRenderer<>(itemLabelGenerator))
                 .setHeader(header)
                 .setComparator(comparator)
                 .setSortable(true));
@@ -501,8 +510,9 @@ public TwinColGrid<T> addSortableColumn(
       Comparator<T> comparator,
       final String header,
       final String key) {
-    forEachGrid(grid -> grid
-                .addColumn(new TextRenderer<>(itemLabelGenerator))
+    forEachGrid(
+        grid ->
+            grid.addColumn(new TextRenderer<>(itemLabelGenerator))
                 .setHeader(header)
                 .setComparator(comparator)
                 .setSortable(true)
@@ -603,8 +613,8 @@ public void setValue(final Set<T> value) {
    */
   @Override
   public Set<T> getValue() {
-    return Collections
-        .unmodifiableSet(collectValue(Collectors.<T, Set<T>>toCollection(LinkedHashSet::new)));
+    return Collections.unmodifiableSet(
+        collectValue(Collectors.<T, Set<T>>toCollection(LinkedHashSet::new)));
   }
 
   /**
@@ -624,15 +634,17 @@ <C> C collectValue(Collector<T, ?, C> collector) {
 
   private static <T> SerializableComparator<T> createSortingComparator(Grid<T> grid) {
     // protected method copied from Grid::createSortingComparator
-    BinaryOperator<SerializableComparator<T>> operator = (comparator1, comparator2) -> {
-      /*
-       * thenComparing is defined to return a serializable comparator as long as both original
-       * comparators are also serializable
-       */
-      return comparator1.thenComparing(comparator2)::compare;
-    };
+    BinaryOperator<SerializableComparator<T>> operator =
+        (comparator1, comparator2) -> {
+          /*
+           * thenComparing is defined to return a serializable comparator as long as both original
+           * comparators are also serializable
+           */
+          return comparator1.thenComparing(comparator2)::compare;
+        };
     return grid.getSortOrder().stream()
-        .map(order -> order.getSorted().getComparator(order.getDirection())).reduce(operator)
+        .map(order -> order.getSorted().getComparator(order.getDirection()))
+        .reduce(operator)
         .orElse(null);
   }
 
@@ -644,7 +656,8 @@ public Registration addValueChangeListener(
         .addDataProviderListener(
             e -> {
               ComponentValueChangeEvent<TwinColGrid<T>, Set<T>> e2 =
-                  new ComponentValueChangeEvent<>(TwinColGrid.this, TwinColGrid.this, null, isFromClient);
+                  new ComponentValueChangeEvent<>(
+                      TwinColGrid.this, TwinColGrid.this, null, isFromClient);
               listener.valueChanged(e2);
             });
   }
@@ -674,7 +687,8 @@ public void setRequiredIndicatorVisible(boolean requiredIndicatorVisible) {
     getElement().setAttribute("required", requiredIndicatorVisible);
   }
 
-  private void updateSelection(final Set<T> addedItems, final Set<T> removedItems, boolean isFromClient) {
+  private void updateSelection(
+      final Set<T> addedItems, final Set<T> removedItems, boolean isFromClient) {
     this.isFromClient = isFromClient;
     available.getItems().addAll(removedItems);
     available.getItems().removeAll(addedItems);
@@ -682,9 +696,10 @@ private void updateSelection(final Set<T> addedItems, final Set<T> removedItems,
     selection.getItems().addAll(addedItems);
     selection.getItems().removeAll(removedItems);
 
-    forEachGrid(grid -> {
-      grid.getDataProvider().refreshAll();
-      grid.getSelectionModel().deselectAll();
+    forEachGrid(
+        grid -> {
+          grid.getDataProvider().refreshAll();
+          grid.getSelectionModel().deselectAll();
         });
   }
 
@@ -702,8 +717,8 @@ private void configDragAndDrop(
             draggedItems.addAll(event.getDraggedItems());
           }
 
-          sourceModel.grid
-              .setDropMode(sourceModel.isReorderingEnabled() ? GridDropMode.BETWEEN : null);
+          sourceModel.grid.setDropMode(
+              sourceModel.isReorderingEnabled() ? GridDropMode.BETWEEN : null);
           targetModel.grid.setDropMode(
               targetModel.isReorderingEnabled() ? GridDropMode.BETWEEN : GridDropMode.ON_GRID);
         });
@@ -740,25 +755,31 @@ private void configDragAndDrop(
           }
         });
 
-    sourceModel.grid.addDropListener(event -> {
-      event.getDropTargetItem().ifPresent(dropOverItem -> {
-        if (sourceModel.isReorderingEnabled()
-            && event.getSource() == draggedGrid
-            && !draggedItems.contains(dropOverItem)
-            && !draggedItems.isEmpty()) {
-          isFromClient = true;
-          sourceModel.getItems().removeAll(draggedItems);
-          addItems(sourceModel, draggedItems, dropOverItem, event.getDropLocation());
-          draggedItems.clear();
-          draggedGrid = null;
-        }
-      });
-    });
-
+    sourceModel.grid.addDropListener(
+        event -> {
+          event
+              .getDropTargetItem()
+              .ifPresent(
+                  dropOverItem -> {
+                    if (sourceModel.isReorderingEnabled()
+                        && event.getSource() == draggedGrid
+                        && !draggedItems.contains(dropOverItem)
+                        && !draggedItems.isEmpty()) {
+                      isFromClient = true;
+                      sourceModel.getItems().removeAll(draggedItems);
+                      addItems(sourceModel, draggedItems, dropOverItem, event.getDropLocation());
+                      draggedItems.clear();
+                      draggedGrid = null;
+                    }
+                  });
+        });
   }
 
-  private void addItems(TwinColModel<T> model, Collection<T> draggedItems,
-      T dropOverItem, GridDropLocation dropLocation) {
+  private void addItems(
+      TwinColModel<T> model,
+      Collection<T> draggedItems,
+      T dropOverItem,
+      GridDropLocation dropLocation) {
     if (dropOverItem != null) {
       Collection<T> collection = model.getItems();
       List<T> list = new ArrayList<>(collection);
@@ -794,7 +815,8 @@ public TwinColGrid<T> addFilterableColumn(
       SerializableFunction<T, String> filterableValue,
       final String header,
       String filterPlaceholder,
-      boolean enableClearButton, String key) {
+      boolean enableClearButton,
+      String key) {
     forEachSide(
         side -> {
           Column<T> column =
@@ -831,33 +853,41 @@ public TwinColGrid<T> addFilterableColumn(
       final String header,
       String filterPlaceholder,
       boolean enableClearButton) {
-    return addFilterableColumn(itemLabelGenerator, itemLabelGenerator, header, filterPlaceholder,
-        enableClearButton, null);
+    return addFilterableColumn(
+        itemLabelGenerator, itemLabelGenerator, header, filterPlaceholder, enableClearButton, null);
   }
 
-  public TwinColGrid<T> addFilterableColumn(ItemLabelGenerator<T> itemLabelGenerator,
-      SerializableFunction<T, String> filterableValue, String header, String filterPlaceholder,
+  public TwinColGrid<T> addFilterableColumn(
+      ItemLabelGenerator<T> itemLabelGenerator,
+      SerializableFunction<T, String> filterableValue,
+      String header,
+      String filterPlaceholder,
       boolean enableClearButton) {
-    return addFilterableColumn(itemLabelGenerator, filterableValue, header, filterPlaceholder,
-        enableClearButton, null);
+    return addFilterableColumn(
+        itemLabelGenerator, filterableValue, header, filterPlaceholder, enableClearButton, null);
   }
 
-  public TwinColGrid<T> addFilterableColumn(ItemLabelGenerator<T> itemLabelGenerator, String header,
-      String filterPlaceholder, boolean enableClearButton, String key) {
-    return addFilterableColumn(itemLabelGenerator, itemLabelGenerator, header, filterPlaceholder,
-        enableClearButton, key);
+  public TwinColGrid<T> addFilterableColumn(
+      ItemLabelGenerator<T> itemLabelGenerator,
+      String header,
+      String filterPlaceholder,
+      boolean enableClearButton,
+      String key) {
+    return addFilterableColumn(
+        itemLabelGenerator, itemLabelGenerator, header, filterPlaceholder, enableClearButton, key);
   }
 
   public TwinColGrid<T> selectRowOnClick() {
-    forEachGrid(grid -> {
-      grid.addClassName("hide-selector-col");
+    forEachGrid(
+        grid -> {
+          grid.addClassName("hide-selector-col");
 
-      grid.addItemClickListener(
+          grid.addItemClickListener(
               c -> {
-            if (grid.getSelectedItems().contains(c.getItem())) {
-              grid.deselect(c.getItem());
+                if (grid.getSelectedItems().contains(c.getItem())) {
+                  grid.deselect(c.getItem());
                 } else {
-              grid.select(c.getItem());
+                  grid.select(c.getItem());
                 }
               });
         });
@@ -879,9 +909,7 @@ private Button createActionButton() {
     return button;
   }
 
-  /**
-   * Return whether autoResize is set or not.
-   */
+  /** Return whether autoResize is set or not. */
   public boolean isAutoResize() {
     return autoResize;
   }
@@ -908,23 +936,26 @@ public void setAutoResize(boolean autoResize) {
    * @param value if true, a a doubleclick event will immediately move an item to the other grid
    */
   public void setMoveItemsByDoubleClick(boolean value) {
-    forEachSide(side -> {
-      if (value && side.moveItemsByDoubleClick == null) {
-        side.moveItemsByDoubleClick = side.grid.addItemDoubleClickListener(ev -> {
-          Set<T> item = Collections.singleton(ev.getItem());
-          if (side == available) {
-            updateSelection(item, Collections.emptySet(), true);
+    forEachSide(
+        side -> {
+          if (value && side.moveItemsByDoubleClick == null) {
+            side.moveItemsByDoubleClick =
+                side.grid.addItemDoubleClickListener(
+                    ev -> {
+                      Set<T> item = Collections.singleton(ev.getItem());
+                      if (side == available) {
+                        updateSelection(item, Collections.emptySet(), true);
+                      }
+                      if (side == selection) {
+                        updateSelection(Collections.emptySet(), item, true);
+                      }
+                    });
           }
-          if (side == selection) {
-            updateSelection(Collections.emptySet(), item, true);
+          if (!value && side.moveItemsByDoubleClick != null) {
+            side.moveItemsByDoubleClick.remove();
+            side.moveItemsByDoubleClick = null;
           }
         });
-      }
-      if (!value && side.moveItemsByDoubleClick != null) {
-        side.moveItemsByDoubleClick.remove();
-        side.moveItemsByDoubleClick = null;
-      }
-    });
   }
 
   @ClientCallable
@@ -935,5 +966,4 @@ private void updateOrientationOnResize(int width, int height) {
       this.withOrientation(Orientation.HORIZONTAL);
     }
   }
-
 }
diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGridListAdapter.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGridListAdapter.java
index 053e415..068e60e 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGridListAdapter.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGridListAdapter.java
@@ -72,7 +72,6 @@ public HasValue<?, List<T>> getHasValue() {
     public List<T> getOldValue() {
       return null;
     }
-
   }
 
   @NonNull
@@ -95,20 +94,26 @@ public Registration addValueChangeListener(
 
     List<Registration> registrations = new ArrayList<>();
 
-    registrations.add(delegate.addValueChangeListener(ev -> {
-      List<T> value = new ArrayList<>(ev.getValue());
-      ValueChangeEvent<List<T>> listEvent;
-      listEvent = new ValueChangeEventImpl(ev.isFromClient(), new ArrayList<>(value));
-      listener.valueChanged(listEvent);
-    }));
+    registrations.add(
+        delegate.addValueChangeListener(
+            ev -> {
+              List<T> value = new ArrayList<>(ev.getValue());
+              ValueChangeEvent<List<T>> listEvent;
+              listEvent = new ValueChangeEventImpl(ev.isFromClient(), new ArrayList<>(value));
+              listener.valueChanged(listEvent);
+            }));
 
     // sorting the grid changes its value under List::equals
-    registrations.add(delegate.getSelectionGrid().addSortListener(ev -> {
-      List<T> value = getValue();
-      ValueChangeEvent<List<T>> listEvent;
-      listEvent = new ValueChangeEventImpl(ev.isFromClient(), value);
-      listener.valueChanged(listEvent);
-    }));
+    registrations.add(
+        delegate
+            .getSelectionGrid()
+            .addSortListener(
+                ev -> {
+                  List<T> value = getValue();
+                  ValueChangeEvent<List<T>> listEvent;
+                  listEvent = new ValueChangeEventImpl(ev.isFromClient(), value);
+                  listener.valueChanged(listEvent);
+                }));
 
     return () -> registrations.forEach(Registration::remove);
   }
@@ -117,5 +122,4 @@ public Registration addValueChangeListener(
   public List<T> getEmptyValue() {
     return Collections.emptyList();
   }
-
 }
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java
index 41b46d2..48613fe 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java
@@ -63,14 +63,22 @@ public BoundDemo() {
     binder.setBean(library);
 
     add(twinColGrid);
-    add(new Button("Get values", ev -> {
-      binder.getBean().getBooks()
-          .forEach(book -> Notification.show(book.getTitle(), 3000, Position.BOTTOM_START));
-    }));
+    add(
+        new Button(
+            "Get values",
+            ev -> {
+              binder
+                  .getBean()
+                  .getBooks()
+                  .forEach(book -> Notification.show(book.getTitle(), 3000, Position.BOTTOM_START));
+            }));
 
-    add(new Button("Clear TwinColGrid", ev -> {
-      twinColGrid.clear();
-    }));
+    add(
+        new Button(
+            "Clear TwinColGrid",
+            ev -> {
+              twinColGrid.clear();
+            }));
 
     setSizeFull();
   }
@@ -79,11 +87,10 @@ private void initializeData() {
     selectedBooks.add(new Book("1478375108", "Vaadin Recipes"));
     selectedBooks.add(new Book("9789526800677", "Book of Vaadin: Volume 2 "));
 
-
     availableBooks.add(new Book("1478375108", "Vaadin Recipes"));
     availableBooks.add(new Book("9781849515221", "Learning Vaadin"));
-    availableBooks
-        .add(new Book("9781782162261", "Vaadin 7 UI Design By Example: Beginner\u2019s Guide"));
+    availableBooks.add(
+        new Book("9781782162261", "Vaadin 7 UI Design By Example: Beginner\u2019s Guide"));
     availableBooks.add(new Book("9781849518802", "Vaadin 7 Cookbook"));
     availableBooks.add(new Book("9526800605", "Book of Vaadin: 7th Edition, 1st Revision"));
     availableBooks.add(new Book("9789526800677", "Book of Vaadin: Volume 2 "));
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DragAndDropDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DragAndDropDemo.java
index ff6205c..6028d29 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DragAndDropDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DragAndDropDemo.java
@@ -49,7 +49,8 @@ public class DragAndDropDemo extends VerticalLayout {
   public DragAndDropDemo() {
     initializeData();
 
-    twinColGrid = new TwinColGrid<>(availableBooks)
+    twinColGrid =
+        new TwinColGrid<>(availableBooks)
             .addSortableColumn(Book::getIsbn, Comparator.comparing(Book::getIsbn), "ISBN")
             .addSortableColumn(Book::getTitle, Comparator.comparing(Book::getTitle), "Title")
             .withAvailableGridCaption("Available books")
@@ -64,8 +65,12 @@ public DragAndDropDemo() {
     twinColGrid.setValue(selectedBooks);
 
     final Label countLabel = new Label("Selected items in left grid: 0");
-    twinColGrid.getAvailableGrid().addSelectionListener(
-        e -> countLabel.setText("Selected items in left grid: " + e.getAllSelectedItems().size()));
+    twinColGrid
+        .getAvailableGrid()
+        .addSelectionListener(
+            e ->
+                countLabel.setText(
+                    "Selected items in left grid: " + e.getAllSelectedItems().size()));
     twinColGrid.addValueChangeListener(e -> countLabel.setText("Selected items in left grid: 0"));
 
     add(twinColGrid, countLabel);
@@ -78,11 +83,10 @@ private void initializeData() {
     selectedBooks.add(new Book("1478375108", "Vaadin Recipes"));
     selectedBooks.add(new Book("9789526800677", "Book of Vaadin: Volume 2 "));
 
-
     availableBooks.add(new Book("1478375108", "Vaadin Recipes"));
     availableBooks.add(new Book("9781849515221", "Learning Vaadin"));
-    availableBooks
-        .add(new Book("9781782162261", "Vaadin 7 UI Design By Example: Beginner\u2019s Guide"));
+    availableBooks.add(
+        new Book("9781782162261", "Vaadin 7 UI Design By Example: Beginner\u2019s Guide"));
     availableBooks.add(new Book("9781849518802", "Vaadin 7 Cookbook"));
     availableBooks.add(new Book("9526800605", "Book of Vaadin: 7th Edition, 1st Revision"));
     availableBooks.add(new Book("9789526800677", "Book of Vaadin: Volume 2 "));
@@ -95,16 +99,18 @@ private void addReorderingToggle() {
     Span description = new Span("(Reordering is disabled while the grid is sorted)");
     description.setVisible(false);
 
-    SerializableRunnable refresh = () -> {
-      boolean sorted = !twinColGrid.getSelectionGrid().getSortOrder().isEmpty();
-      boolean allowed = twinColGrid.isSelectionGridReorderingAllowed();
-      description.setVisible(sorted && allowed);
-    };
-
-    checkbox.addValueChangeListener(ev -> {
-      twinColGrid.setSelectionGridReorderingAllowed(ev.getValue());
-      refresh.run();
-    });
+    SerializableRunnable refresh =
+        () -> {
+          boolean sorted = !twinColGrid.getSelectionGrid().getSortOrder().isEmpty();
+          boolean allowed = twinColGrid.isSelectionGridReorderingAllowed();
+          description.setVisible(sorted && allowed);
+        };
+
+    checkbox.addValueChangeListener(
+        ev -> {
+          twinColGrid.setSelectionGridReorderingAllowed(ev.getValue());
+          refresh.run();
+        });
 
     twinColGrid.getSelectionGrid().addSortListener(ev -> refresh.run());
     add(new Div(checkbox, description));
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java
index e450f6b..60cf525 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java
@@ -60,16 +60,14 @@ private void initializeData() {
     selectedBooks.add(new Book("1478375108", "Vaadin Recipes"));
     selectedBooks.add(new Book("9789526800677", "Book of Vaadin: Volume 2 "));
 
-
     availableBooks.add(new Book("1478375108", "Vaadin Recipes"));
     availableBooks.add(new Book("9781849515221", "Learning Vaadin"));
-    availableBooks
-        .add(new Book("9781782162261", "Vaadin 7 UI Design By Example: Beginner\u2019s Guide"));
+    availableBooks.add(
+        new Book("9781782162261", "Vaadin 7 UI Design By Example: Beginner\u2019s Guide"));
     availableBooks.add(new Book("9781849518802", "Vaadin 7 Cookbook"));
     availableBooks.add(new Book("9526800605", "Book of Vaadin: 7th Edition, 1st Revision"));
     availableBooks.add(new Book("9789526800677", "Book of Vaadin: Volume 2 "));
     availableBooks.add(new Book("9529267533", "Book of Vaadin"));
     availableBooks.add(new Book("1782169776", "Learning Vaadin 7, Second Edition"));
   }
-
 }

From a195e95f98904fe6f778efd999e3760b1232c167 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 26 Dec 2022 15:26:14 -0300
Subject: [PATCH 14/21] feat: add TwinColumn helper

---
 .../addons/twincolgrid/TwinColGrid.java       |  15 ++
 .../vaadin/addons/twincolgrid/TwinColumn.java | 238 ++++++++++++++++++
 2 files changed, 253 insertions(+)
 create mode 100644 src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColumn.java

diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
index ccda964..72574b5 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -455,6 +455,21 @@ public TwinColGrid<T> withSelectionGridCaption(final String caption) {
     return this;
   }
 
+  /**
+   * Adds a column to each grids. Both columns will use a {@link TextRenderer} and the value
+   * will be converted to a String by using the provided {@code itemLabelGenerator}.
+   *
+   * @param itemLabelGenerator the value provider
+   * @return the pair of columns
+   */
+  public TwinColumn<T> addColumn(ItemLabelGenerator<T> itemLabelGenerator) {
+    Column<T> availableColumn =
+        getAvailableGrid().addColumn(new TextRenderer<>(itemLabelGenerator));
+    Column<T> selectionColumn =
+        getSelectionGrid().addColumn(new TextRenderer<>(itemLabelGenerator));
+    return new TwinColumn<>(availableColumn, selectionColumn);
+  }
+
   /**
    * Adds a new text column to this {@link Grid} with a value provider. The column will use a {@link
    * TextRenderer}. The value is converted to a String using the provided {@code
diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColumn.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColumn.java
new file mode 100644
index 0000000..8064d7a
--- /dev/null
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColumn.java
@@ -0,0 +1,238 @@
+package com.flowingcode.vaadin.addons.twincolgrid;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.grid.Grid.Column;
+import com.vaadin.flow.component.grid.SortOrderProvider;
+import com.vaadin.flow.data.provider.QuerySortOrder;
+import com.vaadin.flow.function.SerializableFunction;
+import com.vaadin.flow.function.ValueProvider;
+import java.util.Comparator;
+import java.util.function.Supplier;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/** Fluent helper object that delegates setters on both columns. */
+@RequiredArgsConstructor
+public class TwinColumn<T> {
+
+  /**
+   * Returns the column in the grid with the available items.
+   *
+   * @return The column in the grid with the available items.
+   */
+  @Getter
+  private final Column<T> availableColumn;
+
+  /**
+   * Returns the column in the grid with the selected items.
+   *
+   * @return The column in the grid with the selected items.
+   */
+  @Getter
+  private final Column<T> selectionColumn;
+
+  /**
+   * Sets the width of the columns as a CSS-string.
+   *
+   * @see Column#setWidth(String)
+   *
+   * @param width the width to set both columns to, as a CSS-string, not {@code null}
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setWidth(String width) {
+    availableColumn.setWidth(width);
+    selectionColumn.setWidth(width);
+    return this;
+  }
+
+  /**
+   * Sets the flex grow ratio for the columns. When set to 0, column width is fixed.
+   *
+   * @see Column#setFlexGrow(int)
+   *
+   * @param flexGrow the flex grow ratio
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setFlexGrow(int flexGrow) {
+    availableColumn.setFlexGrow(flexGrow);
+    selectionColumn.setFlexGrow(flexGrow);
+    return this;
+  }
+
+  /**
+   * Enables or disables automatic width for the columns.
+   *
+   * @see Column#setAutoWidth(boolean)
+   *
+   * @param autoWidth whether to enable or disable automatic width on both columns
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setAutoWidth(boolean autoWidth) {
+    availableColumn.setAutoWidth(autoWidth);
+    selectionColumn.setAutoWidth(autoWidth);
+    return this;
+  }
+
+  /**
+   * Sets the user-defined identifier to map the columns.
+   *
+   * @see Column#setKey(String)
+   *
+   * @param key the identifier key, can't be {@code null}
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setKey(String key) {
+    availableColumn.setKey(key);
+    selectionColumn.setKey(key);
+    return this;
+  }
+
+  /**
+   * Sets a comparator to use with in-memory sorting with both columns.
+   *
+   * @see Column#setComparator(Comparator)
+   *
+   * @param comparator the comparator to use when sorting data in both columns
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setComparator(Comparator<T> comparator) {
+    availableColumn.setComparator(comparator);
+    selectionColumn.setComparator(comparator);
+    return this;
+  }
+
+  /**
+   * Sets a comparator to use with in-memory sorting with both columns based on the return type of
+   * the given {@link ValueProvider}.
+   *
+   * @see Column#setComparator(ValueProvider)
+   *
+   * @param <V> the value of the column
+   * @param keyExtractor the value provider used to extract the {@link Comparable} sort key
+   * @return this instance, for method chaining
+   * @see Comparator#comparing(java.util.function.Function)
+   */
+  public <V extends Comparable<? super V>> TwinColumn<T> setComparator(
+      ValueProvider<T, V> keyExtractor) {
+    availableColumn.setComparator(keyExtractor);
+    selectionColumn.setComparator(keyExtractor);
+    return this;
+  }
+
+  /**
+   * Sets strings describing back end properties to be used when sorting the columns.
+   *
+   * @see Column#setSortProperty(String...)
+   *
+   * @param properties the array of strings describing backend properties
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setSortProperty(String... properties) {
+    availableColumn.setSortProperty(properties);
+    selectionColumn.setSortProperty(properties);
+    return this;
+  }
+
+  /**
+   * Sets the sort orders when sorting the columns. The sort order provider is a function which
+   * provides {@link QuerySortOrder} objects to describe how to sort by the columns.
+   *
+   * @see Column#setSortOrderProvider(SortOrderProvider)
+   *
+   * @param provider the function to use when generating sort orders with the given direction
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setSortOrderProvider(SortOrderProvider provider) {
+    availableColumn.setSortOrderProvider(provider);
+    selectionColumn.setSortOrderProvider(provider);
+    return this;
+  }
+
+  /**
+   * Sets whether the user can sort the columns or not.
+   *
+   * @see Column#setSortable(boolean)
+   *
+   * @param sortable {@code true} if the columns can be sorted by the user; {@code false} if not
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setSortable(boolean sortable) {
+    availableColumn.setSortable(sortable);
+    selectionColumn.setSortable(sortable);
+    return this;
+  }
+
+  /**
+   * Sets a header text to both columns.
+   *
+   * @see Column#setHeader(String)
+   *
+   * @param labelText the text to be shown at the columns headers
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setHeader(String labelText) {
+    availableColumn.setHeader(labelText);
+    selectionColumn.setHeader(labelText);
+    return this;
+  }
+
+  /**
+   * Sets a footer text to both columns.
+   *
+   * @see Column#setFooter(String)
+   *
+   * @param labelText the text to be shown at the columns footers
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setFooter(String labelText) {
+    availableColumn.setFooter(labelText);
+    selectionColumn.setFooter(labelText);
+    return this;
+  }
+
+  /**
+   * Sets a header component to both columns.
+   *
+   * @see Column#setHeader(String)
+   *
+   * @param headerComponentSupplier a supplier that instantiates the component to be used in the
+   *        header of each column
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setHeader(Supplier<Component> footerComponentSupplier) {
+    availableColumn.setHeader(footerComponentSupplier.get());
+    selectionColumn.setHeader(footerComponentSupplier.get());
+    return this;
+  }
+
+  /**
+   * Sets a footer component to both columns.
+   *
+   * @see Column#setFooter(String)
+   *
+   * @param footerComponentSuppleir a supplier that instantiates the component to be used in the
+   *        footer of each column
+   * @return this instance, for method chaining
+   */
+  public TwinColumn<T> setFooter(Supplier<Component> footerComponentSupplier) {
+    availableColumn.setFooter(footerComponentSupplier.get());
+    selectionColumn.setFooter(footerComponentSupplier.get());
+    return this;
+  }
+
+  /**
+   * Sets the function that is used for generating CSS class names for cells in both columns.
+   *
+   * @see Column#setClassNameGenerator(SerializableFunction)
+   *
+   * @param classNameGenerator the class name generator to set, not {@code null}
+   * @return this instance, for method chaining
+   * @throws NullPointerException if {@code classNameGenerator} is {@code null}
+   */
+  public TwinColumn<T> setClassNameGenerator(SerializableFunction<T, String> classNameGenerator) {
+    availableColumn.setClassNameGenerator(classNameGenerator);
+    selectionColumn.setClassNameGenerator(classNameGenerator);
+    return this;
+  }
+
+}

From d1cfc4efd8ebd76b8b2da27f9f00be165205005b Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 26 Dec 2022 15:29:50 -0300
Subject: [PATCH 15/21] refactor!: move addColumn(ItemLabelGenerator, String)
 to legacy class

---
 .../addons/twincolgrid/LegacyTwinColGrid.java | 20 +++++++++++++++++++
 .../addons/twincolgrid/TwinColGrid.java       | 15 --------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
index 22ae1f6..1a06613 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
@@ -1,7 +1,9 @@
 package com.flowingcode.vaadin.addons.twincolgrid;
 
+import com.vaadin.flow.component.ItemLabelGenerator;
 import com.vaadin.flow.component.grid.Grid;
 import com.vaadin.flow.data.provider.ListDataProvider;
+import com.vaadin.flow.data.renderer.TextRenderer;
 import com.vaadin.flow.data.selection.SelectionListener;
 import java.util.Collection;
 import java.util.function.Supplier;
@@ -280,4 +282,22 @@ protected void setDataProvider(ListDataProvider<T> dataProvider) {
     super.setDataProvider(dataProvider);
   }
 
+  /**
+   * Adds a new text column to this {@link Grid} with a value provider. The column will use a
+   * {@link TextRenderer}. The value is converted to a String using the provided {@code
+   * itemLabelGenerator}.
+   *
+   * @deprecated Use {@link #addColumn(ItemLabelGenerator)}{@code .setHeader(header)}
+   *
+   * @param itemLabelGenerator the value provider
+   * @param header the column header
+   * @return this instance
+   */
+  @Deprecated
+  public LegacyTwinColGrid<T> addColumn(
+      final ItemLabelGenerator<T> itemLabelGenerator, final String header) {
+    addColumn(itemLabelGenerator).setHeader(header);
+    return this;
+  }
+
 }
diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
index 72574b5..a998efe 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -470,21 +470,6 @@ public TwinColumn<T> addColumn(ItemLabelGenerator<T> itemLabelGenerator) {
     return new TwinColumn<>(availableColumn, selectionColumn);
   }
 
-  /**
-   * Adds a new text column to this {@link Grid} with a value provider. The column will use a {@link
-   * TextRenderer}. The value is converted to a String using the provided {@code
-   * itemLabelGenerator}.
-   *
-   * @param itemLabelGenerator the value provider
-   * @param header the column header
-   * @return this instance
-   */
-  public TwinColGrid<T> addColumn(
-      final ItemLabelGenerator<T> itemLabelGenerator, final String header) {
-    getAvailableGrid().addColumn(new TextRenderer<>(itemLabelGenerator)).setHeader(header);
-    getSelectionGrid().addColumn(new TextRenderer<>(itemLabelGenerator)).setHeader(header);
-    return this;
-  }
 
   /**
    * Adds a new sortable text column to this {@link Grid} with a value provider. The column will use

From f460552c6bd8033ee53e25f754acd57b8c1b26b2 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 26 Dec 2022 15:34:01 -0300
Subject: [PATCH 16/21] refactor!: move addSortableColumn to legacy class

---
 .../addons/twincolgrid/LegacyTwinColGrid.java | 53 +++++++++++++++++++
 .../addons/twincolgrid/TwinColGrid.java       | 51 ------------------
 .../vaadin/addons/twincolgrid/BoundDemo.java  |  5 +-
 .../addons/twincolgrid/DoubleClickDemo.java   |  6 +--
 .../addons/twincolgrid/DragAndDropDemo.java   |  6 +--
 .../addons/twincolgrid/OrientationDemo.java   |  6 +--
 6 files changed, 64 insertions(+), 63 deletions(-)

diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
index 1a06613..a913162 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
@@ -6,6 +6,7 @@
 import com.vaadin.flow.data.renderer.TextRenderer;
 import com.vaadin.flow.data.selection.SelectionListener;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.function.Supplier;
 import lombok.NonNull;
 
@@ -300,4 +301,56 @@ public LegacyTwinColGrid<T> addColumn(
     return this;
   }
 
+  /**
+   * Adds a new sortable text column to this {@link Grid} with a value provider. The column will use
+   * a {@link TextRenderer}. The value is converted to a String using the provided {@code
+   * itemLabelGenerator}.
+   *
+   * @deprecated Use
+   *             {@link #addColumn(ItemLabelGenerator)}{@code .setHeader(header).setComparator(comparator)}
+   *
+   * @param itemLabelGenerator the value provider
+   * @param comparator the in-memory comparator
+   * @param header the column header
+   * @return this instance
+   */
+  @Deprecated
+  public LegacyTwinColGrid<T> addSortableColumn(
+      final ItemLabelGenerator<T> itemLabelGenerator,
+      Comparator<T> comparator,
+      final String header) {
+    addColumn(itemLabelGenerator)
+    .setHeader(header)
+    .setComparator(comparator)
+    .setSortable(true);
+    return this;
+  }
+
+  /**
+   * Adds a new sortable text column to this {@link Grid} with a value provider. The column will use
+   * a {@link TextRenderer}. The value is converted to a String using the provided {@code
+   * itemLabelGenerator}.
+   *
+   * @deprecated Use
+   *             {@link #addColumn(ItemLabelGenerator)}{@code .setHeader(header).setComparator(comparator).setKey(key)}
+   *
+   * @param itemLabelGenerator the value provider
+   * @param comparator the in-memory comparator
+   * @param header the column header
+   * @param header the column key
+   * @return this instance
+   */
+  @Deprecated
+  public LegacyTwinColGrid<T> addSortableColumn(
+      final ItemLabelGenerator<T> itemLabelGenerator,
+      Comparator<T> comparator,
+      final String header,
+      final String key) {
+    addColumn(itemLabelGenerator)
+    .setHeader(header)
+    .setComparator(comparator)
+    .setSortable(true)
+    .setKey(key);
+    return this;
+  }
 }
diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
index a998efe..d8695c5 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -55,7 +55,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -470,56 +469,6 @@ public TwinColumn<T> addColumn(ItemLabelGenerator<T> itemLabelGenerator) {
     return new TwinColumn<>(availableColumn, selectionColumn);
   }
 
-
-  /**
-   * Adds a new sortable text column to this {@link Grid} with a value provider. The column will use
-   * a {@link TextRenderer}. The value is converted to a String using the provided {@code
-   * itemLabelGenerator}.
-   *
-   * @param itemLabelGenerator the value provider
-   * @param comparator the in-memory comparator
-   * @param header the column header
-   * @return this instance
-   */
-  public TwinColGrid<T> addSortableColumn(
-      final ItemLabelGenerator<T> itemLabelGenerator,
-      Comparator<T> comparator,
-      final String header) {
-    forEachGrid(
-        grid ->
-            grid.addColumn(new TextRenderer<>(itemLabelGenerator))
-                .setHeader(header)
-                .setComparator(comparator)
-                .setSortable(true));
-    return this;
-  }
-
-  /**
-   * Adds a new sortable text column to this {@link Grid} with a value provider. The column will use
-   * a {@link TextRenderer}. The value is converted to a String using the provided {@code
-   * itemLabelGenerator}.
-   *
-   * @param itemLabelGenerator the value provider
-   * @param comparator the in-memory comparator
-   * @param header the column header
-   * @param header the column key
-   * @return this instance
-   */
-  public TwinColGrid<T> addSortableColumn(
-      final ItemLabelGenerator<T> itemLabelGenerator,
-      Comparator<T> comparator,
-      final String header,
-      final String key) {
-    forEachGrid(
-        grid ->
-            grid.addColumn(new TextRenderer<>(itemLabelGenerator))
-                .setHeader(header)
-                .setComparator(comparator)
-                .setSortable(true)
-                .setKey(key));
-    return this;
-  }
-
   public TwinColGrid<T> withoutAddAllButton() {
     addAllButton.setVisible(false);
     checkContainerVisibility();
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java
index 48613fe..56c99d1 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/BoundDemo.java
@@ -29,7 +29,6 @@
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 
 @SuppressWarnings("serial")
@@ -48,14 +47,14 @@ public BoundDemo() {
     // Binded
     final TwinColGrid<Book> twinColGrid =
         new TwinColGrid<>(availableBooks)
-            .addSortableColumn(Book::getIsbn, Comparator.comparing(Book::getIsbn), "ISBN")
-            .addSortableColumn(Book::getTitle, Comparator.comparing(Book::getTitle), "Title")
             .withAvailableGridCaption("Available books")
             .withSelectionGridCaption("Added books")
             .withoutRemoveAllButton()
             .withSizeFull()
             .selectRowOnClick();
 
+    twinColGrid.addColumn(Book::getIsbn).setComparator(Book::getIsbn).setHeader("ISBN");
+    twinColGrid.addColumn(Book::getTitle).setComparator(Book::getTitle).setHeader("Title");
     twinColGrid.setCaption("TwinColGrid demo with Binder and row select without checkbox");
 
     final Binder<Library> binder = new Binder<>();
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java
index d693885..4e2aeeb 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DoubleClickDemo.java
@@ -25,7 +25,6 @@
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -44,12 +43,13 @@ public DoubleClickDemo() {
 
     final TwinColGrid<Book> twinColGrid =
         new TwinColGrid<>(availableBooks)
-            .addSortableColumn(Book::getIsbn, Comparator.comparing(Book::getIsbn), "ISBN")
-            .addSortableColumn(Book::getTitle, Comparator.comparing(Book::getTitle), "Title")
             .withAvailableGridCaption("Available books")
             .withSelectionGridCaption("Added books")
             .withSizeFull()
             .selectRowOnClick();
+
+    twinColGrid.addColumn(Book::getIsbn).setComparator(Book::getIsbn).setHeader("ISBN");
+    twinColGrid.addColumn(Book::getTitle).setComparator(Book::getTitle).setHeader("Title");
     twinColGrid.setValue(selectedBooks);
 
     add(new Span("Move items by double click"), twinColGrid);
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DragAndDropDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DragAndDropDemo.java
index 6028d29..9658eff 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DragAndDropDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/DragAndDropDemo.java
@@ -30,7 +30,6 @@
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -51,8 +50,6 @@ public DragAndDropDemo() {
 
     twinColGrid =
         new TwinColGrid<>(availableBooks)
-            .addSortableColumn(Book::getIsbn, Comparator.comparing(Book::getIsbn), "ISBN")
-            .addSortableColumn(Book::getTitle, Comparator.comparing(Book::getTitle), "Title")
             .withAvailableGridCaption("Available books")
             .withSelectionGridCaption("Added books")
             .withoutAddAllButton()
@@ -61,6 +58,9 @@ public DragAndDropDemo() {
             .withSelectionGridReordering()
             .selectRowOnClick();
 
+    twinColGrid.addColumn(Book::getIsbn).setComparator(Book::getIsbn).setHeader("ISBN");
+    twinColGrid.addColumn(Book::getTitle).setComparator(Book::getTitle).setHeader("Title");
+
     twinColGrid.setCaption("TwinColGrid demo with drag and drop support");
     twinColGrid.setValue(selectedBooks);
 
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
index d1e7366..93f4628 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/OrientationDemo.java
@@ -27,7 +27,6 @@
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -48,13 +47,14 @@ public OrientationDemo() {
 
     final TwinColGrid<Book> twinColGrid =
         new TwinColGrid<>(availableBooks)
-            .addSortableColumn(Book::getIsbn, Comparator.comparing(Book::getIsbn), "ISBN")
-            .addSortableColumn(Book::getTitle, Comparator.comparing(Book::getTitle), "Title")
             .withAvailableGridCaption("Available books")
             .withSelectionGridCaption("Added books")
             .withSizeFull()
             .selectRowOnClick()
             .withOrientation(Orientation.VERTICAL);
+
+    twinColGrid.addColumn(Book::getIsbn).setComparator(Book::getIsbn).setHeader("ISBN");
+    twinColGrid.addColumn(Book::getTitle).setComparator(Book::getTitle).setHeader("Title");
     twinColGrid.setValue(selectedBooks);
 
     FormLayout formLayout = new FormLayout();

From ff0c351b84d36215680db772b71f9e4a754c24e3 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 26 Dec 2022 16:23:45 -0300
Subject: [PATCH 17/21] refactor!: refactor addFilterableColumn

---
 .../twincolgrid/FilterableTwinColumn.java     | 127 ++++++++++++++++++
 .../addons/twincolgrid/LegacyTwinColGrid.java |  68 ++++++++++
 .../addons/twincolgrid/TwinColGrid.java       |  90 +++++--------
 .../addons/twincolgrid/FilterableDemo.java    |   8 +-
 4 files changed, 236 insertions(+), 57 deletions(-)
 create mode 100644 src/main/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableTwinColumn.java

diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableTwinColumn.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableTwinColumn.java
new file mode 100644
index 0000000..0e002cf
--- /dev/null
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableTwinColumn.java
@@ -0,0 +1,127 @@
+package com.flowingcode.vaadin.addons.twincolgrid;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.grid.Grid.Column;
+import com.vaadin.flow.component.grid.SortOrderProvider;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.function.SerializableFunction;
+import com.vaadin.flow.function.ValueProvider;
+import java.util.Comparator;
+import java.util.function.Supplier;
+
+/** Fluent helper object that delegates setters on both columns. */
+public class FilterableTwinColumn<T> extends TwinColumn<T> {
+
+  public FilterableTwinColumn(Column<T> availableColumn, Column<T> selectionColumn) {
+    super(availableColumn, selectionColumn);
+  }
+
+  /**
+   * Set the placeholder of the filter text field on both columns.
+   *
+   * @see TextField#setPlaceholder(String)
+   */
+  public FilterableTwinColumn<T> setFilterPlaceholder(String filterPlaceholder) {
+    TwinColGrid.getFilterTextField(getAvailableColumn()).setPlaceholder(filterPlaceholder);
+    TwinColGrid.getFilterTextField(getSelectionColumn()).setPlaceholder(filterPlaceholder);
+    return this;
+  }
+
+  /**
+   * Set to {@code false} to hide the clear button which clears the filter text field.
+   *
+   * @see TextField#setClearButtonVisible(boolean)
+   */
+  public FilterableTwinColumn<T> setClearButtonVisible(boolean clearButtonVisible) {
+    TwinColGrid.getFilterTextField(getAvailableColumn()).setClearButtonVisible(clearButtonVisible);
+    TwinColGrid.getFilterTextField(getSelectionColumn()).setClearButtonVisible(clearButtonVisible);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setWidth(String width) {
+    super.setWidth(width);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setFlexGrow(int flexGrow) {
+    super.setFlexGrow(flexGrow);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setAutoWidth(boolean autoWidth) {
+    super.setAutoWidth(autoWidth);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setKey(String key) {
+    super.setKey(key);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setComparator(Comparator<T> comparator) {
+    super.setComparator(comparator);
+    return this;
+  }
+
+  @Override
+  public <V extends Comparable<? super V>> TwinColumn<T> setComparator(
+      ValueProvider<T, V> keyExtractor) {
+    super.setComparator(keyExtractor);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setSortProperty(String... properties) {
+    super.setSortProperty(properties);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setSortOrderProvider(SortOrderProvider provider) {
+    super.setSortOrderProvider(provider);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setSortable(boolean sortable) {
+    super.setSortable(sortable);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setHeader(String labelText) {
+    super.setHeader(labelText);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setFooter(String labelText) {
+    super.setFooter(labelText);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setHeader(Supplier<Component> footerComponentSupplier) {
+    super.setHeader(footerComponentSupplier);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setFooter(Supplier<Component> footerComponentSupplier) {
+    super.setFooter(footerComponentSupplier);
+    return this;
+  }
+
+  @Override
+  public FilterableTwinColumn<T> setClassNameGenerator(
+      SerializableFunction<T, String> classNameGenerator) {
+    super.setClassNameGenerator(classNameGenerator);
+    return this;
+  }
+
+}
diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
index a913162..31c5d4d 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/LegacyTwinColGrid.java
@@ -5,6 +5,7 @@
 import com.vaadin.flow.data.provider.ListDataProvider;
 import com.vaadin.flow.data.renderer.TextRenderer;
 import com.vaadin.flow.data.selection.SelectionListener;
+import com.vaadin.flow.function.SerializableFunction;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.function.Supplier;
@@ -353,4 +354,71 @@ public LegacyTwinColGrid<T> addSortableColumn(
     .setKey(key);
     return this;
   }
+
+  /**
+   * Adds a new filterable text column to this {@link TwinColGrid}, with a key. The value is
+   * converted to a String using the provided {@code itemLabelGenerator} and matches are computed
+   * against the result of {@code filterableValue}.
+   *
+   * @deprecated Use {@code addFilterableColumn(itemLabelGenerator, filterableValue)} and configure
+   *             the other properties on the returned {@link TwinColumn}.
+   */
+  @Deprecated
+  public LegacyTwinColGrid<T> addFilterableColumn(final ItemLabelGenerator<T> itemLabelGenerator,
+      SerializableFunction<T, String> filterableValue, final String header,
+      String filterPlaceholder, boolean enableClearButton, String key) {
+    TwinColumn<?> column =
+        addFilterableColumn(itemLabelGenerator, filterableValue).setHeader(header)
+        .setFilterPlaceholder(filterPlaceholder).setClearButtonVisible(enableClearButton);
+    if (key != null) {
+      column.setKey(key);
+    }
+    return this;
+  }
+
+  /**
+   * Adds a new filterable text column to this {@link TwinColGrid}, with no key. The value is
+   * converted to a String using the provided {@code itemLabelGenerator} and matches are computed
+   * against the result of the same {@code itemLabelGenerator}.
+   *
+   * @deprecated Use {@code addFilterableColumn(itemLabelGenerator)} and configure the other
+   *             properties on the returned {@link TwinColumn}.
+   */
+  @Deprecated
+  public LegacyTwinColGrid<T> addFilterableColumn(final ItemLabelGenerator<T> itemLabelGenerator,
+      final String header, String filterPlaceholder, boolean enableClearButton) {
+    return addFilterableColumn(itemLabelGenerator, itemLabelGenerator, header, filterPlaceholder,
+        enableClearButton, null);
+  }
+
+  /**
+   * Adds a new filterable text column to this {@link TwinColGrid}, with no key. The value is
+   * converted to a String using the provided {@code itemLabelGenerator} and matches are computed
+   * against the result of {@code filterableValue}.
+   *
+   * @deprecated Use {@code addFilterableColumn(itemLabelGenerator, filterableValue)} and configure
+   *             the other properties on the returned {@link TwinColumn}.
+   */
+  @Deprecated
+  public LegacyTwinColGrid<T> addFilterableColumn(ItemLabelGenerator<T> itemLabelGenerator,
+      SerializableFunction<T, String> filterableValue, String header, String filterPlaceholder,
+      boolean enableClearButton) {
+    return addFilterableColumn(itemLabelGenerator, filterableValue, header, filterPlaceholder,
+        enableClearButton, null);
+  }
+
+  /**
+   * Adds a new filterable text column to this {@link TwinColGrid}, with a key. The value is
+   * converted to a String using the provided {@code itemLabelGenerator} and matches are computed
+   * against the result of the same {@code itemLabelGenerator}.
+   *
+   * @deprecated Use {@code addFilterableColumn(itemLabelGenerator)} and configure the other
+   *             properties on the returned {@link TwinColumn}.
+   */
+  @Deprecated
+  public LegacyTwinColGrid<T> addFilterableColumn(ItemLabelGenerator<T> itemLabelGenerator,
+      String header, String filterPlaceholder, boolean enableClearButton, String key) {
+    return addFilterableColumn(itemLabelGenerator, itemLabelGenerator, header, filterPlaceholder,
+        enableClearButton, key);
+  }
 }
diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
index d8695c5..2a511b1 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -23,6 +23,7 @@
 import com.vaadin.flow.component.AbstractField.ComponentValueChangeEvent;
 import com.vaadin.flow.component.ClientCallable;
 import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentUtil;
 import com.vaadin.flow.component.HasComponents;
 import com.vaadin.flow.component.HasSize;
 import com.vaadin.flow.component.HasValue;
@@ -759,71 +760,50 @@ public boolean isSelectionGridReorderingAllowed() {
     return selection.allowReordering;
   }
 
-  public TwinColGrid<T> addFilterableColumn(
-      final ItemLabelGenerator<T> itemLabelGenerator,
-      SerializableFunction<T, String> filterableValue,
-      final String header,
-      String filterPlaceholder,
-      boolean enableClearButton,
-      String key) {
-    forEachSide(
-        side -> {
-          Column<T> column =
-              side.grid.addColumn(new TextRenderer<>(itemLabelGenerator)).setHeader(header);
+  private static final String COMPONENT_DATA_FILTER = "TwinColGrid#filterTF";
 
-          Optional.ofNullable(key).ifPresent(column::setKey);
-
-          TextField filterTF = new TextField();
-          filterTF.setClearButtonVisible(enableClearButton);
+  private Column<T> createFilterableColumn(TwinColModel<T> side,
+      ItemLabelGenerator<T> itemLabelGenerator,
+      SerializableFunction<T, String> filterableValue) {
+    Column<T> column = side.grid.addColumn(new TextRenderer<>(itemLabelGenerator));
+    TextField filterTF = new TextField();
+
+    filterTF.addValueChangeListener(
+        event ->
+            side.getDataProvider()
+                .addFilter(
+                    filterableEntity ->
+                        StringUtils.containsIgnoreCase(
+                            filterableValue.apply(filterableEntity), filterTF.getValue())));
+
+    if (side.headerRow == null) {
+      side.headerRow = side.grid.appendHeaderRow();
+    }
 
-          filterTF.addValueChangeListener(
-              event ->
-                  side.getDataProvider()
-                      .addFilter(
-                          filterableEntity ->
-                              StringUtils.containsIgnoreCase(
-                                  filterableValue.apply(filterableEntity), filterTF.getValue())));
+    side.headerRow.getCell(column).setComponent(filterTF);
 
-          if (side.headerRow == null) {
-            side.headerRow = side.grid.appendHeaderRow();
-          }
+    filterTF.setValueChangeMode(ValueChangeMode.EAGER);
+    filterTF.setSizeFull();
 
-          side.headerRow.getCell(column).setComponent(filterTF);
-          filterTF.setValueChangeMode(ValueChangeMode.EAGER);
-          filterTF.setSizeFull();
-          filterTF.setPlaceholder(filterPlaceholder);
-        });
-
-    return this;
+    ComponentUtil.setData(column, COMPONENT_DATA_FILTER, filterTF);
+    return column;
   }
 
-  public TwinColGrid<T> addFilterableColumn(
-      final ItemLabelGenerator<T> itemLabelGenerator,
-      final String header,
-      String filterPlaceholder,
-      boolean enableClearButton) {
-    return addFilterableColumn(
-        itemLabelGenerator, itemLabelGenerator, header, filterPlaceholder, enableClearButton, null);
+  static TextField getFilterTextField(Column<?> column) {
+    return (TextField) ComponentUtil.getData(column, COMPONENT_DATA_FILTER);
   }
 
-  public TwinColGrid<T> addFilterableColumn(
-      ItemLabelGenerator<T> itemLabelGenerator,
-      SerializableFunction<T, String> filterableValue,
-      String header,
-      String filterPlaceholder,
-      boolean enableClearButton) {
-    return addFilterableColumn(
-        itemLabelGenerator, filterableValue, header, filterPlaceholder, enableClearButton, null);
+  public FilterableTwinColumn<T> addFilterableColumn(ItemLabelGenerator<T> itemLabelGenerator) {
+    return addFilterableColumn(itemLabelGenerator, itemLabelGenerator);
   }
 
-  public TwinColGrid<T> addFilterableColumn(
-      ItemLabelGenerator<T> itemLabelGenerator,
-      String header,
-      String filterPlaceholder,
-      boolean enableClearButton,
-      String key) {
-    return addFilterableColumn(
-        itemLabelGenerator, itemLabelGenerator, header, filterPlaceholder, enableClearButton, key);
+  public FilterableTwinColumn<T> addFilterableColumn(ItemLabelGenerator<T> itemLabelGenerator,
+      SerializableFunction<T, String> filterableValue) {
+
+    Column<T> availableColumn = createFilterableColumn(available, itemLabelGenerator, filterableValue);
+    Column<T> selectionColumn = createFilterableColumn(selection, itemLabelGenerator, filterableValue);
+
+    return new FilterableTwinColumn<>(availableColumn, selectionColumn);
   }
 
   public TwinColGrid<T> selectRowOnClick() {
diff --git a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java
index 60cf525..9e4bb61 100644
--- a/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java
+++ b/src/test/java/com/flowingcode/vaadin/addons/twincolgrid/FilterableDemo.java
@@ -43,12 +43,16 @@ public FilterableDemo() {
 
     final TwinColGrid<Book> twinColGrid =
         new TwinColGrid<>(availableBooks)
-            .addFilterableColumn(Book::getIsbn, Book::getIsbn, "ISBN", "ISBN Filter", true)
-            .addFilterableColumn(Book::getTitle, "Title", "Title filter", false)
             .withAvailableGridCaption("Available books")
             .withSelectionGridCaption("Added books")
             .withoutAddAllButton()
             .withSizeFull();
+
+    twinColGrid.addFilterableColumn(Book::getIsbn).setHeader("ISBN")
+        .setFilterPlaceholder("ISBN Filter").setClearButtonVisible(true);
+    twinColGrid.addFilterableColumn(Book::getTitle).setHeader("Title")
+        .setFilterPlaceholder("Title filter").setClearButtonVisible(false);
+
     twinColGrid.setCaption("TwinColGrid demo with filtering support");
     twinColGrid.setValue(selectedBooks);
 

From 72336b1dcda65219b2be08059eb19d01b38fecb3 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Mon, 26 Dec 2022 16:52:26 -0300
Subject: [PATCH 18/21] build: upgrade Vaadin to 14.8.20

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e375227..56a90d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<version>2.9.3-SNAPSHOT</version>
 	<name>TwinColGrid add-on</name>
     <properties>
-        <vaadin.version>14.9.7</vaadin.version>
+        <vaadin.version>14.8.20</vaadin.version>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 26542659fc5c7b415e2de21221123aa9b1503b4c Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Tue, 27 Dec 2022 11:50:21 -0300
Subject: [PATCH 19/21] style: declare and assign listEvent value in the same
 line

---
 .../vaadin/addons/twincolgrid/TwinColGridListAdapter.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGridListAdapter.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGridListAdapter.java
index 068e60e..fd93c7f 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGridListAdapter.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGridListAdapter.java
@@ -98,8 +98,8 @@ public Registration addValueChangeListener(
         delegate.addValueChangeListener(
             ev -> {
               List<T> value = new ArrayList<>(ev.getValue());
-              ValueChangeEvent<List<T>> listEvent;
-              listEvent = new ValueChangeEventImpl(ev.isFromClient(), new ArrayList<>(value));
+              ValueChangeEvent<List<T>> listEvent =
+                  new ValueChangeEventImpl(ev.isFromClient(), new ArrayList<>(value));
               listener.valueChanged(listEvent);
             }));
 
@@ -110,8 +110,8 @@ public Registration addValueChangeListener(
             .addSortListener(
                 ev -> {
                   List<T> value = getValue();
-                  ValueChangeEvent<List<T>> listEvent;
-                  listEvent = new ValueChangeEventImpl(ev.isFromClient(), value);
+                  ValueChangeEvent<List<T>> listEvent =
+                      new ValueChangeEventImpl(ev.isFromClient(), value);
                   listener.valueChanged(listEvent);
                 }));
 

From b7b3e7ca1d67983b2cd2f9e371d671126aedd5f8 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Tue, 27 Dec 2022 14:31:00 -0300
Subject: [PATCH 20/21] fix: fix filterable column display

Close #123
---
 .../addons/twincolgrid/TwinColGrid.java       | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
index 2a511b1..dcf65ca 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/twincolgrid/TwinColGrid.java
@@ -145,6 +145,8 @@ public enum Orientation {
 
   private boolean isFromClient = false;
 
+  private boolean explicitHeaderRow = true;
+
   private static <T> ListDataProvider<T> emptyDataProvider() {
     return DataProvider.ofCollection(new LinkedHashSet<>());
   }
@@ -455,6 +457,39 @@ public TwinColGrid<T> withSelectionGridCaption(final String caption) {
     return this;
   }
 
+  /**
+   * Configure this component to create the first header row (for column header labels). If no
+   * column will have a header, this property must be set to {@code false}.
+   *
+   * <p>
+   * When this property is {@code true} (default), the first column added through this component
+   * will {@linkplain Grid#appendHeaderRow() append} a header row, which will be the "default header
+   * row" (used by {@code Column.setHeader}). If no headers are set, then the default header row
+   * will be empty.
+   *
+   * <p>
+   * When this property is {@code false}, then {@code Column.setHeader} will allocate a header row
+   * when called (which prevents an empty row if no headers are set, but also replaces the filter
+   * componentes).
+   *
+   * @param value whether the first header row will be created when a column is added.
+   * @return this instance
+   */
+  public TwinColGrid<T> createFirstHeaderRow(boolean value) {
+    explicitHeaderRow = value;
+    return this;
+  }
+
+  private void createFirstHeaderRowIfNeeded() {
+    if (explicitHeaderRow) {
+      forEachGrid(grid -> {
+        if (grid.getColumns().isEmpty() && grid.getHeaderRows().isEmpty()) {
+          grid.appendHeaderRow();
+        }
+      });
+    }
+  }
+
   /**
    * Adds a column to each grids. Both columns will use a {@link TextRenderer} and the value
    * will be converted to a String by using the provided {@code itemLabelGenerator}.
@@ -463,6 +498,7 @@ public TwinColGrid<T> withSelectionGridCaption(final String caption) {
    * @return the pair of columns
    */
   public TwinColumn<T> addColumn(ItemLabelGenerator<T> itemLabelGenerator) {
+    createFirstHeaderRowIfNeeded();
     Column<T> availableColumn =
         getAvailableGrid().addColumn(new TextRenderer<>(itemLabelGenerator));
     Column<T> selectionColumn =
@@ -800,6 +836,8 @@ public FilterableTwinColumn<T> addFilterableColumn(ItemLabelGenerator<T> itemLab
   public FilterableTwinColumn<T> addFilterableColumn(ItemLabelGenerator<T> itemLabelGenerator,
       SerializableFunction<T, String> filterableValue) {
 
+    createFirstHeaderRowIfNeeded();
+
     Column<T> availableColumn = createFilterableColumn(available, itemLabelGenerator, filterableValue);
     Column<T> selectionColumn = createFilterableColumn(selection, itemLabelGenerator, filterableValue);
 

From aa495878dbf2e8768f5362294160be75d53ff3d9 Mon Sep 17 00:00:00 2001
From: Javier Godoy <11554739+javier-godoy@users.noreply.github.com>
Date: Thu, 6 Jul 2023 17:06:15 -0300
Subject: [PATCH 21/21] build: set version to 3.0.0-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 56a90d2..0637d2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.flowingcode.vaadin.addons</groupId>
 	<artifactId>twincolgrid</artifactId>
-	<version>2.9.3-SNAPSHOT</version>
+	<version>3.0.0-SNAPSHOT</version>
 	<name>TwinColGrid add-on</name>
     <properties>
         <vaadin.version>14.8.20</vaadin.version>