@rapidmx/web-client 0.15.1 → 0.17.0

package/apps/www/contacts/[uid].tsx

@@ -1,109 +1,112 @@
-///////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 2026 Jean-Philippe Steinmetz
-// SPDX-License-Identifier: MPL-2.0
-///////////////////////////////////////////////////////////////////////////////
-import { routedPage } from "../_routedPage.js";
-import { useNavigate } from "../../shared/navigation/AppRouter.js";
-import React, { useEffect, useState } from "react";
-import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
-import { Contact, deleteContact, getContact } from "@rapidmx/react-shared/contacts/contactsApi.js";
-import ContactsShell, { ContactsShellProps } from "../../shared/components/contacts/layout/ContactsShell.js";
-import ContactDetailPane from "../../shared/components/contacts/ContactDetailPane.js";
-import ContactForm from "../../shared/components/contacts/ContactForm.js";
-import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
-import { clearPinnedSignerCache } from "../../shared/components/mail/pinnedSigners.js";
-import { notifyApiError } from "../../shared/notifications/apiErrors.js";
-
-/**
- * Only reached on mobile (below the `md` breakpoint) — desktop's `apps/www/contacts/index.tsx` keeps its
- * existing inline detail pane and never navigates here; see that file's `handleSelectRow`. There is no
- * equivalent "new contact" route — an unsaved contact has no uid to route on, so creation stays an
- * in-place mode-switch on every device (see `apps/www/contacts/index.tsx`'s `handleNew`).
- */
-function ContactDetailPage(props: ContactsShellProps & { params: { uid: string } }) {
-    return (
-        <ContactsShell {...props}>
-            <ContactDetailContent uid={props.params.uid} />
-        </ContactsShell>
-    );
-}
-
-type Mode = "view" | "edit";
-
-function ContactDetailContent({ uid }: { uid: string }) {
-    const navigate = useNavigate();
-    const [contact, setContact] = useState<Contact | null>(null);
-    const [loading, setLoading] = useState(true);
-    const [error, setError] = useState<string | null>(null);
-    const [mode, setMode] = useState<Mode>("view");
-
-    useEffect(() => {
-        setLoading(true);
-        setError(null);
-        getContact(uid)
-            .then(setContact)
-            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load this contact."))
-            .finally(() => setLoading(false));
-    }, [uid]);
-
-    // Takes `contact` as a parameter rather than reading it from the closure/state — mirrors the desktop
-    // pane's own `handleDelete` in `apps/www/contacts/index.tsx`. The only caller (below) is only ever
-    // rendered once `contact` is already resolved (see the `error || !contact` guard above it), so this
-    // never runs with a stale/absent contact — no redundant null check needed here.
-    async function handleDelete(contact: Contact) {
-        try {
-            await deleteContact(contact.uid, contact.version);
-            // A deleted contact's pinned signing keys must stop vouching for signatures.
-            clearPinnedSignerCache();
-            navigate("/contacts");
-        } catch (err) {
-            // A pop-up: a failed delete leaves the contact on screen rather than replacing the page with an error.
-            notifyApiError(err, "Couldn't delete the contact");
-        }
-    }
-
-    // After a key change was resolved (or found stale): re-read the contact, keeping the one shown if that fails.
-    function handleKeysChanged() {
-        getContact(uid).then(setContact, () => undefined);
-    }
-
-    if (loading) {
-        return <p className="p-8 text-sm text-text-muted">Loading&hellip;</p>;
-    }
-    if (error || !contact) {
-        return <Alert>{error ?? "Contact not found."}</Alert>;
-    }
-
-    const backHref = "/contacts";
-    if (mode === "edit") {
-        return (
-            <div>
-                <a href={backHref} className="text-sm text-primary-dark hover:underline block px-6 pt-6">
-                    &larr; Back to contacts
-                </a>
-                <ContactForm
-                    contact={contact}
-                    onSaved={(saved) => {
-                        setContact(saved);
-                        setMode("view");
-                    }}
-                    onCancel={() => setMode("view")}
-                />
-            </div>
-        );
-    }
-
-    return (
-        <div className="p-6">
-            <ContactDetailPane
-                contact={contact}
-                onEdit={() => setMode("edit")}
-                onDelete={() => handleDelete(contact)}
-                backHref={backHref}
-                onKeysChanged={handleKeysChanged}
-            />
-        </div>
-    );
-}
-
-export default routedPage("/contacts/:uid", ContactDetailPage);
+///////////////////////////////////////////////////////////////////////////////
+// Copyright (C) 2026 Jean-Philippe Steinmetz
+// SPDX-License-Identifier: MPL-2.0
+///////////////////////////////////////////////////////////////////////////////
+import { pageTitle } from "../../shared/navigation/pageTitle.js";
+import { useNavigate } from "../../shared/navigation/index.js";
+import React, { useEffect, useState } from "react";
+import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
+import { Contact, deleteContact, getContact } from "@rapidmx/react-shared/contacts/contactsApi.js";
+import ContactsShell, { ContactsShellProps } from "../../shared/components/contacts/layout/ContactsShell.js";
+import ContactDetailPane from "../../shared/components/contacts/ContactDetailPane.js";
+import ContactForm from "../../shared/components/contacts/ContactForm.js";
+import Alert from "@rapidmx/react-shared/components/feedback/Alert.js";
+import { clearPinnedSignerCache } from "../../shared/components/mail/pinnedSigners.js";
+import { notifyApiError } from "../../shared/notifications/apiErrors.js";
+
+/**
+ * Only reached on mobile (below the `md` breakpoint) — desktop's `apps/www/contacts/index.tsx` keeps its
+ * existing inline detail pane and never navigates here; see that file's `handleSelectRow`. There is no
+ * equivalent "new contact" route — an unsaved contact has no uid to route on, so creation stays an
+ * in-place mode-switch on every device (see `apps/www/contacts/index.tsx`'s `handleNew`).
+ */
+function ContactDetailPage(props: ContactsShellProps & { params: { uid: string } }) {
+    return (
+        <ContactsShell {...props}>
+            <ContactDetailContent uid={props.params.uid} />
+        </ContactsShell>
+    );
+}
+
+type Mode = "view" | "edit";
+
+function ContactDetailContent({ uid }: { uid: string }) {
+    const navigate = useNavigate();
+    const [contact, setContact] = useState<Contact | null>(null);
+    const [loading, setLoading] = useState(true);
+    const [error, setError] = useState<string | null>(null);
+    const [mode, setMode] = useState<Mode>("view");
+
+    useEffect(() => {
+        setLoading(true);
+        setError(null);
+        getContact(uid)
+            .then(setContact)
+            .catch((err) => setError(err instanceof ApiRequestError ? err.message : "Could not load this contact."))
+            .finally(() => setLoading(false));
+    }, [uid]);
+
+    // Takes `contact` as a parameter rather than reading it from the closure/state — mirrors the desktop
+    // pane's own `handleDelete` in `apps/www/contacts/index.tsx`. The only caller (below) is only ever
+    // rendered once `contact` is already resolved (see the `error || !contact` guard above it), so this
+    // never runs with a stale/absent contact — no redundant null check needed here.
+    async function handleDelete(contact: Contact) {
+        try {
+            await deleteContact(contact.uid, contact.version);
+            // A deleted contact's pinned signing keys must stop vouching for signatures.
+            clearPinnedSignerCache();
+            navigate("/contacts");
+        } catch (err) {
+            // A pop-up: a failed delete leaves the contact on screen rather than replacing the page with an error.
+            notifyApiError(err, "Couldn't delete the contact");
+        }
+    }
+
+    // After a key change was resolved (or found stale): re-read the contact, keeping the one shown if that fails.
+    function handleKeysChanged() {
+        getContact(uid).then(setContact, () => undefined);
+    }
+
+    if (loading) {
+        return <p className="p-8 text-sm text-text-muted">Loading&hellip;</p>;
+    }
+    if (error || !contact) {
+        return <Alert>{error ?? "Contact not found."}</Alert>;
+    }
+
+    const backHref = "/contacts";
+    if (mode === "edit") {
+        return (
+            <div>
+                <a href={backHref} className="text-sm text-primary-dark hover:underline block px-6 pt-6">
+                    &larr; Back to contacts
+                </a>
+                <ContactForm
+                    contact={contact}
+                    onSaved={(saved) => {
+                        setContact(saved);
+                        setMode("view");
+                    }}
+                    onCancel={() => setMode("view")}
+                />
+            </div>
+        );
+    }
+
+    return (
+        <div className="p-6">
+            <ContactDetailPane
+                contact={contact}
+                onEdit={() => setMode("edit")}
+                onDelete={() => handleDelete(contact)}
+                backHref={backHref}
+                onKeysChanged={handleKeysChanged}
+            />
+        </div>
+    );
+}
+
+export default ContactDetailPage;
+
+/** The tab's title: `Brand: Contacts` (see `pageTitle()`). */
+export const title = pageTitle("Contacts");

