fix: Preserve node and asset URIs in Editable for link editor

networkteam · Mar 21, 2024 · 649513c · 649513c
1 parent fd13ac5
commit 649513c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/lib/components/Editable.tsx b/src/lib/components/Editable.tsx
@@ -7,7 +7,7 @@ type EditableProps = {
 };
 
 export default function Editable({ as = 'div', property, ...rest }: EditableProps) {
-  const { properties, nodeType, contextPath } = useNode();
+  const { properties, nodeType, contextPath, backend } = useNode();
   const inBackend = useInBackend();
   const editPreviewMode = useEditPreviewMode();
   const { className, ...restAttributes } = rest;
@@ -26,7 +26,10 @@ export default function Editable({ as = 'div', property, ...rest }: EditableProp
       property={'typo3:' + property}
       data-neos-node-type={nodeType}
       contentEditable
-      dangerouslySetInnerHTML={{ __html: properties[property] }}
+      dangerouslySetInnerHTML={{
+        // Use the actual content from the backend metadata if available to preserve original node and asset URIs
+        __html: backend?.serializedNode?.properties[property] || properties[property] || '',
+      }}
       {...restAttributes}
     />
   );

diff --git a/src/server/components/Editable.tsx b/src/server/components/Editable.tsx
@@ -18,7 +18,7 @@ const Editable = async ({ ctx, as = 'div', property, ...rest }: EditableProps) =
     return null;
   }
 
-  const { contextPath, nodeType, properties } = node;
+  const { contextPath, nodeType, properties, backend } = node;
   const { className, ...restAttributes } = rest;
   const Component = as;
 
@@ -35,7 +35,10 @@ const Editable = async ({ ctx, as = 'div', property, ...rest }: EditableProps) =
       property={'typo3:' + property}
       data-neos-node-type={nodeType}
       contentEditable
-      dangerouslySetInnerHTML={{ __html: properties[property] || '' }}
+      dangerouslySetInnerHTML={{
+        // Use the actual content from the backend metadata if available to preserve original node and asset URIs
+        __html: backend?.serializedNode?.properties[property] || properties[property] || '',
+      }}
       {...restAttributes}
     />
   );