-
-
Notifications
You must be signed in to change notification settings - Fork 694
fix: use <details>/<summary> for toggle block HTML export #2524
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.
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
YousefED
wants to merge
3
commits into
main
Choose a base branch
from
fix/blo-936-toggle-block-details-summary
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+961
−10
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| import { DOMParser, Fragment, Schema } from "prosemirror-model"; | ||
| import { mergeParagraphs } from "./defaultBlockHelpers.js"; | ||
|
|
||
| /** | ||
| * Parses a `<details>` element into a block's inline content + nested children. | ||
| * | ||
| * Given: | ||
| * <details> | ||
| * <summary>inline content here</summary> | ||
| * <p>child block 1</p> | ||
| * <p>child block 2</p> | ||
| * </details> | ||
| * | ||
| * Returns a Fragment shaped like: | ||
| * [inline content, blockGroup<blockContainer<child1>, blockContainer<child2>>] | ||
| * | ||
| * ProseMirror's "fitting" algorithm will place the inline content into the | ||
| * block node, and lift the blockGroup into the parent blockContainer as | ||
| * nested children. This is the same mechanism used by `getListItemContent`. | ||
| */ | ||
| export function getDetailsContent( | ||
| details: HTMLElement, | ||
| schema: Schema, | ||
| nodeName: string, | ||
| ): Fragment { | ||
| const parser = DOMParser.fromSchema(schema); | ||
| const summary = details.querySelector(":scope > summary"); | ||
|
|
||
| // Parse inline content from <summary>. mergeParagraphs collapses multiple | ||
| // <p> tags into one with <br> separators so it fits a single inline node. | ||
| let inlineContent: Fragment; | ||
| if (summary) { | ||
| const clone = summary.cloneNode(true) as HTMLElement; | ||
| mergeParagraphs(clone); | ||
| inlineContent = parser.parse(clone, { | ||
| topNode: schema.nodes.paragraph.create(), | ||
| preserveWhitespace: true, | ||
| }).content; | ||
| } else { | ||
| inlineContent = Fragment.empty; | ||
| } | ||
|
|
||
| // Collect everything after <summary> as nested block children. | ||
| const childrenContainer = document.createElement("div"); | ||
| childrenContainer.setAttribute("data-node-type", "blockGroup"); | ||
| let hasChildren = false; | ||
|
|
||
| for (const child of Array.from(details.childNodes)) { | ||
| if ((child as HTMLElement).tagName === "SUMMARY") { | ||
| continue; | ||
| } | ||
| // Skip whitespace-only text nodes (from HTML formatting) — ProseMirror | ||
| // would otherwise create empty paragraph blocks from them. | ||
| if (child.nodeType === 3 && !child.textContent?.trim()) { | ||
| continue; | ||
| } | ||
| hasChildren = true; | ||
| childrenContainer.appendChild(child.cloneNode(true)); | ||
| } | ||
|
|
||
| const contentNode = schema.nodes[nodeName].create({}, inlineContent); | ||
|
|
||
| if (!hasChildren) { | ||
| return contentNode.content; | ||
| } | ||
|
|
||
| // Parse children as a blockGroup. ProseMirror's fitting algorithm will | ||
| // lift this out of the inline content node and into the parent | ||
| // blockContainer as nested children. | ||
| const blockGroup = parser.parse(childrenContainer, { | ||
| topNode: schema.nodes.blockGroup.create(), | ||
| }); | ||
|
|
||
| return blockGroup.content.size > 0 | ||
| ? contentNode.content.addToEnd(blockGroup) | ||
| : contentNode.content; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know about this
childrenDOM, maybe it is because we don't have an equivalent for the editor rendered version.