Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/core/providers/canvas/canvas.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export interface CanvasContextModel {
setActivePage: (pageId: string) => void;
deletePage: (pageIndex: number) => void;
editPageTitle: (pageIndex: number, newName: string) => void;
activePageIndex: number;
isThumbnailContextMenuVisible: boolean;
setIsThumbnailContextMenuVisible: React.Dispatch<
React.SetStateAction<boolean>
Expand Down
1 change: 1 addition & 0 deletions src/core/providers/canvas/canvas.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ export const CanvasProvider: React.FC<Props> = props => {
setActivePage,
deletePage,
editPageTitle,
activePageIndex: document.activePageIndex,
isThumbnailContextMenuVisible,
setIsThumbnailContextMenuVisible,
}}
Expand Down
46 changes: 28 additions & 18 deletions src/pods/thumb-pages/components/thumb-page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ import React from 'react';

interface Props {
pageIndex: number;
isVisible: boolean;
onSetActivePage: (pageId: string) => void;
setPageTitleBeingEdited: (index: number) => void;
}

export const ThumbPage: React.FunctionComponent<Props> = props => {
const { pageIndex, onSetActivePage, setPageTitleBeingEdited } = props;
const { fullDocument } = useCanvasContext();
const { pageIndex, onSetActivePage, setPageTitleBeingEdited, isVisible } =
props;
const { fullDocument, activePageIndex } = useCanvasContext();
const page = fullDocument.pages[pageIndex];
const shapes = page.shapes;
const fakeShapeRefs = useRef<ShapeRefs>({});
Expand All @@ -33,33 +35,41 @@ export const ThumbPage: React.FunctionComponent<Props> = props => {
const divRef = useRef<HTMLDivElement>(null);
const [key, setKey] = React.useState(0);

React.useEffect(() => {
const handleResizeAndForceRedraw = () => {
const newCanvaSize = {
width: divRef.current?.clientWidth || 1,
height: divRef.current?.clientHeight || 1,
};

window.addEventListener('resize', () => {
setCanvasSize({
width: divRef.current?.clientWidth || 1,
height: divRef.current?.clientHeight || 1,
});
});

setCanvasSize(newCanvaSize);
setFinalScale(calculateScaleBasedOnBounds(shapes, newCanvaSize));
setTimeout(() => {
setKey(key => key + 1);
}, 100);
};

React.useLayoutEffect(() => {
handleResizeAndForceRedraw();
}, []);

React.useEffect(() => {
if (!isVisible) return;
handleResizeAndForceRedraw();
}, [isVisible]);

React.useEffect(() => {
setTimeout(() => {
handleResizeAndForceRedraw();
}, 100);
}, [shapes, activePageIndex]);

setKey(key => key + 1);
React.useEffect(() => {
window.addEventListener('resize', handleResizeAndForceRedraw);

return () => {
window.removeEventListener('resize', () => {
setCanvasSize({
width: divRef.current?.clientWidth || 1,
height: divRef.current?.clientHeight || 1,
});
});
window.removeEventListener('resize', handleResizeAndForceRedraw);
};
}, [divRef.current, shapes]);
}, [divRef.current]);

const {
showContextMenu,
Expand Down
8 changes: 7 additions & 1 deletion src/pods/thumb-pages/thumb-pages.pod.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import { useCanvasContext } from '@/core/providers';
import { PageTitleInlineEdit, ThumbPage } from './components';
import { PlusIcon } from '@/common/components/icons';

export const ThumbPagesPod: React.FC = () => {
interface Props {
isVisible: boolean;
}

export const ThumbPagesPod: React.FC<Props> = props => {
const { isVisible } = props;
const { fullDocument, addNewPage, setActivePage, getActivePage } =
useCanvasContext();
const [pageTitleBeingEdited, setPageTitleBeingEdited] = React.useState<
Expand Down Expand Up @@ -34,6 +39,7 @@ export const ThumbPagesPod: React.FC = () => {
pageIndex={index}
onSetActivePage={handleSetActivePage}
setPageTitleBeingEdited={setPageTitleBeingEdited}
isVisible={isVisible}
/>
{pageTitleBeingEdited === index ? (
<PageTitleInlineEdit
Expand Down
29 changes: 29 additions & 0 deletions src/scenes/accordion-section-visibility.hook.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { useEffect, useRef, useState } from 'react';

export const useAccordionSectionVisibility = () => {
const [isThumbPagesPodOpen, setIsThumbPagesPodOpen] = useState(false);
const thumbPagesPodRef = useRef<HTMLDetailsElement>(null);

useEffect(() => {
const handleToggle = () => {
setIsThumbPagesPodOpen(thumbPagesPodRef.current?.open ?? false);
};

const detailsElement = thumbPagesPodRef.current;
if (detailsElement) {
detailsElement.addEventListener('toggle', handleToggle);
}

// Cleanup event listener on component unmount
return () => {
if (detailsElement) {
detailsElement.removeEventListener('toggle', handleToggle);
}
};
}, []);

return {
thumbPagesPodRef,
isThumbPagesPodOpen,
};
};
12 changes: 10 additions & 2 deletions src/scenes/main.scene.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,23 @@ import {
import { PropertiesPod } from '@/pods/properties';
import { FooterPod } from '@/pods/footer/footer.pod';
import { ThumbPagesPod } from '@/pods/thumb-pages';
import { useAccordionSectionVisibility } from './accordion-section-visibility.hook';

export const MainScene = () => {
const { isThumbPagesPodOpen, thumbPagesPodRef } =
useAccordionSectionVisibility();

return (
<MainLayout>
<ToolbarPod />
<div className={classes.leftTools}>
<details className={classes.container} name="toolsLeft">
<details
className={classes.container}
name="toolsLeft"
ref={thumbPagesPodRef}
>
<summary className={classes.title}>Pages</summary>
<ThumbPagesPod />
<ThumbPagesPod isVisible={isThumbPagesPodOpen} />
</details>
<details className={classes.container} name="toolsLeft">
<summary className={classes.title}>Devices</summary>
Expand Down