v3: src/ gets one layout rule and keeps to it — each layer holds one kind of module, and every layer is split into the same domains — the previous pass sorted components into folders but left hooks, helpers and a barrel inside them, kept hooks/, utils/ and contexts/ flat, and still grouped most tests by theme. The rule: components/ holds only components (.tsx), contexts/ holds FooContext.ts + FooProvider.tsx pairs, hooks/ every hook, utils/ every non-React module, pages/ one component per route and nothing else. Each of components/, contexts/, hooks/ and utils/ is split into the same domains — auth, category, chat, comment, dump, editor, feed, form, layout, player, playlist, profile, social, theme, ws — plus shared/ for what belongs to no one domain, so the chat is components/chat, contexts/chat, hooks/chat and utils/chat. components/ui becomes components/shared to match. Out of components/: useApiForm goes to hooks/form, chat's message.ts and time.ts to utils/chat (with chatDraft and chatText, now draft.ts and text.ts), the emoji skin tone to utils/editor, the remembered volume to utils/player; player/icons.tsx is PlayerIcons.tsx. components/form/index.ts is gone: everything is imported from its own file, FormProvider straight from react-hook-form, and expectOk sits beside friendlyFetchError in utils/shared/api.ts (apiError.ts), since pages that have no form used it too. Out of pages/: the index's feed views, tab bar and presence row move to components/feed; HotFeed and NewFeed, identical but for the sort, are one DumpFeed with an order prop, which also takes over MainFeedProps from pages/index/types.ts. App is a named export like everything else. Tests mirror the tree one file per module — test/<layer>/<domain>/<Module>.test.tsx — so the themed files (hooks/misc, data, editor, sync; utils/misc, text, storage, remote, journal; contexts/providers; pages/auth and UserSubpages; layout/Fabs) are split by subject, the setup each piece needs kept and the rest dropped; the floating-button test becomes one test per button, 627 tests now. The README states the rule. No behaviour changes; the catalogues only move their source references.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
59
src/contexts/chat/ChatProvider.tsx
Normal file
59
src/contexts/chat/ChatProvider.tsx
Normal file
@@ -0,0 +1,59 @@
|
||||
import {
|
||||
lazy,
|
||||
type ReactNode,
|
||||
Suspense,
|
||||
useCallback,
|
||||
useMemo,
|
||||
useState,
|
||||
} from "react";
|
||||
import { useSearchParams } from "react-router";
|
||||
import { useAuth } from "../../hooks/auth/useAuth.ts";
|
||||
import { ChatContext, type ChatContextValue } from "./ChatContext.ts";
|
||||
|
||||
const ChatModal = lazy(() =>
|
||||
import("../../components/chat/ChatModal.tsx").then((m) => ({
|
||||
default: m.ChatModal,
|
||||
}))
|
||||
);
|
||||
|
||||
/**
|
||||
* Owns the single live-chat modal instance so the header button, the floating
|
||||
* button, and notification deep-links all drive one modal. Open state is derived
|
||||
* (no effects): a manual open, or a `?chat=open` query param (used by mention
|
||||
* notifications), opens it — and it's only ever open for signed-in users.
|
||||
*/
|
||||
export function ChatProvider({ children }: { children: ReactNode }) {
|
||||
const { user } = useAuth();
|
||||
const [manuallyOpen, setManuallyOpen] = useState(false);
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
|
||||
const deepLinkOpen = searchParams.get("chat") === "open";
|
||||
const isChatOpen = !!user && (manuallyOpen || deepLinkOpen);
|
||||
|
||||
const openChat = useCallback(() => setManuallyOpen(true), []);
|
||||
const closeChat = useCallback(() => {
|
||||
setManuallyOpen(false);
|
||||
// Strip the deep-link param so a reload/back-nav doesn't reopen the modal.
|
||||
if (searchParams.get("chat") === "open") {
|
||||
const next = new URLSearchParams(searchParams);
|
||||
next.delete("chat");
|
||||
setSearchParams(next, { replace: true });
|
||||
}
|
||||
}, [searchParams, setSearchParams]);
|
||||
|
||||
const value: ChatContextValue = useMemo(
|
||||
() => ({ isChatOpen, openChat, closeChat }),
|
||||
[isChatOpen, openChat, closeChat],
|
||||
);
|
||||
|
||||
return (
|
||||
<ChatContext.Provider value={value}>
|
||||
{children}
|
||||
{isChatOpen && (
|
||||
<Suspense>
|
||||
<ChatModal onClose={closeChat} />
|
||||
</Suspense>
|
||||
)}
|
||||
</ChatContext.Provider>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user