Merge pull request #6319 from nguyentrannhan/develop

Develop

Author: nguyentrannhan

apps/mobile/src/app/components/ClanSettings/Member/UserItem/UserItem.tsx

@@ -1,6 +1,7 @@
 import { Icons } from '@mezon/mobile-components';
 import { useTheme } from '@mezon/mobile-ui';
-import { selectAllRolesClan, selectMemberClanByUserId2, useAppSelector, UsersClanEntity } from '@mezon/store-mobile';
+import { selectAllRolesClan, selectMemberClanByUserId2, useAppSelector } from '@mezon/store-mobile';
+import { UsersClanEntity } from '@mezon/utils';
 import { useMemo } from 'react';
 import { Pressable, Text, View } from 'react-native';
 import { MezonAvatar } from '../../../../componentUI';

apps/mobile/src/app/screens/home/homedrawer/ChannelApp/index.tsx

@@ -41,6 +41,18 @@ const ChannelAppScreen = memo(({ channelId }: { channelId: string }) => {
 	true;
   `;
 
+	const injectedCSS = `
+    (function() {
+      var style = document.createElement('style');
+      style.innerHTML = \`
+        .h-heightTopBar {
+          display: none !important;
+        }
+      \`;
+      document.head.appendChild(style);
+    })();
+  `;
+
 	return (
 		<View style={styles.container}>
 			{loading && (
@@ -52,7 +64,7 @@ const ChannelAppScreen = memo(({ channelId }: { channelId: string }) => {
 						height: '100%',
 						zIndex: 1,
 						width: '100%',
-						backgroundColor: themeValue.charcoal,
+						backgroundColor: themeValue.primary,
 						flex: 1
 					}}
 				>
@@ -72,6 +84,7 @@ const ChannelAppScreen = memo(({ channelId }: { channelId: string }) => {
 					await sleep(500);
 					setLoading(false);
 				}}
+				injectedJavaScript={injectedCSS}
 			/>
 		</View>
 	);

apps/mobile/src/app/screens/home/homedrawer/Reusables.tsx

@@ -1,5 +1,6 @@
 import { useTheme } from '@mezon/mobile-ui';
-import { DirectEntity, UsersClanEntity } from '@mezon/store-mobile';
+import { DirectEntity } from '@mezon/store-mobile';
+import { UsersClanEntity } from '@mezon/utils';
 import { ChannelType } from 'mezon-js';
 import React from 'react';
 import { Image, Text, TouchableOpacity, View } from 'react-native';

apps/mobile/src/app/screens/home/homedrawer/components/MarkdownFormatText/MentionUser.tsx

@@ -1,4 +1,5 @@
-import { ChannelMembersEntity, UsersClanEntity } from '@mezon/store-mobile';
+import { ChannelMembersEntity } from '@mezon/store-mobile';
+import { UsersClanEntity } from '@mezon/utils';
 import { ChannelStreamMode } from 'mezon-js/client';
 
 type IMentionUser = {

apps/mobile/src/app/screens/home/homedrawer/components/RenderTextMarkdown/index.tsx

@@ -502,7 +502,7 @@ export const RenderTextMarkdownContent = ({
 	}
 	const { t, mentions = [], hg = [], ej = [], mk = [], lk = [], vk = [] } = content || {};
 
-	const hasMarkdown = mk.length > 0 || isEdited;
+	const hasMarkdown = mk?.length > 0 || lk?.length > 0 || isEdited;
 	if (!hasMarkdown) {
 		const elements = [
 			...hg.map((item) => ({ ...item, kindOf: ETokenMessage.HASHTAGS })),
@@ -708,7 +708,7 @@ export const RenderTextMarkdownContent = ({
 				formattedContent += EmojiMarkup({ shortname: contentInElement, emojiid: element.emojiid, isMessageReply: isMessageReply });
 			}
 
-			if (element.kindOf === ETokenMessage.MARKDOWNS) {
+			if (element.kindOf === ETokenMessage.MARKDOWNS || element.kindOf === ETokenMessage.LINKS) {
 				if (element.type === EBacktickType.LINK || element.type === EBacktickType.LINKYOUTUBE) {
 					formattedContent += formatUrls(contentInElement);
 				} else if (element.type === EBacktickType.BOLD) {

apps/mobile/src/app/screens/serverRoles/SetupMembers/components/AddMemberBs/index.tsx

@@ -1,6 +1,7 @@
 import { BottomSheetModal } from '@gorhom/bottom-sheet';
 import { size, useTheme } from '@mezon/mobile-ui';
-import { RolesClanEntity, UsersClanEntity } from '@mezon/store-mobile';
+import { RolesClanEntity } from '@mezon/store-mobile';
+import { UsersClanEntity } from '@mezon/utils';
 import { RefObject, memo } from 'react';
 import Backdrop from '../../../../../componentUI/MezonBottomSheet/backdrop';
 import { AddMemberBsContent } from './AddMemberBsContent';

libs/utils/src/lib/utils/parseHtmlAsFormattedText.ts

@@ -169,13 +169,12 @@ function parseMarkdown(html: string) {
 	return parsedHtml;
 }
 
-const LINK_TEMPLATE = /(?<!<a\s+href="[^"]*">)(https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z]{2,}\b(?:[-a-zA-Z0-9@:%_\+.~#?&//=]*))/gi;
+const LINK_TEMPLATE = /((ftp|http|https?):\/\/)?((www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z][-a-zA-Z0-9]{1,62})\b([-a-zA-Z0-9()@:%_+.,~#?&/=]*)/gi;
 
 function parseMarkdownLinks(html: string) {
 	const parts = html.split(/(`{1,3})/);
 	let isInCode = false;
 	let result = '';
-
 	for (let i = 0; i < parts.length; i++) {
 		const part = parts[i];
 		if (part.match(/^`{1,3}$/)) {
@@ -187,9 +186,7 @@ function parseMarkdownLinks(html: string) {
 		if (isInCode) {
 			result += part;
 		} else {
-			result += part.replace(LINK_TEMPLATE, (url) => {
-				return `<a href="${url}" target="_blank">${url}</a>`;
-			});
+			result += part.replace(LINK_TEMPLATE, '<a href="$&" target="_blank">$&</a>');
 		}
 	}