chore: scope memo providers to authenticated routes
This commit is contained in:
parent
b895a462da
commit
571e0a3ff6
17 changed files with 339 additions and 125 deletions
|
|
@ -1,8 +1,6 @@
|
||||||
import { useEffect } from "react";
|
import { useEffect } from "react";
|
||||||
import { Outlet, ScrollRestoration } from "react-router-dom";
|
import { Outlet, ScrollRestoration } from "react-router-dom";
|
||||||
import { GlobalMemoEditorProvider } from "./contexts/GlobalMemoEditorContext";
|
|
||||||
import { useInstance } from "./contexts/InstanceContext";
|
import { useInstance } from "./contexts/InstanceContext";
|
||||||
import { MemoFilterProvider } from "./contexts/MemoFilterContext";
|
|
||||||
import useNavigateTo from "./hooks/useNavigateTo";
|
import useNavigateTo from "./hooks/useNavigateTo";
|
||||||
import { useUserLocale } from "./hooks/useUserLocale";
|
import { useUserLocale } from "./hooks/useUserLocale";
|
||||||
import { useUserTheme } from "./hooks/useUserTheme";
|
import { useUserTheme } from "./hooks/useUserTheme";
|
||||||
|
|
@ -61,11 +59,7 @@ const App = () => {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<MemoFilterProvider>
|
|
||||||
<GlobalMemoEditorProvider>
|
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</GlobalMemoEditorProvider>
|
|
||||||
</MemoFilterProvider>
|
|
||||||
<ScrollRestoration />
|
<ScrollRestoration />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,9 @@ const Editor = forwardRef(function Editor(props: EditorProps, ref: React.Forward
|
||||||
onSubmitRef.current = onSubmit;
|
onSubmitRef.current = onSubmit;
|
||||||
const placeholderRef = useRef(placeholder);
|
const placeholderRef = useRef(placeholder);
|
||||||
const listenersRef = useRef(new Set<() => void>());
|
const listenersRef = useRef(new Set<() => void>());
|
||||||
const { data: tagData } = useTagCounts();
|
// A user can only author their own memos. Reuse the current-user stats query
|
||||||
|
// instead of fetching and aggregating every user's tags for autocomplete.
|
||||||
|
const { data: tagData } = useTagCounts(true);
|
||||||
const tags = useMemo(() => Object.keys(tagData ?? {}), [tagData]);
|
const tags = useMemo(() => Object.keys(tagData ?? {}), [tagData]);
|
||||||
const tagsRef = useRef(tags);
|
const tagsRef = useRef(tags);
|
||||||
tagsRef.current = tags;
|
tagsRef.current = tags;
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
|
import { EyeIcon } from "lucide-react";
|
||||||
import ClampedSection from "@/components/ClampedSection";
|
import ClampedSection from "@/components/ClampedSection";
|
||||||
import { AttachmentListView, LocationDisplayView, RelationListView } from "@/components/MemoMetadata";
|
import { AttachmentListView, LocationDisplayView, RelationListView } from "@/components/MemoMetadata";
|
||||||
import { isReferenceRelation } from "@/components/MemoMetadata/Relation/relationHelpers";
|
import { isReferenceRelation } from "@/components/MemoMetadata/Relation/relationHelpers";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
import MemoContent from "../../MemoContent";
|
import MemoContent from "../../MemoContent";
|
||||||
|
|
@ -12,10 +14,17 @@ import type { MemoBodyProps } from "../types";
|
||||||
const BlurOverlay: React.FC<{ onClick?: () => void }> = ({ onClick }) => {
|
const BlurOverlay: React.FC<{ onClick?: () => void }> = ({ onClick }) => {
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
return (
|
return (
|
||||||
<div className="absolute inset-0 z-10 pt-4 flex items-center justify-center" onClick={onClick}>
|
<div className="absolute inset-0 z-10 flex items-center justify-center pt-4">
|
||||||
<div className="rounded-lg border border-border bg-card px-2 py-1 text-xs text-muted-foreground transition-colors hover:border-accent hover:bg-accent hover:text-foreground">
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline"
|
||||||
|
size="sm"
|
||||||
|
className="cursor-pointer rounded-lg bg-card px-3 text-xs text-foreground shadow-sm hover:-translate-y-0.5 hover:border-ring/40 hover:bg-accent hover:text-accent-foreground hover:shadow-md active:translate-y-0 active:shadow-sm focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring/50"
|
||||||
|
onClick={onClick}
|
||||||
|
>
|
||||||
|
<EyeIcon className="h-3.5 w-3.5" />
|
||||||
{t("memo.click-to-show-sensitive-content")}
|
{t("memo.click-to-show-sensitive-content")}
|
||||||
</div>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ import { type ReactElement, type ReactNode, useCallback, useEffect, useLayoutEff
|
||||||
import { MentionResolutionProvider } from "@/components/MemoContent/MentionResolutionContext";
|
import { MentionResolutionProvider } from "@/components/MemoContent/MentionResolutionContext";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { useAuth } from "@/contexts/AuthContext";
|
import { useAuth } from "@/contexts/AuthContext";
|
||||||
import { useInstance } from "@/contexts/InstanceContext";
|
|
||||||
import { useMemoFilterContext } from "@/contexts/MemoFilterContext";
|
import { useMemoFilterContext } from "@/contexts/MemoFilterContext";
|
||||||
import { useNewMemo } from "@/contexts/NewMemoContext";
|
import { useNewMemo } from "@/contexts/NewMemoContext";
|
||||||
import { useView } from "@/contexts/ViewContext";
|
import { useView } from "@/contexts/ViewContext";
|
||||||
|
|
@ -113,8 +112,7 @@ function useAutoFetchWhenNotScrollable({
|
||||||
|
|
||||||
const PagedMemoList = (props: Props) => {
|
const PagedMemoList = (props: Props) => {
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
const { isInitialized: authInitialized } = useAuth();
|
const { isUserSettingsInitialized } = useAuth();
|
||||||
const { isInitialized: instanceInitialized } = useInstance();
|
|
||||||
const { filters } = useMemoFilterContext();
|
const { filters } = useMemoFilterContext();
|
||||||
const { maxColumns, compactMode } = useView();
|
const { maxColumns, compactMode } = useView();
|
||||||
// maxColumns is a ceiling: 1 = single reading column, 0 = as many as fit. The single
|
// maxColumns is a ceiling: 1 = single reading column, 0 = as many as fit. The single
|
||||||
|
|
@ -153,10 +151,9 @@ const PagedMemoList = (props: Props) => {
|
||||||
{ enabled: props.enabled ?? true },
|
{ enabled: props.enabled ?? true },
|
||||||
);
|
);
|
||||||
|
|
||||||
// Queries can start as soon as routing is unlocked, but memo content stays
|
// Tag settings decide whether sensitive memo content must be blurred. Keep that
|
||||||
// hidden until settings that control its presentation have settled.
|
// privacy boundary, but do not wait for unrelated shortcuts or instance settings.
|
||||||
const isDisplayPending = isLoading || !authInitialized || !instanceInitialized;
|
const isDisplayPending = isLoading || !isUserSettingsInitialized;
|
||||||
// Only show the spinner once loading exceeds the delay, so fast loads don't flash it.
|
|
||||||
const showLoader = useDelayedFlag(isDisplayPending, LOADING_INDICATOR_DELAY_MS);
|
const showLoader = useDelayedFlag(isDisplayPending, LOADING_INDICATOR_DELAY_MS);
|
||||||
|
|
||||||
// Flatten pages into a single array of memos
|
// Flatten pages into a single array of memos
|
||||||
|
|
@ -198,28 +195,30 @@ const PagedMemoList = (props: Props) => {
|
||||||
|
|
||||||
// A freshly created memo is hoisted to the front; pin it to the top of column one so it
|
// A freshly created memo is hoisted to the front; pin it to the top of column one so it
|
||||||
// appears right under the composer instead of dropping into a random (shortest) column.
|
// appears right under the composer instead of dropping into a random (shortest) column.
|
||||||
const firstMemo = sortedMemoList[0];
|
const displayMemoList = isDisplayPending ? [] : sortedMemoList;
|
||||||
|
const firstMemo = displayMemoList[0];
|
||||||
const priorityKey = newMemoName && firstMemo?.name === newMemoName ? getMemoKey(firstMemo) : undefined;
|
const priorityKey = newMemoName && firstMemo?.name === newMemoName ? getMemoKey(firstMemo) : undefined;
|
||||||
|
|
||||||
// Stable reference so MentionResolutionProvider's memo (keyed on the array) actually holds.
|
// Stable reference so MentionResolutionProvider's memo (keyed on the array) actually holds.
|
||||||
const contents = useMemo(() => sortedMemoList.map((memo) => memo.content), [sortedMemoList]);
|
const contents = useMemo(() => displayMemoList.map((memo) => memo.content), [displayMemoList]);
|
||||||
const userNames = useMemo(
|
const userNames = useMemo(
|
||||||
() =>
|
() =>
|
||||||
Array.from(
|
Array.from(
|
||||||
new Set(
|
new Set(
|
||||||
sortedMemoList.flatMap((memo) => [
|
displayMemoList.flatMap((memo) => [
|
||||||
...(props.showCreator ? [memo.creator] : []),
|
...(props.showCreator ? [memo.creator] : []),
|
||||||
...(memo.reactions ?? []).map((reaction) => reaction.creator),
|
...(memo.reactions ?? []).map((reaction) => reaction.creator),
|
||||||
]),
|
]),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
[props.showCreator, sortedMemoList],
|
[props.showCreator, displayMemoList],
|
||||||
);
|
);
|
||||||
|
|
||||||
const emptyPlaceholder =
|
const emptyPlaceholder =
|
||||||
!isFetchingNextPage && !hasNextPage && sortedMemoList.length === 0 ? (
|
!isDisplayPending && !isFetchingNextPage && !hasNextPage && displayMemoList.length === 0 ? (
|
||||||
<Placeholder variant="empty" message={t("message.no-data")} className="w-full" />
|
<Placeholder variant="empty" message={t("message.no-data")} className="w-full" />
|
||||||
) : null;
|
) : null;
|
||||||
|
const initialLoader = isDisplayPending && showLoader ? <Loader /> : null;
|
||||||
|
|
||||||
// Column one is the action column: the composer and any active filters head it, and the
|
// Column one is the action column: the composer and any active filters head it, and the
|
||||||
// empty state follows them. The newest memo also lands directly beneath them (priorityKey
|
// empty state follows them. The newest memo also lands directly beneath them (priorityKey
|
||||||
|
|
@ -227,10 +226,11 @@ const PagedMemoList = (props: Props) => {
|
||||||
// grid's x-spacing exactly.
|
// grid's x-spacing exactly.
|
||||||
const hasFilters = filters.length > 0;
|
const hasFilters = filters.length > 0;
|
||||||
const gridLeading =
|
const gridLeading =
|
||||||
leadingContent || hasFilters || emptyPlaceholder ? (
|
leadingContent || hasFilters || initialLoader || emptyPlaceholder ? (
|
||||||
<div className="flex w-full flex-col" style={{ gap: GRID_GAP }}>
|
<div className="flex w-full flex-col" style={{ gap: GRID_GAP }}>
|
||||||
{leadingContent}
|
{leadingContent}
|
||||||
<MemoFilters />
|
<MemoFilters />
|
||||||
|
{initialLoader}
|
||||||
{emptyPlaceholder}
|
{emptyPlaceholder}
|
||||||
</div>
|
</div>
|
||||||
) : undefined;
|
) : undefined;
|
||||||
|
|
@ -239,7 +239,7 @@ const PagedMemoList = (props: Props) => {
|
||||||
const footer = (
|
const footer = (
|
||||||
<>
|
<>
|
||||||
{isFetchingNextPage && <Loader />}
|
{isFetchingNextPage && <Loader />}
|
||||||
{!isFetchingNextPage && (hasNextPage || sortedMemoList.length > 0) && (
|
{!isFetchingNextPage && (hasNextPage || displayMemoList.length > 0) && (
|
||||||
<div className="w-full opacity-70 flex flex-row justify-center items-center my-4">
|
<div className="w-full opacity-70 flex flex-row justify-center items-center my-4">
|
||||||
<BackToTop />
|
<BackToTop />
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -251,15 +251,10 @@ const PagedMemoList = (props: Props) => {
|
||||||
<MentionResolutionProvider contents={contents} userNames={userNames}>
|
<MentionResolutionProvider contents={contents} userNames={userNames}>
|
||||||
<div ref={layoutMeasureRef} className="w-full">
|
<div ref={layoutMeasureRef} className="w-full">
|
||||||
<div className={cn("flex flex-col justify-start w-full mx-auto", useGrid ? "max-w-none" : "max-w-2xl")}>
|
<div className={cn("flex flex-col justify-start w-full mx-auto", useGrid ? "max-w-none" : "max-w-2xl")}>
|
||||||
{/* During initial load, show the spinner only after the delay; render nothing before then to avoid a flash. */}
|
{useGrid ? (
|
||||||
{isDisplayPending ? (
|
|
||||||
showLoader ? (
|
|
||||||
<Loader />
|
|
||||||
) : null
|
|
||||||
) : useGrid ? (
|
|
||||||
<>
|
<>
|
||||||
<ColumnGrid
|
<ColumnGrid
|
||||||
items={sortedMemoList}
|
items={displayMemoList}
|
||||||
getKey={getMemoKey}
|
getKey={getMemoKey}
|
||||||
renderItem={(memo) => props.renderer(memo, { compact: effectiveCompact })}
|
renderItem={(memo) => props.renderer(memo, { compact: effectiveCompact })}
|
||||||
estimateHeight={estimateMemoCardHeight}
|
estimateHeight={estimateMemoCardHeight}
|
||||||
|
|
@ -268,15 +263,16 @@ const PagedMemoList = (props: Props) => {
|
||||||
maxColumns={maxColumns}
|
maxColumns={maxColumns}
|
||||||
maxColumnWidth={MAX_COLUMN_WIDTH}
|
maxColumnWidth={MAX_COLUMN_WIDTH}
|
||||||
/>
|
/>
|
||||||
{footer}
|
{!isDisplayPending && footer}
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
{leadingContent}
|
{leadingContent}
|
||||||
<MemoFilters className="mb-2" />
|
<MemoFilters className="mb-2" />
|
||||||
{sortedMemoList.map((memo) => props.renderer(memo, { compact: effectiveCompact }))}
|
{initialLoader}
|
||||||
|
{displayMemoList.map((memo) => props.renderer(memo, { compact: effectiveCompact }))}
|
||||||
{emptyPlaceholder}
|
{emptyPlaceholder}
|
||||||
{footer}
|
{!isDisplayPending && footer}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,8 @@ interface AuthState {
|
||||||
shortcuts: Shortcut[];
|
shortcuts: Shortcut[];
|
||||||
/** Authentication identity has settled, while user settings may still be loading. */
|
/** Authentication identity has settled, while user settings may still be loading. */
|
||||||
isIdentityInitialized: boolean;
|
isIdentityInitialized: boolean;
|
||||||
|
/** User settings that affect memo presentation are safe to consume. */
|
||||||
|
isUserSettingsInitialized: boolean;
|
||||||
isInitialized: boolean;
|
isInitialized: boolean;
|
||||||
isLoading: boolean;
|
isLoading: boolean;
|
||||||
}
|
}
|
||||||
|
|
@ -40,6 +42,7 @@ const UNAUTHENTICATED_STATE: AuthState = {
|
||||||
userTagsSetting: undefined,
|
userTagsSetting: undefined,
|
||||||
shortcuts: [],
|
shortcuts: [],
|
||||||
isIdentityInitialized: true,
|
isIdentityInitialized: true,
|
||||||
|
isUserSettingsInitialized: true,
|
||||||
isInitialized: true,
|
isInitialized: true,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
};
|
};
|
||||||
|
|
@ -53,24 +56,44 @@ export function AuthProvider({ children }: { children: ReactNode }) {
|
||||||
userTagsSetting: undefined,
|
userTagsSetting: undefined,
|
||||||
shortcuts: [],
|
shortcuts: [],
|
||||||
isIdentityInitialized: false,
|
isIdentityInitialized: false,
|
||||||
|
isUserSettingsInitialized: false,
|
||||||
isInitialized: false,
|
isInitialized: false,
|
||||||
isLoading: true,
|
isLoading: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
const fetchUserSettings = useCallback(async (userName: string) => {
|
const fetchUserSettings = useCallback(async (userName: string) => {
|
||||||
const [{ settings }, { shortcuts }] = await Promise.all([
|
const userSettingsPromise = userServiceClient.listUserSettings({ parent: userName }).then(({ settings }) => {
|
||||||
userServiceClient.listUserSettings({ parent: userName }),
|
|
||||||
shortcutServiceClient.listShortcuts({ parent: userName }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const generalSetting = settings.find((s) => s.value.case === "generalSetting");
|
const generalSetting = settings.find((s) => s.value.case === "generalSetting");
|
||||||
const webhooksSetting = settings.find((s) => s.value.case === "webhooksSetting");
|
const webhooksSetting = settings.find((s) => s.value.case === "webhooksSetting");
|
||||||
const tagsSetting = settings.find((s) => s.value.case === "tagsSetting");
|
const tagsSetting = settings.find((s) => s.value.case === "tagsSetting");
|
||||||
|
const userSettings = {
|
||||||
return {
|
|
||||||
userGeneralSetting: generalSetting?.value.case === "generalSetting" ? generalSetting.value.value : undefined,
|
userGeneralSetting: generalSetting?.value.case === "generalSetting" ? generalSetting.value.value : undefined,
|
||||||
userWebhooksSetting: webhooksSetting?.value.case === "webhooksSetting" ? webhooksSetting.value.value : undefined,
|
userWebhooksSetting: webhooksSetting?.value.case === "webhooksSetting" ? webhooksSetting.value.value : undefined,
|
||||||
userTagsSetting: tagsSetting?.value.case === "tagsSetting" ? tagsSetting.value.value : undefined,
|
userTagsSetting: tagsSetting?.value.case === "tagsSetting" ? tagsSetting.value.value : undefined,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Tag settings control sensitive-content blurring. Publish them as soon
|
||||||
|
// as this request settles instead of waiting for unrelated shortcuts.
|
||||||
|
setState((prev) =>
|
||||||
|
prev.currentUser?.name === userName
|
||||||
|
? {
|
||||||
|
...prev,
|
||||||
|
...userSettings,
|
||||||
|
isUserSettingsInitialized: true,
|
||||||
|
}
|
||||||
|
: prev,
|
||||||
|
);
|
||||||
|
|
||||||
|
return userSettings;
|
||||||
|
});
|
||||||
|
|
||||||
|
const [userSettings, { shortcuts }] = await Promise.all([
|
||||||
|
userSettingsPromise,
|
||||||
|
shortcutServiceClient.listShortcuts({ parent: userName }),
|
||||||
|
]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
...userSettings,
|
||||||
shortcuts,
|
shortcuts,
|
||||||
};
|
};
|
||||||
}, []);
|
}, []);
|
||||||
|
|
@ -79,7 +102,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {
|
||||||
// `initialize` also runs after sign-in, when the previous unauthenticated
|
// `initialize` also runs after sign-in, when the previous unauthenticated
|
||||||
// state is already marked initialized. Reset the full-readiness flag so
|
// state is already marked initialized. Reset the full-readiness flag so
|
||||||
// consumers cannot render with the new identity and stale/default settings.
|
// consumers cannot render with the new identity and stale/default settings.
|
||||||
setState((prev) => ({ ...prev, isInitialized: false, isLoading: true }));
|
setState((prev) => ({ ...prev, isUserSettingsInitialized: false, isInitialized: false, isLoading: true }));
|
||||||
|
|
||||||
// Try to get or refresh the access token.
|
// Try to get or refresh the access token.
|
||||||
// This handles PWA isolated storage scenarios (e.g., iOS Safari) where localStorage
|
// This handles PWA isolated storage scenarios (e.g., iOS Safari) where localStorage
|
||||||
|
|
@ -111,7 +134,6 @@ export function AuthProvider({ children }: { children: ReactNode }) {
|
||||||
|
|
||||||
// Publish the verified identity immediately so route modules and their
|
// Publish the verified identity immediately so route modules and their
|
||||||
// data queries can start while display-sensitive settings are loading.
|
// data queries can start while display-sensitive settings are loading.
|
||||||
// Memo rendering remains gated on the full `isInitialized` state.
|
|
||||||
setState((prev) => ({
|
setState((prev) => ({
|
||||||
...prev,
|
...prev,
|
||||||
currentUser,
|
currentUser,
|
||||||
|
|
@ -127,6 +149,7 @@ export function AuthProvider({ children }: { children: ReactNode }) {
|
||||||
currentUser,
|
currentUser,
|
||||||
...settings,
|
...settings,
|
||||||
isIdentityInitialized: true,
|
isIdentityInitialized: true,
|
||||||
|
isUserSettingsInitialized: true,
|
||||||
isInitialized: true,
|
isInitialized: true,
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
import { type ComponentType, createContext, type ReactNode, useCallback, useContext, useMemo, useState } from "react";
|
import { type ComponentType, createContext, type ReactNode, useCallback, useContext, useEffect, useMemo, useState } from "react";
|
||||||
import { loadMemoEditor } from "@/components/MemoEditor/loader";
|
import { loadMemoEditor } from "@/components/MemoEditor/loader";
|
||||||
import type { MemoEditorProps } from "@/components/MemoEditor/types";
|
import type { MemoEditorProps } from "@/components/MemoEditor/types";
|
||||||
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import { useTranslate } from "@/utils/i18n";
|
import { useTranslate } from "@/utils/i18n";
|
||||||
|
|
||||||
interface GlobalMemoEditorContextValue {
|
interface GlobalMemoEditorContextValue {
|
||||||
|
|
@ -8,29 +9,36 @@ interface GlobalMemoEditorContextValue {
|
||||||
openEditor: () => void;
|
openEditor: () => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
const GlobalMemoEditorContext = createContext<GlobalMemoEditorContextValue>({
|
const GlobalMemoEditorContext = createContext<GlobalMemoEditorContextValue | null>(null);
|
||||||
isOpen: false,
|
|
||||||
openEditor: () => {},
|
|
||||||
});
|
|
||||||
|
|
||||||
export function GlobalMemoEditorProvider({ children }: { children: ReactNode }) {
|
export function GlobalMemoEditorProvider({ children }: { children: ReactNode }) {
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
|
const currentUserName = useCurrentUser()?.name;
|
||||||
const [isOpen, setIsOpen] = useState(false);
|
const [isOpen, setIsOpen] = useState(false);
|
||||||
const [EditorComponent, setEditorComponent] = useState<ComponentType<MemoEditorProps>>();
|
const [EditorComponent, setEditorComponent] = useState<ComponentType<MemoEditorProps>>();
|
||||||
|
|
||||||
const openEditor = useCallback(() => {
|
const openEditor = useCallback(() => {
|
||||||
|
if (!currentUserName) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
setIsOpen(true);
|
setIsOpen(true);
|
||||||
void loadMemoEditor()
|
void loadMemoEditor()
|
||||||
.then(({ default: MemoEditor }) => setEditorComponent(() => MemoEditor))
|
.then(({ default: MemoEditor }) => setEditorComponent(() => MemoEditor))
|
||||||
.catch(() => setIsOpen(false));
|
.catch(() => setIsOpen(false));
|
||||||
}, []);
|
}, [currentUserName]);
|
||||||
const closeEditor = useCallback(() => setIsOpen(false), []);
|
const closeEditor = useCallback(() => setIsOpen(false), []);
|
||||||
const value = useMemo(() => ({ isOpen, openEditor }), [isOpen, openEditor]);
|
const editorIsOpen = !!currentUserName && isOpen;
|
||||||
|
const value = useMemo(() => ({ isOpen: editorIsOpen, openEditor }), [editorIsOpen, openEditor]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
closeEditor();
|
||||||
|
}, [currentUserName, closeEditor]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<GlobalMemoEditorContext.Provider value={value}>
|
<GlobalMemoEditorContext.Provider value={value}>
|
||||||
{children}
|
{children}
|
||||||
{isOpen && EditorComponent && (
|
{editorIsOpen && EditorComponent && (
|
||||||
<EditorComponent
|
<EditorComponent
|
||||||
autoFocus
|
autoFocus
|
||||||
initialFocusMode
|
initialFocusMode
|
||||||
|
|
@ -46,5 +54,9 @@ export function GlobalMemoEditorProvider({ children }: { children: ReactNode })
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useGlobalMemoEditor() {
|
export function useGlobalMemoEditor() {
|
||||||
return useContext(GlobalMemoEditorContext);
|
const context = useContext(GlobalMemoEditorContext);
|
||||||
|
if (!context) {
|
||||||
|
throw new Error("useGlobalMemoEditor must be used within GlobalMemoEditorProvider");
|
||||||
|
}
|
||||||
|
return context;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import { uniqBy } from "lodash-es";
|
import { uniqBy } from "lodash-es";
|
||||||
import { createContext, type ReactNode, useCallback, useContext, useEffect, useRef, useState } from "react";
|
import { createContext, type ReactNode, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
|
||||||
import { useSearchParams } from "react-router-dom";
|
import { useSearchParams } from "react-router-dom";
|
||||||
|
|
||||||
export type FilterFactor =
|
export type FilterFactor =
|
||||||
|
|
@ -126,10 +126,8 @@ export function MemoFilterProvider({ children }: { children: ReactNode }) {
|
||||||
const hasFilter = useCallback((filter: MemoFilter) => filters.some((f) => getMemoFilterKey(f) === getMemoFilterKey(filter)), [filters]);
|
const hasFilter = useCallback((filter: MemoFilter) => filters.some((f) => getMemoFilterKey(f) === getMemoFilterKey(filter)), [filters]);
|
||||||
|
|
||||||
const hasActiveFilters = filters.length > 0 || shortcut !== undefined;
|
const hasActiveFilters = filters.length > 0 || shortcut !== undefined;
|
||||||
|
const value = useMemo(
|
||||||
return (
|
() => ({
|
||||||
<MemoFilterContext.Provider
|
|
||||||
value={{
|
|
||||||
filters,
|
filters,
|
||||||
shortcut,
|
shortcut,
|
||||||
hasActiveFilters,
|
hasActiveFilters,
|
||||||
|
|
@ -141,11 +139,23 @@ export function MemoFilterProvider({ children }: { children: ReactNode }) {
|
||||||
clearAllFilters,
|
clearAllFilters,
|
||||||
setShortcut,
|
setShortcut,
|
||||||
hasFilter,
|
hasFilter,
|
||||||
}}
|
}),
|
||||||
>
|
[
|
||||||
{children}
|
filters,
|
||||||
</MemoFilterContext.Provider>
|
shortcut,
|
||||||
|
hasActiveFilters,
|
||||||
|
getFiltersByFactor,
|
||||||
|
setFilters,
|
||||||
|
addFilter,
|
||||||
|
removeFilter,
|
||||||
|
removeFiltersByFactor,
|
||||||
|
clearAllFilters,
|
||||||
|
setShortcut,
|
||||||
|
hasFilter,
|
||||||
|
],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
return <MemoFilterContext.Provider value={value}>{children}</MemoFilterContext.Provider>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useMemoFilterContext() {
|
export function useMemoFilterContext() {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
import { useEffect, useRef } from "react";
|
import { useEffect, useRef } from "react";
|
||||||
import { Navigate, Outlet, useLocation, useSearchParams } from "react-router-dom";
|
import { Navigate, Outlet, useLocation, useSearchParams } from "react-router-dom";
|
||||||
import Navigation from "@/components/Navigation";
|
import Navigation from "@/components/Navigation";
|
||||||
|
import { GlobalMemoEditorProvider } from "@/contexts/GlobalMemoEditorContext";
|
||||||
import { useInstance } from "@/contexts/InstanceContext";
|
import { useInstance } from "@/contexts/InstanceContext";
|
||||||
import { useMemoFilterContext } from "@/contexts/MemoFilterContext";
|
import { MemoFilterProvider, useMemoFilterContext } from "@/contexts/MemoFilterContext";
|
||||||
import useCurrentUser from "@/hooks/useCurrentUser";
|
import useCurrentUser from "@/hooks/useCurrentUser";
|
||||||
import useMediaQuery from "@/hooks/useMediaQuery";
|
import useMediaQuery from "@/hooks/useMediaQuery";
|
||||||
import { cn } from "@/lib/utils";
|
import { cn } from "@/lib/utils";
|
||||||
|
|
@ -27,7 +28,7 @@ const DemoBanner = () => {
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
const RootLayout = () => {
|
const RootLayoutContent = () => {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const [searchParams] = useSearchParams();
|
const [searchParams] = useSearchParams();
|
||||||
const sm = useMediaQuery("sm");
|
const sm = useMediaQuery("sm");
|
||||||
|
|
@ -57,6 +58,7 @@ const RootLayout = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<GlobalMemoEditorProvider>
|
||||||
<div className="w-full min-h-full flex flex-row justify-center items-start sm:pl-16">
|
<div className="w-full min-h-full flex flex-row justify-center items-start sm:pl-16">
|
||||||
{sm && (
|
{sm && (
|
||||||
<div
|
<div
|
||||||
|
|
@ -74,7 +76,14 @@ const RootLayout = () => {
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
</GlobalMemoEditorProvider>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const RootLayout = () => (
|
||||||
|
<MemoFilterProvider>
|
||||||
|
<RootLayoutContent />
|
||||||
|
</MemoFilterProvider>
|
||||||
|
);
|
||||||
|
|
||||||
export default RootLayout;
|
export default RootLayout;
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ function AppInitializer({ children }: { children: React.ReactNode }) {
|
||||||
|
|
||||||
// Route loading and feed requests only need the verified identity and the
|
// Route loading and feed requests only need the verified identity and the
|
||||||
// instance profile. Display-sensitive settings continue in the background;
|
// instance profile. Display-sensitive settings continue in the background;
|
||||||
// PagedMemoList keeps memo content hidden until they have settled.
|
// PagedMemoList keeps memo content hidden until privacy settings have settled.
|
||||||
if (!isIdentityInitialized || !isProfileInitialized) {
|
if (!isIdentityInitialized || !isProfileInitialized) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ import MemoEditor from "@/components/MemoEditor";
|
||||||
import { deriveDefaultCreateTimeFromFilters } from "@/components/MemoEditor/utils/deriveDefaultCreateTime";
|
import { deriveDefaultCreateTimeFromFilters } from "@/components/MemoEditor/utils/deriveDefaultCreateTime";
|
||||||
import MemoView from "@/components/MemoView";
|
import MemoView from "@/components/MemoView";
|
||||||
import PagedMemoList, { getMemoKey } from "@/components/PagedMemoList";
|
import PagedMemoList, { getMemoKey } from "@/components/PagedMemoList";
|
||||||
|
import { useAuth } from "@/contexts/AuthContext";
|
||||||
import { useMemoFilterContext } from "@/contexts/MemoFilterContext";
|
import { useMemoFilterContext } from "@/contexts/MemoFilterContext";
|
||||||
import { NewMemoProvider } from "@/contexts/NewMemoContext";
|
import { NewMemoProvider } from "@/contexts/NewMemoContext";
|
||||||
import { useMemoFilters, useMemoSorting } from "@/hooks";
|
import { useMemoFilters, useMemoSorting } from "@/hooks";
|
||||||
|
|
@ -14,6 +15,7 @@ import { useTranslate } from "@/utils/i18n";
|
||||||
const Home = () => {
|
const Home = () => {
|
||||||
const user = useCurrentUser();
|
const user = useCurrentUser();
|
||||||
const t = useTranslate();
|
const t = useTranslate();
|
||||||
|
const { isUserSettingsInitialized } = useAuth();
|
||||||
const { filters } = useMemoFilterContext();
|
const { filters } = useMemoFilterContext();
|
||||||
const defaultCreateTime = useMemo(() => deriveDefaultCreateTimeFromFilters(filters), [filters]);
|
const defaultCreateTime = useMemo(() => deriveDefaultCreateTimeFromFilters(filters), [filters]);
|
||||||
|
|
||||||
|
|
@ -38,14 +40,18 @@ const Home = () => {
|
||||||
listSort={listSort}
|
listSort={listSort}
|
||||||
orderBy={orderBy}
|
orderBy={orderBy}
|
||||||
filter={memoFilter}
|
filter={memoFilter}
|
||||||
renderLeading={({ useGrid }) => (
|
renderLeading={({ useGrid }) => {
|
||||||
|
if (!isUserSettingsInitialized) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
<MemoEditor
|
<MemoEditor
|
||||||
className={useGrid ? undefined : "mb-2"}
|
className={useGrid ? undefined : "mb-2"}
|
||||||
cacheKey="home-memo-editor"
|
cacheKey="home-memo-editor"
|
||||||
placeholder={t("editor.any-thoughts")}
|
placeholder={t("editor.any-thoughts")}
|
||||||
defaultCreateTime={defaultCreateTime}
|
defaultCreateTime={defaultCreateTime}
|
||||||
/>
|
/>
|
||||||
)}
|
);
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</NewMemoProvider>
|
</NewMemoProvider>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -32,10 +32,11 @@ vi.mock("@/connect", () => ({
|
||||||
import { AuthProvider, useAuth } from "@/contexts/AuthContext";
|
import { AuthProvider, useAuth } from "@/contexts/AuthContext";
|
||||||
|
|
||||||
const Probe = () => {
|
const Probe = () => {
|
||||||
const { currentUser, initialize, isInitialized } = useAuth();
|
const { currentUser, initialize, isInitialized, isUserSettingsInitialized } = useAuth();
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<span data-testid="initialized">{isInitialized ? "yes" : "no"}</span>
|
<span data-testid="initialized">{isInitialized ? "yes" : "no"}</span>
|
||||||
|
<span data-testid="user-settings-initialized">{isUserSettingsInitialized ? "yes" : "no"}</span>
|
||||||
<span data-testid="user">{currentUser?.name ?? "none"}</span>
|
<span data-testid="user">{currentUser?.name ?? "none"}</span>
|
||||||
<button type="button" onClick={() => void initialize()}>
|
<button type="button" onClick={() => void initialize()}>
|
||||||
initialize
|
initialize
|
||||||
|
|
@ -80,8 +81,12 @@ describe("AuthProvider initialization", () => {
|
||||||
fireEvent.click(screen.getByRole("button", { name: "initialize" }));
|
fireEvent.click(screen.getByRole("button", { name: "initialize" }));
|
||||||
await waitFor(() => expect(screen.getByTestId("user")).toHaveTextContent("users/alice"));
|
await waitFor(() => expect(screen.getByTestId("user")).toHaveTextContent("users/alice"));
|
||||||
expect(screen.getByTestId("initialized")).toHaveTextContent("no");
|
expect(screen.getByTestId("initialized")).toHaveTextContent("no");
|
||||||
|
expect(screen.getByTestId("user-settings-initialized")).toHaveTextContent("no");
|
||||||
|
|
||||||
resolveSettings({ settings: [] });
|
resolveSettings({ settings: [] });
|
||||||
|
await waitFor(() => expect(screen.getByTestId("user-settings-initialized")).toHaveTextContent("yes"));
|
||||||
|
expect(screen.getByTestId("initialized")).toHaveTextContent("no");
|
||||||
|
|
||||||
resolveShortcuts({ shortcuts: [] });
|
resolveShortcuts({ shortcuts: [] });
|
||||||
await waitFor(() => expect(screen.getByTestId("initialized")).toHaveTextContent("yes"));
|
await waitFor(() => expect(screen.getByTestId("initialized")).toHaveTextContent("yes"));
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -4,11 +4,30 @@ import { describe, expect, it, vi } from "vitest";
|
||||||
import Editor from "@/components/MemoEditor/Editor";
|
import Editor from "@/components/MemoEditor/Editor";
|
||||||
import type { EditorController } from "@/components/MemoEditor/types/editorController";
|
import type { EditorController } from "@/components/MemoEditor/types/editorController";
|
||||||
|
|
||||||
|
const queries = vi.hoisted(() => ({
|
||||||
|
useTagCounts: vi.fn(() => ({ data: {} })),
|
||||||
|
}));
|
||||||
|
|
||||||
vi.mock("@/hooks/useUserQueries", () => ({
|
vi.mock("@/hooks/useUserQueries", () => ({
|
||||||
useTagCounts: () => ({ data: {} }),
|
useTagCounts: queries.useTagCounts,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
describe("Editor", () => {
|
describe("Editor", () => {
|
||||||
|
it("scopes tag autocomplete stats to the current user", () => {
|
||||||
|
render(
|
||||||
|
<Editor
|
||||||
|
className="x"
|
||||||
|
initialContent=""
|
||||||
|
placeholder="memo"
|
||||||
|
onContentChange={vi.fn()}
|
||||||
|
onFiles={vi.fn()}
|
||||||
|
onSubmit={vi.fn()}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(queries.useTagCounts).toHaveBeenCalledWith(true);
|
||||||
|
});
|
||||||
|
|
||||||
it("loads markdown and serializes it back verbatim", () => {
|
it("loads markdown and serializes it back verbatim", () => {
|
||||||
const ref = createRef<EditorController>();
|
const ref = createRef<EditorController>();
|
||||||
render(
|
render(
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,12 @@
|
||||||
import { fireEvent, render, screen } from "@testing-library/react";
|
import { fireEvent, render, screen } from "@testing-library/react";
|
||||||
import { describe, expect, it, vi } from "vitest";
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
import { loadMemoEditor } from "@/components/MemoEditor/loader";
|
||||||
import { GlobalMemoEditorProvider, useGlobalMemoEditor } from "@/contexts/GlobalMemoEditorContext";
|
import { GlobalMemoEditorProvider, useGlobalMemoEditor } from "@/contexts/GlobalMemoEditorContext";
|
||||||
|
|
||||||
|
const authState = vi.hoisted(() => ({
|
||||||
|
currentUser: undefined as { name: string } | undefined,
|
||||||
|
}));
|
||||||
|
|
||||||
vi.mock("@/components/MemoEditor/loader", () => ({
|
vi.mock("@/components/MemoEditor/loader", () => ({
|
||||||
loadMemoEditor: vi.fn(async () => ({
|
loadMemoEditor: vi.fn(async () => ({
|
||||||
default: ({ initialFocusMode, onFocusModeExit }: { initialFocusMode?: boolean; onFocusModeExit?: () => void }) => (
|
default: ({ initialFocusMode, onFocusModeExit }: { initialFocusMode?: boolean; onFocusModeExit?: () => void }) => (
|
||||||
|
|
@ -14,6 +19,10 @@ vi.mock("@/components/MemoEditor/loader", () => ({
|
||||||
})),
|
})),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/hooks/useCurrentUser", () => ({
|
||||||
|
default: () => authState.currentUser,
|
||||||
|
}));
|
||||||
|
|
||||||
vi.mock("@/utils/i18n", () => ({ useTranslate: () => (key: string) => key }));
|
vi.mock("@/utils/i18n", () => ({ useTranslate: () => (key: string) => key }));
|
||||||
|
|
||||||
function Trigger() {
|
function Trigger() {
|
||||||
|
|
@ -27,6 +36,8 @@ function Trigger() {
|
||||||
|
|
||||||
describe("GlobalMemoEditorProvider", () => {
|
describe("GlobalMemoEditorProvider", () => {
|
||||||
it("opens the shared editor in focus mode and closes when focus mode exits", async () => {
|
it("opens the shared editor in focus mode and closes when focus mode exits", async () => {
|
||||||
|
authState.currentUser = { name: "users/test" };
|
||||||
|
|
||||||
render(
|
render(
|
||||||
<GlobalMemoEditorProvider>
|
<GlobalMemoEditorProvider>
|
||||||
<Trigger />
|
<Trigger />
|
||||||
|
|
@ -41,4 +52,19 @@ describe("GlobalMemoEditorProvider", () => {
|
||||||
fireEvent.click(screen.getByRole("button", { name: "Exit focus mode" }));
|
fireEvent.click(screen.getByRole("button", { name: "Exit focus mode" }));
|
||||||
expect(screen.queryByTestId("global-editor")).not.toBeInTheDocument();
|
expect(screen.queryByTestId("global-editor")).not.toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("does not load or open the editor for an unauthenticated user", () => {
|
||||||
|
authState.currentUser = undefined;
|
||||||
|
|
||||||
|
render(
|
||||||
|
<GlobalMemoEditorProvider>
|
||||||
|
<Trigger />
|
||||||
|
</GlobalMemoEditorProvider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole("button", { name: "Open editor" }));
|
||||||
|
|
||||||
|
expect(loadMemoEditor).not.toHaveBeenCalled();
|
||||||
|
expect(screen.queryByTestId("global-editor")).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
61
web/tests/home-loading-boundary.test.tsx
Normal file
61
web/tests/home-loading-boundary.test.tsx
Normal file
|
|
@ -0,0 +1,61 @@
|
||||||
|
import { render, screen } from "@testing-library/react";
|
||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
import Home from "@/pages/Home";
|
||||||
|
|
||||||
|
vi.mock("@/components/MemoEditor", () => ({
|
||||||
|
default: () => <div data-testid="memo-editor" />,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/components/MemoView", () => ({
|
||||||
|
default: () => <div data-testid="memo-view" />,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/components/PagedMemoList", () => ({
|
||||||
|
default: ({
|
||||||
|
renderer,
|
||||||
|
renderLeading,
|
||||||
|
}: {
|
||||||
|
renderer: (memo: { name: string }, options: { compact: boolean }) => React.ReactNode;
|
||||||
|
renderLeading: (options: { useGrid: boolean }) => React.ReactNode;
|
||||||
|
}) => (
|
||||||
|
<>
|
||||||
|
{renderLeading({ useGrid: false })}
|
||||||
|
{renderer({ name: "memos/1" }, { compact: false })}
|
||||||
|
</>
|
||||||
|
),
|
||||||
|
getMemoKey: (memo: { name: string }) => memo.name,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/contexts/AuthContext", () => ({
|
||||||
|
useAuth: () => ({ isUserSettingsInitialized: true }),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/contexts/MemoFilterContext", () => ({
|
||||||
|
useMemoFilterContext: () => ({ filters: [] }),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/contexts/NewMemoContext", () => ({
|
||||||
|
NewMemoProvider: ({ children }: { children: React.ReactNode }) => <>{children}</>,
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/hooks", () => ({
|
||||||
|
useMemoFilters: () => "",
|
||||||
|
useMemoSorting: () => ({ listSort: undefined, orderBy: "create_time desc" }),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/hooks/useCurrentUser", () => ({
|
||||||
|
default: () => ({ name: "users/1" }),
|
||||||
|
}));
|
||||||
|
|
||||||
|
vi.mock("@/utils/i18n", () => ({
|
||||||
|
useTranslate: () => (key: string) => key,
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe("<Home>", () => {
|
||||||
|
it("renders the editor and memo cards synchronously without blank placeholders", () => {
|
||||||
|
render(<Home />);
|
||||||
|
|
||||||
|
expect(screen.getByTestId("memo-editor")).toBeInTheDocument();
|
||||||
|
expect(screen.getByTestId("memo-view")).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -11,6 +11,9 @@ const mockState = vi.hoisted(() => ({
|
||||||
attachments: [],
|
attachments: [],
|
||||||
reactions: [],
|
reactions: [],
|
||||||
},
|
},
|
||||||
|
blurred: false,
|
||||||
|
showBlurredContent: false,
|
||||||
|
toggleBlurVisibility: vi.fn(),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("@/utils/i18n", () => ({
|
vi.mock("@/utils/i18n", () => ({
|
||||||
|
|
@ -46,12 +49,12 @@ vi.mock("@/components/MemoView/MemoViewContext", () => ({
|
||||||
useMemoViewContext: () => ({
|
useMemoViewContext: () => ({
|
||||||
memo: mockState.memo,
|
memo: mockState.memo,
|
||||||
parentPage: "",
|
parentPage: "",
|
||||||
showBlurredContent: false,
|
showBlurredContent: mockState.showBlurredContent,
|
||||||
blurred: false,
|
blurred: mockState.blurred,
|
||||||
readonly: false,
|
readonly: false,
|
||||||
openEditor: vi.fn(),
|
openEditor: vi.fn(),
|
||||||
openPreview: vi.fn(),
|
openPreview: vi.fn(),
|
||||||
toggleBlurVisibility: vi.fn(),
|
toggleBlurVisibility: mockState.toggleBlurVisibility,
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|
@ -64,6 +67,9 @@ const createMemo = (content: string) => ({
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
|
mockState.blurred = false;
|
||||||
|
mockState.showBlurredContent = false;
|
||||||
|
mockState.toggleBlurVisibility.mockReset();
|
||||||
vi.restoreAllMocks();
|
vi.restoreAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -97,4 +103,17 @@ describe("<MemoBody /> compact body clamp", () => {
|
||||||
|
|
||||||
expect(screen.queryByRole("button", { name: /memo\.show-more/ })).toBeNull();
|
expect(screen.queryByRole("button", { name: /memo\.show-more/ })).toBeNull();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("renders the sensitive-content action as a button", () => {
|
||||||
|
mockState.blurred = true;
|
||||||
|
mockState.memo = createMemo("sensitive content");
|
||||||
|
|
||||||
|
render(<MemoBody compact={false} />);
|
||||||
|
|
||||||
|
const revealButton = screen.getByRole("button", { name: "memo.click-to-show-sensitive-content" });
|
||||||
|
expect(revealButton).toHaveClass("cursor-pointer");
|
||||||
|
|
||||||
|
fireEvent.click(revealButton);
|
||||||
|
expect(mockState.toggleBlurVisibility).toHaveBeenCalledOnce();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ const feed = vi.hoisted(() => ({
|
||||||
isLoading: false,
|
isLoading: false,
|
||||||
fetchNextPage: vi.fn(async () => undefined),
|
fetchNextPage: vi.fn(async () => undefined),
|
||||||
}));
|
}));
|
||||||
const readiness = vi.hoisted(() => ({ auth: true, instance: true }));
|
const readiness = vi.hoisted(() => ({ userSettings: true }));
|
||||||
|
|
||||||
vi.mock("@/hooks/useMemoQueries", () => ({
|
vi.mock("@/hooks/useMemoQueries", () => ({
|
||||||
useInfiniteMemos: () => ({
|
useInfiniteMemos: () => ({
|
||||||
|
|
@ -28,11 +28,7 @@ vi.mock("@/contexts/MemoFilterContext", () => ({
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("@/contexts/AuthContext", () => ({
|
vi.mock("@/contexts/AuthContext", () => ({
|
||||||
useAuth: () => ({ isInitialized: readiness.auth }),
|
useAuth: () => ({ isUserSettingsInitialized: readiness.userSettings }),
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("@/contexts/InstanceContext", () => ({
|
|
||||||
useInstance: () => ({ isInitialized: readiness.instance }),
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("@/contexts/ViewContext", () => ({
|
vi.mock("@/contexts/ViewContext", () => ({
|
||||||
|
|
@ -71,13 +67,12 @@ describe("<PagedMemoList>", () => {
|
||||||
feed.hasNextPage = false;
|
feed.hasNextPage = false;
|
||||||
feed.isLoading = false;
|
feed.isLoading = false;
|
||||||
feed.fetchNextPage.mockClear();
|
feed.fetchNextPage.mockClear();
|
||||||
readiness.auth = true;
|
readiness.userSettings = true;
|
||||||
readiness.instance = true;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it("does not render fetched memo content before display settings settle", () => {
|
it("keeps fetched memo content hidden until privacy settings settle", () => {
|
||||||
feed.memos = [memo];
|
feed.memos = [memo];
|
||||||
readiness.auth = false;
|
readiness.userSettings = false;
|
||||||
const renderer = vi.fn((m: Memo) => <div key={m.name}>{m.content}</div>);
|
const renderer = vi.fn((m: Memo) => <div key={m.name}>{m.content}</div>);
|
||||||
|
|
||||||
renderList(renderer);
|
renderList(renderer);
|
||||||
|
|
@ -86,12 +81,22 @@ describe("<PagedMemoList>", () => {
|
||||||
expect(screen.queryByText("hello")).not.toBeInTheDocument();
|
expect(screen.queryByText("hello")).not.toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("does not auto-fetch more pages while display settings are pending", async () => {
|
it("renders fetched memo content once privacy settings settle", () => {
|
||||||
|
feed.memos = [memo];
|
||||||
|
const renderer = vi.fn((m: Memo) => <div key={m.name}>{m.content}</div>);
|
||||||
|
|
||||||
|
renderList(renderer);
|
||||||
|
|
||||||
|
expect(renderer).toHaveBeenCalled();
|
||||||
|
expect(screen.getByText("hello")).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("does not auto-fetch more pages before privacy settings settle", async () => {
|
||||||
vi.useFakeTimers();
|
vi.useFakeTimers();
|
||||||
try {
|
try {
|
||||||
feed.memos = [memo];
|
feed.memos = [memo];
|
||||||
feed.hasNextPage = true;
|
feed.hasNextPage = true;
|
||||||
readiness.auth = false;
|
readiness.userSettings = false;
|
||||||
|
|
||||||
renderList();
|
renderList();
|
||||||
await act(async () => vi.advanceTimersByTimeAsync(1000));
|
await act(async () => vi.advanceTimersByTimeAsync(1000));
|
||||||
|
|
@ -102,6 +107,21 @@ describe("<PagedMemoList>", () => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("auto-fetches more pages once memo data is ready", async () => {
|
||||||
|
vi.useFakeTimers();
|
||||||
|
try {
|
||||||
|
feed.memos = [memo];
|
||||||
|
feed.hasNextPage = true;
|
||||||
|
|
||||||
|
renderList();
|
||||||
|
await act(async () => vi.advanceTimersByTimeAsync(200));
|
||||||
|
|
||||||
|
expect(feed.fetchNextPage).toHaveBeenCalledTimes(1);
|
||||||
|
} finally {
|
||||||
|
vi.useRealTimers();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
it("delays the initial loading spinner to avoid flashing on fast loads", async () => {
|
it("delays the initial loading spinner to avoid flashing on fast loads", async () => {
|
||||||
vi.useFakeTimers();
|
vi.useFakeTimers();
|
||||||
try {
|
try {
|
||||||
|
|
@ -118,6 +138,14 @@ describe("<PagedMemoList>", () => {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("keeps route-owned leading content visible while memos load", () => {
|
||||||
|
feed.isLoading = true;
|
||||||
|
|
||||||
|
renderList(undefined, { leading: <div data-testid="leading-content" /> });
|
||||||
|
|
||||||
|
expect(screen.getByTestId("leading-content")).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
it("uses the tile sprite Placeholder for the empty state", () => {
|
it("uses the tile sprite Placeholder for the empty state", () => {
|
||||||
renderList();
|
renderList();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
import { act, render, screen, waitFor } from "@testing-library/react";
|
import { act, render, screen, waitFor } from "@testing-library/react";
|
||||||
import type { ReactNode } from "react";
|
|
||||||
import { createMemoryRouter, RouterProvider } from "react-router-dom";
|
import { createMemoryRouter, RouterProvider } from "react-router-dom";
|
||||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||||
import App from "@/App";
|
import App from "@/App";
|
||||||
|
|
@ -12,10 +11,6 @@ vi.mock("@/contexts/InstanceContext", () => ({
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock("@/contexts/MemoFilterContext", () => ({
|
|
||||||
MemoFilterProvider: ({ children }: { children: ReactNode }) => children,
|
|
||||||
}));
|
|
||||||
|
|
||||||
vi.mock("@/hooks/useNavigateTo", () => ({ default: () => vi.fn() }));
|
vi.mock("@/hooks/useNavigateTo", () => ({ default: () => vi.fn() }));
|
||||||
vi.mock("@/hooks/useUserLocale", () => ({ useUserLocale: vi.fn() }));
|
vi.mock("@/hooks/useUserLocale", () => ({ useUserLocale: vi.fn() }));
|
||||||
vi.mock("@/hooks/useUserTheme", () => ({ useUserTheme: vi.fn() }));
|
vi.mock("@/hooks/useUserTheme", () => ({ useUserTheme: vi.fn() }));
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue