[FIX] clickable cells: prevent overlap with grid icons

If a cell has both a clickable cell and a clickable grid icon (eg. a
link in a cell with a filter icon), clicking the icon would click the
clickable cell.

With this commit, we reduce the clickable cell size based on the
position of the icons on the cell to prevent any overlap.

closes #7570

Task: 4930803
X-original-commit: 645e850
Signed-off-by: Pierre Rousseau (pro) <pro@odoo.com>

Author: hokolomopo

src/components/dashboard/clickable_cell_store.ts

@@ -60,16 +60,18 @@ export class ClickableCellsStore extends SpreadsheetStore {
   get clickableCells(): ClickableCell[] {
     const cells: ClickableCell[] = [];
     const getters = this.getters;
-    const sheetId = getters.getActiveSheetId();
     for (const position of this.getters.getVisibleCellPositions()) {
       const item = this.getClickableItem(position);
       if (!item) {
         continue;
       }
       const title = typeof item.title === "function" ? item.title(position, getters) : item.title;
-      const zone = getters.expandZone(sheetId, positionToZone(position));
+      const rect = this.getClickableCellRect(position);
+      if (!rect) {
+        continue;
+      }
       cells.push({
-        coordinates: getters.getVisibleRect(zone),
+        coordinates: rect,
         position,
         action: item.execute,
         title: title || "",
@@ -79,4 +81,32 @@ export class ClickableCellsStore extends SpreadsheetStore {
     }
     return cells;
   }
+
+  private getClickableCellRect(position: CellPosition): Rect | undefined {
+    const zone = this.getters.expandZone(position.sheetId, positionToZone(position));
+    const clickableRect = this.getters.getVisibleRect(zone);
+
+    const icons = this.getters.getCellIcons(position);
+    const iconsAtPosition = {
+      center: icons.find((icon) => icon.horizontalAlign === "center"),
+      left: icons.find((icon) => icon.horizontalAlign === "left"),
+      right: icons.find((icon) => icon.horizontalAlign === "right"),
+    };
+    if (iconsAtPosition.center?.onClick) {
+      return undefined;
+    }
+    if (iconsAtPosition.right?.onClick) {
+      const cellRect = this.getters.getRect(zone);
+      const iconRect = this.getters.getCellIconRect(iconsAtPosition.right, cellRect);
+      clickableRect.width -= iconRect.width + iconsAtPosition.right.margin;
+    }
+    if (iconsAtPosition.left?.onClick) {
+      const cellRect = this.getters.getRect(zone);
+      const iconRect = this.getters.getCellIconRect(iconsAtPosition.left, cellRect);
+      clickableRect.x += iconRect.width + iconsAtPosition.left.margin;
+      clickableRect.width -= iconRect.width + iconsAtPosition.left.margin;
+    }
+
+    return clickableRect;
+  }
 }

tests/grid/dashboard_grid_component.test.ts

@@ -1,3 +1,4 @@
+import { CHECKBOX_CHECKED } from "@odoo/o-spreadsheet-engine/components/icons/icons";
 import {
   DEFAULT_CELL_HEIGHT,
   DEFAULT_CELL_WIDTH,
@@ -6,7 +7,11 @@ import {
   MIN_CELL_TEXT_MARGIN,
 } from "@odoo/o-spreadsheet-engine/constants";
 import { Model } from "@odoo/o-spreadsheet-engine/model";
-import { Spreadsheet } from "../../src";
+import {
+  GridIcon,
+  iconsOnCellRegistry,
+} from "@odoo/o-spreadsheet-engine/registries/icons_on_cell_registry";
+import { Align, Spreadsheet } from "../../src";
 import { toZone } from "../../src/helpers";
 import { clickableCellRegistry } from "../../src/registries/cell_clickable_registry";
 import {
@@ -221,4 +226,74 @@ describe("Grid component in dashboard mode", () => {
       "hello Magical Françoise"
     );
   });
+
+  const TEST_GRID_ICON: GridIcon = {
+    horizontalAlign: "left",
+    size: 20,
+    margin: 2,
+    type: "debug_icon",
+    position: { sheetId: "s1", col: 0, row: 0 },
+    priority: 1,
+    svg: CHECKBOX_CHECKED,
+    onClick: () => {},
+  };
+
+  test("Clickable cell size is reduced based on the icon on the cell", async () => {
+    let horizontalAlign: Exclude<Align, undefined> = "center";
+
+    addToRegistry(clickableCellRegistry, "fake", {
+      condition: (position, getters) => position.row === 0 && position.col === 0,
+      execute: () => () => {},
+      sequence: 5,
+    });
+    addToRegistry(iconsOnCellRegistry, "test_icon", (getters, position) =>
+      position.col === 0 && position.row === 0 ? { ...TEST_GRID_ICON, horizontalAlign } : undefined
+    );
+
+    model.updateMode("dashboard");
+    await nextTick();
+
+    expect("div.o-dashboard-clickable-cell").toHaveCount(0); // because center icon => no clickable cell
+
+    horizontalAlign = "right";
+    model.dispatch("EVALUATE_CELLS");
+    await nextTick();
+    expect("div.o-dashboard-clickable-cell").toHaveStyle({
+      left: "0px",
+      width: DEFAULT_CELL_WIDTH - TEST_GRID_ICON.size - TEST_GRID_ICON.margin + "px",
+      height: DEFAULT_CELL_HEIGHT + "px",
+    });
+
+    horizontalAlign = "left";
+    model.dispatch("EVALUATE_CELLS");
+    await nextTick();
+    expect("div.o-dashboard-clickable-cell").toHaveStyle({
+      left: 20 + 2 + "px",
+      width: DEFAULT_CELL_WIDTH - TEST_GRID_ICON.size - TEST_GRID_ICON.margin + "px",
+      height: DEFAULT_CELL_HEIGHT + "px",
+    });
+  });
+
+  test("Clickable cell size is not reduced if the icon has no onClick action", async () => {
+    addToRegistry(clickableCellRegistry, "fake", {
+      condition: (position, getters) => position.row === 0 && position.col === 0,
+      execute: () => () => {},
+      sequence: 5,
+    });
+    addToRegistry(iconsOnCellRegistry, "test_icon", (getters, position) =>
+      position.col === 0 && position.row === 0
+        ? { ...TEST_GRID_ICON, onClick: undefined }
+        : undefined
+    );
+
+    model.updateMode("dashboard");
+    await nextTick();
+    await nextTick(); // Need to wait one render to have correct grid position with the resize observers
+
+    expect("div.o-dashboard-clickable-cell").toHaveStyle({
+      left: "0px",
+      width: DEFAULT_CELL_WIDTH + "px",
+      height: DEFAULT_CELL_HEIGHT + "px",
+    });
+  });
 });