@rapidmx/web-client 0.20.0 → 0.22.0

package/dist/apps/shared/components/mail/compose/ComposeContext.js

@@ -4,7 +4,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { createContext, useContext, useEffect, useMemo, useRef, useState } from "react";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import { useApiClient } from "../../../../../lib/util/apiClientContext.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import { registerComposeOpener } from "../../../mail/outbox/composeBridge.js";
 import { markComposePhase } from "./composePerf.js";
 import ComposeWindowPlaceholder from "./ComposeWindowPlaceholder.js";
@@ -81,6 +82,7 @@ export function useCompose() {
  */
 export default function ComposeProvider({ children, userUid, trusted }) {
     const [sessions, setSessions] = useState([]);
+    const client = useApiClient();
     const isMobile = useIsMobile();
     const { Component: ComposeWindow, failed, retry: retryLoad } = useComposeWindowComponent(sessions.length > 0);
     // The top edge of the compose windows, published as `--rr-compose-top` so the pop-up stack (`NotificationCenter`) can keep clear of them.
@@ -134,7 +136,7 @@ export default function ComposeProvider({ children, userUid, trusted }) {
     function toggleMinimize(id) {
         setSessions((prev) => prev.map((s) => (s.id === id ? { ...s, minimized: !s.minimized } : s)));
     }
-    const value = useMemo(() => ({ openCompose }), []);
+    const value = useMemo(() => ({ openCompose, client }), [client]);
     // Code with no React context - a failed send's "Open draft" pop-up - opens windows through this.
     useEffect(() => registerComposeOpener((input) => value.openCompose(input)), [value]);
     // On mobile, a non-minimized `ComposeWindow` renders full-screen (see that component's own doc

package/dist/apps/shared/components/mail/compose/ComposeWindow.d.ts

@@ -12,12 +12,18 @@ export interface ComposeWindowProps {
     /** How long (ms) after the last edit the draft is autosaved. Defaults to `DEFAULT_AUTOSAVE_DELAY_MS`;
      * only overridden by tests. */
     autosaveDelayMs?: number;
+    /** The longest (ms) an unsaved edit waits before the draft is saved even though typing hasn't paused - so a
+     * message written without a 2-second break is still saved regularly. Defaults to `DEFAULT_AUTOSAVE_MAX_WAIT_MS`
+     * and is never shorter than `autosaveDelayMs`; only overridden by tests. */
+    autosaveMaxWaitMs?: number;
     /** Backoff (ms) between automatic retries of a failed mailbox/encryption-policy load, one entry per retry.
      * Defaults to `DEFAULT_CRYPTO_RETRY_DELAYS_MS`; only overridden by tests. */
     cryptoRetryDelaysMs?: number[];
 }
 /** Debounce between the last edit and the draft autosave. */
 export declare const DEFAULT_AUTOSAVE_DELAY_MS = 2000;
+/** The longest an edit stays unsaved while the user keeps typing (the debounce above restarts on every keystroke, so it alone never fires then). */
+export declare const DEFAULT_AUTOSAVE_MAX_WAIT_MS = 30000;
 /** Automatic, silent retries of a failed mailbox/encryption-policy (or recipient key) load, one entry per retry - a flapping gateway is waited out
  * in the background, without a word to the user. */
 export declare const DEFAULT_CRYPTO_RETRY_DELAYS_MS: number[];
@@ -35,4 +41,4 @@ export declare const DEFAULT_CRYPTO_RETRY_DELAYS_MS: number[];
  * see `ComposeContext.tsx`'s own doc comment for how that interacts with several sessions being open at
  * once.
  */
-export default function ComposeWindow({ session, onClose, onToggleMinimize, userUid, trusted, autosaveDelayMs, cryptoRetryDelaysMs, }: ComposeWindowProps): React.JSX.Element;
+export default function ComposeWindow({ session, onClose, onToggleMinimize, userUid, trusted, autosaveDelayMs, autosaveMaxWaitMs, cryptoRetryDelaysMs, }: ComposeWindowProps): React.JSX.Element;

package/dist/apps/shared/components/mail/compose/ComposeWindow.js

@@ -5,17 +5,17 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useRef, useState } from "react";
 import { HiOutlineArrowsPointingIn, HiOutlineArrowsPointingOut, HiOutlineChevronDown, HiOutlineLockClosed, HiOutlineMinus, HiOutlinePaperClip, HiOutlineTrash, HiOutlineXMark, } from "react-icons/hi2";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { assembleDraft, attachmentContentUrl, createDraft, deleteMessage, getMailbox, getMessage, listFolders, listMailboxes, uploadAttachment, } from "@rapidmx/react-shared/mail/mailApi.js";
-import { listMailSignatures } from "@rapidmx/react-shared/mail/mailSignaturesApi.js";
-import { buildComposeBodyHtml } from "@rapidmx/react-shared/mail/compose/composeQuoting.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import { assembleDraft, attachmentContentUrl, createDraft, deleteMessage, getMailbox, getMessage, listFolders, listMailboxes, uploadAttachment, } from "../../../../../lib/mail/mailApi.js";
+import { listMailSignatures } from "../../../../../lib/mail/mailSignaturesApi.js";
+import { buildComposeBodyHtml } from "../../../../../lib/mail/compose/composeQuoting.js";
 import { peekMailboxWritability, useMailboxWritability } from "../writableMailboxes.js";
 import { orderMailboxes, primaryMailboxUid } from "../../../mail/primaryMailbox.js";
-import { resolveRecipientEncryption } from "@rapidmx/react-shared/crypto/composeSecurity.js";
-import { getUnlockedKeys, subscribeKeySession } from "@rapidmx/react-shared/crypto/keySession.js";
-import { findActivePublicKey, getEncryptionPolicy, lookupKeys } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+import { resolveRecipientEncryption } from "../../../../../lib/crypto/composeSecurity.js";
+import { getUnlockedKeys, subscribeKeySession } from "../../../../../lib/crypto/keySession.js";
+import { findActivePublicKey, getEncryptionPolicy, lookupKeys } from "../../../../../lib/crypto/keyvaultApi.js";
 import { useUnlockPrompt } from "../../layout/UnlockPromptProvider.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import { notify } from "../../../notifications/store.js";
 import { evaluateEncryptionRequirement } from "./encryptionRequirement.js";
 import { decideSend } from "../../../mail/outbox/sendDecision.js";
@@ -31,11 +31,13 @@ import RecipientInput from "./RecipientInput.js";
 import { parseRecipientList } from "./recipients.js";
 import RichTextEditor from "./RichTextEditor.js";
 import ScheduleSendPicker from "./ScheduleSendPicker.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
+import Alert from "../../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
+import Modal from "../../../../../lib/components/overlays/Modal.js";
 /** Debounce between the last edit and the draft autosave. */
 export const DEFAULT_AUTOSAVE_DELAY_MS = 2000;
+/** The longest an edit stays unsaved while the user keeps typing (the debounce above restarts on every keystroke, so it alone never fires then). */
+export const DEFAULT_AUTOSAVE_MAX_WAIT_MS = 30000;
 /** Automatic, silent retries of a failed mailbox/encryption-policy (or recipient key) load, one entry per retry - a flapping gateway is waited out
  * in the background, without a word to the user. */
 export const DEFAULT_CRYPTO_RETRY_DELAYS_MS = [1000, 2000, 4000, 8000, 15000, 30000, 60000];
@@ -96,7 +98,7 @@ function HeaderButton({ label, onClick, icon: Icon, disabled, shortcut, }) {
  * see `ComposeContext.tsx`'s own doc comment for how that interacts with several sessions being open at
  * once.
  */
-export default function ComposeWindow({ session, onClose, onToggleMinimize, userUid, trusted, autosaveDelayMs = DEFAULT_AUTOSAVE_DELAY_MS, cryptoRetryDelaysMs = DEFAULT_CRYPTO_RETRY_DELAYS_MS, }) {
+export default function ComposeWindow({ session, onClose, onToggleMinimize, userUid, trusted, autosaveDelayMs = DEFAULT_AUTOSAVE_DELAY_MS, autosaveMaxWaitMs = DEFAULT_AUTOSAVE_MAX_WAIT_MS, cryptoRetryDelaysMs = DEFAULT_CRYPTO_RETRY_DELAYS_MS, }) {
     const { id, initialTo, initialCc, initialSubject, initialQuotedHtml, initialEncrypt, signatureContext, suppressSigning, minimized, quotePending, late, resume } = session;
     // What a reply worked out after this window opened (see `OpenComposeInput.pending`): better recipients, applied below
     // only to fields still exactly as they opened - so these, not `initialTo`/`initialCc`, are what "untouched" is measured against.
@@ -117,7 +119,11 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
     const [hasUploads, setHasUploads] = useState(!!resume && resume.attachments.length > 0);
     const isMobile = useIsMobile();
     const { requestUnlock } = useUnlockPrompt();
-    const { openCompose } = useCompose();
+    // Resolved once by `ComposeProvider` (see `ComposeContext.tsx`'s own doc comment on `ComposeContextValue.client`)
+    // rather than calling `useApiClient()` again here - every REST call below (including `startSend()`'s own,
+    // see `sendJob.ts`) passes it through as the trailing `client` argument, `undefined` (the default global
+    // cookie-based fetch) for every existing caller.
+    const { openCompose, client } = useCompose();
     const keyEnv = useKeyEnvironment();
     // Bumped after a successful on-demand unlock to force a re-render - `getUnlockedKeys()` below is a
     // plain read from a module-level store, not React state, so nothing else would pick up the change.
@@ -197,6 +203,8 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
     const lastSavedRef = useRef(null);
     /** An edit is waiting on the autosave debounce - flushed if the window unmounts first. */
     const pendingSaveRef = useRef(false);
+    /** Fires the save when an edit has waited `autosaveMaxWaitMs` without the debounce ever getting a pause to fire in. */
+    const maxWaitTimerRef = useRef(undefined);
     /** Send was pressed and is being validated/handed over: a second press (a double click, the shortcut held or repeated) does nothing. */
     const submittingRef = useRef(false);
     /** Attachment/inline-image uploads on the wire, and who is waiting for them to finish (Send pressed meanwhile). */
@@ -215,7 +223,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
     // to apply - see the transition rules there.
     useEffect(() => {
         let cancelled = false;
-        listMailboxes({ limit: 100 })
+        listMailboxes({ limit: 100 }, client)
             .then((result) => {
             if (cancelled) {
                 return;
@@ -252,14 +260,14 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         async function load() {
             await Promise.all([
                 mailboxLoaded ||
-                    getMailbox(mailboxUid).then((result) => {
+                    getMailbox(mailboxUid, {}, client).then((result) => {
                         mailboxLoaded = true;
                         if (!cancelled) {
                             setMailbox(result);
                         }
                     }, () => undefined),
                 policyLoaded ||
-                    getEncryptionPolicy().then((result) => {
+                    getEncryptionPolicy(client).then((result) => {
                         policyLoaded = true;
                         if (!cancelled) {
                             setEncryptionPolicy(result);
@@ -283,7 +291,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         // Cancellable so a slow response for a mailbox the user has since switched away from can't point
         // the new draft at the wrong mailbox's Drafts folder.
         let cancelled = false;
-        listFolders(mailboxUid)
+        listFolders(mailboxUid, client)
             .then((folders) => {
             if (!cancelled) {
                 setDraftsFolderUid(folders.find((f) => f.type === "drafts")?.uid);
@@ -322,7 +330,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         for (const recipient of unchecked) {
             const key = addressCacheKey(recipient.address);
             inFlight.add(key);
-            void lookupKeys(mailbox.uid, recipient.address)
+            void lookupKeys(mailbox.uid, recipient.address, client)
                 .then((lookup) => ({ lookup }), () => null)
                 .then((result) => {
                 inFlight.delete(key);
@@ -383,7 +391,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         if (!mailboxUid || contentReady || defaultSignature) {
             return;
         }
-        listMailSignatures(mailboxUid)
+        listMailSignatures(mailboxUid, {}, client)
             .then((signatures) => {
             const signature = signatures.find((s) => signatureContext === "new" ? s.isDefaultForNewMessages : s.isDefaultForReplyForward);
             setDefaultSignature({ html: signature?.contentHtml });
@@ -415,11 +423,11 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         // `In-Reply-To`/`References` and groups the message into the thread being answered. Recorded on
         // every draft this window creates, including the replacement one a From switch makes - the thread
         // doesn't change because the sending mailbox did.
-        createDraft(mailboxUid, draftsFolderUid, session.threading)
+        createDraft(mailboxUid, draftsFolderUid, session.threading, client)
             .then((created) => {
             if (cancelled) {
                 // The sender changed while this was in flight - discard the now-orphaned draft.
-                void deleteMessage(created.uid, created.version).catch(() => undefined);
+                void deleteMessage(created.uid, created.version, client).catch(() => undefined);
                 return;
             }
             setDraft(created);
@@ -459,13 +467,13 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         // Once it's out of `supersededDraftsRef` a landing save can't update `superseded.version` any more.
         const version = saved?.uid === superseded.uid ? saved.version : superseded.version;
         try {
-            await deleteMessage(superseded.uid, version);
+            await deleteMessage(superseded.uid, version, client);
         }
         catch {
             try {
-                const fresh = await getMessage(superseded.uid);
+                const fresh = await getMessage(superseded.uid, client);
                 if (isStillDraft(fresh, superseded.folderUid)) {
-                    await deleteMessage(fresh.uid, fresh.version);
+                    await deleteMessage(fresh.uid, fresh.version, client);
                 }
             }
             catch {
@@ -598,7 +606,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
      * current version. */
     async function refreshDraftVersion(uid) {
         try {
-            const fresh = await getMessage(uid);
+            const fresh = await getMessage(uid, client);
             setDraft((prev) => (prev?.uid === fresh.uid && fresh.version > prev.version ? { ...prev, version: fresh.version } : prev));
         }
         catch {
@@ -709,7 +717,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
             }
             pendingSaveRef.current = false;
             finishedRef.current = true;
-            if (!startSend(request)) {
+            if (!startSend(request, client)) {
                 finishedRef.current = false;
                 setSendError("This message is already being sent.");
                 return;
@@ -751,6 +759,8 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         const target = latestRef.current.draft;
         const previous = saveInFlightRef.current;
         pendingSaveRef.current = false;
+        clearTimeout(maxWaitTimerRef.current);
+        maxWaitTimerRef.current = undefined;
         setSaveStatus("saving");
         const outcome = (async () => {
             const before = await previous;
@@ -772,7 +782,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
                     bcc: parseAddresses(current.bcc),
                     subject: current.subject,
                     html: current.html,
-                });
+                }, client);
                 lastSavedRef.current = savedKey;
                 saveErrorRef.current = null;
                 // A From switch may have replaced the draft while this was in flight - never resurrect it,
@@ -812,13 +822,13 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
         const saved = await saveInFlightRef.current;
         const version = Math.max(current.version, saved?.uid === current.uid ? saved.version : 0);
         try {
-            await deleteMessage(current.uid, version);
+            await deleteMessage(current.uid, version, client);
         }
         catch (err) {
             if (!(err instanceof ApiRequestError) || (err.status !== 404 && err.status !== 409)) {
                 throw err;
             }
-            const fresh = await getMessage(current.uid).catch((getErr) => {
+            const fresh = await getMessage(current.uid, client).catch((getErr) => {
                 if (getErr instanceof ApiRequestError && getErr.status === 404) {
                     return null;
                 }
@@ -831,7 +841,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
             if (!isStillDraft(fresh, current.folderUid)) {
                 throw new ApiRequestError(NO_LONGER_A_DRAFT_MESSAGE, 409);
             }
-            await deleteMessage(fresh.uid, fresh.version);
+            await deleteMessage(fresh.uid, fresh.version, client);
         }
     }
     /**
@@ -979,7 +989,7 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
             await previous;
             try {
                 // Its answer (the new version) is what a later delete waits for through `saveInFlightRef`, like any save's.
-                return await assembleDraft(target.uid, { to: [], cc: [], bcc: [], subject: "", html: "" });
+                return await assembleDraft(target.uid, { to: [], cc: [], bcc: [], subject: "", html: "" }, client);
             }
             catch {
                 notify({
@@ -1022,14 +1032,27 @@ export default function ComposeWindow({ session, onClose, onToggleMinimize, user
             lastSavedRef.current !== `${draft.uid}:${contentKey}`;
         pendingSaveRef.current = due;
         if (!due) {
+            clearTimeout(maxWaitTimerRef.current);
+            maxWaitTimerRef.current = undefined;
             return;
         }
+        // The debounce below restarts on every edit, so steady typing never lets it fire: this timer, started by the first unsaved edit and stopped
+        // by the save that follows, is what saves such a message at a regular interval.
+        if (maxWaitTimerRef.current === undefined) {
+            maxWaitTimerRef.current = setTimeout(() => {
+                maxWaitTimerRef.current = undefined;
+                if (pendingSaveRef.current && !finishedRef.current) {
+                    void saveDraftNow();
+                }
+            }, Math.max(autosaveMaxWaitMs, autosaveDelayMs));
+        }
         const timer = setTimeout(() => void saveDraftNow(), autosaveDelayMs);
         return () => clearTimeout(timer);
     }, [draft, contentReady, autosaveSuppressed, hasUserContent, contentKey]);
     // Unmounting with an edit still waiting on the debounce (e.g. the whole app shell unmounting) saves it
     // right away rather than losing it.
     useEffect(() => () => {
+        clearTimeout(maxWaitTimerRef.current);
         if (pendingSaveRef.current && !finishedRef.current) {
             void saveDraftNow();
         }

package/dist/apps/shared/components/mail/compose/ComposeWindowPlaceholder.js

@@ -5,10 +5,10 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect } from "react";
 import { HiOutlineMinus, HiOutlineXMark } from "react-icons/hi2";
-import Skeleton from "@rapidmx/react-shared/components/feedback/Skeleton.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import Skeleton from "../../../../../lib/components/feedback/Skeleton.js";
+import Alert from "../../../../../lib/components/feedback/Alert.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import { markComposePhase } from "./composePerf.js";
 /**
  * What stands in for the compose window in the moment between clicking Compose/Reply/Forward and the window's code being

package/dist/apps/shared/components/mail/compose/EmojiPicker.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { EMOJI_CATEGORIES } from "@rapidmx/react-shared/mail/compose/emojiData.js";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import { EMOJI_CATEGORIES } from "../../../../../lib/mail/compose/emojiData.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
 const CATEGORY_LABELS = {
     people: "Smileys & People",
     nature: "Animals & Nature",

package/dist/apps/shared/components/mail/compose/GifPicker.js

@@ -4,9 +4,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { searchGifs } from "@rapidmx/react-shared/mail/compose/giphyApi.js";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import { ApiRequestError } from "../../../../../lib/util/api.js";
+import { searchGifs } from "../../../../../lib/mail/compose/giphyApi.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
 const SEARCH_DEBOUNCE_MS = 350;
 const WIDTH = 288;
 const HEIGHT = 320;

package/dist/apps/shared/components/mail/compose/RecipientInput.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import { type ContactSuggestionOptions, type RecipientSuggestion } from "@rapidmx/react-shared/mail/directoryApi.js";
+import { type ContactSuggestionOptions, type RecipientSuggestion } from "../../../../../lib/mail/directoryApi.js";
 /** How long typing must pause before suggestions are requested. */
 export declare const RECIPIENT_SUGGESTION_DEBOUNCE_MS = 150;
 export interface RecipientInputProps {

package/dist/apps/shared/components/mail/compose/RecipientInput.js

@@ -6,7 +6,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useLayoutEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
 import { HiOutlineXMark } from "react-icons/hi2";
-import { fetchRecipientSuggestions, RECIPIENT_SUGGESTION_MIN_QUERY_LENGTH, } from "@rapidmx/react-shared/mail/directoryApi.js";
+import { fetchRecipientSuggestions, RECIPIENT_SUGGESTION_MIN_QUERY_LENGTH, } from "../../../../../lib/mail/directoryApi.js";
 import { formatRecipient, isValidRecipientAddress, parseRecipient, splitRecipientList, splitTypedRecipients } from "./recipients.js";
 /** How long typing must pause before suggestions are requested. */
 export const RECIPIENT_SUGGESTION_DEBOUNCE_MS = 150;

package/dist/apps/shared/components/mail/compose/ScheduleSendPicker.js

@@ -4,7 +4,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useState } from "react";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
 /**
  * The "Send later" popover next to Compose's Send button — same `PopoverPortal` shell
  * `EmojiPicker`/`GifPicker`/`ResourcePicker` already use, just holding a single `datetime-local` input

package/dist/apps/shared/components/mail/compose/encryptionRequirement.d.ts

@@ -1,5 +1,5 @@
-import { RecipientEncryptionStatus } from "@rapidmx/react-shared/crypto/composeSecurity.js";
-import type { EncryptionPolicy } from "@rapidmx/react-shared/crypto/keyvaultApi.js";
+import { RecipientEncryptionStatus } from "../../../../../lib/crypto/composeSecurity.js";
+import type { EncryptionPolicy } from "../../../../../lib/crypto/keyvaultApi.js";
 /**
  * Whether a message must be treated as encrypted - the one place that decides it, as a pure function of what is *known*.
  *

package/dist/apps/shared/components/mail/compose/encryptionRequirement.js

@@ -2,7 +2,7 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import { decideMessageEncryption } from "@rapidmx/react-shared/crypto/composeSecurity.js";
+import { decideMessageEncryption } from "../../../../../lib/crypto/composeSecurity.js";
 /** Any tier of `policy` auto-encrypts - only then can what is still unknown about the recipients turn a message into an encrypted one. */
 export function policyCanAutoEncrypt(policy) {
     return [policy.encryptSameOrg, policy.encryptFederated, policy.encryptExternal].includes("automatic");

package/dist/apps/shared/components/mail/compose/quotedBody.d.ts

@@ -1,6 +1,6 @@
-import { Message, Recipient } from "@rapidmx/react-shared/mail/mailApi.js";
-import type { QuotedBody } from "@rapidmx/react-shared/mail/compose/composeQuoting.js";
-import type { MessageSecurityResult } from "@rapidmx/react-shared/crypto/messageSecurity.js";
+import { Message, Recipient } from "../../../../../lib/mail/mailApi.js";
+import type { QuotedBody } from "../../../../../lib/mail/compose/composeQuoting.js";
+import type { MessageSecurityResult } from "../../../../../lib/crypto/messageSecurity.js";
 /** What a Reply/Reply All/Forward needs from the message being answered, beyond what its `Message` record holds. */
 export interface OriginalMessage {
     /** The body to quote. Empty when none could be loaded - the quote builders then fall back to `bodyPreview`. */

package/dist/apps/shared/components/mail/compose/quotedBody.js

@@ -2,9 +2,9 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import { apiUrl } from "@rapidmx/react-shared/util/api.js";
-import { getMessageRawContent } from "@rapidmx/react-shared/mail/mailApi.js";
-import { decodeHeaderText, extractDisplayBody, parseMimeEntity } from "@rapidmx/react-shared/crypto/mime.js";
+import { apiUrl } from "../../../../../lib/util/api.js";
+import { getMessageRawContent } from "../../../../../lib/mail/mailApi.js";
+import { decodeHeaderText, extractDisplayBody, parseMimeEntity } from "../../../../../lib/crypto/mime.js";
 import { parseRecipientList } from "./recipients.js";
 /** How long a reply waits for the original's body before it goes ahead with the preview - a slow or hung request must not
  * leave the window waiting on it (or, before it opened at once, keep it from opening) indefinitely. */

package/dist/apps/shared/components/mail/compose/recipients.d.ts

@@ -3,7 +3,7 @@
  * semicolons, each either a bare address or `Display Name <address>` (the name optionally quoted, so it can hold a comma
  * or semicolon itself). Separators inside quotes or angle brackets don't split.
  */
-import type { ComposeRecipientInput } from "@rapidmx/react-shared/mail/mailApi.js";
+import type { ComposeRecipientInput } from "../../../../../lib/mail/mailApi.js";
 /** Splits a field's text into trimmed, non-empty recipient strings - see `splitRaw()`. */
 export declare function splitRecipientList(value: string): string[];
 /** Splits text typed into a field: the recipients finished by a separator, and the text after the last separator

package/dist/apps/shared/components/mail/invite/InviteRowChip.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { Message } from "@rapidmx/react-shared/mail/mailApi.js";
+import type { Message } from "../../../../../lib/mail/mailApi.js";
 export interface InviteRowChipProps {
     message: Message;
     /** Called with the row's message carrying the reader's new answer (`meetingResponse`), after an RSVP, so the list can show it. */

package/dist/apps/shared/components/mail/invite/InviteRsvpPopover.d.ts

@@ -1,5 +1,5 @@
 import React, { RefObject } from "react";
-import { MessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
+import { MessageInvite } from "../../../../../lib/calendar/inviteApi.js";
 export interface InviteRsvpPopoverProps {
     messageUid: string;
     invite: MessageInvite;

package/dist/apps/shared/components/mail/invite/InviteRsvpPopover.js

@@ -5,11 +5,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 ///////////////////////////////////////////////////////////////////////////////
 import { useEffect, useId, useRef, useState } from "react";
 import { HiOutlineCheck, HiOutlineEllipsisHorizontal } from "react-icons/hi2";
-import { proposeNewTime, respondToMessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
-import Modal from "@rapidmx/react-shared/components/overlays/Modal.js";
-import PopoverPortal from "@rapidmx/react-shared/components/overlays/PopoverPortal.js";
-import useIsMobile from "@rapidmx/react-shared/util/useIsMobile.js";
+import { proposeNewTime, respondToMessageInvite } from "../../../../../lib/calendar/inviteApi.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
+import Modal from "../../../../../lib/components/overlays/Modal.js";
+import PopoverPortal from "../../../../../lib/components/overlays/PopoverPortal.js";
+import { useApiClient } from "../../../../../lib/util/apiClientContext.js";
+import useIsMobile from "../../../../../lib/util/useIsMobile.js";
 import { notifyApiError } from "../../../notifications/apiErrors.js";
 import { calendarHref, conflictSummary, formatInviteWhen } from "./inviteFormat.js";
 import InviteTimeline from "./InviteTimeline.js";
@@ -44,6 +45,7 @@ const RESPONSES = [
 /** What is inside the RSVP popover (or dialog): the meeting, a day view around it and the buttons that answer it. */
 function RsvpPanel({ messageUid, invite, onDone, onClose, onProposingChange }) {
     const titleId = useId();
+    const client = useApiClient();
     const [pending, setPending] = useState(null);
     const [proposing, setProposingState] = useState(false);
     const [menuOpen, setMenuOpen] = useState(false);
@@ -63,7 +65,7 @@ function RsvpPanel({ messageUid, invite, onDone, onClose, onProposingChange }) {
     async function answer(response, failure) {
         setPending(response);
         try {
-            onDone(await respondToMessageInvite(messageUid, response));
+            onDone(await respondToMessageInvite(messageUid, response, client));
         }
         catch (err) {
             notifyApiError(err, failure);
@@ -73,7 +75,7 @@ function RsvpPanel({ messageUid, invite, onDone, onClose, onProposingChange }) {
     async function propose(proposal) {
         setPending("propose");
         try {
-            onDone(await proposeNewTime(messageUid, proposal));
+            onDone(await proposeNewTime(messageUid, proposal, client));
         }
         catch (err) {
             notifyApiError(err, "Couldn't send the proposed time");

package/dist/apps/shared/components/mail/invite/InviteTimeline.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { MessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
+import type { MessageInvite } from "../../../../../lib/calendar/inviteApi.js";
 /** A block of the day and where it sits among the blocks it overlaps. */
 export interface PlacedBlock {
     /** Which of the overlapping columns it is drawn in. */

package/dist/apps/shared/components/mail/invite/ProposeTimeForm.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { MessageInvite, ProposedTime } from "@rapidmx/react-shared/calendar/inviteApi.js";
+import type { MessageInvite, ProposedTime } from "../../../../../lib/calendar/inviteApi.js";
 export interface ProposeTimeFormProps {
     /** The invitation being answered: its own time (in the reader's zone) is what the fields start out as. */
     invite: Pick<MessageInvite, "startDate" | "endDate">;

package/dist/apps/shared/components/mail/invite/ProposeTimeForm.js

@@ -4,7 +4,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
 import { useId, useState } from "react";
-import Button from "@rapidmx/react-shared/components/buttons/Button.js";
+import Button from "../../../../../lib/components/buttons/Button.js";
 import { isoDay, validDate } from "./inviteFormat.js";
 const INPUT_CLASS = "w-full text-sm border border-border rounded-sm py-1.5 px-2 bg-surface text-text";
 /** `HH:MM` of an instant in the reader's zone, the value of a time input. */

package/dist/apps/shared/components/mail/invite/inviteFormat.d.ts

@@ -1,5 +1,5 @@
-import type { Attachment } from "@rapidmx/react-shared/mail/mailApi.js";
-import type { InviteResponse, MessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
+import type { Attachment } from "../../../../../lib/mail/mailApi.js";
+import type { InviteResponse, MessageInvite } from "../../../../../lib/calendar/inviteApi.js";
 /** Whether an attachment is a calendar file - what tells the pane a message may carry an invitation worth asking the server about. By type
  * or by name, since mail clients disagree about which one they set (`text/calendar`, `application/ics`, or a bare `.ics` as octet-stream). */
 export declare function isCalendarAttachment(attachment: Pick<Attachment, "filename" | "mimeType">): boolean;

package/dist/apps/shared/components/mail/invite/inviteStore.d.ts

@@ -1,4 +1,5 @@
-import { MessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
+import { MessageInvite } from "../../../../../lib/calendar/inviteApi.js";
+import { ApiClient } from "../../../../../lib/util/api.js";
 /**
  * A per-message cache of the calendar invitation the server reads out of a message, shared by everything that draws one: the reading pane's
  * card, the list row's RSVP chip and its popover. They ask for the same message a moment apart (the row's chip, then the pane once it is
@@ -10,8 +11,13 @@ import { MessageInvite } from "@rapidmx/react-shared/calendar/inviteApi.js";
  */
 /** How long a looked-up invitation is trusted before the next ask reads it again. */
 export declare const INVITE_TTL_MS = 30000;
-/** Reads a message's invitation, from the cache when it is fresh. Rejects when the lookup fails. */
-export declare function loadInvite(uid: string): Promise<MessageInvite | null>;
+/**
+ * Reads a message's invitation, from the cache when it is fresh. Rejects when the lookup fails. `client` (see
+ * `useApiClient()`) is only consulted for a lookup this call actually makes - a fresh entry already in flight or
+ * cached keeps whichever client (or lack of one) started it, same as every other cache-by-uid shortcut here; the
+ * cache itself is keyed only by `uid`, not by account, so it assumes distinct accounts never share one.
+ */
+export declare function loadInvite(uid: string, client?: ApiClient): Promise<MessageInvite | null>;
 /** Records the invitation as it now stands after an answer, so the pane, the chip and the popover all show it. */
 export declare function storeInvite(uid: string, invite: MessageInvite): void;
 /** Forgets everything - for tests, and for a sign-out. */