danak/dmail-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rtl and ltr text in new message

Browse Source
This commit is contained in:
hamid zarghami
2025-08-04 12:17:24 +03:30
parent 026f2472a4
commit 52508741ab
4 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/newMessage/EmailEditor.tsx
+5 -1
View File
@@ -47,11 +47,15 @@ const EmailEditor: FC<EmailEditorProps> = ({
line-height: 1.6;
min-height: 120px;
}
.ql-editor p {
.ql-editor p, .ql-editor div, .ql-editor span {
unicode-bidi: plaintext;
text-align: start;
direction: auto;
}
.ql-editor br + * {
direction: auto;
unicode-bidi: plaintext;
}
.ql-editor.ql-blank::before {
direction: rtl;
text-align: right;
src/components/newMessage/hooks/useNewMessage.ts
+10 -11
View File
@@ -9,6 +9,7 @@ import { SendEmailDto, EmailAttachmentDto } from "@/pages/received/types/Types";
import { useUpdateDraft, useSendDraft } from "@/pages/draft/hooks/useDraftData";
import { toast } from "@/components/Toast";
import { useEmailSuggestions } from "./useEmailSuggestions";
import { detectTextDirection } from "@/helpers/utils";
export const useNewMessage = () => {
const {
@@ -143,13 +144,13 @@ export const useNewMessage = () => {
try {
let messageId = "";
if (isEditingDraft) {
const contentString = ensureString(content);
const textDirection = detectTextDirection(contentString);
const draftUpdateData = {
to: parseEmailAddresses(toEmails),
subject,
html: `<div dir="auto" style="text-align: start; unicode-bidi: plaintext; font-family: 'Irancell', 'Vazirmatn', sans-serif;">${ensureString(
content
)}</div>`,
text: ensureString(content).replace(/<[^>]*>/g, ""),
html: `<div dir="${textDirection}" style="text-align: start; unicode-bidi: plaintext; font-family: 'Irancell', 'Vazirmatn', sans-serif;">${contentString}</div>`,
text: contentString.replace(/<[^>]*>/g, ""),
...(attachments.length > 0 && { attachments }),
};
@@ -172,9 +173,7 @@ export const useNewMessage = () => {
messageId: editingDraftId.toString(),
draftData: {
...draftUpdateData,
html: `<div dir="auto" style="text-align: start; unicode-bidi: plaintext; font-family: 'Irancell', 'Vazirmatn', sans-serif;">${ensureString(
content
)}</div>`,
html: `<div dir="${textDirection}" style="text-align: start; unicode-bidi: plaintext; font-family: 'Irancell', 'Vazirmatn', sans-serif;">${contentString}</div>`,
isDraft: true,
uploadOnly: true,
},
@@ -196,14 +195,14 @@ export const useNewMessage = () => {
setEditingDraftId(null);
return true;
} else {
const contentString = ensureString(content);
const textDirection = detectTextDirection(contentString);
const emailData: SendEmailDto = {
from: { address: userEmail || "sender@example.com" },
to: parseEmailAddresses(toEmails),
subject,
html: `<div dir="auto" style="text-align: start; unicode-bidi: plaintext; font-family: 'Irancell', 'Vazirmatn', sans-serif;">${ensureString(
content
)}</div>`,
text: ensureString(content).replace(/<[^>]*>/g, ""),
html: `<div dir="${textDirection}" style="text-align: start; unicode-bidi: plaintext; font-family: 'Irancell', 'Vazirmatn', sans-serif;">${contentString}</div>`,
text: contentString.replace(/<[^>]*>/g, ""),
...(attachments.length > 0 && { attachments }),
...(isDraft && { isDraft: true, uploadOnly: true }),
};