Build your personal knowledge base with Trilium Notes
TypeScript electronelectron-appknowledge-baseknowledge-graphknowledge-managementknowledge-management-graphlocal-firstnote-managmentnote-takernote-takingnotebooknotesnotes-apppersonal-knowledge-basepersonal-wikiscriptableself-hostedself-hostingwiki
refactor(hooks): extract attachment hook outside UI components
Elian Doran6e7243ecf1ba
diff --git a/apps/client/src/widgets/layout/StatusBar.tsx b/apps/client/src/widgets/layout/StatusBar.tsxindex 026549ae28..908da20657 100644--- a/apps/client/src/widgets/layout/StatusBar.tsx+++ b/apps/client/src/widgets/layout/StatusBar.tsx@@ -22,7 +22,7 @@ import { BacklinksWidget, useBacklinkCount } from "../FloatingButtonsDefinitionsimport Dropdown, { DropdownProps } from "../react/Dropdown";import { FormDropdownDivider, FormListHeader, FormListItem } from "../react/FormList";import HelpDropdown from "../react/HelpDropdown";-import { useActiveNoteContext, useLegacyImperativeHandlers, useNoteLabel, useNoteLabelInt, useNoteLabelOptionalBool, useNoteProperty, useStaticTooltip, useTriliumEvent, useTriliumEvents, useTriliumOptionBool, useTriliumOptionInt } from "../react/hooks";+import { useActiveNoteContext, useLegacyImperativeHandlers, useNoteLabel, useNoteLabelInt, useNoteLabelOptionalBool, useNoteProperty, useStaticTooltip, useTriliumEvent, useTriliumEvents, useTriliumOptionBool, useTriliumOptionInt, useAttachments } from "../react/hooks";import Icon from "../react/Icon";import LinkButton from "../react/LinkButton";import { ParentComponent } from "../react/react_utils";@@ -34,7 +34,6 @@ import { NoteSizeWidget, useNoteMetadata } from "../ribbon/NoteInfoTab";import { NotePathsWidget, useSortedNotePaths } from "../ribbon/NotePathsTab";import SimilarNotesTab from "../ribbon/SimilarNotesTab";import type { RightPaneTabId } from "../sidebar/RightPaneTabs";-import { useAttachments } from "../type_widgets/Attachment";import { useProcessedLocales } from "../type_widgets/options/components/LocaleSelector";import Breadcrumb from "./Breadcrumb";import { convertIndentation } from "./reindentation";diff --git a/apps/client/src/widgets/react/hooks.tsx b/apps/client/src/widgets/react/hooks.tsxindex c4eac0f804..76c3739bbc 100644--- a/apps/client/src/widgets/react/hooks.tsx+++ b/apps/client/src/widgets/react/hooks.tsx@@ -33,6 +33,7 @@ import NoteContextAwareWidget from "../note_context_aware_widget";import { DragData } from "../note_tree";import { noteSavedDataStore } from "./NoteStore";import { NoteContextContext, ParentComponent, refToJQuerySelector } from "./react_utils";+import type FAttachment from "../../entities/fattachment";export function useTriliumEvent<T extends EventNames>(eventName: T, handler: (data: EventData<T>) => void) {const parentComponent = useContext(ParentComponent);@@ -2178,3 +2179,21 @@ export function useDebouncedValue<T>(value: T, delay: number): T {return settled;}++export function useAttachments(note: FNote) {+ const [ attachments, setAttachments ] = useState<FAttachment[]>([]);++ function refresh() {+ note.getAttachments().then(attachments => setAttachments(Array.from(attachments)));+ }++ useEffect(refresh, [ note ]);++ useTriliumEvent("entitiesReloaded", ({ loadResults }) => {+ if (loadResults.getAttachmentRows().some((att) => att.attachmentId && att.ownerId === note.noteId)) {+ refresh();+ }+ });++ return attachments;+}\ No newline at end of filediff --git a/apps/client/src/widgets/type_widgets/Attachment.tsx b/apps/client/src/widgets/type_widgets/Attachment.tsxindex 456f342cab..0af0d526d2 100644--- a/apps/client/src/widgets/type_widgets/Attachment.tsx+++ b/apps/client/src/widgets/type_widgets/Attachment.tsx@@ -31,7 +31,7 @@ import Dropdown from "../react/Dropdown";import FormFileUpload from "../react/FormFileUpload";import { FormDropdownDivider, FormListItem } from "../react/FormList";import HelpButton from "../react/HelpButton";-import { useTriliumEvent } from "../react/hooks";+import { useAttachments, useTriliumEvent } from "../react/hooks";import Icon from "../react/Icon";import ImageViewer from "../react/ImageViewer";import NoItems from "../react/NoItems";@@ -128,24 +128,6 @@ function SystemAttachments({ attachments }: { attachments: FAttachment[] }) {);}-export function useAttachments(note: FNote) {- const [ attachments, setAttachments ] = useState<FAttachment[]>([]);-- function refresh() {- note.getAttachments().then(attachments => setAttachments(Array.from(attachments)));- }-- useEffect(refresh, [ note ]);-- useTriliumEvent("entitiesReloaded", ({ loadResults }) => {- if (loadResults.getAttachmentRows().some((att) => att.attachmentId && att.ownerId === note.noteId)) {- refresh();- }- });-- return attachments;-}-function AttachmentListHeader({ noteId }: { noteId: string }) {const parentComponent = useContext(ParentComponent);