[MM-53810] Add mobile markdown support for highlighting without notif…

…ications without configuration ability (#7663)
mattermost · Nov 23, 2023 · 4b5489c · 4b5489c
1 parent 6baa850
commit 4b5489c
Show file tree

Hide file tree

Showing 23 changed files with 712 additions and 131 deletions.
diff --git a/app/components/markdown/markdown.tsx b/app/components/markdown/markdown.tsx
@@ -29,11 +29,11 @@ import MarkdownTable from './markdown_table';
 import MarkdownTableCell, {type MarkdownTableCellProps} from './markdown_table_cell';
 import MarkdownTableImage from './markdown_table_image';
 import MarkdownTableRow, {type MarkdownTableRowProps} from './markdown_table_row';
-import {addListItemIndices, combineTextNodes, highlightMentions, highlightSearchPatterns, parseTaskLists, pullOutImages} from './transform';
+import {addListItemIndices, combineTextNodes, highlightMentions, highlightWithoutNotification, highlightSearchPatterns, parseTaskLists, pullOutImages} from './transform';
 
 import type {
     MarkdownAtMentionRenderer, MarkdownBaseRenderer, MarkdownBlockStyles, MarkdownChannelMentionRenderer,
-    MarkdownEmojiRenderer, MarkdownImageRenderer, MarkdownLatexRenderer, MarkdownTextStyles, SearchPattern, UserMentionKey,
+    MarkdownEmojiRenderer, MarkdownImageRenderer, MarkdownLatexRenderer, MarkdownTextStyles, SearchPattern, UserMentionKey, HighlightWithoutNotificationKey,
 } from '@typings/global/markdown';
 
 type MarkdownProps = {
@@ -55,6 +55,7 @@ type MarkdownProps = {
     disableTables?: boolean;
     enableLatex: boolean;
     enableInlineLatex: boolean;
+    highlightKeys?: HighlightWithoutNotificationKey[];
     imagesMetadata?: Record<string, PostImage | undefined>;
     isEdited?: boolean;
     isReplyPost?: boolean;
@@ -133,7 +134,7 @@ const Markdown = ({
     disableCodeBlock, disableGallery, disableHashtags, disableHeading, disableTables,
     enableInlineLatex, enableLatex, maxNodes,
     imagesMetadata, isEdited, isReplyPost, isSearchResult, layoutHeight, layoutWidth,
-    location, mentionKeys, minimumHashtagLength = 3, onPostPress, postId, searchPatterns,
+    location, mentionKeys, highlightKeys, minimumHashtagLength = 3, onPostPress, postId, searchPatterns,
     textStyles = {}, theme, value = '', baseParagraphStyle, onLinkLongPress,
 }: MarkdownProps) => {
     const style = getStyleSheet(theme);
@@ -578,6 +579,7 @@ const Markdown = ({
 
             mention_highlight: Renderer.forwardChildren,
             search_highlight: Renderer.forwardChildren,
+            highlight_without_notification: Renderer.forwardChildren,
             checkbox: renderCheckbox,
 
             editedIndicator: renderEditedIndicator,
@@ -604,10 +606,12 @@ const Markdown = ({
     if (mentionKeys) {
         ast = highlightMentions(ast, mentionKeys);
     }
+    if (highlightKeys) {
+        ast = highlightWithoutNotification(ast, highlightKeys);
+    }
     if (searchPatterns) {
         ast = highlightSearchPatterns(ast, searchPatterns);
     }
-
     if (isEdited) {
         const editIndicatorNode = new Node('edited_indicator');
         if (ast.lastChild && ['heading', 'paragraph'].includes(ast.lastChild.type)) {