Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions source/components/JsxParser.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,19 @@ describe('JsxParser Component', () => {
expect(() => render(<JsxParser jsx='{ document.querySelector("body") }' onError={e => { throw e }} />)).toThrow()
expect(() => render(<JsxParser jsx='{ document.createElement("script") }' onError={e => { throw e }} />)).toThrow()
})

test('renderError catches errors', () => {
const renderError = jest.fn((...args) => console.error(...args))
render(
<JsxParser
bindings={{ badFn() { throw new Error('Test error') } }}
jsx="<div>{badFn()}</div>"
renderError={renderError}
/>,
)
expect(renderError).toHaveBeenCalledWith({ error: 'Error: Test error' })
})

test('supports className prop', () => {
const { node } = render(<JsxParser className="foo" jsx="Text" />)
expect(node.classList.contains('foo')).toBeTruthy()
Expand Down
11 changes: 10 additions & 1 deletion source/components/JsxParser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,16 @@ export default class JsxParser extends React.Component<TProps> {
return null
}

return parsed.map(p => this.#parseExpression(p)).filter(Boolean)
try {
return parsed.map(p => this.#parseExpression(p)).filter(Boolean)
} catch (error) {
if (this.props.showWarnings) console.warn(error) // eslint-disable-line no-console
if (this.props.onError) this.props.onError(error as Error)
if (this.props.renderError) {
return this.props.renderError({ error: String(error) })
}
throw error
}
}

/**
Expand Down