chore(meteor): Update mention style (RocketChat#29426)

sampaiodiego · Jun 1, 2023 · cde2539 · cde2539
1 parent 7d769b9
commit cde2539
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 32 deletions.
diff --git a/.changeset/warm-scissors-itch.md b/.changeset/warm-scissors-itch.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/gazzodown": patch
+---
+
+chore(meteor): Update mention style
diff --git a/packages/gazzodown/src/mentions/ChannelMentionElement.tsx b/packages/gazzodown/src/mentions/ChannelMentionElement.tsx
@@ -18,9 +18,9 @@ const ChannelMentionElement = ({ mention }: ChannelMentionElementProps): ReactEl
 	}
 
 	return (
-		<Message.Mention clickable tag='#' onClick={handleClick}>
+		<Message.Highlight variant='link' clickable onClick={handleClick}>
 			{resolved.name ?? mention}
-		</Message.Mention>
+		</Message.Highlight>
 	);
 };
 

diff --git a/packages/gazzodown/src/mentions/UserMentionElement.tsx b/packages/gazzodown/src/mentions/UserMentionElement.tsx
@@ -19,36 +19,27 @@ const UserMentionElement = ({ mention }: UserMentionElementProps): ReactElement
 	const showRealName = useSetting<boolean>('UI_Use_Real_Name') && !isMobile;
 
 	if (mention === 'all') {
-		return (
-			<Message.Mention tag='@' variant='relevant'>
-				all
-			</Message.Mention>
-		);
+		return <Message.Highlight variant='relevant'>all</Message.Highlight>;
 	}
 
 	if (mention === 'here') {
-		return (
-			<Message.Mention tag='@' variant='relevant'>
-				here
-			</Message.Mention>
-		);
+		return <Message.Highlight variant='relevant'>here</Message.Highlight>;
 	}
 
 	if (!resolved) {
 		return <>@{mention}</>;
 	}
 
 	return (
-		<Message.Mention
-			tag='@'
+		<Message.Highlight
 			variant={resolved._id === uid ? 'critical' : 'other'}
 			title={resolved.username || resolved.name}
 			clickable
 			onClick={handleClick}
 			data-uid={resolved._id}
 		>
 			{(showRealName ? resolved.name : resolved.username) ?? mention}
-		</Message.Mention>
+		</Message.Highlight>
 	);
 };
 

diff --git a/yarn.lock b/yarn.lock
@@ -7950,7 +7950,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/css-in-js@npm:^0.31.12, @rocket.chat/css-in-js@npm:^0.31.23, @rocket.chat/css-in-js@npm:~0.31.23-dev.103, @rocket.chat/css-in-js@npm:~0.31.23-dev.124":
+"@rocket.chat/css-in-js@npm:^0.31.12, @rocket.chat/css-in-js@npm:^0.31.23, @rocket.chat/css-in-js@npm:~0.31.23-dev.103, @rocket.chat/css-in-js@npm:~0.31.23-dev.125":
   version: 0.31.23
   resolution: "@rocket.chat/css-in-js@npm:0.31.23"
   dependencies:
@@ -7976,7 +7976,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/css-supports@npm:^0.31.23, @rocket.chat/css-supports@npm:~0.31.23-dev.103, @rocket.chat/css-supports@npm:~0.31.23-dev.124":
+"@rocket.chat/css-supports@npm:^0.31.23, @rocket.chat/css-supports@npm:~0.31.23-dev.103, @rocket.chat/css-supports@npm:~0.31.23-dev.125":
   version: 0.31.23
   resolution: "@rocket.chat/css-supports@npm:0.31.23"
   dependencies:
@@ -8205,10 +8205,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/fuselage-tokens@npm:~0.32.0-dev.300":
-  version: 0.32.0-dev.300
-  resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.300"
-  checksum: 99e52eeadd8f4fdf335bef7ecf10a637019efb0f40cef6f8cd23c34b11f079fc99bbda06bdb25f625d914fb96cfb69bf3e888c3e7892a8b10e9592686a24e882
+"@rocket.chat/fuselage-tokens@npm:~0.32.0-dev.301":
+  version: 0.32.0-dev.301
+  resolution: "@rocket.chat/fuselage-tokens@npm:0.32.0-dev.301"
+  checksum: 0dc5967c6ab3c25ff586d816b76d80d932c777498be5586da22c60d37994ced7fcfdeb3f19fe4d236b1ddc1529800975433bdff7669ac9873bed1e3d5469a3df
   languageName: node
   linkType: hard
 
@@ -8269,14 +8269,14 @@ __metadata:
   linkType: soft
 
 "@rocket.chat/fuselage@npm:next":
-  version: 0.32.0-dev.350
-  resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.350"
-  dependencies:
-    "@rocket.chat/css-in-js": ~0.31.23-dev.124
-    "@rocket.chat/css-supports": ~0.31.23-dev.124
-    "@rocket.chat/fuselage-tokens": ~0.32.0-dev.300
-    "@rocket.chat/memo": ~0.31.23-dev.124
-    "@rocket.chat/styled": ~0.31.23-dev.124
+  version: 0.32.0-dev.351
+  resolution: "@rocket.chat/fuselage@npm:0.32.0-dev.351"
+  dependencies:
+    "@rocket.chat/css-in-js": ~0.31.23-dev.125
+    "@rocket.chat/css-supports": ~0.31.23-dev.125
+    "@rocket.chat/fuselage-tokens": ~0.32.0-dev.301
+    "@rocket.chat/memo": ~0.31.23-dev.125
+    "@rocket.chat/styled": ~0.31.23-dev.125
     invariant: ^2.2.4
     react-aria: ~3.23.1
     react-keyed-flatten-children: ^1.3.0
@@ -8288,7 +8288,7 @@ __metadata:
     react: ^17.0.2
     react-dom: ^17.0.2
     react-virtuoso: 1.2.4
-  checksum: e9897ff83f824418e4e1ee8be7e6a5544e94febb82ba15adf4a8e6427f975a2ae5b32bfd1b260015af6c9381b2d10797a3283fab6e74ecefc2abb798bae6bd0f
+  checksum: b0e2db6830c99000de8ccbba06f556bc486bd44ce25fa270fb3196f6dd2b768322882485c2dd8730eff79493e010f81791d650d771118fe2f35b5990fe96538d
   languageName: node
   linkType: hard
 
@@ -8518,7 +8518,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/memo@npm:^0.31.23, @rocket.chat/memo@npm:~0.31.23-dev.103, @rocket.chat/memo@npm:~0.31.23-dev.124":
+"@rocket.chat/memo@npm:^0.31.23, @rocket.chat/memo@npm:~0.31.23-dev.103, @rocket.chat/memo@npm:~0.31.23-dev.125":
   version: 0.31.23
   resolution: "@rocket.chat/memo@npm:0.31.23"
   checksum: 070debb940749a2e4463cf767dd65c6967cea664a5bd67c22a812d611f6c3c46d6fe4bb0bf329e43dcd927493413add37c45ae3b05ec08f0b24e9d7385caebdd
@@ -9310,7 +9310,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/styled@npm:~0.31.23-dev.103, @rocket.chat/styled@npm:~0.31.23-dev.124":
+"@rocket.chat/styled@npm:~0.31.23-dev.103, @rocket.chat/styled@npm:~0.31.23-dev.125":
   version: 0.31.23
   resolution: "@rocket.chat/styled@npm:0.31.23"
   dependencies: