@ciridae/ui 0.8.0 → 0.8.1

package/dist/components/blocks/feedback-center-comments.js

@@ -4,7 +4,8 @@ import { CommentThread } from "./comment-thread";
 import { Alert, AlertDescription, AlertTitle } from "../ui/alert";
 import { Button } from "../ui/button";
 function FeedbackCenterCommentThread({ comments, error, feedback, isCommentSubmitting, isCommentsLoading, onRetry, onSubmitComment, }) {
-    if (error) {
+    // A retry in flight shows the thread's loading state, not the stale error.
+    if (error && !isCommentsLoading) {
         return (_jsxs(Alert, { variant: "destructive", children: [_jsx(AlertCircleIcon, {}), _jsx(AlertTitle, { children: "Conversation could not be loaded" }), _jsxs(AlertDescription, { className: "grid gap-3", children: [_jsx("span", { children: error.message }), onRetry ? (_jsx(Button, { className: "justify-self-start", onClick: onRetry, size: "sm", type: "button", variant: "outline", children: "Try again" })) : null] })] }));
     }
     return (_jsx(CommentThread, { comments: comments, composerPlaceholder: "Write a reply...", composerSubmitLabel: "Reply", isLoading: isCommentsLoading, isSubmitting: isCommentSubmitting, onSubmit: getCommentSubmitHandler(feedback, onSubmitComment), readOnly: !onSubmitComment, showHeader: false }));

package/dist/components/ui/form-sheet.js

@@ -51,11 +51,12 @@ function FormSheet({ children, closeDisabled = false, isDirty, onOpenChange, ope
     }
     return (_jsxs(_Fragment, { children: [_jsxs(Sheet, { onOpenChange: handleOpenChange, open: open, children: [trigger ? _jsx(SheetTrigger, { asChild: true, children: trigger }) : null, _jsx(FormSheetContext.Provider, { value: actions, children: children })] }), _jsx(DiscardChangesPrompt, { onDiscard: discardChanges, onOpenChange: handleDiscardPromptOpenChange, open: discardPromptOpen })] }));
 }
+// useLayoutEffect warns during server rendering; the capture is browser-only anyway.
+const useIsomorphicLayoutEffect = typeof document === "undefined" ? React.useEffect : React.useLayoutEffect;
 function useFormSheetReturnFocus(open) {
-    const activeElementDuringRender = getActiveElement();
     const focusFrameRef = React.useRef(null);
-    const returnFocusRef = React.useRef(activeElementDuringRender);
-    const wasOpenRef = React.useRef(open);
+    const returnFocusRef = React.useRef(null);
+    const wasOpenRef = React.useRef(false);
     const schedule = React.useCallback(() => {
         const returnFocus = returnFocusRef.current;
         if (!returnFocus)
@@ -68,10 +69,12 @@ function useFormSheetReturnFocus(open) {
                 returnFocus.focus();
         });
     }, []);
-    React.useEffect(() => {
+    // Layout effect: a controlled open (no trigger, so capture() never ran) must
+    // read the pre-open element before the sheet's focus scope moves focus.
+    useIsomorphicLayoutEffect(() => {
         if (open) {
             if (!wasOpenRef.current)
-                returnFocusRef.current = activeElementDuringRender;
+                returnFocusRef.current = getActiveElement();
             wasOpenRef.current = true;
             return;
         }
@@ -79,7 +82,7 @@ function useFormSheetReturnFocus(open) {
             return;
         wasOpenRef.current = false;
         schedule();
-    }, [activeElementDuringRender, open, schedule]);
+    }, [open, schedule]);
     React.useEffect(() => () => {
         if (wasOpenRef.current)
             schedule();
@@ -98,9 +101,8 @@ function DiscardChangesPrompt({ onDiscard, onOpenChange, open, }) {
     return (_jsx(AlertDialog, { onOpenChange: onOpenChange, open: open, children: _jsxs(AlertDialogContent, { size: "sm", children: [_jsxs(AlertDialogHeader, { children: [_jsx(AlertDialogTitle, { children: "Discard unsaved changes?" }), _jsx(AlertDialogDescription, { children: "Your changes have not been saved. Keep editing or discard them and close this panel." })] }), _jsxs(AlertDialogFooter, { children: [_jsx(AlertDialogCancel, { children: "Keep editing" }), _jsx(AlertDialogAction, { onClick: onDiscard, variant: "destructive", children: "Discard changes" })] })] }) }));
 }
 function getActiveElement() {
-    // Called during render, so it must be safe on the server too.
     if (typeof document === "undefined")
-        return null;
+        return null; // SSR-safe
     return document.activeElement instanceof HTMLElement ? document.activeElement : null;
 }
 export { FormSheet, useFormSheetActions };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ciridae/ui",
-	"version": "0.8.0",
+	"version": "0.8.1",
 	"type": "module",
 	"private": false,
 	"engines": {