[FIX] borders: preserve side borders when combining External and All

When applying an External border on a range and then applying All borders on
an inner/overlapping range, the side borders (left/right) of the inner cells
were lost after re-opening the spreadsheet.

The exported border data was correct, but the BordersPlugin recomputation
logic in addBorder incorrectly cleared adjacent borders on import/update. The
adjacency check (adjacent(existingBorder.zone, zone)) reported the side of the
existing zone, but we were deciding whether to clear it based on the same side
key in the new border, instead of the opposite side (shared edge) on the new
zone. As a result, importing the combination of:

C2:C4 with All borders
B2:B4 with left/top/bottom
D2:D4 with right/top/bottom

ended up clearing the left and right borders of C2:C4.

This commit adjusts the adjacent clearing logic to:

Map the adjacent side of the existing zone to the opposite side on the new
zone.

Only clear the existing side if the corresponding opposite side is actually
being written on the new border.

Task: 5270171

Author: dhrp-odoo

src/plugins/core/borders.ts

@@ -354,25 +354,39 @@ export class BordersPlugin extends CorePlugin<BordersPluginState> implements Bor
       if (!inter) {
         // Clear adjacent borders on which you write
         const adjacentEdge = adjacent(existingBorder.zone, zone);
-        if (adjacentEdge && sideToClear[adjacentEdge.position]) {
-          for (const newZone of splitIfAdjacent(existingBorder.zone, zone)) {
-            const border = this.computeBorderFromZone(newZone, existingBorder);
-            const adjacentEdge = adjacent(newZone, zone);
-            switch (adjacentEdge?.position) {
-              case "left":
-                border.style.left = undefined;
-                break;
-              case "right":
-                border.style.right = undefined;
-                break;
-              case "top":
-                border.style.top = undefined;
-                break;
-              case "bottom":
-                border.style.bottom = undefined;
-                break;
+        if (adjacentEdge) {
+          // Side on the *new* zone that lies on the same line as `adjacentEdge.position`
+          const sideOnNewBorder: "left" | "right" | "top" | "bottom" =
+            adjacentEdge.position === "left"
+              ? "right"
+              : adjacentEdge.position === "right"
+              ? "left"
+              : adjacentEdge.position === "top"
+              ? "bottom"
+              : "top";
+
+          if (sideToClear[sideOnNewBorder]) {
+            for (const newZone of splitIfAdjacent(existingBorder.zone, zone)) {
+              const border = this.computeBorderFromZone(newZone, existingBorder);
+              const edge = adjacent(newZone, zone);
+              switch (edge?.position) {
+                case "left":
+                  border.style.left = undefined;
+                  break;
+                case "right":
+                  border.style.right = undefined;
+                  break;
+                case "top":
+                  border.style.top = undefined;
+                  break;
+                case "bottom":
+                  border.style.bottom = undefined;
+                  break;
+              }
+              borders.push(border);
             }
-            borders.push(border);
+          } else {
+            borders.push(existingBorder);
           }
         } else {
           borders.push(existingBorder);

tests/borders/border_plugin.test.ts

@@ -1255,6 +1255,54 @@ test("Cells that have undefined borders don't override borders of neighboring ce
   });
 });
 
+test("Import preserves side borders when combining External and All borders", () => {
+  const defaultBorder = DEFAULT_BORDER_DESC;
+  const data = {
+    sheets: [
+      {
+        id: "Sheet1",
+        name: "Sheet1",
+        colNumber: 26,
+        rowNumber: 100,
+        cells: {},
+        borders: {
+          "C2:C4": 1,
+          "B2:B4": 2,
+          "D2:D4": 3,
+        },
+      },
+    ],
+    borders: {
+      1: {
+        top: defaultBorder,
+        bottom: defaultBorder,
+        left: defaultBorder,
+        right: defaultBorder,
+        vertical: defaultBorder,
+        horizontal: defaultBorder,
+      },
+      2: {
+        top: defaultBorder,
+        bottom: defaultBorder,
+        left: defaultBorder,
+      },
+      3: {
+        top: defaultBorder,
+        bottom: defaultBorder,
+        right: defaultBorder,
+      },
+    },
+  };
+
+  const model = new Model(data);
+  expect(getBorder(model, "C2")).toEqual({
+    top: defaultBorder,
+    bottom: defaultBorder,
+    left: defaultBorder,
+    right: defaultBorder,
+  });
+});
+
 describe("Borders formatting", () => {
   let model: Model;