@rapidmx/web-client 0.27.0 → 0.28.0

package/apps/shared/components/mail/ConversationList.tsx

@@ -47,9 +47,9 @@ export interface ConversationListProps {
      * conversation is what this list's rows are. A child row stays a plain "open this message" button - a
      * mixed conversation/message selection has no sensible bulk semantics (see `MailListToolbar`). */
     selectMode?: boolean;
-    /** The `conversationId`s currently ticked. */
+    /** The `conversationRowKey()`s currently ticked. */
     selectedConversationIds?: Set<string>;
-    onToggleSelected?: (conversation: ConversationSummary) => void;
+    onToggleSelected?: (conversation: ListedConversation) => void;
     /**
      * What swiping a parent row does on a phone: right to left archives the conversation (resolving whether it went through), left
      * to right asks where to move it. Absent, or `enabled: false` (a desktop), rows don't follow a finger.
@@ -175,7 +175,7 @@ export default function ConversationList({
                 // list itself is arranged in. Copied before reversing - the fetched array is cached.
                 const children = loaded && newestFirst ? [...loaded].reverse() : loaded;
                 const panelId = `conversation-messages-${conversation.mailboxUid ? `${conversation.mailboxUid}-` : ""}${conversation.conversationId}`;
-                const ticked = selectedConversationIds?.has(conversation.conversationId) ?? false;
+                const ticked = selectedConversationIds?.has(id) ?? false;
                 return (
                     <li key={id}>
                         <SwipeRow

package/apps/shared/mail/usePermanentDelete.tsx

@@ -23,6 +23,8 @@ import {
 export interface EmptiableFolder {
     uid: string;
     name: string;
+    /** Every folder to empty, when "the folder" is the "All mailboxes" view of one type (each mailbox's own Deleted Items): `uid` is then the first of them. */
+    uids?: string[];
 }
 
 export interface PermanentDelete {
@@ -113,13 +115,18 @@ export function usePermanentDelete(): PermanentDelete {
             finish(outcome);
             return;
         }
-        let outcome: EmptyFolderOutcome;
-        try {
-            outcome = await purgeFolder(request.folder.uid, undefined, client);
-        } catch (err) {
-            notifyApiError(err, `Couldn't empty ${request.folder.name}`);
-            // Part of it may have gone before the failure: the caller reloads rather than assume nothing did.
-            outcome = { emptied: false, deleted: [], failed: [] };
+        const outcome: EmptyFolderOutcome = { emptied: true, deleted: [], failed: [] };
+        for (const folderUid of request.folder.uids ?? [request.folder.uid]) {
+            try {
+                const one = await purgeFolder(folderUid, undefined, client);
+                outcome.emptied &&= one.emptied;
+                outcome.deleted.push(...one.deleted);
+                outcome.failed.push(...one.failed);
+            } catch (err) {
+                notifyApiError(err, `Couldn't empty ${request.folder.name}`);
+                // Part of it may have gone before the failure: the caller reloads rather than assume nothing did.
+                outcome.emptied = false;
+            }
         }
         afterDeleted(outcome.deleted);
         // The whole-folder request does not say which messages went, so the counts are read back rather than adjusted.

package/apps/www/index.tsx

@@ -80,7 +80,7 @@ import MailListToolbar from "../shared/components/mail/MailListToolbar.js";
 import MailSelectionBar from "../shared/components/mail/MailSelectionBar.js";
 import EmptyFolderBar from "../shared/components/mail/EmptyFolderBar.js";
 import { EMPTIABLE_FOLDER_TYPES } from "../shared/mail/permanentDelete.js";
-import { usePermanentDelete } from "../shared/mail/usePermanentDelete.js";
+import { type EmptiableFolder, usePermanentDelete } from "../shared/mail/usePermanentDelete.js";
 import { useMailboxUpdateAccess } from "../shared/mail/useMailboxUpdateAccess.js";
 import {
     CONVERSATION_SORT_NOTE,
@@ -1002,12 +1002,6 @@ function InboxContent({ userUid }: { userUid?: string }) {
             setSearchAllMailboxes(false);
         }
     }, [searchQuery]);
-    // Rows can be ticked in the results of a search over every mailbox, but not in the listing they came out of: clearing the search leaves select mode.
-    useEffect(() => {
-        if (aggregateFolderType && !isSearching) {
-            setSelectMode(false);
-        }
-    }, [aggregateFolderType, isSearching]);
 
     // Which listing this is, for the short-lived snapshot of each folder that makes going back to one instant (see
     // `listSnapshots.ts`). A search, an aggregate view and a folder that hasn't resolved have no snapshot.
@@ -1842,7 +1836,7 @@ function InboxContent({ userUid }: { userUid?: string }) {
      * Items copy of its reply), and the list only ever showed this folder's half of it, so a bulk action
      * from here must not reach into the other folders' copies either. */
     const selectedConversationMessages = [...selectedConversationIds].flatMap((id) =>
-        (conversationMessagesById[id] ?? []).filter((m) => !folderUid || m.folderUid === folderUid),
+        (conversationMessagesById[id] ?? []).filter((m) => (aggregateFolderType ? folderTypeOf(m.folderUid) === aggregateFolderType : !folderUid || m.folderUid === folderUid)),
     );
     const selectedMessages = asConversations
         ? selectedConversationMessages
@@ -1886,23 +1880,24 @@ function InboxContent({ userUid }: { userUid?: string }) {
     /** Loads (once) the messages behind each of `ids`, so a ticked conversation resolves to the messages
      * every bulk action below acts on. If any of them fails to load, none of that batch stays ticked and
      * a pop-up says why - better than acting on the part of a selection that happened to arrive. */
-    async function resolveConversations(ids: string[]) {
-        const missing = ids.filter((id) => !conversationMessagesById[id]);
+    async function resolveConversations(rows: ListedConversation[]) {
+        const missing = rows.filter((row) => !conversationMessagesById[conversationKey(row)]);
         if (missing.length === 0) {
             return;
         }
         setResolvingSelection((n) => n + 1);
         try {
             const loaded = await Promise.all(
-                missing.map(async (id) => [id, await listConversationMessages(activeMailboxUid, id, {}, client)] as const),
+                // A row of the "All mailboxes" view names its own mailbox; any other list is the open mailbox's.
+                missing.map(async (row) => [conversationKey(row), await listConversationMessages(row.mailboxUid ?? activeMailboxUid, row.conversationId, {}, client)] as const),
             );
             setConversationMessagesById((prev) => ({ ...prev, ...Object.fromEntries(loaded) }));
         } catch (err) {
             notifyApiError(err, "Couldn't load the messages in one of those conversations");
             setSelectedConversationIds((prev) => {
                 const next = new Set(prev);
-                for (const id of missing) {
-                    next.delete(id);
+                for (const row of missing) {
+                    next.delete(conversationKey(row));
                 }
                 return next;
             });
@@ -1911,8 +1906,8 @@ function InboxContent({ userUid }: { userUid?: string }) {
         }
     }
 
-    function toggleConversationSelected(conversation: ConversationSummary) {
-        const id = conversation.conversationId;
+    function toggleConversationSelected(conversation: ListedConversation) {
+        const id = conversationKey(conversation);
         const ticking = !selectedConversationIds.has(id);
         setSelectedConversationIds((prev) => {
             const next = new Set(prev);
@@ -1924,14 +1919,13 @@ function InboxContent({ userUid }: { userUid?: string }) {
             return next;
         });
         if (ticking) {
-            void resolveConversations([id]);
+            void resolveConversations([conversation]);
         }
     }
 
     function selectAllConversations() {
-        const ids = conversations.map(conversationKey);
-        setSelectedConversationIds(new Set(ids));
-        void resolveConversations(ids);
+        setSelectedConversationIds(new Set(conversations.map(conversationKey)));
+        void resolveConversations(conversations);
     }
 
     /**
@@ -2105,7 +2099,7 @@ function InboxContent({ userUid }: { userUid?: string }) {
     }
 
     /** Empty folder: permanently deletes everything in the folder being listed (Deleted Items or Junk Email) after the reader has confirmed. */
-    async function emptyListedFolder(folder: Folder, count: number | undefined) {
+    async function emptyListedFolder(folder: EmptiableFolder, count: number | undefined) {
         const outcome = await permanent.requestEmptyFolder({ uid: folder.uid, name: folder.name }, count);
         if (!outcome) {
             return;
@@ -2348,7 +2342,7 @@ function InboxContent({ userUid }: { userUid?: string }) {
     const inConversations = asConversations;
     /** The selection bar isn't offered in the aggregate listing (its rows belong to several mailboxes), and neither are these - but the results of a
      * search over them are, each hit acted on in its own mailbox (see `inEachMailbox()`). */
-    const keyboardActions = !aggregateFolderType || isSearching;
+    const keyboardActions = true;
     /** What the keyboard acts on exists: the ticked rows in select mode, else the message (or conversation) open in the reading pane. */
     const keyboardTargetExists = selectMode ? selectedMessages.length > 0 : threadPane ? openThread !== null : selected !== null;
     const rowCount = inConversations ? listedConversations.length : messages.length;
@@ -2586,13 +2580,33 @@ function InboxContent({ userUid }: { userUid?: string }) {
     // Delete is the permanent one for what is in Deleted Items: for the selection when there is one (search results can come from any folder),
     // else for the folder being viewed, so the button says so before anything is ticked.
     const deletesPermanently =
-        selectedMessages.length > 0 ? selectedMessages.every(inDeletedItems) : currentFolders.find((f) => f.uid === folderUid)?.type === "deleted_items";
-    // Empty folder is offered at the top of the list of a mailbox's own Deleted Items or Junk Email - not for search results, nor for the "All
-    // mailboxes" views, which have no one folder to empty.
-    const emptiableFolder = !isSearching && !aggregateFolderType ? currentFolders.find((f) => f.uid === folderUid && EMPTIABLE_FOLDER_TYPES.includes(f.type)) : undefined;
+        selectedMessages.length > 0
+            ? selectedMessages.every(inDeletedItems)
+            : aggregateFolderType
+              ? aggregateFolderType === "deleted_items"
+              : currentFolders.find((f) => f.uid === folderUid)?.type === "deleted_items";
+    // Empty folder is offered at the top of the list of a mailbox's own Deleted Items or Junk Email, and of the "All mailboxes" view of either, which
+    // empties each mailbox's own (a share the reader may not delete in refuses, and says so) - not for search results.
+    const emptiableFolders: Folder[] =
+        isSearching
+            ? []
+            : aggregateFolderType
+              ? EMPTIABLE_FOLDER_TYPES.includes(aggregateFolderType)
+                  ? mailboxFolders.flatMap((entry) => entry.folders.filter((f) => f.type === aggregateFolderType))
+                  : []
+              : currentFolders.filter((f) => f.uid === folderUid && EMPTIABLE_FOLDER_TYPES.includes(f.type));
+    const emptiableFolder: EmptiableFolder | undefined =
+        emptiableFolders.length === 0
+            ? undefined
+            : {
+                  uid: emptiableFolders[0].uid,
+                  name: aggregateFolderType ? (emptiableFolders[0].type === "junk" ? "Junk Email" : "Deleted Items") : emptiableFolders[0].name,
+                  uids: aggregateFolderType ? emptiableFolders.map((f) => f.uid) : undefined,
+              };
     // How many it holds as the sidebar's counts have it (kept right as messages leave), unless that says none while the list shows some.
-    const emptiableCount = emptiableFolder && folderCountOf(emptiableFolder).total > 0 ? folderCountOf(emptiableFolder).total : undefined;
-    const emptyDisabledReason = !mailboxWritable
+    const emptiableTotal = emptiableFolders.reduce((sum, f) => sum + folderCountOf(f).total, 0);
+    const emptiableCount = emptiableFolder && emptiableTotal > 0 ? emptiableTotal : undefined;
+    const emptyDisabledReason = !(aggregateFolderType ? emptiableFolders.length > 0 : mailboxWritable)
         ? "This mailbox is shared with you view-only"
         : listedRowCount === 0 && emptiableCount === undefined
           ? "This folder is already empty"
@@ -2698,14 +2712,8 @@ function InboxContent({ userUid }: { userUid?: string }) {
                                     ? CONVERSATION_SORT_NOTE
                                     : undefined
                         }
-                        selectDisabled={(!!aggregateFolderType && !isSearching) || loading || listedRowCount === 0}
-                        selectDisabledReason={
-                            aggregateFolderType && !isSearching
-                                ? "Open a mailbox's own folder to select messages"
-                                : loading
-                                  ? "Wait for this folder to finish loading"
-                                  : "There is nothing here to select"
-                        }
+                        selectDisabled={loading || listedRowCount === 0}
+                        selectDisabledReason={loading ? "Wait for this folder to finish loading" : "There is nothing here to select"}
                     />
                 )}
                 {!isMobile && <div className="p-2 border-b border-border">{searchField}</div>}

package/dist/apps/shared/components/mail/ConversationList.d.ts

@@ -30,9 +30,9 @@ export interface ConversationListProps {
      * conversation is what this list's rows are. A child row stays a plain "open this message" button - a
      * mixed conversation/message selection has no sensible bulk semantics (see `MailListToolbar`). */
     selectMode?: boolean;
-    /** The `conversationId`s currently ticked. */
+    /** The `conversationRowKey()`s currently ticked. */
     selectedConversationIds?: Set<string>;
-    onToggleSelected?: (conversation: ConversationSummary) => void;
+    onToggleSelected?: (conversation: ListedConversation) => void;
     /**
      * What swiping a parent row does on a phone: right to left archives the conversation (resolving whether it went through), left
      * to right asks where to move it. Absent, or `enabled: false` (a desktop), rows don't follow a finger.

package/dist/apps/shared/components/mail/ConversationList.js

@@ -104,7 +104,7 @@ export default function ConversationList({ conversations, mailboxUid, selectedUi
             // list itself is arranged in. Copied before reversing - the fetched array is cached.
             const children = loaded && newestFirst ? [...loaded].reverse() : loaded;
             const panelId = `conversation-messages-${conversation.mailboxUid ? `${conversation.mailboxUid}-` : ""}${conversation.conversationId}`;
-            const ticked = selectedConversationIds?.has(conversation.conversationId) ?? false;
+            const ticked = selectedConversationIds?.has(id) ?? false;
             return (_jsxs("li", { children: [_jsxs(SwipeRow, { as: "div", enabled: !!swipe?.enabled && !selectMode, onArchive: () => swipe.onArchive(conversation), onMove: () => swipe.onMove(conversation), "data-message-uid": conversation.latestMessageUid, "data-unread": unread ? "true" : undefined, className: rowClass({ unread, selected: conversation.latestMessageUid === selectedUid || ticked }, "flex items-stretch"), children: [_jsx(UnreadBar, { unread: unread }), selectMode && (_jsx("span", { className: "shrink-0 flex items-center pl-3", children: _jsx("input", { type: "checkbox", checked: ticked, onChange: () => onToggleSelected?.(conversation), "aria-label": `Select conversation: ${conversation.subject || "(no subject)"}`, className: "w-4 h-4 accent-primary" }) })), _jsx("button", { type: "button", onClick: () => toggle(conversation), "aria-expanded": isExpanded, "aria-controls": panelId, "aria-label": `${isExpanded ? "Collapse" : "Expand"} conversation: ${conversation.subject || "(no subject)"}`, className: ["shrink-0 px-2 text-text-muted hover:text-text", ROW_FOCUS_CLASS].join(" "), children: isExpanded ? (_jsx(HiChevronDown, { size: 16, "aria-hidden": "true" })) : (_jsx(HiChevronRight, { size: 16, "aria-hidden": "true" })) }), _jsxs("div", { className: "flex-1 min-w-0 flex flex-col", children: [_jsxs("button", { type: "button", "data-row-open": true, onClick: () => onOpenMessage(conversation, conversation.latestMessageUid), className: ["w-full text-left pr-4 py-3", ROW_FOCUS_CLASS].join(" "), children: [_jsx(UnreadLabel, { unread: unread }), _jsxs("div", { className: "flex items-center justify-between gap-2 text-sm", children: [_jsx(MailAddress, { recipient: conversation.participants[0] ?? conversation.latestFrom, className: ["flex-1", senderClass(unread)].join(" ") }), conversation.participants.length > 1 && (_jsxs("span", { className: "text-xs text-text-muted shrink-0 font-normal", title: participantList(conversation), children: ["+", conversation.participants.length - 1, _jsxs("span", { className: "sr-only", children: [" more: ", participantList(conversation)] })] })), _jsx("span", { className: ["text-xs shrink-0", dateClass(unread)].join(" "), children: new Date(conversation.latestDate).toLocaleDateString() })] }), _jsx("div", { className: ["text-sm truncate", subjectClass(unread)].join(" "), children: decrypted[conversation.latestMessageUid]?.subject || displaySubject(conversation.subject) || "(no subject)" }), _jsx("div", { className: "text-xs text-text-muted truncate font-normal", children: conversationLooksEncrypted(conversation) ? decrypted[conversation.latestMessageUid]?.preview || _jsx(EncryptedPreview, {}) : conversation.latestPreview }), _jsxs("div", { className: "flex items-center gap-2 mt-1 text-xs text-text-muted font-normal", children: [conversation.messageCount > 1 && _jsxs("span", { children: [conversation.messageCount, " messages"] }), unread && conversation.messageCount > 1 && (_jsxs("span", { className: "py-0.5 px-2 rounded-pill bg-primary/15 text-primary-dark font-bold", children: [conversation.unreadCount, " unread"] })), conversation.hasAttachments && (_jsx(HiOutlinePaperClip, { size: 13, "aria-label": "Has attachments" })), conversation.flagged && (_jsx(HiOutlineFlag, { size: 13, "aria-label": "Flagged", className: "text-danger" }))] })] }), _jsx(InviteRowChip, { message: {
                                             uid: conversation.latestMessageUid,
                                             meetingMethod: conversation.latestMeetingMethod ?? undefined,

package/dist/apps/shared/mail/usePermanentDelete.d.ts

@@ -5,6 +5,8 @@ import { EmptyFolderOutcome, PurgeOutcome } from "./permanentDelete.js";
 export interface EmptiableFolder {
     uid: string;
     name: string;
+    /** Every folder to empty, when "the folder" is the "All mailboxes" view of one type (each mailbox's own Deleted Items): `uid` is then the first of them. */
+    uids?: string[];
 }
 export interface PermanentDelete {
     /**

package/dist/apps/shared/mail/usePermanentDelete.js

@@ -65,14 +65,19 @@ export function usePermanentDelete() {
             finish(outcome);
             return;
         }
-        let outcome;
-        try {
-            outcome = await purgeFolder(request.folder.uid, undefined, client);
-        }
-        catch (err) {
-            notifyApiError(err, `Couldn't empty ${request.folder.name}`);
-            // Part of it may have gone before the failure: the caller reloads rather than assume nothing did.
-            outcome = { emptied: false, deleted: [], failed: [] };
+        const outcome = { emptied: true, deleted: [], failed: [] };
+        for (const folderUid of request.folder.uids ?? [request.folder.uid]) {
+            try {
+                const one = await purgeFolder(folderUid, undefined, client);
+                outcome.emptied && (outcome.emptied = one.emptied);
+                outcome.deleted.push(...one.deleted);
+                outcome.failed.push(...one.failed);
+            }
+            catch (err) {
+                notifyApiError(err, `Couldn't empty ${request.folder.name}`);
+                // Part of it may have gone before the failure: the caller reloads rather than assume nothing did.
+                outcome.emptied = false;
+            }
         }
         afterDeleted(outcome.deleted);
         // The whole-folder request does not say which messages went, so the counts are read back rather than adjusted.

package/dist/apps/www/index.js

@@ -804,12 +804,6 @@ function InboxContent({ userUid }) {
             setSearchAllMailboxes(false);
         }
     }, [searchQuery]);
-    // Rows can be ticked in the results of a search over every mailbox, but not in the listing they came out of: clearing the search leaves select mode.
-    useEffect(() => {
-        if (aggregateFolderType && !isSearching) {
-            setSelectMode(false);
-        }
-    }, [aggregateFolderType, isSearching]);
     // Which listing this is, for the short-lived snapshot of each folder that makes going back to one instant (see
     // `listSnapshots.ts`). A search, an aggregate view and a folder that hasn't resolved have no snapshot.
     const listKey = listSnapshotKey({
@@ -1582,7 +1576,7 @@ function InboxContent({ userUid }) {
      * that is in the folder being listed. A conversation spans folders (an Inbox message and the Sent
      * Items copy of its reply), and the list only ever showed this folder's half of it, so a bulk action
      * from here must not reach into the other folders' copies either. */
-    const selectedConversationMessages = [...selectedConversationIds].flatMap((id) => (conversationMessagesById[id] ?? []).filter((m) => !folderUid || m.folderUid === folderUid));
+    const selectedConversationMessages = [...selectedConversationIds].flatMap((id) => (conversationMessagesById[id] ?? []).filter((m) => (aggregateFolderType ? folderTypeOf(m.folderUid) === aggregateFolderType : !folderUid || m.folderUid === folderUid)));
     const selectedMessages = asConversations
         ? selectedConversationMessages
         : messages.filter((m) => selectedUids.has(m.uid));
@@ -1622,22 +1616,24 @@ function InboxContent({ userUid }) {
     /** Loads (once) the messages behind each of `ids`, so a ticked conversation resolves to the messages
      * every bulk action below acts on. If any of them fails to load, none of that batch stays ticked and
      * a pop-up says why - better than acting on the part of a selection that happened to arrive. */
-    async function resolveConversations(ids) {
-        const missing = ids.filter((id) => !conversationMessagesById[id]);
+    async function resolveConversations(rows) {
+        const missing = rows.filter((row) => !conversationMessagesById[conversationKey(row)]);
         if (missing.length === 0) {
             return;
         }
         setResolvingSelection((n) => n + 1);
         try {
-            const loaded = await Promise.all(missing.map(async (id) => [id, await listConversationMessages(activeMailboxUid, id, {}, client)]));
+            const loaded = await Promise.all(
+            // A row of the "All mailboxes" view names its own mailbox; any other list is the open mailbox's.
+            missing.map(async (row) => [conversationKey(row), await listConversationMessages(row.mailboxUid ?? activeMailboxUid, row.conversationId, {}, client)]));
             setConversationMessagesById((prev) => ({ ...prev, ...Object.fromEntries(loaded) }));
         }
         catch (err) {
             notifyApiError(err, "Couldn't load the messages in one of those conversations");
             setSelectedConversationIds((prev) => {
                 const next = new Set(prev);
-                for (const id of missing) {
-                    next.delete(id);
+                for (const row of missing) {
+                    next.delete(conversationKey(row));
                 }
                 return next;
             });
@@ -1647,7 +1643,7 @@ function InboxContent({ userUid }) {
         }
     }
     function toggleConversationSelected(conversation) {
-        const id = conversation.conversationId;
+        const id = conversationKey(conversation);
         const ticking = !selectedConversationIds.has(id);
         setSelectedConversationIds((prev) => {
             const next = new Set(prev);
@@ -1660,13 +1656,12 @@ function InboxContent({ userUid }) {
             return next;
         });
         if (ticking) {
-            void resolveConversations([id]);
+            void resolveConversations([conversation]);
         }
     }
     function selectAllConversations() {
-        const ids = conversations.map(conversationKey);
-        setSelectedConversationIds(new Set(ids));
-        void resolveConversations(ids);
+        setSelectedConversationIds(new Set(conversations.map(conversationKey)));
+        void resolveConversations(conversations);
     }
     /**
      * Runs one bulk action over the current selection, then either patches the affected rows in place or
@@ -1951,7 +1946,7 @@ function InboxContent({ userUid }) {
     const inConversations = asConversations;
     /** The selection bar isn't offered in the aggregate listing (its rows belong to several mailboxes), and neither are these - but the results of a
      * search over them are, each hit acted on in its own mailbox (see `inEachMailbox()`). */
-    const keyboardActions = !aggregateFolderType || isSearching;
+    const keyboardActions = true;
     /** What the keyboard acts on exists: the ticked rows in select mode, else the message (or conversation) open in the reading pane. */
     const keyboardTargetExists = selectMode ? selectedMessages.length > 0 : threadPane ? openThread !== null : selected !== null;
     const rowCount = inConversations ? listedConversations.length : messages.length;
@@ -2132,13 +2127,31 @@ function InboxContent({ userUid }) {
         : undefined;
     // Delete is the permanent one for what is in Deleted Items: for the selection when there is one (search results can come from any folder),
     // else for the folder being viewed, so the button says so before anything is ticked.
-    const deletesPermanently = selectedMessages.length > 0 ? selectedMessages.every(inDeletedItems) : currentFolders.find((f) => f.uid === folderUid)?.type === "deleted_items";
-    // Empty folder is offered at the top of the list of a mailbox's own Deleted Items or Junk Email - not for search results, nor for the "All
-    // mailboxes" views, which have no one folder to empty.
-    const emptiableFolder = !isSearching && !aggregateFolderType ? currentFolders.find((f) => f.uid === folderUid && EMPTIABLE_FOLDER_TYPES.includes(f.type)) : undefined;
+    const deletesPermanently = selectedMessages.length > 0
+        ? selectedMessages.every(inDeletedItems)
+        : aggregateFolderType
+            ? aggregateFolderType === "deleted_items"
+            : currentFolders.find((f) => f.uid === folderUid)?.type === "deleted_items";
+    // Empty folder is offered at the top of the list of a mailbox's own Deleted Items or Junk Email, and of the "All mailboxes" view of either, which
+    // empties each mailbox's own (a share the reader may not delete in refuses, and says so) - not for search results.
+    const emptiableFolders = isSearching
+        ? []
+        : aggregateFolderType
+            ? EMPTIABLE_FOLDER_TYPES.includes(aggregateFolderType)
+                ? mailboxFolders.flatMap((entry) => entry.folders.filter((f) => f.type === aggregateFolderType))
+                : []
+            : currentFolders.filter((f) => f.uid === folderUid && EMPTIABLE_FOLDER_TYPES.includes(f.type));
+    const emptiableFolder = emptiableFolders.length === 0
+        ? undefined
+        : {
+            uid: emptiableFolders[0].uid,
+            name: aggregateFolderType ? (emptiableFolders[0].type === "junk" ? "Junk Email" : "Deleted Items") : emptiableFolders[0].name,
+            uids: aggregateFolderType ? emptiableFolders.map((f) => f.uid) : undefined,
+        };
     // How many it holds as the sidebar's counts have it (kept right as messages leave), unless that says none while the list shows some.
-    const emptiableCount = emptiableFolder && folderCountOf(emptiableFolder).total > 0 ? folderCountOf(emptiableFolder).total : undefined;
-    const emptyDisabledReason = !mailboxWritable
+    const emptiableTotal = emptiableFolders.reduce((sum, f) => sum + folderCountOf(f).total, 0);
+    const emptiableCount = emptiableFolder && emptiableTotal > 0 ? emptiableTotal : undefined;
+    const emptyDisabledReason = !(aggregateFolderType ? emptiableFolders.length > 0 : mailboxWritable)
         ? "This mailbox is shared with you view-only"
         : listedRowCount === 0 && emptiableCount === undefined
             ? "This folder is already empty"
@@ -2174,11 +2187,7 @@ function InboxContent({ userUid }) {
                                 ? "This view merges the newest mail from every mailbox and is always listed by date."
                                 : asConversations
                                     ? CONVERSATION_SORT_NOTE
-                                    : undefined, selectDisabled: (!!aggregateFolderType && !isSearching) || loading || listedRowCount === 0, selectDisabledReason: aggregateFolderType && !isSearching
-                            ? "Open a mailbox's own folder to select messages"
-                            : loading
-                                ? "Wait for this folder to finish loading"
-                                : "There is nothing here to select" })), !isMobile && _jsx("div", { className: "p-2 border-b border-border", children: searchField }), isMobile && mobileSearchSlot && createPortal(searchField, mobileSearchSlot), emptiableFolder && !selectMode && (_jsx(EmptyFolderBar, { folderName: emptiableFolder.name, count: emptiableCount, disabled: !!emptyDisabledReason || permanent.busy || bulkBusy, disabledReason: emptyDisabledReason, onEmpty: () => void emptyListedFolder(emptiableFolder, emptiableCount) })), permanent.dialog, offerClassificationFilters && (_jsx("div", { className: "flex border-b border-border text-xs", children: MAIL_LIST_CLASSIFICATION_FILTERS.map(({ value, label }) => (_jsx("button", { type: "button", "aria-pressed": preferences.filter === value, onClick: () => updatePreferences({ filter: value }), className: [
+                                    : undefined, selectDisabled: loading || listedRowCount === 0, selectDisabledReason: loading ? "Wait for this folder to finish loading" : "There is nothing here to select" })), !isMobile && _jsx("div", { className: "p-2 border-b border-border", children: searchField }), isMobile && mobileSearchSlot && createPortal(searchField, mobileSearchSlot), emptiableFolder && !selectMode && (_jsx(EmptyFolderBar, { folderName: emptiableFolder.name, count: emptiableCount, disabled: !!emptyDisabledReason || permanent.busy || bulkBusy, disabledReason: emptyDisabledReason, onEmpty: () => void emptyListedFolder(emptiableFolder, emptiableCount) })), permanent.dialog, offerClassificationFilters && (_jsx("div", { className: "flex border-b border-border text-xs", children: MAIL_LIST_CLASSIFICATION_FILTERS.map(({ value, label }) => (_jsx("button", { type: "button", "aria-pressed": preferences.filter === value, onClick: () => updatePreferences({ filter: value }), className: [
                                 "flex-1 py-1.5 font-semibold",
                                 preferences.filter === value
                                     ? "text-primary-dark border-b-2 border-primary-dark"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rapidmx/web-client",
-  "version": "0.27.0",
+  "version": "0.28.0",
   "description": "RapidMX's webmail and admin console React UI for web-based clients.",
   "type": "module",
   "repository": "https://github.com/rapidmx/web-client",