includio-cms 0.5.2 → 0.5.3

package/dist/admin/components/tiptap/InlineBlockNodeView.svelte

@@ -1,25 +1,144 @@
 <script lang="ts">
 	import { NodeViewWrapper } from 'svelte-tiptap';
 	import type { NodeViewProps } from '@tiptap/core';
-	import StandaloneFieldRenderer from '../fields/standalone-field-renderer.svelte';
-	import type { ObjectField } from '../../../types/fields.js';
+	import FieldRenderer from '../fields/field-renderer.svelte';
+	import { createStandaloneForm } from './standalone-form.js';
+	import type { ObjectField, BlocksField, Field, FieldType } from '../../../types/fields.js';
+	import { getContentLanguage } from '../../state/content-language.svelte.js';
 	import GripVertical from '@tabler/icons-svelte/icons/grip-vertical';
 	import ArrowUp from '@tabler/icons-svelte/icons/arrow-up';
 	import ArrowDown from '@tabler/icons-svelte/icons/arrow-down';
 	import Trash from '@tabler/icons-svelte/icons/trash';
+	import ChevronDown from '@tabler/icons-svelte/icons/chevron-down';
+	import { slide } from 'svelte/transition';
+	import { onMount, onDestroy } from 'svelte';
+	import type { FormPathLeaves } from 'sveltekit-superforms';
+	import { evaluateCondition } from '../../utils/fieldCondition.js';
 
 	let { node, updateAttributes, editor, getPos, deleteNode, selected }: NodeViewProps = $props();
 
+	let collapsed = $state(false);
+
+	const contentLanguage = getContentLanguage();
+
+	const SKIP_TYPES: Set<FieldType> = new Set(['slug', 'seo']);
+
+	function normalizeBlockData(
+		data: Record<string, unknown>,
+		fields: Field[],
+		langs: string[]
+	): Record<string, unknown> {
+		const result = { ...data };
+		for (const f of fields) {
+			const key = f.slug;
+			if (['text', 'richtext', 'content'].includes(f.type)) {
+				if (typeof result[key] !== 'object' || result[key] == null) {
+					const val = result[key] ?? (f.type === 'content' ? null : '');
+					result[key] = Object.fromEntries(langs.map((l) => [l, val]));
+				}
+			} else if (f.type === 'url') {
+				const v = result[key] as Record<string, unknown> | undefined;
+				if (!v || typeof v !== 'object') {
+					result[key] = { id: '', url: {} };
+				} else if (!('url' in v) || v.url == null) {
+					result[key] = { ...v, url: {} };
+				} else if (typeof v.url === 'string') {
+					const urlStr = v.url as string;
+					const textStr = typeof v.text === 'string' ? v.text : '';
+					result[key] = {
+						...v,
+						url: Object.fromEntries(langs.map((l) => [l, urlStr])),
+						text: Object.fromEntries(langs.map((l) => [l, textStr]))
+					};
+				}
+				const urlField = f as import('../../../types/fields.js').UrlField;
+				const d = result[key] as Record<string, unknown>;
+				if (urlField.text && !d.text) d.text = {};
+				if (urlField.newTab && d.newTab === undefined) d.newTab = false;
+				if (urlField.rel && d.rel === undefined) d.rel = '';
+			} else if (f.type === 'blocks') {
+				const bf = f as BlocksField;
+				if (Array.isArray(result[key])) {
+					result[key] = (result[key] as any[]).map((item) => ({
+						...item,
+						data: normalizeBlockData(
+							item.data ?? {},
+							bf.of.find((d: ObjectField) => d.slug === item.slug)?.fields ?? [],
+							langs
+						)
+					}));
+				}
+			} else if (f.type === 'object') {
+				const of_ = f as ObjectField;
+				if (result[key] && typeof result[key] === 'object' && 'data' in (result[key] as object)) {
+					const obj = result[key] as Record<string, unknown>;
+					result[key] = { ...obj, data: normalizeBlockData(obj.data as Record<string, unknown>, of_.fields, langs) };
+				}
+			}
+		}
+		return result;
+	}
+
+	function denormalizeBlockData(
+		data: Record<string, unknown>,
+		fields: Field[],
+		currentLang: string
+	): Record<string, unknown> {
+		const result = { ...data };
+		for (const f of fields) {
+			const key = f.slug;
+			const val = result[key];
+			if (['text', 'richtext'].includes(f.type)) {
+				if (val && typeof val === 'object' && !Array.isArray(val)) {
+					result[key] = (val as Record<string, unknown>)[currentLang] ?? '';
+				}
+			} else if (f.type === 'url' && val && typeof val === 'object') {
+				const v = val as Record<string, unknown>;
+				const flat: Record<string, unknown> = {};
+				if (v.id !== undefined) flat.id = v.id;
+				flat.url =
+					v.url && typeof v.url === 'object'
+						? (v.url as Record<string, string>)[currentLang] ?? ''
+						: v.url ?? '';
+				if ('text' in v) {
+					flat.text =
+						v.text && typeof v.text === 'object'
+							? (v.text as Record<string, string>)[currentLang] ?? ''
+							: v.text ?? '';
+				}
+				if (v.newTab !== undefined) flat.newTab = v.newTab;
+				if (v.rel !== undefined) flat.rel = v.rel;
+				result[key] = flat;
+			} else if (f.type === 'blocks') {
+				const bf = f as BlocksField;
+				if (Array.isArray(val)) {
+					result[key] = (val as any[]).map((item) => ({
+						...item,
+						data: denormalizeBlockData(
+							item.data ?? {},
+							bf.of.find((d: ObjectField) => d.slug === item.slug)?.fields ?? [],
+							currentLang
+						)
+					}));
+				}
+			} else if (f.type === 'object') {
+				const of_ = f as ObjectField;
+				if (val && typeof val === 'object' && 'data' in (val as object)) {
+					const obj = val as Record<string, unknown>;
+					result[key] = { ...obj, data: denormalizeBlockData(obj.data as Record<string, unknown>, of_.fields, currentLang) };
+				}
+			}
+		}
+		return result;
+	}
+
 	const inlineBlocks: ObjectField[] = $derived(
 		(editor.extensionManager.extensions.find((e) => e.name === 'inlineBlock')?.options as { inlineBlocks: ObjectField[] })?.inlineBlocks ?? []
 	);
 
 	const blockDef = $derived(inlineBlocks.find((b) => b.slug === node.attrs.blockType));
 	const blockLabel = $derived(blockDef?.label ? (Object.values(blockDef.label)[0] ?? blockDef.slug) : node.attrs.blockType);
