From d37422ab8a7bdce85b5dc8faeb11360c17644ba2 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Sat, 18 Oct 2025 16:43:03 +0200 Subject: [PATCH] fix: Creating new doc offline in sidebar leaves corrupt state in UI (#10412) --- app/components/EditableTitle.tsx | 6 ++- .../Sidebar/components/CollectionLink.tsx | 37 +++++++++------- .../Sidebar/components/DocumentLink.tsx | 43 +++++++++++-------- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/app/components/EditableTitle.tsx b/app/components/EditableTitle.tsx index aaf9964a9a..b00399b44b 100644 --- a/app/components/EditableTitle.tsx +++ b/app/components/EditableTitle.tsx @@ -83,13 +83,15 @@ function EditableTitle( try { await onSubmit(trimmedValue); setOriginalValue(trimmedValue); + setIsEditing(false); } catch (error) { - setValue(originalValue); + setValue(value); + setIsEditing(true); + toast.error(error.message); throw error; } finally { setIsSubmitting(false); - setIsEditing(false); } }, [originalValue, value, onCancel, onSubmit, isSubmitting] diff --git a/app/components/Sidebar/components/CollectionLink.tsx b/app/components/Sidebar/components/CollectionLink.tsx index 20862514cb..2e9310270a 100644 --- a/app/components/Sidebar/components/CollectionLink.tsx +++ b/app/components/Sidebar/components/CollectionLink.tsx @@ -86,27 +86,33 @@ const CollectionLink: React.FC = ({ editableTitleRef.current?.setIsEditing(true); }, [editableTitleRef]); + const newChildTitleRef = React.useRef(null); const [isAddingNewChild, setIsAddingNewChild, closeAddingNewChild] = useBoolean(); const handleNewDoc = React.useCallback( async (input) => { - const newDocument = await documents.create( - { - collectionId: collection.id, - title: input, - fullWidth: user.getPreference(UserPreference.FullWidthDocuments), - data: ProsemirrorHelper.getEmptyDocument(), - }, - { publish: true } - ); - collection?.addDocument(newDocument); + try { + newChildTitleRef.current?.setIsEditing(false); + const newDocument = await documents.create( + { + collectionId: collection.id, + title: input, + fullWidth: user.getPreference(UserPreference.FullWidthDocuments), + data: ProsemirrorHelper.getEmptyDocument(), + }, + { publish: true } + ); + collection?.addDocument(newDocument); - closeAddingNewChild(); - history.push({ - pathname: documentEditPath(newDocument), - state: { sidebarContext }, - }); + closeAddingNewChild(); + history.push({ + pathname: documentEditPath(newDocument), + state: { sidebarContext }, + }); + } catch (_err) { + newChildTitleRef.current?.setIsEditing(true); + } }, [user, sidebarContext, closeAddingNewChild, history, collection, documents] ); @@ -192,6 +198,7 @@ const CollectionLink: React.FC = ({ onCancel={closeAddingNewChild} onSubmit={handleNewDoc} maxLength={DocumentValidation.maxTitleLength} + ref={newChildTitleRef} /> } /> diff --git a/app/components/Sidebar/components/DocumentLink.tsx b/app/components/Sidebar/components/DocumentLink.tsx index fba4778d3f..251858080c 100644 --- a/app/components/Sidebar/components/DocumentLink.tsx +++ b/app/components/Sidebar/components/DocumentLink.tsx @@ -281,30 +281,36 @@ function InnerDocumentLink( [setExpanded, setCollapsed, hasChildren, expanded] ); + const newChildTitleRef = React.useRef(null); const [isAddingNewChild, setIsAddingNewChild, closeAddingNewChild] = useBoolean(); const handleNewDoc = React.useCallback( async (input) => { - const newDocument = await documents.create( - { - collectionId: collection?.id, - parentDocumentId: node.id, - fullWidth: - doc?.fullWidth ?? - user.getPreference(UserPreference.FullWidthDocuments), - title: input, - data: ProsemirrorHelper.getEmptyDocument(), - }, - { publish: true } - ); - collection?.addDocument(newDocument, node.id); + try { + newChildTitleRef.current?.setIsEditing(false); + const newDocument = await documents.create( + { + collectionId: collection?.id, + parentDocumentId: node.id, + fullWidth: + doc?.fullWidth ?? + user.getPreference(UserPreference.FullWidthDocuments), + title: input, + data: ProsemirrorHelper.getEmptyDocument(), + }, + { publish: true } + ); + collection?.addDocument(newDocument, node.id); - closeAddingNewChild(); - history.push({ - pathname: documentEditPath(newDocument), - state: { sidebarContext }, - }); + closeAddingNewChild(); + history.push({ + pathname: documentEditPath(newDocument), + state: { sidebarContext }, + }); + } catch (_err) { + newChildTitleRef.current?.setIsEditing(true); + } }, [ documents, @@ -414,6 +420,7 @@ function InnerDocumentLink( onCancel={closeAddingNewChild} onSubmit={handleNewDoc} maxLength={DocumentValidation.maxTitleLength} + ref={newChildTitleRef} /> } />