Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

[Content Experience ]fix wrong column resizing handle insertion #1

Merged
merged 2 commits into from
Mar 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/columnresizing.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ function handleDecorations(state, cell) {
// of the table to their right, and either the top of the table or
// a different cell above them, add a decoration
if ((col == map.width || map.map[index] != map.map[index + 1]) &&
(row == 0 || map.map[index - 1] != map.map[index - 1 - map.width])) {
(row == 0 || map.map[index] != map.map[index - map.width])) {
let cellPos = map.map[index]
let pos = start + cellPos + table.nodeAt(cellPos).nodeSize - 1
let dom = document.createElement("div")
Expand Down
179 changes: 179 additions & 0 deletions test/test-columnresizing.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
const ist = require("ist");
const { columnResizing, columnResizingPluginKey } = require("../dist/");
const { EditorState } = require("prosemirror-state");
const { doc, table, tr, td, cEmpty, p } = require("./build");

describe("columnresizing", () => {
// setup document object for testing
beforeEach(() => {
document = {
createElement: () => {
return { className: "" };
},
};
});

// clean up document object after test
afterEach(() => {
delete document;
});
// simple table is a table with colspan = 1 and rowspan = 1
describe("3 x 2 simple table", () => {
let state = null;
let plugin = null;
beforeEach(() => {
let simpleTable = table(
tr(cEmpty, cEmpty),
tr(cEmpty, cEmpty),
tr(cEmpty, cEmpty)
);
plugin = columnResizing();
state = EditorState.create({ doc: doc(simpleTable), plugins: [plugin] });
});
afterEach(() => {
state = null;
plugin = null;
});

it("hovering on the first row border", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 2,
setDragging: null,
});
let newState = state.apply(transaction);
ist(plugin.props.decorations(newState).find().length, 3);
});

it("hovering on the second row border", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 12,
setDragging: null,
});
let newState = state.apply(transaction);
ist(plugin.props.decorations(newState).find().length, 3);
});

it("hovering on the third row border", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 22,
setDragging: null,
});
let newState = state.apply(transaction);
ist(plugin.props.decorations(newState).find().length, 3);
});
});

// This is a labelled diagram of the table being tested.
// Notice the left border is not labelled. This is because
// all borders are referenced to the right of the cells.
// The (x, pos) indicate where the user is hovering and the resolved
// position. The initial editor state is a document with just an empty
// table. All cells are empty exce
//
// border 1 border 2 border 3
// | |(1, 2)
// --------------------------------------
// | |(2, 9) |(3, 14) |(4, 18)
// ---------------------------
// | |(5, 9) |(6, 24) |(7, 28)
// --------------------------------------
Comment on lines +66 to +79

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LOL thank you for this

describe("3 x 3 table with rowspan and colspan", () => {
let state = null;
let plugin = null;
beforeEach(() => {
let complicatedTable = table(
tr(td({ colspan: 3, rowspan: 1 }, p())),
tr(td({ colspan: 1, rowspan: 2 }, p()), cEmpty, cEmpty),
tr(cEmpty, cEmpty)
);
plugin = columnResizing();
state = EditorState.create({
doc: doc(complicatedTable),
plugins: [plugin],
});
});
afterEach(() => {
state = null;
plugin = null;
});

describe("border 1", () => {
it("resolves for (2)", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 8,
setDragging: null,
});
let newState = state.apply(transaction);

// it is one cell so there should be only one decoration
ist(plugin.props.decorations(newState).find().length, 1);
});

it("resolves for (5)", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 8, // this is the same as previous test this cell span over to 2 rows
setDragging: null,
});
let newState = state.apply(transaction);

// it is one cell so there should be only one decoration
ist(plugin.props.decorations(newState).find().length, 1);
});
});

describe("border 2", () => {
it("resolves for (3)", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 12,
setDragging: null,
});
let newState = state.apply(transaction);

ist(plugin.props.decorations(newState).find().length, 2);
});

it("resolves for (6)", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 22, // this is the same as previous test because it resolves to the same cell
setDragging: null,
});
let newState = state.apply(transaction);

ist(plugin.props.decorations(newState).find().length, 2);
});
});

describe("border 3", () => {
it("resolves for (1)", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 2,
setDragging: null,
});
let newState = state.apply(transaction);

ist(plugin.props.decorations(newState).find().length, 3);
});

it("resolves for (4)", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 16,
setDragging: null,
});
let newState = state.apply(transaction);

ist(plugin.props.decorations(newState).find().length, 3);
});

it("resolves for (7)", () => {
let transaction = state.tr.setMeta(columnResizingPluginKey, {
setHandle: 26,
setDragging: null,
});

let newState = state.apply(transaction);

ist(plugin.props.decorations(newState).find().length, 3);
});
});
});
});