package/apps/www/contacts/index.tsx

@@ -2,8 +2,8 @@
 // Copyright (C) 2026 Jean-Philippe Steinmetz
 // SPDX-License-Identifier: MPL-2.0
 ///////////////////////////////////////////////////////////////////////////////
-import { routedPage } from "../_routedPage.js";
-import { useNavigate } from "../../shared/navigation/AppRouter.js";
+import { pageTitle } from "../../shared/navigation/pageTitle.js";
+import { useNavigate } from "../../shared/navigation/index.js";
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import { ApiRequestError } from "@rapidmx/react-shared/util/api.js";
 import {
@@ -21,6 +21,8 @@ import { useCompose } from "../../shared/components/mail/compose/ComposeContext.
 import ContactsShell, { ContactsShellProps, useContactsShell } from "../../shared/components/contacts/layout/ContactsShell.js";
 import ContactsSidebar, { ContactsView } from "../../shared/components/contacts/ContactsSidebar.js";
 import ContactsToolbar from "../../shared/components/contacts/ContactsToolbar.js";
+import FloatingActionButton from "../../shared/components/layout/FloatingActionButton.js";
+import { HiOutlineUserPlus } from "react-icons/hi2";
 import ContactAvatar from "@rapidmx/react-shared/components/avatar/ContactAvatar.js";
 import ContactDetailPane from "../../shared/components/contacts/ContactDetailPane.js";
 import ContactForm from "../../shared/components/contacts/ContactForm.js";
@@ -419,6 +421,7 @@ function ContactsContent({ userUid }: { userUid?: string }) {
                     onExportVCard={handleExportVCard}
                     onImportFile={handleImportFile}
                     shortcuts
+                    hideNew={isMobile}
                 />
                 <div className="p-3 border-b border-border">
                     <input
@@ -533,6 +536,8 @@ function ContactsContent({ userUid }: { userUid?: string }) {
                         {mailboxes.find((mb) => mb.uid === savedElsewhere.mailboxUid)?.displayName ?? "another mailbox"}.{" "}
                         <a
                             href={`/contacts?mailboxUid=${encodeURIComponent(savedElsewhere.mailboxUid)}`}
+                            data-router-shallow=""
+                            data-router-prefetch="false"
                             className="font-medium text-primary-dark hover:underline"
                         >
                             View that mailbox&rsquo;s contacts
@@ -580,8 +585,14 @@ function ContactsContent({ userUid }: { userUid?: string }) {
                     </Button>
                 </div>
             </Modal>
+            {/* The phone layout's New contact, in place of the toolbar's button: the same action, and not while the new-contact form (which takes the
+                list's place there) is open. */}
+            {isMobile && mode !== "new" && <FloatingActionButton label="New contact" icon={HiOutlineUserPlus} onClick={handleNew} />}
         </div>
     );
 }
 
-export default routedPage("/contacts", ContactsPage);
+export default ContactsPage;
+
+/** The tab's title: `Brand: Contacts` (see `pageTitle()`). */
+export const title = pageTitle("Contacts");