Fix TabSheet attaching and detaching components (#10988)

This patch reverts the fix #10557 and replaces it with a
proper solution from Grid perspective.

Fixes #10987
Fixes #10985

1 files changed, 5 insertions, 5 deletions

diff --git a/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java b/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java
index 574ed99045..3df69d45f3 100644
--- a/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java
+++ b/server/src/main/java/com/vaadin/data/provider/DataCommunicator.java
@@ -220,11 +220,6 @@ public class DataCommunicator<T> extends AbstractExtension {
     public void attach() {
         super.attach();
         attachDataProviderListener();
-
-        if (getPushRows().isEmpty()) {
-            // Make sure rows are pushed when component is attached.
-            setPushRows(Range.withLength(0, getMinPushSize()));
-        }
     }
 
     @Override
@@ -313,6 +308,11 @@ public class DataCommunicator<T> extends AbstractExtension {
     public void beforeClientResponse(boolean initial) {
         super.beforeClientResponse(initial);
 
+        if (initial && getPushRows().isEmpty()) {
+            // Make sure rows are pushed when component is attached.
+            setPushRows(Range.withLength(0, getMinPushSize()));
+        }
+
         sendDataToClient(initial);
     }