gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 15:19:01 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

refactor(collection/presentation): apply review suggestions

Browse Source
This commit is contained in:
Elian Doran 2025-10-16 09:02:02 +03:00
parent 90e5193a97
commit 96f5b55d9f
No known key found for this signature in database
3 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/client/src/widgets/collections/presentation/index.tsx
View File

@ -30,7 +30,6 @@ export default function PresentationView({ note, noteIds }: ViewModeProps<{}>) {
useTriliumEvent("entitiesReloaded", ({ loadResults }) => { useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
if (loadResults.getNoteIds().find(noteId => noteIds.includes(noteId))) { if (loadResults.getNoteIds().find(noteId => noteIds.includes(noteId))) {
console.log("Needs reload!");
refresh(); refresh();
} }
}); });
@ -105,7 +104,7 @@ function ButtonOverlay({ containerRef, api }: { containerRef: RefObject<HTMLDivE
) )
} }
function Presentation({ presentation, setApi } : { presentation: PresentationModel, setApi: (api: Reveal.Api) => void }) { function Presentation({ presentation, setApi } : { presentation: PresentationModel, setApi: (api: Reveal.Api | undefined) => void }) {
const containerRef = useRef<HTMLDivElement>(null); const containerRef = useRef<HTMLDivElement>(null);
const apiRef = useRef<Reveal.Api>(null); const apiRef = useRef<Reveal.Api>(null);
const isFirstRenderRef = useRef(true); const isFirstRenderRef = useRef(true);
@ -133,6 +132,7 @@ function Presentation({ presentation, setApi } : { presentation: PresentationMod
return () => { return () => {
api.destroy(); api.destroy();
apiRef.current = null; apiRef.current = null;
setApi(undefined);
} }
}, [ ]); }, [ ]);

17
apps/client/src/widgets/collections/presentation/model.ts
View File

@ -19,17 +19,12 @@ export interface PresentationModel {
} }
export async function buildPresentationModel(note: FNote): Promise<PresentationModel> { export async function buildPresentationModel(note: FNote): Promise<PresentationModel> {
const slideNotes = await note.getChildNotes(); const slideNotes = await note.getChildNotes();
const slides: PresentationSlideModel[] = []; const slides: PresentationSlideModel[] = await Promise.all(slideNotes.map(async slideNote => ({
for (const slideNote of slideNotes) {
slides.push({
noteId: slideNote.noteId, noteId: slideNote.noteId,
content: await processContent(slideNote), content: await processContent(slideNote),
verticalSlides: await buildVerticalSlides(slideNote) verticalSlides: await buildVerticalSlides(slideNote)
}) })))
}
return { slides }; return { slides };
} }
@ -38,13 +33,11 @@ async function buildVerticalSlides(parentSlideNote: FNote): Promise<undefined |
const children = await parentSlideNote.getChildNotes(); const children = await parentSlideNote.getChildNotes();
if (!children.length) return; if (!children.length) return;
const slides: PresentationSlideBaseModel[] = []; const slides: PresentationSlideBaseModel[] = await Promise.all(children.map(async childNote => ({
for (const childNote of children) {
slides.push({
noteId: childNote.noteId, noteId: childNote.noteId,
content: await processContent(childNote) content: await processContent(childNote)
}); })));
}
return slides; return slides;
} }

4
apps/client/src/widgets/react/ShadowDom.tsx
View File

@ -13,10 +13,10 @@ export default function ShadowDom({ children, containerRef: externalContainerRef
// Create the shadow root. // Create the shadow root.
useEffect(() => { useEffect(() => {
if (!containerRef.current || shadowRoot) return; if (!containerRef.current) return;
const shadow = containerRef.current.attachShadow({ mode: "open" }); const shadow = containerRef.current.attachShadow({ mode: "open" });
setShadowRoot(shadow); setShadowRoot(shadow);
}, [ shadowRoot ]); }, []);
// Render the child elements. // Render the child elements.
useEffect(() => { useEffect(() => {