Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix(web): correct sharing dialog initial focus and close button rings

tianma-if043752546fdc
diff --git a/apps/web/src/components/dialogs/ShareMemoDialog.tsx b/apps/web/src/components/dialogs/ShareMemoDialog.tsx
index bfebc20e..7b53a5fe 100644
--- a/apps/web/src/components/dialogs/ShareMemoDialog.tsx
+++ b/apps/web/src/components/dialogs/ShareMemoDialog.tsx
@@ -33,6 +33,7 @@ export const ShareMemoDialog = ({
const [copyState, setCopyState] = useState<"idle" | "copied" | "error">("idle");
const [copyTarget, setCopyTarget] = useState<"link" | "password" | "both">("link");
const copyResetTimerRef = useRef<number | null>(null);
+ const dialogContentRef = useRef<HTMLDivElement>(null);
const autoCreateAttemptRef = useRef<string | null>(null);
const queryKey = memoShareQueryKey(memoId);
const shareQuery = useQuery({
@@ -120,7 +121,15 @@ export const ShareMemoDialog = ({
return (
<Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent aria-describedby={undefined} className={`${SHARE_DIALOG_WIDTH_CLASS_NAME} space-y-4`}>
+ <DialogContent
+ ref={dialogContentRef}
+ aria-describedby={undefined}
+ className={`${SHARE_DIALOG_WIDTH_CLASS_NAME} space-y-4`}
+ onOpenAutoFocus={(event) => {
+ event.preventDefault();
+ dialogContentRef.current?.focus({ preventScroll: true });
+ }}
+ >
<DialogHeader className="space-y-1.5 text-left">
<DialogTitle className="flex items-center gap-2 text-base font-semibold">
<Share2 className="h-5 w-5 text-slate-700" />
diff --git a/apps/web/src/components/dialogs/ShareNotebookDialog.tsx b/apps/web/src/components/dialogs/ShareNotebookDialog.tsx
index 7e508bbb..6c381e19 100644
--- a/apps/web/src/components/dialogs/ShareNotebookDialog.tsx
+++ b/apps/web/src/components/dialogs/ShareNotebookDialog.tsx
@@ -38,6 +38,7 @@ export const ShareNotebookDialog = ({
const queryClient = useQueryClient();
const [copyState, setCopyState] = useState<"idle" | "copied" | "error">("idle");
const copyResetTimerRef = useRef<number | null>(null);
+ const dialogContentRef = useRef<HTMLDivElement>(null);
const queryKey = [
"notebook-share",
@@ -118,7 +119,14 @@ export const ShareNotebookDialog = ({
return (
<Dialog open={open} onOpenChange={onOpenChange}>
- <DialogContent className={`${SHARE_DIALOG_WIDTH_CLASS_NAME} space-y-4`}>
+ <DialogContent
+ ref={dialogContentRef}
+ className={`${SHARE_DIALOG_WIDTH_CLASS_NAME} space-y-4`}
+ onOpenAutoFocus={(event) => {
+ event.preventDefault();
+ dialogContentRef.current?.focus({ preventScroll: true });
+ }}
+ >
<DialogHeader className="space-y-1.5 text-left">
<DialogTitle className="flex items-center gap-2 text-base font-semibold">
<Share2 className="h-5 w-5 text-slate-700" />
diff --git a/apps/web/src/components/ui/dialog.tsx b/apps/web/src/components/ui/dialog.tsx
index 6f630ca0..855e77d1 100644
--- a/apps/web/src/components/ui/dialog.tsx
+++ b/apps/web/src/components/ui/dialog.tsx
@@ -41,7 +41,7 @@ const DialogContent = React.forwardRef<
>
{children}
{showCloseButton ? (
- <DialogPrimitive.Close className="absolute right-4 top-4 flex h-8 w-8 items-center justify-center rounded-md text-slate-500 transition-colors hover:bg-slate-100 hover:text-slate-900 focus:outline-none focus:ring-2 focus:ring-slate-900/20 focus:ring-offset-2 disabled:pointer-events-none">
+ <DialogPrimitive.Close className="absolute right-4 top-4 flex h-8 w-8 items-center justify-center rounded-md text-slate-500 transition-colors hover:bg-slate-100 hover:text-slate-900 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-slate-900/20 focus-visible:ring-offset-2 disabled:pointer-events-none">
<X className="h-4 w-4" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>