Skip to content
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

Quill: Fix table insert #96

Merged
merged 11 commits into from
Nov 9, 2023
Merged

Quill: Fix table insert #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a060398
Quill: Fix table insert
marker-dao Nov 7, 2023
7fd4286
fix
marker-dao Nov 7, 2023
c6fcfbb
revert(data && scroll)
marker-dao Nov 7, 2023
ffb78a7
revert && refactor(scroll && table.formats)
marker-dao Nov 7, 2023
48941a7
fix(minor)
marker-dao Nov 7, 2023
3378623
test(table && tests): Revert table && Add tests
marker-dao Nov 8, 2023
5d71f15
revert(package-lock): Remove
marker-dao Nov 8, 2023
eacf2b3
fix(func tests): Add max closed test
marker-dao Nov 8, 2023
e7bc497
refactor(tests): Remove extra code
marker-dao Nov 8, 2023
186426c
refactor(tests): Update description
marker-dao Nov 8, 2023
954900e
fix(test): Fix description
marker-dao Nov 8, 2023
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
22 changes: 14 additions & 8 deletions formats/table/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,16 +350,22 @@ class RowContainer extends Container {
this.statics.requiredContainer
&& !(this.parent instanceof this.statics.requiredContainer)
) {
const { domNode } = this.children.head.children.head.children.head;
const domNode = this.children.head.children.head.children?.head?.domNode || null;
const formats = {};
Object.keys(TABLE_FORMATS).forEach((format) => {
const value = domNode.dataset[format.toLowerCase()];
if (value) {
formats[format] = value;
}
});

if (domNode) {
Object.keys(TABLE_FORMATS).forEach((format) => {
const value = domNode.dataset[format.toLowerCase()];

if (value) {
formats[format] = value;
}
});
}

this.wrap(this.statics.requiredContainer.blotName, formats);
}

super.optimize(...args);
}
}
Expand Down Expand Up @@ -530,7 +536,7 @@ class TableContainer extends Container {
const formats = {};
const childElem = this.cells()[0].domNode.firstElementChild;
Object.keys(TABLE_FORMATS).forEach((format) => {
const value = childElem.dataset[format.toLowerCase()];
const value = childElem?.dataset[format.toLowerCase()];
if (value) {
formats[format] = value;
}
Expand Down
28 changes: 28 additions & 0 deletions test/functional/epic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,34 @@ if (!isMac) {
});
}

describe('Mutation content with table', function () {
it('Should be no errors when table is inserted to editor (T1180959)', async function () {
const browser = await puppeteer.launch({
headless: false,
});
const page = await browser.newPage();

await page.goto(`${HOST}/table_drag_drop.html`);
await page.waitForSelector('.ql-editor', { timeout: 10000 });

page.on('pageerror', () => {
expect(true).toEqual(false);
});

await page.evaluate(() => {
const editor = document.querySelector('.ql-editor');

const table = document.createElement('table');

table.innerHTML = '<tbody><tr><td><p><br/></p></td><td><p>Custom text</p></td></tr></tbody>';

editor.appendChild(table);
});

expect(true).toEqual(true);
});
});

function getSelectionInTextNode() {
const {
anchorNode, anchorOffset, focusNode, focusOffset,
Expand Down
30 changes: 30 additions & 0 deletions test/functional/example/table_drag_drop.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>DevExtreme-Quill</title>
<link rel="stylesheet" type="text/css" href="src/dx-quill.core.css" />
<script type="text/javascript" src="src/dx-quill.js"></script>
</head>

<body>
<div>
<div id="editor">
<p>Init text</p>
</div>
</div>
</body>

<script>
const editorContainer = document.getElementById('editor');
const quillInstance = new DevExpress.Quill(editorContainer, {
modules: {
table: true
}
});
</script>

</html>