[FIX] paint format: properly paint borders and tables

Since the paint format tool was moved from the clipboard plugin to its own store, it didn't handle the borders and tables properly. This commit fixes that by adding the two ClipboardHandlers to the PaintFormatStore. closes #5034 Task: 4213894 Signed-off-by: Lucas Lefèvre (lul) <[email protected]>
odoo · Oct 1, 2024 · d29a874 · d29a874
1 parent a006d0b
commit d29a874
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 7 deletions.
diff --git a/src/components/paint_format_button/paint_format_store.ts b/src/components/paint_format_button/paint_format_store.ts
@@ -1,4 +1,7 @@
+import { ClipboardHandler } from "../../clipboard_handlers/abstract_clipboard_handler";
+import { BorderClipboardHandler } from "../../clipboard_handlers/borders_clipboard";
 import { CellClipboardHandler } from "../../clipboard_handlers/cell_clipboard";
+import { TableClipboardHandler } from "../../clipboard_handlers/tables_clipboard";
 import { SELECTION_BORDER_COLOR } from "../../constants";
 import { getClipboardDataPositions } from "../../helpers/clipboard/clipboard_helpers";
 import { Get } from "../../store_engine";
@@ -16,7 +19,11 @@ export class PaintFormatStore extends SpreadsheetStore {
   mutators = ["activate", "cancel", "pasteFormat"] as const;
 
   protected highlightStore = this.get(HighlightStore);
-  private cellClipboardHandler = new CellClipboardHandler(this.getters, this.model.dispatch);
+  private clipboardHandlers: ClipboardHandler<any>[] = [
+    new CellClipboardHandler(this.getters, this.model.dispatch),
+    new BorderClipboardHandler(this.getters, this.model.dispatch),
+    new TableClipboardHandler(this.getters, this.model.dispatch),
+  ];
 
   private status: "inactive" | "oneOff" | "persistent" = "inactive";
   private copiedData?: ClipboardContent;
@@ -42,10 +49,12 @@ export class PaintFormatStore extends SpreadsheetStore {
   pasteFormat(target: Zone[]) {
     if (this.copiedData) {
       const sheetId = this.getters.getActiveSheetId();
-      this.cellClipboardHandler.paste({ zones: target, sheetId }, this.copiedData, {
-        isCutOperation: false,
-        pasteOption: "onlyFormat",
-      });
+      for (const handler of this.clipboardHandlers) {
+        handler.paste({ zones: target, sheetId }, this.copiedData, {
+          isCutOperation: false,
+          pasteOption: "onlyFormat",
+        });
+      }
     }
     if (this.status === "oneOff") {
       this.cancel();
@@ -60,7 +69,12 @@ export class PaintFormatStore extends SpreadsheetStore {
     const sheetId = this.getters.getActiveSheetId();
     const zones = this.getters.getSelectedZones();
 
-    return this.cellClipboardHandler.copy(getClipboardDataPositions(sheetId, zones));
+    const copiedData = {};
+    for (const handler of this.clipboardHandlers) {
+      Object.assign(copiedData, handler.copy(getClipboardDataPositions(sheetId, zones)));
+    }
+
+    return copiedData as ClipboardContent;
   }
 
   get highlights(): Highlight[] {

diff --git a/tests/grid/grid_component.test.ts b/tests/grid/grid_component.test.ts
@@ -5,6 +5,7 @@ import { PaintFormatStore } from "../../src/components/paint_format_button/paint
 import { CellPopoverStore } from "../../src/components/popover";
 import {
   BACKGROUND_GRAY_COLOR,
+  DEFAULT_BORDER_DESC,
   DEFAULT_CELL_HEIGHT,
   DEFAULT_CELL_WIDTH,
   GRID_ICON_EDGE_LENGTH,
@@ -40,6 +41,7 @@ import {
   selectColumn,
   selectHeader,
   selectRow,
+  setBorders,
   setCellContent,
   setCellFormat,
   setSelection,
@@ -64,6 +66,7 @@ import {
 } from "../test_helpers/dom_helper";
 import {
   getActiveSheetFullScrollInfo,
+  getBorder,
   getCell,
   getCellContent,
   getCellText,
@@ -849,22 +852,34 @@ describe("Grid component", () => {
       highlightStore = env.getStore(HighlightStore);
     });
 
-    test("can paste format with mouse once", async () => {
+    test("can paste format and borders with mouse once", async () => {
       setCellContent(model, "B2", "b2");
       selectCell(model, "B2");
       setStyle(model, "B2", { bold: true });
+      setBorders(model, "B2", { top: DEFAULT_BORDER_DESC });
       paintFormatStore.activate({ persistent: false });
       gridMouseEvent(model, "pointerdown", "C8");
       expect(getCell(model, "C8")).toBeUndefined();
       gridMouseEvent(model, "pointerup", "C8");
       expect(getCell(model, "C8")!.style).toEqual({ bold: true });
+      expect(getBorder(model, "C8")).toEqual({ top: DEFAULT_BORDER_DESC });
 
       gridMouseEvent(model, "pointerdown", "D8");
       expect(getCell(model, "D8")).toBeUndefined();
       gridMouseEvent(model, "pointerup", "D8");
       expect(getCell(model, "D8")).toBeUndefined();
     });
 
+    test("Paste format works with table style", () => {
+      createTable(model, "A1:B2", { styleId: "TableStyleLight11" });
+      selectCell(model, "A1");
+      paintFormatStore.activate({ persistent: false });
+      gridMouseEvent(model, "pointerdown", "C8");
+      gridMouseEvent(model, "pointerup", "C8");
+
+      expect(getCell(model, "C8")?.style).toMatchObject({ fillColor: "#748747" });
+    });
+
     test("can keep the paint format mode persistently", async () => {
       setCellContent(model, "B2", "b2");
       selectCell(model, "B2");