Skip to content

Fixed parsing error when dom is same as contentDOM #429

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 2 commits into from
Nov 29, 2023
Merged

Fixed parsing error when dom is same as contentDOM #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8893bcc
Fixed parsing error for styles/inline content where `dom` was the sam…
matthewlipski Nov 29, 2023
3b92e0d
Updated react snapshots
matthewlipski Nov 29, 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
2 changes: 1 addition & 1 deletion packages/core/src/api/exporters/html/__snapshots__/fontSize/basic/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="bn-inline-content"><span style="font-size: 18px" class="bn-style" data-style-type="fontSize" data-value="18px">This is text with a custom fontSize</span></p>
<p class="bn-inline-content"><span style="font-size: 18px" data-style-type="fontSize" data-value="18px" data-editable="">This is text with a custom fontSize</span></p>
2 changes: 1 addition & 1 deletion packages/core/src/api/exporters/html/__snapshots__/fontSize/basic/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content"><span style="font-size: 18px" class="bn-style" data-style-type="fontSize" data-value="18px">This is text with a custom fontSize</span></p></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content"><span style="font-size: 18px" data-style-type="fontSize" data-value="18px" data-editable="">This is text with a custom fontSize</span></p></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/core/src/api/exporters/html/__snapshots__/mention/basic/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="bn-inline-content">I enjoy working with<span class="bn-inline-content-section" data-inline-content-type="mention" data-user="Matthew">@Matthew</span></p>
<p class="bn-inline-content">I enjoy working with<span data-inline-content-type="mention" data-user="Matthew">@Matthew</span></p>
2 changes: 1 addition & 1 deletion packages/core/src/api/exporters/html/__snapshots__/small/basic/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="bn-inline-content"><small class="bn-style" data-style-type="small">This is a small text</small></p>
<p class="bn-inline-content"><small data-style-type="small" data-editable="">This is a small text</small></p>
19 changes: 14 additions & 5 deletions packages/core/src/extensions/Blocks/api/inlineContent/createSpec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,15 @@ export function getInlineContentParseRules(
return [
{
tag: `[data-inline-content-type="${config.type}"]`,
contentElement: "[data-editable]",
contentElement: (element) => {
const htmlElement = element as HTMLElement;

if (htmlElement.matches("[data-editable]")) {
return htmlElement;
}

return htmlElement.querySelector("[data-editable]") || htmlElement;
},
},
];
}
Expand All @@ -65,10 +73,11 @@ export function createInlineContentSpec<
name: inlineContentConfig.type,
inline: true,
group: "inline",
content:
inlineContentConfig.content === "styled"
? "inline*"
: ("inline" as T["content"] extends "styled" ? "inline*" : "inline"),
selectable: inlineContentConfig.content === "styled",
atom: inlineContentConfig.content === "none",
content: (inlineContentConfig.content === "styled"
? "inline*"
: "") as T["content"] extends "styled" ? "inline*" : "",

