[FW][FIX] data_validation: prevent icon overlap

src/components/data_validation_overlay/data_validation_overlay.ts

@@ -12,7 +12,11 @@ export class DataValidationOverlay extends Component<{}, SpreadsheetChildEnv> {
   get checkBoxCellPositions(): CellPosition[] {
     return this.env.model.getters
       .getVisibleCellPositions()
-      .filter(this.env.model.getters.isCellValidCheckbox);
+      .filter(
+        (position) =>
+          this.env.model.getters.isCellValidCheckbox(position) &&
+          !this.env.model.getters.isFilterHeader(position)
+      );
   }
 
   get listIconsCellPositions(): CellPosition[] {
@@ -21,6 +25,10 @@ export class DataValidationOverlay extends Component<{}, SpreadsheetChildEnv> {
     }
     return this.env.model.getters
       .getVisibleCellPositions()
-      .filter(this.env.model.getters.cellHasListDataValidationIcon);
+      .filter(
+        (position) =>
+          this.env.model.getters.cellHasListDataValidationIcon(position) &&
+          !this.env.model.getters.isFilterHeader(position)
+      );
   }
 }

tests/data_validation/data_validation_checkbox_component.test.ts

@@ -1,5 +1,10 @@
 import { Model } from "../../src";
-import { addDataValidation, setCellContent, setStyle } from "../test_helpers/commands_helpers";
+import {
+  addDataValidation,
+  createFilter,
+  setCellContent,
+  setStyle,
+} from "../test_helpers/commands_helpers";
 import { getStyle } from "../test_helpers/getters_helpers";
 import { mountSpreadsheet, nextTick } from "../test_helpers/helpers";
 import { MockGridRenderingContext } from "../test_helpers/renderer_helpers";
@@ -81,4 +86,14 @@ describe("Checkbox component", () => {
 
     expect(fixture.querySelector(".o-dv-checkbox")?.classList).toContain("pe-none");
   });
+
+  test("Icon is not displayed if there is a filter icon", async () => {
+    const model = new Model();
+    addDataValidation(model, "A1", "id", { type: "isBoolean", values: [] });
+    createFilter(model, "A1:A4");
+
+    const { fixture } = await mountSpreadsheet({ model });
+    expect(fixture.querySelector(".o-dv-checkbox")).toBeNull();
+    expect(fixture.querySelector(".o-filter-icon")).not.toBeNull();
+  });
 });

tests/data_validation/data_validation_list_component.test.ts

@@ -6,7 +6,12 @@ import {
   GRID_ICON_MARGIN,
 } from "../../src/constants";
 import { IsValueInListCriterion, UID } from "../../src/types";
-import { addDataValidation, setCellContent, setSelection } from "../test_helpers/commands_helpers";
+import {
+  addDataValidation,
+  createFilter,
+  setCellContent,
+  setSelection,
+} from "../test_helpers/commands_helpers";
 import { click, keyDown, setInputValueAndTrigger } from "../test_helpers/dom_helper";
 import { getCellContent } from "../test_helpers/getters_helpers";
 import {
@@ -329,17 +334,30 @@ describe("Selection arrow icon in grid", () => {
       displayStyle: "plainText",
     });
     ({ fixture } = await mountSpreadsheet({ model }));
-    expect(fixture.querySelector(".o-grid-cell-icon")).toBeNull();
+    expect(fixture.querySelector(".o-dv-list-icon")).toBeNull();
   });
 
   test("Icon is not displayed in dashboard", async () => {
     model.updateMode("dashboard");
     addDataValidation(model, "A1", "id", {
       type: "isValueInList",
       values: ["ok", "hello", "okay"],
-      displayStyle: "plainText",
+      displayStyle: "arrow",
+    });
+    ({ fixture } = await mountSpreadsheet({ model }));
+    expect(fixture.querySelector(".o-dv-list-icon")).toBeNull();
+  });
+
+  test("Icon is not displayed if there is a filter icon", async () => {
+    addDataValidation(model, "A1", "id", {
+      type: "isValueInList",
+      values: ["ok", "hello", "okay"],
+      displayStyle: "arrow",
     });
+    createFilter(model, "A1:A4");
+
     ({ fixture } = await mountSpreadsheet({ model }));
-    expect(fixture.querySelector(".o-grid-cell-icon")).toBeNull();
+    expect(fixture.querySelector(".o-dv-list-icon")).toBeNull();
+    expect(fixture.querySelector(".o-filter-icon")).not.toBeNull();
   });
 });