fix: allow filtering out all values in spreadsheet filter (#9574)

In the spreadsheet filter popup, unchecking "Select All" had no effect,
and when unchecking values one by one, the last one didn't do anything
either. The selection looked empty, but no filtering happened, and after
closing the popup everything was selected again, which was confusing.

Unchecking now hides the rows and the deselected state persists. The PR
also hides the "Select All" checkbox entirely when all of a column's
values are already filtered out by other columns.

Fixes #9549

🤖 Generated with Claude Code

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: 2 people

vaadin-spreadsheet-flow-parent/vaadin-spreadsheet-flow/src/main/java/com/vaadin/flow/component/spreadsheet/ItemFilter.java

@@ -14,7 +14,6 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -24,8 +23,6 @@
 import com.vaadin.flow.component.checkbox.CheckboxGroup;
 import com.vaadin.flow.component.checkbox.CheckboxGroupVariant;
 import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.spreadsheet.PopupButton.PopupCloseEvent;
-import com.vaadin.flow.component.spreadsheet.PopupButton.PopupCloseListener;
 import com.vaadin.flow.component.spreadsheet.PopupButton.PopupOpenEvent;
 import com.vaadin.flow.component.spreadsheet.PopupButton.PopupOpenListener;
 import com.vaadin.flow.data.provider.ListDataProvider;
@@ -48,9 +45,7 @@ public class ItemFilter extends Div implements SpreadsheetFilter {
     private ListDataProvider<String> filterOptionsProvider;
     private List<String> filterOptions = new ArrayList<>();
     private ArrayList<String> allCellValues;
-    private Collection<String> latestFilteredValues;
     private PopupButton popupButton;
-    private boolean firstUpdate = true;
     private boolean cancelValueChangeUpdate;
     private SpreadsheetFilterTable filterTable;
     private Set<Integer> filteredRows;
@@ -77,7 +72,6 @@ public ItemFilter(CellRangeAddress filterRange, Spreadsheet spreadsheet,
 
         allCellValues = new ArrayList<>();
         filteredRows = new HashSet<>();
-        latestFilteredValues = new LinkedHashSet<>();
         initComponents();
         updateOptions();
     }
@@ -103,43 +97,11 @@ protected void initLayouts() {
     }
 
     /**
-     * Initializes pop-up close listener for verifying that filter selections
-     * match with what is currently shown.
+     * Initializes the pop-up open listener that refreshes the filter options
+     * whenever the pop-up is opened.
      */
     protected void initPopupButtonListeners() {
 
-        popupButton.addPopupCloseListener(new PopupCloseListener() {
-
-            @Override
-            public void onPopupClose(PopupCloseEvent event) {
-                // need to check that the filter wasn't left a different state
-                // than what is displayed, like in case when allItems and all
-                // options were left unchecked.
-                if (!allItems.getValue()) {
-                    Collection<String> currentValue = filterCheckbox.getValue();
-                    cancelValueChangeUpdate = true;
-                    if (currentValue.isEmpty()) {
-                        if (latestFilteredValues.isEmpty()
-                                || latestFilteredValues
-                                        .containsAll(allCellValues)) {
-                            allItems.setIndeterminate(false);
-                            allItems.setValue(true);
-                            filterCheckbox
-                                    .setValue(new HashSet<>(allCellValues));
-                        } else {
-                            filterCheckbox.setValue(
-                                    new HashSet<>(latestFilteredValues));
-                        }
-                    } else {
-                        if (currentValue.containsAll(allCellValues)) {
-                            allItems.setIndeterminate(false);
-                            allItems.setValue(true);
-                        }
-                    }
-                    cancelValueChangeUpdate = false;
-                }
-            }
-        });
         popupButton.addPopupOpenListener(new PopupOpenListener() {
 
             @Override
@@ -163,6 +125,7 @@ protected void initAllItemsCheckbox() {
                     updateFilteredItems(allCellValues);
                 } else {
                     filterCheckbox.setValue(Collections.emptySet());
+                    updateFilteredItems(Collections.emptySet());
                 }
                 cancelValueChangeUpdate = false;
             }
@@ -178,31 +141,21 @@ protected void initOptions() {
         filterCheckbox.setItems(filterOptionsProvider);
         filterCheckbox.addThemeVariants(CheckboxGroupVariant.LUMO_VERTICAL);
         filterCheckbox.addValueChangeListener(event -> {
-            if (firstUpdate) {
-                firstUpdate = false;
-            } else {
-                if (!cancelValueChangeUpdate) {
-                    Collection<String> value = filterCheckbox.getValue();
-                    // value should not be updated when options are empty and
-                    // all
-                    // items is unchecked - just as in Excel
-                    if (!value.isEmpty()) {
-                        updateFilteredItems(value);
-                        cancelValueChangeUpdate = true;
-                        if (value.containsAll(allCellValues)) {
-                            allItems.setIndeterminate(false);
-                            if (!allItems.getValue()) {
-                                allItems.setValue(true);
-                            }
-                        } else {
-                            if (allItems.getValue()) {
-                                allItems.setValue(false);
-                                allItems.setIndeterminate(true);
-                            }
-                        }
-                        cancelValueChangeUpdate = false;
-                    }
+            if (!cancelValueChangeUpdate) {
+                Collection<String> value = filterCheckbox.getValue();
+                updateFilteredItems(value);
+                cancelValueChangeUpdate = true;
+                if (value.containsAll(allCellValues)) {
+                    allItems.setIndeterminate(false);
+                    allItems.setValue(true);
+                } else if (value.isEmpty()) {
+                    allItems.setIndeterminate(false);
+                    allItems.setValue(false);
+                } else {
+                    allItems.setValue(false);
+                    allItems.setIndeterminate(true);
                 }
+                cancelValueChangeUpdate = false;
             }
         });
     }
@@ -239,15 +192,26 @@ public void updateOptions() {
             Collections.sort(filterOptions, byString);
         }
 
+        // Hide "Select All" when there are no values to control, i.e. all of
+        // this column's values are hidden by other columns' filters.
+        allItems.setVisible(!allCellValues.isEmpty());
+
         Set<String> visibleValues = getVisibleValues();
         cancelValueChangeUpdate = true;
-        allItems.setIndeterminate(!visibleValues.containsAll(allCellValues));
-        allItems.setValue(visibleValues.containsAll(allCellValues));
-        cancelValueChangeUpdate = false;
+        if (visibleValues.containsAll(allCellValues)) {
+            allItems.setIndeterminate(false);
+            allItems.setValue(true);
+        } else if (visibleValues.isEmpty()) {
+            allItems.setIndeterminate(false);
+            allItems.setValue(false);
+        } else {
+            allItems.setValue(false);
+            allItems.setIndeterminate(true);
+        }
         filterOptionsProvider = new ListDataProvider<>(filterOptions);
         filterCheckbox.setItems(filterOptionsProvider);
-        firstUpdate = true;
         filterCheckbox.setValue(visibleValues);
+        cancelValueChangeUpdate = false;
     }
 
     /**
@@ -299,7 +263,6 @@ protected void updateFilteredItems(Collection<String> visibleValues) {
                 filteredRows.add(r);
             }
         }
-        latestFilteredValues = new ArrayList<>(visibleValues);
 
         filterTable.onFiltersUpdated();
     }