add ability to enter html for public group chat

This commit is contained in:
PhilReact 2025-05-29 21:19:57 +03:00
parent cfa4afc506
commit 4ad0fb7db3
3 changed files with 54 additions and 42 deletions

View File

@ -39,6 +39,7 @@ import StarterKit from "@tiptap/starter-kit";
import Underline from "@tiptap/extension-underline"; import Underline from "@tiptap/extension-underline";
import { generateHTML } from "@tiptap/react"; import { generateHTML } from "@tiptap/react";
import ErrorBoundary from "../../common/ErrorBoundary"; import ErrorBoundary from "../../common/ErrorBoundary";
import { isHtmlString } from "../../utils/chat";
const extractTextFromHTML = (htmlString = '') => { const extractTextFromHTML = (htmlString = '') => {
return convert(htmlString, { return convert(htmlString, {
@ -59,27 +60,30 @@ export const ChatOptions = ({ messages : untransformedMessages, goToMessage, mem
const parentRefMentions = useRef(); const parentRefMentions = useRef();
const [lastMentionTimestamp, setLastMentionTimestamp] = useState(null) const [lastMentionTimestamp, setLastMentionTimestamp] = useState(null)
const [debouncedValue, setDebouncedValue] = useState(""); // Debounced value const [debouncedValue, setDebouncedValue] = useState(""); // Debounced value
const messages = useMemo(()=> { const messages = useMemo(() => {
return untransformedMessages?.map((item)=> { return untransformedMessages?.map((item) => {
if(item?.messageText){ if (item?.messageText) {
let transformedMessage = item?.messageText let transformedMessage = item?.messageText;
const isHtml = isHtmlString(item?.messageText);
try { try {
transformedMessage = generateHTML(item?.messageText, [ transformedMessage = isHtml
StarterKit, ? item?.messageText
Underline, : generateHTML(item?.messageText, [
Highlight, StarterKit,
Mention Underline,
]) Highlight,
return { Mention,
...item, ]);
messageText: transformedMessage return {
} ...item,
messageText: transformedMessage,
};
} catch (error) { } catch (error) {
// error console.log(error);
} }
} else return item } else return item;
}) });
}, [untransformedMessages]) }, [untransformedMessages]);
const getTimestampMention = async () => { const getTimestampMention = async () => {
try { try {

View File

@ -34,7 +34,7 @@ import level8Img from "../../assets/badges/level-8.png"
import level9Img from "../../assets/badges/level-9.png" import level9Img from "../../assets/badges/level-9.png"
import level10Img from "../../assets/badges/level-10.png" import level10Img from "../../assets/badges/level-10.png"
import { Embed } from "../Embeds/Embed"; import { Embed } from "../Embeds/Embed";
import { buildImageEmbedLink, messageHasImage } from "../../utils/chat"; import { buildImageEmbedLink, isHtmlString, messageHasImage } from "../../utils/chat";
const getBadgeImg = (level)=> { const getBadgeImg = (level)=> {
switch(level?.toString()){ switch(level?.toString()){
@ -104,35 +104,33 @@ useEffect(()=> {
getInfo() getInfo()
}, [message?.sender, getIndividualUserInfo]) }, [message?.sender, getIndividualUserInfo])
const htmlText = useMemo(()=> { const htmlText = useMemo(() => {
if (message?.messageText) {
if(message?.messageText){ const isHtml = isHtmlString(message?.messageText);
if (isHtml) return message?.messageText;
return generateHTML(message?.messageText, [ return generateHTML(message?.messageText, [
StarterKit, StarterKit,
Underline, Underline,
Highlight, Highlight,
Mention, Mention,
TextStyle TextStyle,
]) ]);
} }
}, [message?.editTimestamp]);
}, [message?.editTimestamp])
const htmlReply = useMemo(() => {
if (reply?.messageText) {
const htmlReply = useMemo(()=> { const isHtml = isHtmlString(reply?.messageText);
if (isHtml) return reply?.messageText;
if(reply?.messageText){
return generateHTML(reply?.messageText, [ return generateHTML(reply?.messageText, [
StarterKit, StarterKit,
Underline, Underline,
Highlight, Highlight,
Mention, Mention,
TextStyle TextStyle,
]) ]);
} }
}, [reply?.editTimestamp]);
}, [reply?.editTimestamp])
const userAvatarUrl = useMemo(()=> { const userAvatarUrl = useMemo(()=> {
return message?.senderName ? `${getBaseApiReact()}/arbitrary/THUMBNAIL/${ return message?.senderName ? `${getBaseApiReact()}/arbitrary/THUMBNAIL/${
@ -524,6 +522,18 @@ const onSeenFunc = useCallback(()=> {
export const ReplyPreview = ({message, isEdit})=> { export const ReplyPreview = ({message, isEdit})=> {
const replyMessageText = useMemo(() => {
const isHtml = isHtmlString(message?.messageText);
if (isHtml) return message?.messageText;
return generateHTML(message?.messageText, [
StarterKit,
Underline,
Highlight,
Mention,
TextStyle,
]);
}, [message?.messageText]);
return ( return (
<Box <Box
sx={{ sx={{
@ -560,13 +570,7 @@ export const ReplyPreview = ({message, isEdit})=> {
{message?.messageText && ( {message?.messageText && (
<MessageDisplay <MessageDisplay
htmlContent={generateHTML(message?.messageText, [ htmlContent={replyMessageText}
StarterKit,
Underline,
Highlight,
Mention,
TextStyle
])}
/> />
)} )}
{message?.decryptedData?.type === "notification" ? ( {message?.decryptedData?.type === "notification" ? (

View File

@ -20,3 +20,7 @@ export const messageHasImage = (message) => {
message.images[0]?.service message.images[0]?.service
); );
}; };
export function isHtmlString(value) {
return typeof value === 'string' && /<[^>]+>/.test(value.trim());
}