Merged in fix/SW-2848-RTE-with-copied-divs (pull request #2173)
fix: handle when content has copied divs from episervers RTE * fix: handle when content has copied divs from episervers RTE Approved-by: Matilda Landström
This commit is contained in:
committed by
Linus Flood
parent
fe71348827
commit
cc34cdcf74
@@ -122,16 +122,13 @@ export function nodeToHtml(
|
||||
if ("type" in node === false) {
|
||||
return textNodeToHtml(node, fullRenderOptions)
|
||||
} else {
|
||||
if (fullRenderOptions[node.type] !== undefined) {
|
||||
const renderer = fullRenderOptions[node.type] as RTERenderOptionComponent
|
||||
if (renderer) {
|
||||
if (node.type === RTETypeEnum.doc) {
|
||||
return null
|
||||
}
|
||||
return (fullRenderOptions[node.type] as RTERenderOptionComponent)(
|
||||
node,
|
||||
embeds,
|
||||
next,
|
||||
fullRenderOptions
|
||||
)
|
||||
|
||||
return renderer(node, embeds, next, fullRenderOptions)
|
||||
} else {
|
||||
return next(node.children, embeds, fullRenderOptions)
|
||||
}
|
||||
@@ -152,11 +149,16 @@ export function nodesToHtml(
|
||||
) {
|
||||
const embeds = groupEmbedsByUid(embedsArray)
|
||||
const fullRenderOptions = { ...renderOptions, ...overrideRenderOptions }
|
||||
return nodes.map((node, index) => (
|
||||
<React.Fragment key={getUniqueId(node) ?? `node-${index}`}>
|
||||
{nodeToHtml(node, embeds, fullRenderOptions)}
|
||||
</React.Fragment>
|
||||
))
|
||||
|
||||
return nodes.map((node, index) => {
|
||||
const nodeHtml = nodeToHtml(node, embeds, fullRenderOptions)
|
||||
|
||||
return (
|
||||
<React.Fragment key={getUniqueId(node) ?? `node-${index}`}>
|
||||
{nodeHtml}
|
||||
</React.Fragment>
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
export function makeCssModuleCompatibleClassName(
|
||||
|
||||
Reference in New Issue
Block a user