hotfix: render embeds in sites correctly

seed-hypermedia · May 13, 2024 · 904d35e · 904d35e
1 parent 5b31b8f
commit 904d35e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/frontend/apps/site/src/site-embeds.tsx b/frontend/apps/site/src/site-embeds.tsx
@@ -135,13 +135,11 @@ function EmbedWrapper({
     if (wrapperRef.current) {
       observeSize(wrapperRef.current, (rect) => {
         wrapperRect.current = rect
-        console.log('OBSERVER', wrapperRect.current)
       })
     }
     if (sideannotationRef.current) {
       observeSize(sideannotationRef.current, (rect) => {
         sideRect.current = rect
-        console.log('OBSERVER SIDE', sideRect.current)
       })
     }
 
@@ -191,12 +189,14 @@ function EmbedWrapper({
         // overflow="hidden"
         // borderRadius={layoutUnit / 4}
       >
-        {props.children && viewType == 'content'}
-        <EmbedSideAnnotation
-          ref={sideannotationRef}
-          hmId={props.hmRef}
-          sidePos={sidePos}
-        />
+        {props.children}
+        {viewType == 'content' ? (
+          <EmbedSideAnnotation
+            ref={sideannotationRef}
+            hmId={props.hmRef}
+            sidePos={sidePos}
+          />
+        ) : null}
       </YStack>
     </NextLink>
   )

diff --git a/frontend/packages/shared/src/publication-content.tsx b/frontend/packages/shared/src/publication-content.tsx
@@ -452,6 +452,7 @@ export function BlockNodeContent({
   childrenType = 'group',
   isFirstChild = false,
   expanded = true,
+  embedDepth = 1,
   parentBlockId,
   ...props
 }: {
@@ -504,9 +505,7 @@ export function BlockNodeContent({
           start={blockNode.block?.attributes?.start}
           index={index}
           parentBlockId={blockNode.block?.id || null}
-          embedDepth={
-            props.embedDepth ? props.embedDepth + 1 : props.embedDepth
-          }
+          embedDepth={embedDepth ? embedDepth + 1 : embedDepth}
         />
       ))
     : null