Skip to content

Commit b4cfe73

Browse files
committed
add feedback markdown rendering
1 parent e06cf05 commit b4cfe73

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

__tests__/html2/fluentTheme/feedback.form.markdown.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
channelData: {
4848
feedbackLoop: {
4949
type: 'default',
50-
disclaimer: 'This is a test disclaimer message with **bold** text',
50+
disclaimer: 'This is a test disclaimer message with **bold** text and a [link](https://microsoft.com)'
5151
}
5252
}
5353
});
@@ -67,7 +67,6 @@
6767
);
6868

6969
await host.snapshot('local');
70-
7170
});
7271
</script>
7372
</body>
549 Bytes
Loading

packages/component/src/Activity/private/FeedbackForm.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { useRefFrom } from 'use-ref-from';
55
import useStyleSet from '../../hooks/useStyleSet';
66
import testIds from '../../testIds';
77
import TextArea from './FeedbackTextArea';
8+
import { useRenderMarkdownAsHTML } from '../../hooks';
89

910
const { useLocalizer, usePostActivity } = hooks;
1011

@@ -23,6 +24,11 @@ function FeedbackForm({ feedbackType, disclaimer, onReset, replyToId }: Feedback
2324
const localize = useLocalizer();
2425
const onResetRef = useRefFrom(onReset);
2526
const postActivity = usePostActivity();
27+
const renderMarkdownAsHTML = useRenderMarkdownAsHTML('message activity');
28+
29+
const disclaimerHtml = {
30+
__html: disclaimer ? renderMarkdownAsHTML(disclaimer) : undefined
31+
};
2632

2733
const handleReset = useCallback(
2834
(wasFeedbackSubmitted: boolean) => {
@@ -90,7 +96,11 @@ function FeedbackForm({ feedbackType, disclaimer, onReset, replyToId }: Feedback
9096
value={userFeedback}
9197
/>
9298
{disclaimer && (
93-
<span className={classNames('webchat__feedback-form__caption1', feedbackForm + '')}>{disclaimer}</span>
99+
<span
100+
className={classNames('webchat__feedback-form__caption1', feedbackForm + '')}
101+
// eslint-disable-next-line react/no-danger
102+
dangerouslySetInnerHTML={disclaimerHtml}
103+
/>
94104
)}
95105
<div className={classNames('webchat__feedback-form__container', feedbackForm + '')}>
96106
<button className={classNames('webchat__feedback-form__button__submit', feedbackForm + '')} type="submit">

0 commit comments

Comments
 (0)