Skip to content

fix: Lossy html conversion equality #1635

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

Merged
merged 8 commits into from
Apr 28, 2025
Merged

fix: Lossy html conversion equality #1635

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5a7a42b
Added lossy HTML export/parse equality tests
matthewlipski Apr 23, 2025
1202d05
Fixed list item props in external HTML
matthewlipski Apr 23, 2025
6b0de88
Merge branch 'lossy-html-fixes' into lossy-html-equality-fixes
matthewlipski Apr 23, 2025
0c01ed5
Fixed tables in `partialBlockToBlockForTesting`
matthewlipski Apr 23, 2025
b2c3660
Merge branch 'lossy-html-fixes' into lossy-html-equality-fixes
matthewlipski Apr 24, 2025
06b84af
Added advanced table test
matthewlipski Apr 24, 2025
ebe9785
Added comment
matthewlipski Apr 24, 2025
4c38f3c
feat: Inline style props in external HTML (#1636)
matthewlipski Apr 28, 2025
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
60 changes: 34 additions & 26 deletions packages/core/src/api/exporters/html/util/serializeBlocksExternalHTML.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,28 +117,40 @@ function serializeBlock<
].implementation.toExternalHTML({ ...block, props } as any, editor as any);

const elementFragment = doc.createDocumentFragment();
if (ret.dom.classList.contains("bn-block-content")) {
const blockContentDataAttributes = [
...attrs,
...Array.from(ret.dom.attributes),
].filter(
(attr) =>
attr.name.startsWith("data") &&
attr.name !== "data-content-type" &&
attr.name !== "data-file-block" &&
attr.name !== "data-node-view-wrapper" &&
attr.name !== "data-node-type" &&
attr.name !== "data-id" &&
attr.name !== "data-index" &&
attr.name !== "data-editable"
);

// ret.dom = ret.dom.firstChild! as any;
for (const attr of blockContentDataAttributes) {
(ret.dom.firstChild! as HTMLElement).setAttribute(attr.name, attr.value);
let listType = undefined;
if (orderedListItemBlockTypes.has(block.type!)) {
listType = "OL";
} else if (unorderedListItemBlockTypes.has(block.type!)) {
listType = "UL";
}

const blockContentDataAttributes = [
...attrs,
...Array.from(ret.dom.attributes),
].filter(
(attr) =>
attr.name.startsWith("data") &&
attr.name !== "data-content-type" &&
attr.name !== "data-file-block" &&
attr.name !== "data-node-view-wrapper" &&
attr.name !== "data-node-type" &&
attr.name !== "data-id" &&
attr.name !== "data-index" &&
attr.name !== "data-editable"
);

if (ret.dom.classList.contains("bn-block-content")) {
if (!listType) {
for (const attr of blockContentDataAttributes) {
(ret.dom.firstChild! as HTMLElement).setAttribute(
attr.name,
attr.value
);
}
}

addAttributesAndRemoveClasses(ret.dom.firstChild! as HTMLElement);
addAttributesAndRemoveClasses(ret.dom.firstChild as HTMLElement);
elementFragment.append(...Array.from(ret.dom.childNodes));
} else {
elementFragment.append(ret.dom);
Expand All @@ -155,13 +167,6 @@ function serializeBlock<
ret.contentDOM.appendChild(ic);
}

let listType = undefined;
if (orderedListItemBlockTypes.has(block.type!)) {
listType = "OL";
} else if (unorderedListItemBlockTypes.has(block.type!)) {
listType = "UL";
}

if (listType) {
if (fragment.lastChild?.nodeName !== listType) {
const list = doc.createElement(listType);
Expand All @@ -172,6 +177,9 @@ function serializeBlock<
fragment.append(list);
}
const li = doc.createElement("li");
for (const attr of blockContentDataAttributes) {
li.setAttribute(attr.name, attr.value);
}
li.append(elementFragment);
fragment.lastChild!.appendChild(li);
} else {
Expand Down
12 changes: 6 additions & 6 deletions tests/src/unit/core/clipboard/copy/__snapshots__/text/html/basicBlocksWithProps.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<p data-text-color="red">Paragraph 1</p>
<h2 data-level="2">Heading 1</h2>
<ol start="2">
<li>
<p data-start="2">Numbered List Item 1</p>
<li data-start="2">
<p>Numbered List Item 1</p>
</li>
</ol>
<ul>
<li>
<p data-background-color="red">Bullet List Item 1</p>
<li data-background-color="red">
<p>Bullet List Item 1</p>
</li>
<li>
<input type="checkbox" checked="" data-checked="true" />
<li data-checked="true">
<input type="checkbox" checked="" />
<p class="bn-inline-content">Check List Item 1</p>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions tests/src/unit/core/formatConversion/export/__snapshots__/html/lists/basic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<input type="checkbox" />
<p class="bn-inline-content">Check List Item 1</p>
</li>
<li>
<input type="checkbox" checked="" data-checked="true" />
<li data-checked="true">
<input type="checkbox" checked="" />
<p class="bn-inline-content">Check List Item 2</p>
</li>
</ul>
4 changes: 2 additions & 2 deletions tests/src/unit/core/formatConversion/export/__snapshots__/html/lists/nested.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<input type="checkbox" />
<p class="bn-inline-content">Check List Item 1</p>
</li>
<li>
<input type="checkbox" checked="" data-checked="true" />
<li data-checked="true">
<input type="checkbox" checked="" />
<p class="bn-inline-content">Check List Item 2</p>
</li>
</ul>
Expand Down
Loading
Loading