-
-	let blockData = $state<Record<string, unknown>>(parseBlockData(node.attrs.blockData));
-	// Track last JSON we wrote to PM to avoid re-parsing our own writes
-	let lastWrittenJson = '';
+	const supportedFields = $derived(blockDef?.fields.filter((f) => !SKIP_TYPES.has(f.type)) ?? []);
 
 	function parseBlockData(raw: unknown): Record<string, unknown> {
 		if (typeof raw === 'string') {
@@ -29,25 +148,41 @@
 		return {};
 	}
 
-	// Sync external changes (e.g. undo/redo) — skip if it's our own write
-	$effect(() => {
-		const raw = node.attrs.blockData;
-		const rawJson = typeof raw === 'string' ? raw : JSON.stringify(raw);
-		if (rawJson !== lastWrittenJson) {
-			blockData = parseBlockData(raw);
-		}
-	});
+	const langs = contentLanguage.all;
+	const allFields = blockDef?.fields ?? [];
+	const standaloneForm = createStandaloneForm(normalizeBlockData(parseBlockData(node.attrs.blockData), allFields, langs));
+	const formStore = standaloneForm.form;
 
+	// Track last JSON we wrote to PM to avoid re-parsing our own writes
+	let lastWrittenJson = '';
 	let debounceTimer: ReturnType<typeof setTimeout> | null = null;
 
-	function handleFieldChange(slug: string, value: unknown) {
-		blockData = { ...blockData, [slug]: value };
+	// Form store → ProseMirror (user edits)
+	const unsubscribe = formStore.subscribe((data) => {
 		if (debounceTimer) clearTimeout(debounceTimer);
 		debounceTimer = setTimeout(() => {
-			lastWrittenJson = JSON.stringify(blockData);
-			updateAttributes({ blockData: lastWrittenJson });
+			const denormalized = denormalizeBlockData(data, allFields, contentLanguage.current);
+			const json = JSON.stringify(denormalized);
+			if (json !== lastWrittenJson) {
+				lastWrittenJson = json;
+				updateAttributes({ blockData: json });
+			}
 		}, 300);
-	}
+	});
+
+	onDestroy(() => {
+		unsubscribe();
+		if (debounceTimer) clearTimeout(debounceTimer);
+	});
+
+	// ProseMirror → Form store (undo/redo, external changes)
+	$effect(() => {
+		const raw = node.attrs.blockData;
+		const rawJson = typeof raw === 'string' ? raw : JSON.stringify(raw);
+		if (rawJson !== lastWrittenJson) {
+			formStore.set(normalizeBlockData(parseBlockData(raw), allFields, langs));
+		}
+	});
 
 	function moveUp() {
 		const pos = getPos();
@@ -116,7 +251,18 @@
 				<button type="button" class="grip-handle" aria-label="Przeciągnij" data-drag-handle>
 					<GripVertical size={16} />
 				</button>
-				<span class="inline-block-label">{blockLabel}</span>
+				<button
+					type="button"
+					class="inline-block-collapse-toggle"
+					onclick={() => (collapsed = !collapsed)}
+					aria-expanded={!collapsed}
+					aria-label={collapsed ? 'Rozwiń blok' : 'Zwiń blok'}
+				>
+					<span class="inline-block-label">{blockLabel}</span>
+					<span class="collapse-chevron" class:collapsed>
+						<ChevronDown size={14} />
+					</span>
+				</button>
 			</div>
 			<div class="inline-block-header-actions">
 				<button type="button" class="action-btn" onclick={moveUp} aria-label="Przenieś wyżej" title="Przenieś wyżej">
@@ -132,17 +278,25 @@
 		</div>
 
 		<!-- Body: field renderer -->
-		{#if blockDef}
-			<div class="inline-block-body">
-				<StandaloneFieldRenderer
-					fields={blockDef.fields}
-					data={blockData}
-					onchange={handleFieldChange}
-				/>
-			</div>
-		{:else}
-			<div class="inline-block-body inline-block-unknown">
-				Nieznany typ bloku: {node.attrs.blockType}
+		{#if !collapsed}
+			<div transition:slide={{ duration: 150 }}>
+				{#if blockDef}
+					<div class="inline-block-body space-y-3">
+						{#each supportedFields as f}
+							{#if evaluateCondition(f.showWhen, (slug) => $formStore[slug])}
+								<FieldRenderer
+									field={f}
+									form={standaloneForm}
+									path={f.slug as FormPathLeaves<Record<string, unknown>>}
+								/>
+							{/if}
+						{/each}
+					</div>
+				{:else}
+					<div class="inline-block-body inline-block-unknown">
+						Nieznany typ bloku: {node.attrs.blockType}
+					</div>
+				{/if}
 			</div>
 		{/if}
 	</div>
@@ -175,18 +329,54 @@
 		min-height: 36px;
 	}
 
+	.inline-block-wrapper:has(.collapse-chevron.collapsed) .inline-block-header {
+		border-bottom-color: transparent;
+	}
+
 	.inline-block-header-left {
 		display: flex;
 		align-items: center;
 		gap: 0.25rem;
 	}
 
+	.inline-block-collapse-toggle {
+		display: flex;
+		align-items: center;
+		gap: 0.25rem;
+		border: none;
+		background: transparent;
+		cursor: pointer;
+		padding: 2px 4px;
+		border-radius: 4px;
+		color: inherit;
+	}
+
+	.inline-block-collapse-toggle:hover {
+		background: var(--accent);
+	}
+
+	.inline-block-collapse-toggle:focus-visible {
+		outline: 2px solid var(--ring);
+		outline-offset: 1px;
+	}
+
 	.inline-block-label {
 		font-size: 0.8125rem;
 		font-weight: 600;
 		color: var(--foreground);
 	}
 
+	.collapse-chevron {
+		display: flex;
+		align-items: center;
+		color: var(--muted-foreground);
+		transition: transform 0.15s ease;
+	}
+
+	.collapse-chevron.collapsed {
+		transform: rotate(-90deg);
+	}
+
 	.inline-block-header-actions {
 		display: flex;
 		align-items: center;

package/dist/admin/components/tiptap/content-editor.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onMount } from 'svelte';
+	import { onMount, getAllContexts } from 'svelte';
 	import { Editor, type Editor as EditorType } from '@tiptap/core';
 	import BubbleMenu from '@tiptap/extension-bubble-menu';
 	import { extensions } from './extensions.js';
@@ -17,6 +17,7 @@
 	import { InlineBlockNode } from './inline-block-node.js';
 	import { SlashCommand } from './slash-command.js';
 	import { HeadingA11yPlugin } from './heading-a11y-plugin.js';
+	import Placeholder from '@tiptap/extension-placeholder';
 
 	// Icons (bubble menu only)
 	import Bold from '@tabler/icons-svelte/icons/bold';
@@ -43,6 +44,10 @@
 
 	let { value = $bindable(undefined), inlineBlocks = [] }: Props = $props();
 
+	// Capture parent contexts at init time (before onMount) so SvelteNodeViewRenderer
+	// can propagate them to inline block node views (needed for getRemotes() etc.)
+	const parentContexts = getAllContexts();
+
 	const hasInlineBlocks = $derived(inlineBlocks.length > 0);
 
 	let element = $state<HTMLDivElement | null>(null);
@@ -64,7 +69,7 @@
 
 		const extraExtensions = hasInlineBlocks
 			? [
-					InlineBlockNode.configure({ inlineBlocks }),
+					InlineBlockNode.configure({ inlineBlocks, context: parentContexts }),
 					SlashCommand.configure({ inlineBlocks })
 				]
 			: [];
@@ -77,6 +82,10 @@
 				HeadingA11yPlugin,
 				BubbleMenu.configure({
 					element: bubbleMenu!
+				}),
+				Placeholder.configure({
+					placeholder: 'Wpisz treść lub "/" by wstawić element',
+					showOnlyCurrent: true
 				})
 			],
 			content: initialContent,
@@ -271,6 +280,8 @@
 
 <style>
 	.bubble-menu {
+		height: 0;
+		overflow: visible;
 		visibility: hidden;
 		opacity: 0;
 		transition:

package/dist/admin/components/tiptap/inline-block-node.d.ts

@@ -3,6 +3,7 @@ import type { ObjectField } from '../../../types/fields.js';
 export interface InlineBlockOptions {
     HTMLAttributes: Record<string, string>;
     inlineBlocks: ObjectField[];
+    context?: Map<unknown, unknown>;
 }
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {

package/dist/admin/components/tiptap/inline-block-node.js

@@ -17,6 +17,9 @@ function getFieldDefault(field) {
         return field.defaultValue;
     switch (field.type) {
         case 'text':
+        case 'richtext':
+        case 'date':
+        case 'datetime':
             return '';
         case 'number':
             return 0;
@@ -25,8 +28,20 @@ function getFieldDefault(field) {
         case 'select':
         case 'radio':
             return field.options[0]?.value ?? '';
+        case 'checkboxes':
+            return [];
         case 'url':
             return { url: '' };
+        case 'image':
+        case 'file':
+        case 'media':
+        case 'relation':
+            return field.multiple ? [] : '';
+        case 'object':
+            return { slug: field.slug, data: {} };
+        case 'blocks':
+        case 'array':
+            return [];
         default:
             return '';
     }
@@ -93,6 +108,8 @@ export const InlineBlockNode = Node.create({
         };
     },
     addNodeView() {
-        return SvelteNodeViewRenderer(InlineBlockNodeView);
+        return SvelteNodeViewRenderer(InlineBlockNodeView, {
+            context: this.options.context
+        });
     }
 });

package/dist/admin/components/tiptap/slash-command.js

@@ -104,8 +104,7 @@ export const SlashCommand = Extension.create({
                     if (!query)
                         return allItems;
                     const q = query.toLowerCase();
-                    return allItems.filter((item) => item.label.toLowerCase().includes(q) ||
-                        item.group.toLowerCase().includes(q));
+                    return allItems.filter((item) => item.label.toLowerCase().includes(q) || item.group.toLowerCase().includes(q));
                 },
                 render: () => {
                     let popup;
@@ -167,7 +166,7 @@ export const SlashCommand = Extension.create({
                             return false;
                         },
                         onExit: () => {
-                            popup?.destroy();
+                            // popup?.destroy();
                             if (component)
                                 unmount(component);
                             container = undefined;

package/dist/admin/components/tiptap/standalone-form.d.ts

@@ -0,0 +1,7 @@
+import type { SuperForm } from 'sveltekit-superforms';
+/**
+ * Creates a minimal SuperForm-compatible object for use outside SvelteKit form actions.
+ * Only implements the 4 stores that formFieldProxy and formsnap actually use:
+ * form, errors, constraints, tainted.
+ */
+export declare function createStandaloneForm(data: Record<string, unknown>): SuperForm<Record<string, unknown>>;

package/dist/admin/components/tiptap/standalone-form.js

@@ -0,0 +1,31 @@
+import { writable, readable } from 'svelte/store';
+/**
+ * Creates a minimal SuperForm-compatible object for use outside SvelteKit form actions.
+ * Only implements the 4 stores that formFieldProxy and formsnap actually use:
+ * form, errors, constraints, tainted.
+ */
+export function createStandaloneForm(data) {
+    return {
+        form: writable(data),
+        errors: writable({}),
+        constraints: writable({}),
+        tainted: writable(undefined),
+        // Stubs required by SuperForm type — not used by formFieldProxy/formsnap
+        formId: writable('standalone'),
+        message: writable(undefined),
+        submitting: readable(false),
+        delayed: readable(false),
+        timeout: readable(false),
+        posted: readable(false),
+        allErrors: readable([]),
+        options: {},
+        enhance: (() => ({ destroy() { } })),
+        validate: (async () => undefined),
+        validateForm: (async () => ({ valid: true })),
+        isTainted: (() => false),
+        reset: (() => { }),
+        submit: (() => { }),
+        capture: (() => ({})),
+        restore: (() => { })
+    };
+}

package/dist/admin/components/tiptap/tiptap-editor.svelte

@@ -3,6 +3,7 @@
 	import { Editor, type Editor as EditorType } from '@tiptap/core';
 	import BubbleMenu from '@tiptap/extension-bubble-menu';
 	import { extensions } from './extensions.js';
+	import Placeholder from '@tiptap/extension-placeholder';
 	import ToolbarButton from './toolbar-button.svelte';
 	import EditorToolbar from './editor-toolbar.svelte';
 	import LinkDialog from './link-dialog.svelte';
@@ -55,6 +56,10 @@
 				...extensions,
 				BubbleMenu.configure({
 					element: bubbleMenu!
+				}),
+				Placeholder.configure({
+					placeholder: 'Wpisz treść...',
+					showOnlyCurrent: true
 				})
 			],
 			content: value || '',
@@ -246,6 +251,8 @@
 
 <style>
 	.bubble-menu {
+		height: 0;
+		overflow: visible;
 		visibility: hidden;
 		opacity: 0;
 		transition:

package/dist/admin/remote/entry.remote.js

@@ -199,6 +199,14 @@ export const getRecentEntries = query(z.number().default(6), async (limit) => {
                 label = String(Object.values(titleData)[0] || '');
             }
         }
+        if (config && config.type === 'single' && config.label) {
+            if (typeof config.label === 'object') {
+                label = String(Object.values(config.label)[0] || '');
+            }
+            else {
+                label = config.label;
+            }
+        }
         let collectionLabel = { pl: entry.slug, en: entry.slug };
         if (config) {
             if (config.type === 'collection' && config.labels) {
@@ -237,6 +245,14 @@ export const getRecentActivity = query(z.number().default(10), async (limit) =>
                     label = String(Object.values(titleData)[0] || '');
                 }
             }
+            if (config && config.type === 'single' && config.label) {
+                if (typeof config.label === 'object') {
+                    label = String(Object.values(config.label)[0] || '');
+                }
+                else {
+                    label = config.label;
+                }
+            }
             activity.push({
                 type: 'entry_edit',
                 entryId: entry.id,

package/dist/admin/styles/admin.css

@@ -308,6 +308,16 @@ div[data-collapsible]:not([data-collapsible='icon'])
 	flex-shrink: 0;
 }
 
+/* Placeholder — Notion-style */
+.ProseMirror .is-empty.is-editor-empty::before,
+.ProseMirror .has-focus.is-empty::before {
+	color: var(--text-light);
+	content: attr(data-placeholder);
+	float: left;
+	height: 0;
+	pointer-events: none;
+}
+
 .tiptap-highlight {
 	background-color: rgb(250 204 21 / 0.4);
 	padding: 0.125em 0.25em;

package/dist/admin/utils/fieldCondition.d.ts

@@ -0,0 +1,6 @@
+import type { FieldCondition } from '../../types/fields.js';
+/**
+ * Evaluate whether a field should be visible based on its showWhen condition.
+ * Returns true (visible) when no condition is set.
+ */
+export declare function evaluateCondition(condition: FieldCondition | undefined, getValue: (slug: string) => unknown): boolean;

package/dist/admin/utils/fieldCondition.js

@@ -0,0 +1,20 @@
+/**
+ * Evaluate whether a field should be visible based on its showWhen condition.
+ * Returns true (visible) when no condition is set.
+ */
+export function evaluateCondition(condition, getValue) {
+    if (!condition)
+        return true;
+    const value = getValue(condition.field);
+    if (condition.equals !== undefined) {
+        const allowed = Array.isArray(condition.equals) ? condition.equals : [condition.equals];
+        return allowed.includes(value);
+    }
+    if (condition.notEquals !== undefined) {
+        const disallowed = Array.isArray(condition.notEquals)
+            ? condition.notEquals
+            : [condition.notEquals];
+        return !disallowed.includes(value);
+    }
+    return true;
+}

package/dist/components/ui/switch/index.d.ts

@@ -0,0 +1,2 @@
+import Root from "./switch.svelte";
+export { Root, Root as Switch, };

package/dist/components/ui/switch/index.js

@@ -0,0 +1,4 @@
+import Root from "./switch.svelte";
+export { Root, 
+//
+Root as Switch, };

package/dist/components/ui/switch/switch.svelte

@@ -0,0 +1,26 @@
+<script lang="ts">
+	import { Switch as SwitchPrimitive } from "bits-ui";
+	import { cn, type WithoutChildrenOrChild } from "../../../utils.js";
+
+	let {
+		ref = $bindable(null),
+		checked = $bindable(false),
+		class: className,
+		...restProps
+	}: WithoutChildrenOrChild<SwitchPrimitive.RootProps> = $props();
+</script>
+
+<SwitchPrimitive.Root
+	bind:ref
+	bind:checked
+	data-slot="switch"
+	class={cn(
+		"peer inline-flex h-[22px] w-[38px] shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-primary data-[state=unchecked]:bg-border",
+		className
+	)}
+	{...restProps}
+>
+	<SwitchPrimitive.Thumb
+		class="pointer-events-none block size-[18px] rounded-full bg-white shadow-sm ring-0 transition-transform data-[state=checked]:translate-x-4 data-[state=unchecked]:translate-x-0"
+	/>
+</SwitchPrimitive.Root>

package/dist/components/ui/switch/switch.svelte.d.ts

@@ -0,0 +1,4 @@
+import { Switch as SwitchPrimitive } from "bits-ui";
+declare const Switch: import("svelte").Component<Omit<Omit<SwitchPrimitive.RootProps, "child">, "children">, {}, "ref" | "checked">;
+type Switch = ReturnType<typeof Switch>;
+export default Switch;

package/dist/core/fields/fieldSchemaToTs.js

@@ -139,7 +139,8 @@ export function generateZodSchemaFromField(field, languages, options = {
         }
         case 'object': {
             const data = generateZodSchemaFromFields(field.fields, languages, {
-                parentRequired: field.required
+                parentRequired: field.required,
+                localized: options.localized
             });
             const finalData = !field.required ? data.partial().optional() : data;
             return z.object({
@@ -148,7 +149,10 @@ export function generateZodSchemaFromField(field, languages, options = {
             });
         }
         case 'blocks': {
-            const schemas = field.of.map((f) => generateZodSchemaFromField(f, languages, { parentRequired: field.required }));
+            const schemas = field.of.map((f) => generateZodSchemaFromField(f, languages, {
+                parentRequired: field.required,
+                localized: options.localized
+            }));
             const itemSchema = schemas.length > 1
                 ? z.discriminatedUnion('slug', schemas)
                 : schemas[0];
@@ -283,6 +287,14 @@ export function generateZodSchemaFromField(field, languages, options = {
 }
 export function generateZodSchemaFromFields(fields, languages, options = {}) {
     return z.object({
-        ...Object.fromEntries(fields.map((f) => [f.slug, generateZodSchemaFromField(f, languages, options)]))
+        ...Object.fromEntries(fields.map((f) => {
+            let schema = generateZodSchemaFromField(f, languages, options);
+            // Fields with showWhen are conditionally visible — make them optional
+            // so hidden fields don't block validation
+            if (f.showWhen) {
+                schema = schema.optional();
+            }
+            return [f.slug, schema];
+        }))
     });
 }