Skip to content

Commit dd1ac6d

Browse files
author
Zaydek Michels-Gualtieri
committed
Renamed markupToDOMTree to renderMarkupTree
1 parent 24a6319 commit dd1ac6d

4 files changed

Lines changed: 12 additions & 18 deletions

File tree

src/Editor/TODO/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import * as Readers from "../Readers"
22
import decorate from "../decorate"
3-
import markupToDOMTree from "lib/markupToDOMTree"
43
import methods from "./methods"
54
import React from "react"
65
import ReactDOMServer from "react-dom/server"
6+
import renderMarkupTree from "lib/renderMarkupTree"
77
import useMethods from "use-methods"
88

99
// // TODO
@@ -49,10 +49,10 @@ function useEditor({ markup, children }) {
4949
}
5050
let domTree = null
5151
if (markup !== undefined) {
52-
domTree = markupToDOMTree("<div>" + markup + "</div>")
52+
domTree = renderMarkupTree("<div>" + markup + "</div>")
5353
} else if (children !== undefined) {
5454
const markup = ReactDOMServer.renderToStaticMarkup(children) // Shadows markup
55-
domTree = markupToDOMTree("<div>" + markup + "</div>")
55+
domTree = renderMarkupTree("<div>" + markup + "</div>")
5656
}
5757
decorate(domTree)
5858
return Readers.semantic.elements(domTree)

src/Editor/components/components.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import deeplySyncTrees from "../utils/deeplySyncTrees"
2-
import markupToDOMTree from "lib/markupToDOMTree"
32
import React from "react"
43
import ReactDOMServer from "react-dom/server"
4+
import renderMarkupTree from "lib/renderMarkupTree"
55
import T from "./T"
66
import toReact from "./toReact"
77
import types from "../types"
@@ -17,7 +17,7 @@ const Node = ({ id, style, children, ...props }) => {
1717
// NOTE: Uses ReactDOMServer.renderToStaticMarkup
1818
// because ReactDOM.render is asynchronous.
1919
const markup = ReactDOMServer.renderToStaticMarkup(children)
20-
const domTree = markupToDOMTree("<div>" + markup + "</div>")
20+
const domTree = renderMarkupTree("<div>" + markup + "</div>")
2121

2222
// ;[...ref.current.childNodes].reverse().map(each => each.remove())
2323
// ref.current.append(...domTree.childNodes)

src/lib/markupToDOMTree.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/lib/renderMarkupTree.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Renders markup to a tree.
2+
function renderMarkupTree(markup) {
3+
const doc = new DOMParser().parseFromString(markup, "text/html")
4+
return doc.body.childNodes[0]
5+
}
6+
7+
export default renderMarkupTree

0 commit comments

Comments
 (0)