npm - @novacraft-engineering/mailbox - Versions diffs - 0.4.21 → 0.4.23 - Mend

@novacraft-engineering/mailbox 0.4.21 → 0.4.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/app/mail/page.tsx +55 -10
package/package.json +1 -1

package/app/mail/page.tsx CHANGED Viewed

@@ -663,6 +663,12 @@ function htmlToQuoteText(html: string | null, text: string | null): string {
  * imported without ids fall back to the names mail clients give such parts. Anything
  * larger, or not an image, is a real file.
  */
+// Some senders put the plain-text body straight into the HTML part. Rendered as markup its
+// line breaks are just whitespace and the message collapses into one paragraph, so a part
+// carrying no tags has to be treated as the text it actually is.
+const hasMarkup = (html: string | null | undefined): html is string =>
+  typeof html === 'string' && /<[a-z!/][^>]*>/i.test(html)
 const INLINE_IMAGE_MAX_BYTES = 150_000
 const INLINE_IMAGE_NAME = /^(image\d*|outlook-[\w-]+|blocked|[0-9a-f]{8}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.(png|gif|jpe?g)$/i
 function inlineAttachmentNames(message: InboundEmail): Set<string> {
@@ -3712,6 +3718,9 @@ export default function DevMailPage() {
         .catch(() => {})
         .finally(() => {
           if (flags.read === true) ids.forEach(id => pendingRead.current.delete(id))
+          // The starred tally counts conversations, not messages, so it cannot be derived
+          // from the ids alone — the server says what it is now.
+          if (flags.starred !== undefined) loadCounts(true)
         })
     },
     [apiHeaders],
@@ -3748,6 +3757,40 @@ export default function DevMailPage() {
     },
     [apiHeaders, setInboundFlag, threadIds, threadKeys, loadCounts],
   )
+  /**
+   * The row carries the newest message's id, but the star belongs to the conversation —
+   * starring the newest message leaves an older starred one lit and the row never clears.
+   */
+  const toggleRowStar = useCallback(
+    (id: string, threadId: string | null, starred: boolean) => {
+      if (!threadId) {
+        setInboundFlag(threadIds(id), { starred })
+        return
+      }
+      setInboxEmails(list =>
+        list.map(entry => (threadKeys.get(entry.id) === threadKeys.get(id) ? { ...entry, starred } : entry)),
+      )
+      setThreads(list =>
+        list.map(thread =>
+          thread.threadId === threadId
+            ? { ...thread, starredCount: starred ? Math.max(1, thread.count) : 0 }
+            : thread,
+        ),
+      )
+      setServerCounts(current =>
+        current ? { ...current, starred: Math.max(0, current.starred + (starred ? 1 : -1)) } : current,
+      )
+      fetch('/api/mail/inbox', {
+        method: 'PATCH',
+        headers: apiHeaders(),
+        body: JSON.stringify({ threadId, starred }),
+      })
+        .then(() => loadCounts(true))
+        .catch(() => {})
+    },
+    [apiHeaders, setInboundFlag, threadIds, threadKeys, loadCounts],
+  )
   useEffect(() => { swipeCommitRef.current = commitRowFlags }, [commitRowFlags])
   useEffect(() => { setInboundFlagRef.current = setInboundFlag }, [setInboundFlag])
@@ -4978,7 +5021,7 @@ export default function DevMailPage() {
       img { max-width: 100%; }
     </style>`
     doc.open()
-    doc.write(`<!doctype html><html><head><meta charset="utf-8"><title>${escapeHtml(subject)}</title>${printCss}</head><body>${meta}${html ? stripOwnPixel(html) : `<pre style="font-family:Arial,sans-serif;white-space:pre-wrap;">${escapeHtml(text ?? '')}</pre>`}</body></html>`)
+    doc.write(`<!doctype html><html><head><meta charset="utf-8"><title>${escapeHtml(subject)}</title>${printCss}</head><body>${meta}${hasMarkup(html) ? stripOwnPixel(html) : `<pre style="font-family:Arial,sans-serif;white-space:pre-wrap;">${escapeHtml(text?.trim() || html || '')}</pre>`}</body></html>`)
     doc.close()
     frame.contentWindow?.focus()
     window.setTimeout(() => {
@@ -5881,13 +5924,14 @@ export default function DevMailPage() {
     if (readerMode === 'html') return <pre className={styles.readerSource}>{formatHtmlSource(message.html ?? '')}</pre>
     if (readerMode === 'raw') return <pre className={styles.readerSource}>{rawInboundMessage(message)}</pre>
     // preview
-    if (!message.html) {
-      const plain = splitQuotedText(message.text ?? '')
+    if (!hasMarkup(message.html)) {
+      const source = message.text?.trim() ? message.text : (message.html ?? '')
+      const plain = splitQuotedText(source)
       const textShown = quoteOpen.has(message.id)
       return (
         <>
-          {(textShown ? message.text : plain.head)
-            ? <pre className={styles.readerText}>{textShown ? message.text : plain.head}</pre>
+          {(textShown ? source : plain.head)
+            ? <pre className={styles.readerText}>{textShown ? source : plain.head}</pre>
             : renderBodylessAttachment(inboundAttachments[message.id] ?? []) ?? <pre className={styles.readerText}>(no content)</pre>}
           {plain.tail && renderQuoteLine(message.id, textShown)}
         </>
@@ -5936,7 +5980,7 @@ export default function DevMailPage() {
   const renderSentBody = (sent: SentEmail) => {
     const detail = detailCache[sent.id]
     if (!detail) return <div className={styles.threadPending}>Loading message…</div>
-    if (detail.html && detail.html.trim()) {
+    if (hasMarkup(detail.html)) {
       return (
         <iframe
           className={styles.threadFrame}
@@ -5952,8 +5996,9 @@ export default function DevMailPage() {
         />
       )
     }
-    return detail.text?.trim()
-      ? <pre className={styles.readerText}>{detail.text}</pre>
+    const plainSent = detail.text?.trim() ? detail.text : (detail.html ?? '').trim()
+    return plainSent
+      ? <pre className={styles.readerText}>{plainSent}</pre>
       : renderBodylessAttachment(detail.attachments ?? []) ?? <pre className={styles.readerText}>(no content)</pre>
   }
@@ -7891,12 +7936,12 @@ export default function DevMailPage() {
                     className={`${styles.itemStar} ${item.starred ? styles.itemStarOn : ''}`}
                     onClick={event => {
                       event.stopPropagation()
-                      setInboundFlag([item.id], { starred: !item.starred })
+                      toggleRowStar(item.id, item.kind === 'inbound' ? item.threadId : null, !item.starred)
                     }}
                     onKeyDown={event => {
                       if (event.key === 'Enter') {
                         event.stopPropagation()
-                        setInboundFlag([item.id], { starred: !item.starred })
+                        toggleRowStar(item.id, item.kind === 'inbound' ? item.threadId : null, !item.starred)
                       }
                     }}
                   >

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@novacraft-engineering/mailbox",
-  "version": "0.4.21",
+  "version": "0.4.23",
   "description": "A shared webmail app: one codebase, one deployment per mailbox. Threads, a rich composer with signatures, attachments on S3-compatible storage, sharing links, full-text search, web push and PWA install.",
   "keywords": [
     "webmail",