Skip to content

ENG-779 - Refactor Tldraw component to improve canvas rendering logic #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2025
Merged

ENG-779 - Refactor Tldraw component to improve canvas rendering logic #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 22 additions & 13 deletions apps/roam/src/components/canvas/Tldraw.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,22 +886,31 @@ const renderTldrawCanvasHelper = ({
const rootElement = h1.closest(rootSelector) as HTMLDivElement;
if (!rootElement) return () => {};

if (rootElement.hasAttribute(TLDRAW_DATA_ATTRIBUTE)) return () => {};

const blockChildrenContainer =
const childFromRoot =
rootElement.querySelector<HTMLDivElement>(".rm-block-children");
if (!blockChildrenContainer) return () => {};

rootElement.setAttribute(TLDRAW_DATA_ATTRIBUTE, "true");
if (!childFromRoot) return () => {};

const canvasWrapperEl = document.createElement("div");
canvasWrapperEl.style.minHeight = minHeight;
canvasWrapperEl.style.height = height;
if (
childFromRoot &&
childFromRoot.parentElement &&
!childFromRoot.hasAttribute(TLDRAW_DATA_ATTRIBUTE)
) {
childFromRoot.setAttribute(TLDRAW_DATA_ATTRIBUTE, "true");
const parentEl = childFromRoot.parentElement;
parentEl.appendChild(canvasWrapperEl);
canvasWrapperEl.style.minHeight = minHeight;
canvasWrapperEl.style.height = height;
}

blockChildrenContainer.parentElement?.insertBefore(
canvasWrapperEl,
blockChildrenContainer.nextSibling,
);
// console.log(
// "blockChildrenContainer.parentElement",
// articleChildren.parentElement,
// );
// articleChildren.parentElement?.insertBefore(
// canvasWrapperEl,
// articleChildren.nextSibling,
// );

const unmount = renderWithUnmount(
<ExtensionApiContextProvider {...onloadArgs}>
Expand All @@ -913,7 +922,7 @@ const renderTldrawCanvasHelper = ({
const originalUnmount = unmount;
return () => {
originalUnmount();
rootElement.removeAttribute(TLDRAW_DATA_ATTRIBUTE);
childFromRoot.removeAttribute(TLDRAW_DATA_ATTRIBUTE);
canvasWrapperEl.remove();
};
};
Expand Down
4 changes: 2 additions & 2 deletions apps/roam/src/components/canvas/tldrawStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
export const TLDRAW_DATA_ATTRIBUTE = "dg-tldraw-canvas-wrapper";
export default `
/* Hide Roam Blocks only when canvas is present */
.roam-article[${TLDRAW_DATA_ATTRIBUTE}="true"] .rm-block-children {
.roam-article .rm-block-children[${TLDRAW_DATA_ATTRIBUTE}="true"] {
display: none;
}

/* Hide Roam Blocks in sidebar when canvas is present */
.rm-sidebar-outline[${TLDRAW_DATA_ATTRIBUTE}="true"] .rm-block-children {
.rm-sidebar-outline .rm-block-children[${TLDRAW_DATA_ATTRIBUTE}="true"] {
display: none;
}

Expand Down