addAttributes() {
return propsToAttributes(inlineContentConfig.propSchema);
Expand Down
10 changes: 9 additions & 1 deletion packages/core/src/extensions/Blocks/api/styles/createSpec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,15 @@ export function getStyleParseRules(config: StyleConfig): ParseRule[] {
return [
{
tag: `[data-style-type="${config.type}"]`,
contentElement: "[data-editable]",
contentElement: (element) => {
const htmlElement = element as HTMLElement;

if (htmlElement.matches("[data-editable]")) {
return htmlElement;
}

return htmlElement.querySelector("[data-editable]") || htmlElement;
},
},
];
}
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/fontSize/basic/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="bn-inline-content"><span style="font-size: 18px;" class="bn-style" data-style-type="fontSize" data-value="18px">This is text with a custom fontSize</span></p>
<p class="bn-inline-content"><span style="font-size: 18px;" data-style-type="fontSize" data-value="18px" data-editable="">This is text with a custom fontSize</span></p>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/fontSize/basic/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content"><span style="font-size: 18px;" class="bn-style" data-style-type="fontSize" data-value="18px">This is text with a custom fontSize</span></p></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content"><span style="font-size: 18px;" data-style-type="fontSize" data-value="18px" data-editable="">This is text with a custom fontSize</span></p></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/mention/basic/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="bn-inline-content">I enjoy working with<span class="bn-inline-content-section" data-inline-content-type="mention" data-user="Matthew">@Matthew</span></p>
<p class="bn-inline-content">I enjoy working with<span data-inline-content-type="mention" data-user="Matthew">@Matthew</span></p>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/mention/basic/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content">I enjoy working with<span class="bn-inline-content-section" data-inline-content-type="mention" data-user="Matthew">@Matthew</span></p></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content">I enjoy working with<span data-inline-content-type="mention" data-user="Matthew">@Matthew</span></p></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/reactCustomParagraph/basic/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph">React Custom Paragraph</p></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph" data-editable="">React Custom Paragraph</p></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/reactCustomParagraph/nested/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph">React Custom Paragraph</p></div><div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="2"><div class="bn-block" data-node-type="blockContainer" data-id="2"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph">Nested React Custom Paragraph 1</p></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="3"><div class="bn-block" data-node-type="blockContainer" data-id="3"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph">Nested React Custom Paragraph 2</p></div></div></div></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph" data-editable="">React Custom Paragraph</p></div><div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="2"><div class="bn-block" data-node-type="blockContainer" data-id="2"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph" data-editable="">Nested React Custom Paragraph 1</p></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="3"><div class="bn-block" data-node-type="blockContainer" data-id="3"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph" data-editable="">Nested React Custom Paragraph 2</p></div></div></div></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/reactCustomParagraph/styled/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1" data-text-color="orange" data-background-color="pink"><div class="bn-block" data-node-type="blockContainer" data-id="1" data-text-color="orange" data-background-color="pink"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-text-alignment="center" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph">Plain <span data-text-color="red">Red Text </span><span data-background-color="blue">Blue Background </span><span data-text-color="red"><span data-background-color="blue">Mixed Colors</span></span></p></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1" data-text-color="orange" data-background-color="pink"><div class="bn-block" data-node-type="blockContainer" data-id="1" data-text-color="orange" data-background-color="pink"><div class="bn-block-content" data-content-type="reactCustomParagraph" data-text-alignment="center" data-node-view-wrapper="" style="white-space: normal;"><p class="react-custom-paragraph" data-editable="">Plain <span data-text-color="red">Red Text </span><span data-background-color="blue">Blue Background </span><span data-text-color="red"><span data-background-color="blue">Mixed Colors</span></span></p></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/simpleReactCustomParagraph/basic/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="simple-react-custom-paragraph">React Custom Paragraph</p>
<p class="simple-react-custom-paragraph" data-editable="">React Custom Paragraph</p>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/simpleReactCustomParagraph/basic/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph">React Custom Paragraph</p></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph" data-editable="">React Custom Paragraph</p></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/simpleReactCustomParagraph/nested/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="simple-react-custom-paragraph">Custom React Paragraph</p><p class="simple-react-custom-paragraph">Nested React Custom Paragraph 1</p><p class="simple-react-custom-paragraph">Nested React Custom Paragraph 2</p>
<p class="simple-react-custom-paragraph" data-editable="">Custom React Paragraph</p><p class="simple-react-custom-paragraph" data-editable="">Nested React Custom Paragraph 1</p><p class="simple-react-custom-paragraph" data-editable="">Nested React Custom Paragraph 2</p>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/simpleReactCustomParagraph/nested/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph">Custom React Paragraph</p></div><div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="2"><div class="bn-block" data-node-type="blockContainer" data-id="2"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph">Nested React Custom Paragraph 1</p></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="3"><div class="bn-block" data-node-type="blockContainer" data-id="3"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph">Nested React Custom Paragraph 2</p></div></div></div></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph" data-editable="">Custom React Paragraph</p></div><div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="2"><div class="bn-block" data-node-type="blockContainer" data-id="2"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph" data-editable="">Nested React Custom Paragraph 1</p></div></div></div><div class="bn-block-outer" data-node-type="blockOuter" data-id="3"><div class="bn-block" data-node-type="blockContainer" data-id="3"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph" data-editable="">Nested React Custom Paragraph 2</p></div></div></div></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/simpleReactCustomParagraph/styled/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="simple-react-custom-paragraph">Plain <span data-text-color="red">Red Text </span><span data-background-color="blue">Blue Background </span><span data-text-color="red"><span data-background-color="blue">Mixed Colors</span></span></p>
<p class="simple-react-custom-paragraph" data-editable="">Plain <span data-text-color="red">Red Text </span><span data-background-color="blue">Blue Background </span><span data-text-color="red"><span data-background-color="blue">Mixed Colors</span></span></p>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/simpleReactCustomParagraph/styled/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1" data-text-color="orange" data-background-color="pink"><div class="bn-block" data-node-type="blockContainer" data-id="1" data-text-color="orange" data-background-color="pink"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-text-alignment="center" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph">Plain <span data-text-color="red">Red Text </span><span data-background-color="blue">Blue Background </span><span data-text-color="red"><span data-background-color="blue">Mixed Colors</span></span></p></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1" data-text-color="orange" data-background-color="pink"><div class="bn-block" data-node-type="blockContainer" data-id="1" data-text-color="orange" data-background-color="pink"><div class="bn-block-content" data-content-type="simpleReactCustomParagraph" data-text-alignment="center" data-node-view-wrapper="" style="white-space: normal;"><p class="simple-react-custom-paragraph" data-editable="">Plain <span data-text-color="red">Red Text </span><span data-background-color="blue">Blue Background </span><span data-text-color="red"><span data-background-color="blue">Mixed Colors</span></span></p></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/small/basic/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="bn-inline-content"><small class="bn-style" data-style-type="small">This is a small text</small></p>
<p class="bn-inline-content"><small data-style-type="small" data-editable="">This is a small text</small></p>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/small/basic/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content"><small class="bn-style" data-style-type="small">This is a small text</small></p></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content"><small data-style-type="small" data-editable="">This is a small text</small></p></div></div></div></div>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/tag/basic/external.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p class="bn-inline-content">I love <span class="bn-inline-content-section" data-inline-content-type="tag">#<span>BlockNote</span></span></p>
<p class="bn-inline-content">I love <span data-inline-content-type="tag">#<span data-editable="">BlockNote</span></span></p>
2 changes: 1 addition & 1 deletion packages/react/src/test/__snapshots__/tag/basic/internal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content">I love <span class="bn-inline-content-section" data-inline-content-type="tag">#<span>BlockNote</span></span></p></div></div></div></div>
<div class="bn-block-group" data-node-type="blockGroup"><div class="bn-block-outer" data-node-type="blockOuter" data-id="1"><div class="bn-block" data-node-type="blockContainer" data-id="1"><div class="bn-block-content" data-content-type="paragraph"><p class="bn-inline-content">I love <span data-inline-content-type="tag">#<span data-editable="">BlockNote</span></span></p></div></div></div></div>