@storyblok/astro 10.1.0 → 10.2.1

package/dist/components/StoryblokRichText.astro

@@ -6,9 +6,8 @@ interface Props extends SbAstroRichTextRenderContext {
   document: SbRichTextInput;
 }
 
-const { document, components, optimizeImage } = Astro.props;
-
+const { document, components, optimizeImage, data } = Astro.props;
 const nodes = normalizeNodes(document);
 ---
 
-<RenderChildren nodes={nodes} options={{ components, optimizeImage }} />
+<RenderChildren nodes={nodes} options={{ components, optimizeImage, data }} />

package/dist/components/richtext/RenderLinkGroup.astro

@@ -20,7 +20,7 @@ const Custom = components ? components[linkMark.type] : undefined;
 
 {
   isValidAstroComponent(Custom) ? (
-    <Custom {...linkMark}>
+    <Custom {...linkMark} context={options}>
       <RenderLinkInner nodes={nodes} options={options} />
     </Custom>
   ) : (

package/dist/components/richtext/RenderNode.astro

@@ -19,16 +19,22 @@ interface Props {
 }
 const { node, options } = Astro.props;
 const components = options.components;
-const Custom = components && node.type !== 'text' ? components[node.type] : undefined;
+const Custom = components ? components[node.type] : undefined;
+
+// When passing context to a custom component, exclude that component type
+// to prevent infinite loops if the custom component uses StoryblokRichText internally
+const contextForCustom = Custom
+  ? { ...options, components: { ...components, [node.type]: undefined } }
+  : options;
 ---
 
 {
-  node.type === 'text' ? (
-    <RenderTextNodeWithMarks node={node} marks={node.marks} options={options} />
-  ) : isValidAstroComponent(Custom) ? (
-    <Custom {...node} context={options}>
-      {node.content && <RenderChildren nodes={node.content} options={options} />}
+  isValidAstroComponent(Custom) ? (
+    <Custom {...node} context={contextForCustom}>
+      {node.type !== 'text' && node.content && <RenderChildren nodes={node.content} options={options} />}
     </Custom>
+  ) : node.type === 'text' ? (
+    <RenderTextNodeWithMarks node={node} marks={node.marks} options={options} />
   ) : node.type === 'image' ? (
     <RenderImage node={node} options={options} />
   ) : node.type === 'blok' ? (

package/dist/components/richtext/RenderTextNodeWithMarks.astro

@@ -23,7 +23,7 @@ const MarkComponent = mark && components ? components[mark.type] : undefined;
   reversedMarks.length === 0 ? (
     node.text
   ) : isValidAstroComponent(MarkComponent) ? (
-    <MarkComponent {...mark}>
+    <MarkComponent {...mark} context={options}>
       <Astro.self node={node} marks={rest} options={options} />
     </MarkComponent>
   ) : (

package/dist/index.js

@@ -952,13 +952,22 @@ function dt(e, t) {
 	return n?.length ? pt(n, t) : "";
 }
 function q(e, t) {
+	let n = e.type !== "text" && e.content ? pt(e.content, t) : "", r = t?.renderers?.[e.type];
+	if (r) {
+		let i = t?.renderers?.[e.type] ? {
+			...t,
+			renderers: {
+				...t.renderers,
+				[e.type]: void 0
+			}
+		} : t;
+		return r({
+			...e,
+			children: n,
+			context: i
+		});
+	}
 	if (e.type === "text") return mt(e, e.marks, t);
-	let n = e.content ? pt(e.content, t) : "", r = t?.renderers?.[e.type];
-	if (r) return r({
-		...e,
-		children: n,
-		context: t
-	});
 	if (e.type === "blok") return console.warn("\"blok\" nodes require a custom renderer in renderRichText."), "";
 	let i = G(e);
 	if (!i) return n;
@@ -1004,7 +1013,8 @@ function ht(e, t, n) {
 	let r = n?.renderers?.[t.type];
 	if (r) return r({
 		...t,
-		children: e
+		children: e,
+		context: n
 	});
 	let i = G(t);
 	return i ? `<${i}${J(t.type, t.attrs)}>${e}</${i}>` : e;
@@ -1018,7 +1028,8 @@ function gt(e, t, n, r, i) {
 	let o = i?.renderers?.[r.type];
 	if (o) return o({
 		...r,
-		children: a
+		children: a,
+		context: i
 	});
 	let s = G(r);
 	return s ? `<${s}${J(r.type, r.attrs)}>${a}</${s}>` : a;
@@ -1614,7 +1625,7 @@ var Ht = class {
 	}
 	return { storyblokApi: new Ut(t) };
 }, Jt = (e) => {
-	if (typeof e != "object" || typeof e._editable > "u") return {};
+	if (typeof e != "object" || typeof e._editable != "string") return {};
 	try {
 		let t = JSON.parse(e._editable.replace(/^<!--#storyblok#/, "").replace(/-->$/, ""));
 		return t ? {

package/dist/utils/richtext-helpers.d.ts

@@ -6,6 +6,7 @@ export type SbAstroRichTextComponentMap = {
 export interface SbAstroRichTextRenderContext {
     optimizeImage?: boolean | SbRichTextImageOptions;
     components?: SbAstroRichTextComponentMap;
+    data?: unknown;
 }
 export type SbAstroRichTextProps<T extends SbRichTextElement> = SbRichTextElementByType<SbAstroRichTextRenderContext>[T];
 export declare function isValidAstroComponent(component: unknown): component is AstroComponentFactory;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@storyblok/astro",
   "type": "module",
-  "version": "10.1.0",
+  "version": "10.2.1",
   "private": false,
   "description": "Official Astro integration for the Storyblok Headless CMS",
   "author": "Storyblok",
@@ -51,8 +51,8 @@
   "dependencies": {
     "camelcase": "^8.0.0",
     "morphdom": "^2.7.8",
-    "@storyblok/richtext": "5.1.0",
-    "@storyblok/js": "6.1.0"
+    "@storyblok/js": "6.2.1",
+    "@storyblok/richtext": "5.2.0"
   },
   "devDependencies": {
     "@cypress/vite-dev-server": "^6.0.3",