Integrate react-letter for improved email rendering

- Replace dangerouslySetInnerHTML with Letter component - Remove DOMPurify as react-letter handles sanitization
hppanpaliya · Jun 28, 2024 · d8d80f5 · d8d80f5
1 parent e9057e7
commit d8d80f5
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 263 deletions.
diff --git a/react/package.json b/react/package.json
@@ -7,17 +7,18 @@
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.11.16",
     "@mui/material": "^5.13.6",
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^13.0.0",
-    "@testing-library/user-event": "^13.2.1",
+    "@testing-library/jest-dom": "^6.4.6",
+    "@testing-library/react": "^16.0.0",
+    "@testing-library/user-event": "^14.5.2",
     "axios": "^1.4.0",
     "dompurify": "^3.0.5",
-    "framer-motion": "^10.16.1",
+    "framer-motion": "^11.2.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-letter": "^0.4.0",
     "react-router-dom": "^6.14.0",
-    "react-scripts": "5.0.1",
-    "web-vitals": "^2.1.0"
+    "react-scripts": "^5.0.1",
+    "web-vitals": "^4.2.0"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/react/src/components/InboxEmail/index.js b/react/src/components/InboxEmail/index.js
@@ -1,18 +1,16 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useContext } from "react";
 import { Grid, Typography, Paper, Box, Chip, Tooltip, IconButton } from "@mui/material";
 import { useParams } from "react-router-dom";
 import axios from "axios";
+import { Letter } from "react-letter";
 import ButtonSection from "../ButtonSection";
 import InfoIcon from "@mui/icons-material/Info";
 import { ThemeContext } from "../../context/ThemeContext";
-import { useContext } from "react";
 import { motion } from "framer-motion";
-import DOMPurify from "dompurify";
 import { env } from "../../env";
 
 const InboxEmail = () => {
-  const { emailId } = useParams();
-  const { email_id } = useParams();
+  const { emailId, email_id } = useParams();
   const [emailData, setEmailData] = useState();
   const [emailAttachments, setEmailAttachments] = useState([]);
   const [emailHeaders, setEmailHeaders] = useState([]);
@@ -131,7 +129,7 @@ const InboxEmail = () => {
                     wordBreak: "break-all",
                   }}
                 >
-                  {emailData ? emailData.subject : "No Subject"}
+                  {emailData?.subject || "No Subject"}
                 </Typography>
               </motion.div>
               <motion.div variants={childVariants}>
@@ -149,30 +147,24 @@ const InboxEmail = () => {
                     flexDirection: isMobile ? "column" : "row",
                   }}
                 >
-                  <Typography variant="subtitle1">From: {emailData ? emailData.from.text : "No From"}</Typography>
+                  <Typography variant="subtitle1">From: {emailData?.from.text || "No From"}</Typography>
                   <Tooltip title="Click to copy to clipboard" placement="top">
                     <Chip
-                      label={`To: ${emailData ? emailData.to.text : "No To"}`}
-                      onClick={() => (emailData ? navigator.clipboard.writeText(emailData.to.text) : null)}
+                      label={`To: ${emailData?.to.text || "No To"}`}
+                      onClick={() => emailData?.to.text && navigator.clipboard.writeText(emailData.to.text)}
                     />
                   </Tooltip>
                 </Box>
               </motion.div>
               <motion.div variants={childVariants}>
                 <Typography variant="body1" mb={2}>
-                  Date: {emailData ? new Date(emailData.date).toLocaleString() : "No Date"}
+                  Date: {emailData?.date ? new Date(emailData.date).toLocaleString() : "No Date"}
                 </Typography>
               </motion.div>
               <motion.div variants={childVariants}>
-                <Typography
-                  variant="body1"
-                  mb={2}
-                  sx={{
-                    justifyContent: "center",
-                    wordBreak: "break-all",
-                  }}
-                  dangerouslySetInnerHTML={{ __html: emailData ? DOMPurify.sanitize(emailData.html) : "No Message" }}
-                />
+                <Box sx={{ maxWidth: "100%", overflowX: "auto" }}>
+                  <Letter html={emailData?.html || "<p>No Message</p>"} text={emailData?.text || "No Message"} />
+                </Box>
               </motion.div>
               <motion.div variants={childVariants}>
                 <Typography variant="body1">Attachments: {emailData ? emailAttachments.length : "No Attachments"}</Typography>