[FIX] borders: fix border on column/row deletion

- Fix issue when deleting the first/last row/colum not deleting
the exterior borders

- Fix issue with wrong border movement when deleting row/col

- Fix not removing internal border when deleting row/col

closes #5300

Task: 4089281
Signed-off-by: Rémi Rahir (rar) <[email protected]>

Author: fdamhaut

src/plugins/core/borders.ts

@@ -90,9 +90,55 @@ export class BordersPlugin extends CorePlugin<BordersPluginState> implements Bor
         const elements = [...cmd.elements].sort((a, b) => b - a);
         for (const group of groupConsecutive(elements)) {
           if (cmd.dimension === "COL") {
-            this.shiftBordersHorizontally(cmd.sheetId, group[group.length - 1] + 1, -group.length);
+            if (group[0] >= this.getters.getNumberCols(cmd.sheetId)) {
+              for (let row: HeaderIndex = 0; row < this.getters.getNumberRows(cmd.sheetId); row++) {
+                this.history.update(
+                  "borders",
+                  cmd.sheetId,
+                  group[0] + 1,
+                  row,
+                  "vertical",
+                  undefined
+                );
+              }
+            }
+            if (group[group.length - 1] === 0) {
+              for (let row: HeaderIndex = 0; row < this.getters.getNumberRows(cmd.sheetId); row++) {
+                this.history.update("borders", cmd.sheetId, 0, row, "vertical", undefined);
+              }
+            }
+            const zone = this.getters.getColsZone(
+              cmd.sheetId,
+              group[group.length - 1] + 1,
+              group[0]
+            );
+            this.clearInsideBorders(cmd.sheetId, [zone]);
+            this.shiftBordersHorizontally(cmd.sheetId, group[0] + 1, -group.length);
           } else {
-            this.shiftBordersVertically(cmd.sheetId, group[group.length - 1] + 1, -group.length);
+            if (group[0] >= this.getters.getNumberRows(cmd.sheetId)) {
+              for (let col = 0; col < this.getters.getNumberCols(cmd.sheetId); col++) {
+                this.history.update(
+                  "borders",
+                  cmd.sheetId,
+                  col,
+                  group[0] + 1,
+                  "horizontal",
+                  undefined
+                );
+              }
+            }
+            if (group[group.length - 1] === 0) {
+              for (let col = 0; col < this.getters.getNumberCols(cmd.sheetId); col++) {
+                this.history.update("borders", cmd.sheetId, col, 0, "horizontal", undefined);
+              }
+            }
+            const zone = this.getters.getRowsZone(
+              cmd.sheetId,
+              group[group.length - 1] + 1,
+              group[0]
+            );
+            this.clearInsideBorders(cmd.sheetId, [zone]);
+            this.shiftBordersVertically(cmd.sheetId, group[0] + 1, -group.length);
           }
         }
         break;
@@ -436,6 +482,19 @@ export class BordersPlugin extends CorePlugin<BordersPluginState> implements Bor
     }
   }
 
+  /**
+   * Remove the borders inside of a zone
+   */
+  private clearInsideBorders(sheetId: UID, zones: Zone[]) {
+    for (let zone of zones) {
+      for (let row = zone.top; row <= zone.bottom; row++) {
+        for (let col = zone.left; col <= zone.right; col++) {
+          this.history.update("borders", sheetId, col, row, undefined);
+        }
+      }
+    }
+  }
+
   /**
    * Add a border to the existing one to a cell
    */

tests/plugins/borders.test.ts

@@ -533,6 +533,48 @@ describe("Grid manipulation", () => {
     expect(getBorder(model, "C96")).toEqual({ bottom: b });
     expect(getBorder(model, "D96")).toEqual({ right: b, bottom: b });
   });
+
+  test("Removing multiple rows removes internal borders", () => {
+    setBorder(model, "hv", "B42:E45");
+    deleteRows(model, [41, 42, 43, 44]);
+    expect(model.exportData().borders).toEqual({});
+  });
+
+  test("Removing multiple columns removes internal borders", () => {
+    setBorder(model, "hv", "B42:E45");
+    deleteColumns(model, ["B", "C", "D", "E"]);
+    expect(model.exportData().borders).toEqual({});
+  });
+
+  test("Removing top row removes top border", () => {
+    setBorder(model, "top", "A1:J1");
+    deleteRows(model, [0]);
+    expect(model.exportData().borders).toEqual({});
+  });
+
+  test("Removing bottom row removes bottom border", () => {
+    setBorder(model, "bottom", "A100:J100");
+    deleteRows(model, [99]);
+    expect(model.exportData().borders).toEqual({});
+  });
+
+  test("Removing left-most cost removes left-most border", () => {
+    setBorder(model, "left", "A1:A6");
+    deleteColumns(model, ["A"]);
+    expect(model.exportData().borders).toEqual({});
+  });
+
+  test("Removing right-most row removes right-most border", () => {
+    setBorder(model, "right", "Z1:Z6");
+    deleteColumns(model, ["Z"]);
+    expect(model.exportData().borders).toEqual({});
+  });
+
+  test("Removing bottom two row removes bottom border", () => {
+    setBorder(model, "bottom", "A100:J100");
+    deleteRows(model, [98, 99]);
+    expect(model.exportData().borders).toEqual({});
+  });
 });
 
 test("Cells that have undefined borders don't override borders of neighboring cells at import", () => {