Skip to content

[FIX] borders: merged cell loses adjacent border after import #7607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhrp-odoo wants to merge 1 commit into
base: 19.0
Choose a base branch
from
Open

[FIX] borders: merged cell loses adjacent border after import #7607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/plugins/core/borders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,10 @@ export class BordersPlugin extends CorePlugin<BordersPluginState> implements Bor
// existingBorderSideToClear[side] = true means we should clear the border on that
// side of the existing adjacent zone before adding the new border.
const existingBorderSideToClear = {
left: force || !!newBorder?.right,
right: force || !!newBorder?.left,
top: force || !!newBorder?.bottom,
bottom: force || !!newBorder?.top,
left: !!newBorder?.right,
right: !!newBorder?.left,
top: !!newBorder?.bottom,
bottom: !!newBorder?.top,
};
let editingZone: Zone[] = [zone];
for (const existingBorder of this.borders[sheetId] ?? []) {
Expand Down
17 changes: 17 additions & 0 deletions tests/borders/border_plugin.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
deleteCells,
deleteColumns,
deleteRows,
merge,
moveColumns,
moveRows,
paste,
Expand Down Expand Up @@ -201,6 +202,22 @@ describe("borders", () => {
});
});

test("import preserves merged cell borders", () => {
const b = DEFAULT_BORDER_DESC;
const allSides = { top: b, bottom: b, left: b, right: b };
const model = new Model();

setZoneBorders(model, { position: "all" }, ["B2:C3"]);
merge(model, "C2:C3");

const importedModel = new Model(model.exportData());

expect(getBorder(importedModel, "B2")).toEqual(allSides);
expect(getBorder(importedModel, "B3")).toEqual(allSides);
expect(getBorder(importedModel, "C2")).toEqual({ top: b, right: b });
expect(getBorder(importedModel, "C3")).toEqual({ bottom: b, right: b });
});

test("can set all borders in a zone", () => {
const model = new Model();

Expand Down