Skip to content

Commit

Permalink
fix: unexpected renderText() for contentful nodes (#3410)
Browse files Browse the repository at this point in the history
  • Loading branch information
mylesj authored Apr 5, 2024
1 parent ee645c1 commit d6c71a8
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 1 deletion.
6 changes: 5 additions & 1 deletion packages/core/src/helpers/getTextBetween.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ export function getTextBetween(
range,
})
}
} else if (node.isText) {
// do not descend into child nodes when there exists a serializer
return false
}

if (node.isText) {
text += node?.text?.slice(Math.max(from, pos) - pos, to - pos) // eslint-disable-line
separated = false
} else if (node.isBlock && !separated) {
Expand Down
66 changes: 66 additions & 0 deletions tests/cypress/integration/core/generateText.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/// <reference types="cypress" />

import { generateText, Node, NodeConfig } from '@tiptap/core'
import Document from '@tiptap/extension-document'
import Paragraph from '@tiptap/extension-paragraph'
import Text from '@tiptap/extension-text'

describe(generateText.name, () => {
it('generates Text from JSON without an editor instance', () => {
const json = {
type: 'doc',
content: [{
type: 'paragraph',
content: [
{
type: 'custom-node-default-renderer',
content: [
{
type: 'text',
text: 'Example One',
},
],
},
{
type: 'text',
text: ' ',
},
{
type: 'custom-node-custom-renderer',
content: [
{
type: 'text',
text: 'Example Two',
},
],
},
],
}],
}

const contentfulInlineNode = (name: string, config?: Partial<NodeConfig>) => Node.create({
name,
group: 'inline',
inline: true,
content: 'text*',
parseHTML() {
return [{ tag: name }]
},
...config,
})

const text = generateText(json, [
Document,
Paragraph,
Text,
contentfulInlineNode('custom-node-default-renderer'),
contentfulInlineNode('custom-node-custom-renderer', {
renderText({ node }) {
return `~${node.textContent}~`
},
}),
])

expect(text).to.eq('Example One ~Example Two~')
})
})

0 comments on commit d6c71a8

Please sign in to comment.