From ed4b100962629c3e4aa2aacdc23f50cc4533a4e5 Mon Sep 17 00:00:00 2001 From: Miguel Alatzar Date: Wed, 10 Feb 2021 14:39:01 -0700 Subject: [PATCH] [MM-32734] Convert value to string to prevent crash (#5164) * Convert value to string * Add default value prop --- app/components/markdown/markdown.js | 3 ++- app/components/markdown/markdown.test.js | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/components/markdown/markdown.js b/app/components/markdown/markdown.js index 5ab9e1442..b5315d98f 100644 --- a/app/components/markdown/markdown.js +++ b/app/components/markdown/markdown.js @@ -73,6 +73,7 @@ export default class Markdown extends PureComponent { disableChannelLink: false, disableAtChannelMentionHighlight: false, disableGallery: false, + value: '', }; constructor(props) { @@ -444,7 +445,7 @@ export default class Markdown extends PureComponent { }; render() { - let ast = this.parser.parse(this.props.value); + let ast = this.parser.parse(this.props.value.toString()); ast = combineTextNodes(ast); ast = addListItemIndices(ast); diff --git a/app/components/markdown/markdown.test.js b/app/components/markdown/markdown.test.js index 805c76032..760fa4185 100644 --- a/app/components/markdown/markdown.test.js +++ b/app/components/markdown/markdown.test.js @@ -44,4 +44,15 @@ describe('Markdown', () => { , ); }); + + test('should not crash when given a non-string value', () => { + const props = { + ...baseProps, + value: 10, + }; + + shallow( + , + ); + }); });