@contentful/experiences-visual-editor-react 1.20.1 → 1.21.0-beta.0

package/dist/index.js

@@ -1165,7 +1165,7 @@ const getBoundValue = (entryOrAsset, path) => {
         : value;
 };
 
-const transformRichText = (entryOrAsset, path) => {
+const transformRichText = (entryOrAsset, entityStore, path) => {
     const value = getBoundValue(entryOrAsset, path);
     if (typeof value === 'string') {
         return {
@@ -1188,6 +1188,17 @@ const transformRichText = (entryOrAsset, path) => {
         };
     }
     if (typeof value === 'object' && value.nodeType === BLOCKS.DOCUMENT) {
+        //resolve any embedded links - we currently only support resolving embedded in the first entry
+        const richTextDocument = value;
+        richTextDocument.content.forEach((node) => {
+            if ((node.nodeType === BLOCKS.EMBEDDED_ENTRY || node.nodeType === BLOCKS.EMBEDDED_ASSET) &&
+                node.data.target.sys.type === 'Link') {
+                const entity = entityStore.getEntityFromLink(node.data.target);
+                if (entity) {
+                    node.data.target = entity;
+                }
+            }
+        });
         return value;
     }
     return undefined;
@@ -1347,6 +1358,30 @@ function getResolvedEntryFromLink(entryOrAsset, path, entityStore) {
     }
     //Look up the reference in the entity store
     const resolvedEntity = entityStore.getEntityFromLink(value);
+    if (!resolvedEntity) {
+        return;
+    }
+    //resolve any embedded links - we currently only support 2 levels deep
+    const fields = resolvedEntity.fields || {};
+    Object.entries(fields).forEach(([fieldKey, field]) => {
+        if (field && field.sys?.type === 'Link') {
+            const entity = entityStore.getEntityFromLink(field);
+            if (entity) {
+                resolvedEntity.fields[fieldKey] = entity;
+            }
+        }
+        else if (field && Array.isArray(field)) {
+            resolvedEntity.fields[fieldKey] = field.map((innerField) => {
+                if (innerField && innerField.sys?.type === 'Link') {
+                    const entity = entityStore.getEntityFromLink(innerField);
+                    if (entity) {
+                        return entity;
+                    }
+                }
+                return innerField;
+            });
+        }
+    });
     return resolvedEntity;
 }
 
@@ -1364,7 +1399,21 @@ function getArrayValue(entryOrAsset, path, entityStore) {
             return value;
         }
         else if (value?.sys?.type === 'Link') {
-            return entityStore.getEntityFromLink(value);
+            const resolvedEntity = entityStore.getEntityFromLink(value);
+            if (!resolvedEntity) {
+                return;
+            }
+            //resolve any embedded links - we currently only support 2 levels deep
+            const fields = resolvedEntity.fields || {};
+            Object.entries(fields).forEach(([fieldKey, field]) => {
+                if (field && field.sys?.type === 'Link') {
+                    const entity = entityStore.getEntityFromLink(field);
+                    if (entity) {
+                        resolvedEntity.fields[fieldKey] = entity;
+                    }
+                }
+            });
+            return resolvedEntity;
         }
         else {
             console.warn(`Expected value to be a string or Link, but got: ${JSON.stringify(value)}`);
@@ -1386,7 +1435,7 @@ const transformBoundContentValue = (variables, entityStore, binding, resolveDesi
             }
             return transformMedia(entityOrAsset, variables, resolveDesignValue, variableName, path);
         case 'RichText':
-            return transformRichText(entityOrAsset, path);
+            return transformRichText(entityOrAsset, entityStore, path);
         case 'Array':
             return getArrayValue(entityOrAsset, path, entityStore);
         case 'Link':
@@ -4241,7 +4290,7 @@ const useComponent = ({ node: rawNode, resolveDesignValue, renderDropzone, userI
     const componentId = node.data.id;
     const isAssembly = node.type === 'assembly';
     const isStructureComponent = isContentfulStructureComponent(node.data.blockId);
-    const requiresDragWrapper = !isAssembly && !isStructureComponent && !componentRegistration?.options?.wrapComponent;
+    const requiresDragWrapper = !isAssembly && !isStructureComponent && componentRegistration?.options?.wrapComponent === false;
     const { componentProps, wrapperStyles } = useComponentProps({
         node,
         areEntitiesFetched,