courrier refactor rebuild 2
This commit is contained in:
parent
c3284982b5
commit
7466037779
@ -382,7 +382,7 @@ export default function ComposeEmail(props: ComposeEmailAllProps) {
|
|||||||
{/* Message Body */}
|
{/* Message Body */}
|
||||||
<div className="flex-1 min-h-[200px] flex flex-col overflow-hidden">
|
<div className="flex-1 min-h-[200px] flex flex-col overflow-hidden">
|
||||||
<Label htmlFor="message" className="flex-none block text-sm font-medium text-gray-700 mb-2">Message</Label>
|
<Label htmlFor="message" className="flex-none block text-sm font-medium text-gray-700 mb-2">Message</Label>
|
||||||
<div className="flex-1 border border-gray-300 rounded-md overflow-hidden">
|
<div className="flex-1 border border-gray-300 rounded-md overflow-auto">
|
||||||
<RichEmailEditor
|
<RichEmailEditor
|
||||||
initialContent={emailContent}
|
initialContent={emailContent}
|
||||||
onChange={setEmailContent}
|
onChange={setEmailContent}
|
||||||
@ -390,15 +390,17 @@ export default function ComposeEmail(props: ComposeEmailAllProps) {
|
|||||||
maxHeight="none"
|
maxHeight="none"
|
||||||
preserveFormatting={true}
|
preserveFormatting={true}
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
{/* Render quoted content for replies and forwards */}
|
{/* Render quoted content for replies and forwards */}
|
||||||
{initialEmail && type !== 'new' && (
|
{initialEmail && type !== 'new' && (
|
||||||
|
<div className="mt-4">
|
||||||
<EmailMessageToQuotedContentAdapter
|
<EmailMessageToQuotedContentAdapter
|
||||||
email={initialEmail}
|
email={initialEmail}
|
||||||
type={type as 'reply' | 'reply-all' | 'forward'}
|
type={type as 'reply' | 'reply-all' | 'forward'}
|
||||||
/>
|
/>
|
||||||
)}
|
</div>
|
||||||
</div>
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Attachments */}
|
{/* Attachments */}
|
||||||
@ -696,7 +698,7 @@ function LegacyAdapter({
|
|||||||
{/* Message Body */}
|
{/* Message Body */}
|
||||||
<div className="flex-1 min-h-[200px] flex flex-col overflow-hidden">
|
<div className="flex-1 min-h-[200px] flex flex-col overflow-hidden">
|
||||||
<Label htmlFor="message" className="flex-none block text-sm font-medium text-gray-700 mb-2">Message</Label>
|
<Label htmlFor="message" className="flex-none block text-sm font-medium text-gray-700 mb-2">Message</Label>
|
||||||
<div className="flex-1 border border-gray-300 rounded-md overflow-hidden">
|
<div className="flex-1 border border-gray-300 rounded-md overflow-auto">
|
||||||
<RichEmailEditor
|
<RichEmailEditor
|
||||||
initialContent={composeBody}
|
initialContent={composeBody}
|
||||||
onChange={setComposeBody}
|
onChange={setComposeBody}
|
||||||
@ -704,34 +706,34 @@ function LegacyAdapter({
|
|||||||
maxHeight="none"
|
maxHeight="none"
|
||||||
preserveFormatting={true}
|
preserveFormatting={true}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{/* Render original message for replies and forwards */}
|
|
||||||
{(originalEmail || replyTo || forwardFrom) && (
|
|
||||||
<div className="mt-4">
|
|
||||||
{replyTo ? (
|
|
||||||
<QuotedEmailContent
|
|
||||||
content={originalEmail?.content || ''}
|
|
||||||
sender={{
|
|
||||||
name: replyTo.name,
|
|
||||||
email: replyTo.email
|
|
||||||
}}
|
|
||||||
date={new Date()}
|
|
||||||
type="reply"
|
|
||||||
/>
|
|
||||||
) : forwardFrom ? (
|
|
||||||
<QuotedEmailContent
|
|
||||||
content={originalEmail?.content || ''}
|
|
||||||
sender={{
|
|
||||||
name: forwardFrom.name,
|
|
||||||
email: forwardFrom.email
|
|
||||||
}}
|
|
||||||
date={new Date()}
|
|
||||||
type="forward"
|
|
||||||
/>
|
|
||||||
) : null}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Render original message for replies and forwards */}
|
||||||
|
{(originalEmail || replyTo || forwardFrom) && (
|
||||||
|
<div className="mt-4">
|
||||||
|
{replyTo ? (
|
||||||
|
<QuotedEmailContent
|
||||||
|
content={originalEmail?.content || ''}
|
||||||
|
sender={{
|
||||||
|
name: replyTo.name,
|
||||||
|
email: replyTo.email
|
||||||
|
}}
|
||||||
|
date={new Date()}
|
||||||
|
type="reply"
|
||||||
|
/>
|
||||||
|
) : forwardFrom ? (
|
||||||
|
<QuotedEmailContent
|
||||||
|
content={originalEmail?.content || ''}
|
||||||
|
sender={{
|
||||||
|
name: forwardFrom.name,
|
||||||
|
email: forwardFrom.email
|
||||||
|
}}
|
||||||
|
date={new Date()}
|
||||||
|
type="forward"
|
||||||
|
/>
|
||||||
|
) : null}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Attachments */}
|
{/* Attachments */}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user