view-contracts 0.4.0 → 0.4.2

package/renderers/swiftui/lowering/lowerToSwiftUI.ts

@@ -28,6 +28,45 @@ function indent(level: number): string {
   return '  '.repeat(level);
 }
 
+function tokenHexColorExpr(tokens: TokenIR, path: string, fallback: string): string {
+  const entry = tokens.entries.find((item) => item.path === path);
+  const value = entry?.value ?? fallback;
+  const match = value.match(/^#([0-9a-fA-F]{6})$/);
+  if (!match) return `Color(${JSON.stringify(value)})`;
+  const hex = match[1]!;
+  const r = parseInt(hex.slice(0, 2), 16) / 255;
+  const g = parseInt(hex.slice(2, 4), 16) / 255;
+  const b = parseInt(hex.slice(4, 6), 16) / 255;
+  return `Color(red: ${r}, green: ${g}, blue: ${b})`;
+}
+
+function renderGridChildBlock(
+  children: IrNode[],
+  level: number,
+  renderNested: NodeRenderer,
+  ctx: SwiftUIRenderContext,
+  itemScope: string | undefined,
+): string {
+  const childFrameMod = `${indent(level + 2)}.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)`;
+  const parts = children.map((child) => {
+    if (child.kind === 'map') {
+      const mapNode = child as IrMapNode;
+      const item = mapNode.item;
+      let body = renderNested(mapNode.body, level + 2, item);
+      body += `\n${childFrameMod}`;
+      const source = bindingExpr(mapNode.source, ctx, itemScope);
+      return `${indent(level + 2)}ForEach(${source}, id: \\.id) { ${item} in\n${body}\n${indent(level + 2)}}`;
+    }
+    let rendered = '';
+    if (child.kind === 'text') rendered = `${indent(level + 2)}Text(${JSON.stringify((child as IrTextNode).value)})`;
+    else if (child.kind === 'binding') rendered = `${indent(level + 2)}Text(${bindingExpr(child as IrBinding, ctx, itemScope)})`;
+    else rendered = renderNested(child, level + 2, itemScope);
+    if (!rendered) return '';
+    return `${rendered}\n${childFrameMod}`;
+  }).filter(Boolean);
+  return parts.join('\n');
+}
+
 function propLiteral(props: Record<string, IrValue>, key: string): unknown | undefined {
   const value = props[key];
   if (value === null || value === undefined) return undefined;
@@ -103,9 +142,11 @@ function mergedModifiersForProps(
       instanceLiterals,
     });
     const instanceModifiers = visualPropSetToModifiers(instanceOnly);
+    const paddingMods = instanceModifiers.filter((mod) => mod.startsWith('.padding'));
+    const otherInstanceMods = instanceModifiers.filter((mod) => !mod.startsWith('.padding'));
 
-    // Order: runtime lookup (base+variant) → instance overrides
-    return [runtimeLookup, ...instanceModifiers];
+    // Padding must sit inside background/border from applyVcStyle.
+    return [...paddingMods, runtimeLookup, ...otherInstanceMods];
   }
 
   const merged = mergeVisualProps({
@@ -118,6 +159,87 @@ function mergedModifiersForProps(
   return visualPropSetToModifiers(merged);
 }
 
+function emitPickerSelection(
+  props: Record<string, IrValue>,
+  ctx: SwiftUIRenderContext,
+  itemScope: string | undefined,
+): string {
+  const options = props.options;
+  if (typeof options === 'object' && options !== null && 'kind' in options && options.kind === 'literal' && Array.isArray((options as IrLiteral).value)) {
+    const items = (options as IrLiteral).value as Array<{ value: string }>;
+    return `.constant(${JSON.stringify(items[0]?.value ?? '')})`;
+  }
+  if (typeof options === 'object' && options !== null && 'kind' in options && options.kind === 'binding') {
+    const expr = bindingExpr(options as IrBinding, ctx, itemScope);
+    return `Binding(get: { ${expr}.first?.value ?? "" }, set: { _ in })`;
+  }
+  return '.constant("")';
+}
+
+function emitPickerOptions(
+  props: Record<string, IrValue>,
+  ctx: SwiftUIRenderContext,
+  itemScope: string | undefined,
+  level: number,
+): string {
+  const options = props.options;
+  if (!options || typeof options !== 'object' || !('kind' in options)) {
+    return `${indent(level + 1)}Text("--").tag("")`;
+  }
+  if (options.kind === 'binding') {
+    const expr = bindingExpr(options as IrBinding, ctx, itemScope);
+    return `${indent(level + 1)}ForEach(${expr}, id: \\.value) { option in\n${indent(level + 2)}Text(option.label).tag(option.value)\n${indent(level + 1)}}`;
+  }
+  if (options.kind === 'literal' && Array.isArray((options as IrLiteral).value)) {
+    const items = (options as IrLiteral).value as Array<{ label: string; value: string }>;
+    return items.map((opt) =>
+      `${indent(level + 1)}Text(${JSON.stringify(opt.label)}).tag(${JSON.stringify(opt.value)})`,
+    ).join('\n');
+  }
+  return `${indent(level + 1)}Text("--").tag("")`;
+}
+
+function leafExtraModifiers(elementName: string): string[] {
+  return [];
+}
+
+function emitMenuOptions(
+  props: Record<string, IrValue>,
+  ctx: SwiftUIRenderContext,
+  itemScope: string | undefined,
+  level: number,
+): string {
+  const options = props.options;
+  if (typeof options === 'object' && options !== null && 'kind' in options && options.kind === 'binding') {
+    const expr = bindingExpr(options as IrBinding, ctx, itemScope);
+    return `${indent(level + 1)}ForEach(${expr}, id: \\.value) { option in\n${indent(level + 2)}Button(option.label) {}\n${indent(level + 1)}}`;
+  }
+  if (typeof options === 'object' && options !== null && 'kind' in options && options.kind === 'literal' && Array.isArray((options as IrLiteral).value)) {
+    const items = (options as IrLiteral).value as Array<{ label: string; value: string }>;
+    return items.map((opt) =>
+      `${indent(level + 1)}Button(${JSON.stringify(opt.label)}) {}`,
+    ).join('\n');
+  }
+  return `${indent(level + 1)}Button("--") {}`;
+}
+
+function emitSelectLabelText(
+  props: Record<string, IrValue>,
+  ctx: SwiftUIRenderContext,
+  itemScope: string | undefined,
+): string {
+  const options = props.options;
+  if (typeof options === 'object' && options !== null && 'kind' in options && options.kind === 'binding') {
+    const expr = bindingExpr(options as IrBinding, ctx, itemScope);
+    return `${expr}.first?.label ?? ""`;
+  }
+  if (typeof options === 'object' && options !== null && 'kind' in options && options.kind === 'literal' && Array.isArray((options as IrLiteral).value)) {
+    const items = (options as IrLiteral).value as Array<{ label: string }>;
+    return JSON.stringify(items[0]?.label ?? '');
+  }
+  return '""';
+}
+
 function bindingExpr(binding: IrBinding, ctx: SwiftUIRenderContext, itemScope?: string): string {
   const root = binding.scope ?? itemScope ?? ctx.propsRoot ?? 'vm';
   return binding.path ? `${root}.${binding.path}` : root;
@@ -185,25 +307,84 @@ function renderLeaf(
 
   if (entry.leaf === 'textfield') {
     const placeholder = propLiteral(node.props, 'placeholder');
-    const name = propLiteral(node.props, 'name');
     const ph = typeof placeholder === 'string' ? JSON.stringify(placeholder) : '""';
-    const binding = typeof name === 'string' ? name : 'text';
-    const line = `${pad}TextField(${ph}, text: .constant(""))`;
-    const modLines = modifiers.map((mod) => `${pad}${mod}`);
+    const mutedColor = tokenHexColorExpr(ctx.tokens, 'ui.text-muted', '#6b7280');
+    const line = `${pad}TextField("", text: .constant(""), prompt: Text(${ph}).foregroundStyle(${mutedColor}))`;
+    const allMods = [...modifiers, ...leafExtraModifiers(node.name)];
+    const modLines = allMods.map((mod) => `${pad}${mod}`);
     return [line, ...modLines].join('\n');
   }
 
   if (entry.leaf === 'texteditor') {
-    const line = `${pad}TextEditor(text: .constant(""))`;
-    const modLines = modifiers.map((mod) => `${pad}${mod}`);
-    return [line, ...modLines].join('\n');
+    const placeholder = propLiteral(node.props, 'placeholder');
+    const ph = typeof placeholder === 'string' ? JSON.stringify(placeholder) : '""';
+    const mutedColor = tokenHexColorExpr(ctx.tokens, 'ui.text-muted', '#6b7280');
+    const minHeightMod = modifiers.find((mod) => mod.startsWith('.frame(minHeight:'));
+    const minHeight = minHeightMod?.match(/minHeight: (\d+)/)?.[1] ?? '72';
+
+    // Split modifiers: text-related go on TextEditor, visual/layout go on ZStack
+    const textMods = modifiers.filter((mod) =>
+      mod.startsWith('.foregroundStyle(') || mod.startsWith('.font(') || mod.startsWith('.fontWeight(')
+    );
+    const containerMods = modifiers.filter((mod) =>
+      !mod.startsWith('.foregroundStyle(') && !mod.startsWith('.font(') &&
+      !mod.startsWith('.fontWeight(') && !mod.startsWith('.frame(minHeight:')
+    );
+
+    const textModLines = textMods.map((mod) => `${pad}    ${mod}`);
+    const containerModLines = containerMods.map((mod) => `${pad}${mod}`);
+    return [
+      `${pad}ZStack(alignment: .topLeading) {`,
+      `${pad}  if true {`,
+      `${pad}    Text(${ph})`,
+      `${pad}      .font(.system(size: 14))`,
+      `${pad}      .foregroundStyle(${mutedColor})`,
+      `${pad}      .padding(.top, 8)`,
+      `${pad}      .padding(.horizontal, 4)`,
+      `${pad}      .allowsHitTesting(false)`,
+      `${pad}  }`,
+      `${pad}  TextEditor(text: .constant(""))`,
+      `${pad}    .scrollContentBackground(.hidden)`,
+      ...textModLines,
+      `${pad}}`,
+      `${pad}.frame(minHeight: ${minHeight})`,
+      ...containerModLines,
+    ].join('\n');
   }
 
   if (entry.leaf === 'picker') {
-    const label = propLiteral(node.props, 'label') ?? propLiteral(node.props, 'name') ?? '';
-    const line = `${pad}Picker(${JSON.stringify(label)}, selection: .constant("")) { Text("--") }`;
-    const modLines = modifiers.map((mod) => `${pad}${mod}`);
-    return [line, ...modLines].join('\n');
+    const textColor = tokenHexColorExpr(ctx.tokens, 'ui.text', '#111827');
+    const mutedColor = tokenHexColorExpr(ctx.tokens, 'ui.text-muted', '#6b7280');
+    const optionsBlock = emitMenuOptions(node.props, ctx, itemScope, level);
+    const labelText = emitSelectLabelText(node.props, ctx, itemScope);
+    const labelMods = modifiers.filter((mod) => !mod.startsWith('.frame'));
+    const widthLit = propLiteral(node.props, 'width');
+    const widthMod = typeof widthLit === 'number'
+      ? `${pad}.frame(width: ${widthLit})`
+      : `${pad}.frame(maxWidth: .infinity)`;
+    const lines = [
+      `${pad}Menu {`,
+      optionsBlock,
+      `${pad}} label: {`,
+      `${pad}  HStack(spacing: 0) {`,
+      `${pad}    Text(${labelText})`,
+      `${pad}      .foregroundStyle(${textColor})`,
+      `${pad}      .lineLimit(1)`,
+      `${pad}    Spacer(minLength: 0)`,
+      `${pad}    Image(systemName: "chevron.down")`,
+      `${pad}      .font(.system(size: 12, weight: .semibold))`,
+      `${pad}      .foregroundStyle(${mutedColor})`,
+      `${pad}  }`,
+      `${pad}  .padding(.vertical, 9)`,
+      `${pad}  .padding(.leading, 12)`,
+      `${pad}  .padding(.trailing, 12)`,
+      ...labelMods.map((mod) => `${pad}  ${mod}`),
+      `${pad}}`,
+      widthMod,
+      `${pad}.frame(minHeight: 42)`,
+      `${pad}.frame(maxWidth: .infinity)`,
+    ];
+    return lines.join('\n');
   }
 
   if (entry.leaf === 'spacer') {
@@ -253,21 +434,23 @@ function renderContainer(
     const spacingLit = entry.spacingProp ? propLiteral(node.props, entry.spacingProp) : undefined;
     const spacing = typeof spacingLit === 'number' ? spacingLit : 0;
     const inner = `${indent(level + 1)}VStack(alignment: .leading, spacing: ${spacing}) {\n${childBlock}\n${indent(level + 1)}}`;
-    return applyModifiers(inner, [...modifiers, '.frame(maxWidth: .infinity, alignment: .leading)'], level + 1);
+    return applyModifiers(inner, modifiers, level + 1);
   }
 
   if (entry.container === 'hstack') {
     const spacingLit = entry.spacingProp ? propLiteral(node.props, entry.spacingProp) : undefined;
     const spacing = typeof spacingLit === 'number' ? spacingLit : 0;
     const alignLit = propLiteral(node.props, 'align');
-    const alignment = alignLit === 'center' ? '.center' : '.top';
     const heightLit = propLiteral(node.props, 'height');
+    const alignment = alignLit === 'center' || typeof heightLit === 'number' ? '.center' : '.top';
     const justifyLit = propLiteral(node.props, 'justify');
     const flexLit = propLiteral(node.props, 'flex');
+    const wrapLit = propLiteral(node.props, 'wrap');
     const isTableElement = node.name === 'TableHeader' || node.name === 'TableRow';
     const shouldFill = isTableElement || justifyLit !== undefined || typeof flexLit === 'number';
+    const hStackFrameAlign = justifyLit === 'end' ? '.trailing' : justifyLit === 'center' ? '.center' : '.leading';
     const frameMods: string[] = [];
-    if (shouldFill) frameMods.push('.frame(maxWidth: .infinity, alignment: .leading)');
+    if (shouldFill) frameMods.push(`.frame(maxWidth: .infinity, alignment: ${hStackFrameAlign})`);
     if (typeof heightLit === 'number') frameMods.push(`.frame(height: ${heightLit})`);
 
     let block = childBlock;
@@ -283,6 +466,19 @@ function renderContainer(
         const rest = childLines.slice(1);
         block = [first, `${indent(level + 2)}Spacer()`, ...rest].join('\n');
       }
+    } else if (wrapLit === true) {
+      block = node.children.map((child) => {
+        if (child.kind === 'map') return renderMap(child, level + 2, renderNested, ctx);
+        if (child.kind === 'text') return `${indent(level + 2)}Text(${JSON.stringify((child as IrTextNode).value)})`;
+        if (child.kind === 'binding') return `${indent(level + 2)}Text(${bindingExpr(child as IrBinding, ctx, itemScope)})`;
+        const rendered = renderNested(child, level + 2, itemScope);
+        if (!rendered) return '';
+        return rendered;
+      }).filter(Boolean).join('\n');
+
+      // Use FlowLayout (custom Layout protocol) for wrapping
+      const inner = `${indent(level + 1)}FlowLayout(spacing: ${spacing}) {\n${block}\n${indent(level + 1)}}`;
+      return applyModifiers(inner, [...modifiers, ...frameMods], level + 1);
     }
 
     const inner = `${indent(level + 1)}HStack(alignment: ${alignment}, spacing: ${spacing}) {\n${block}\n${indent(level + 1)}}`;
@@ -293,12 +489,12 @@ function renderContainer(
     const inner = childBlock
       ? `${indent(level + 1)}VStack(alignment: .leading, spacing: 0) {\n${childBlock}\n${indent(level + 1)}}`
       : `${indent(level + 1)}VStack { EmptyView() }`;
-    return applyModifiers(inner, [...modifiers, '.frame(maxWidth: .infinity, alignment: .leading)'], level + 1);
+    return applyModifiers(inner, modifiers, level + 1);
   }
 
   if (entry.container === 'navstack') {
     const inner = childBlock;
-    return applyModifiers(inner, [...modifiers, '.frame(maxWidth: .infinity, maxHeight: .infinity)'], level + 1);
+    return applyModifiers(inner, modifiers, level + 1);
   }
 
   if (entry.container === 'scrollview') {
@@ -308,8 +504,12 @@ function renderContainer(
 
   if (entry.container === 'field') {
     const label = propLiteral(node.props, 'label');
-    const labelView = typeof label === 'string' ? `\n${indent(level + 2)}Text(${JSON.stringify(label)})\n${indent(level + 2)}  .font(.caption)\n${indent(level + 2)}  .foregroundStyle(.secondary)` : '';
-    const inner = `${indent(level + 1)}VStack(alignment: .leading, spacing: 4) {${labelView}\n${childBlock}\n${indent(level + 1)}}`;
+    const gapLit = propLiteral(node.props, 'gap');
+    const gap = typeof gapLit === 'number' ? gapLit : 4;
+    const labelView = typeof label === 'string'
+      ? `\n${indent(level + 2)}Text(${JSON.stringify(label)})\n${indent(level + 2)}  .applyVcStyle(VcTheme.resolve("Text", variant: "field-label"))`
+      : '';
+    const inner = `${indent(level + 1)}VStack(alignment: .leading, spacing: ${gap}) {${labelView}\n${childBlock}\n${indent(level + 1)}}`;
     return applyModifiers(inner, modifiers, level + 1);
   }
 
@@ -349,7 +549,7 @@ function renderContainer(
     }
 
     const inner = `${indent(level + 1)}VStack(alignment: .leading, spacing: 0) {\n${body.join('\n')}\n${indent(level + 1)}}`;
-    return applyModifiers(inner, [...modifiers, '.frame(maxWidth: .infinity, alignment: .leading)'], level + 1);
+    return applyModifiers(inner, modifiers, level + 1);
   }
 
   if (entry.container === 'cellgroup') {
@@ -358,15 +558,15 @@ function renderContainer(
     const alignLit = propLiteral(node.props, 'align');
     const swiftAlign = alignLit === 'end' ? '.trailing' : alignLit === 'center' ? '.center' : '.leading';
     const isFlex = typeof flexLit === 'number';
-    const cellMods = [...modifiers, '.padding(.horizontal, 4)', '.lineLimit(1)'];
+    const cellMods = [...modifiers, '.lineLimit(1)'];
     if (typeof widthLit === 'number') {
       cellMods.push(`.frame(width: ${widthLit}, alignment: ${swiftAlign})`);
     } else if (isFlex) {
       cellMods.push(`.frame(maxWidth: .infinity, alignment: ${swiftAlign})`);
     }
     const inner = childBlock
-      ? `${indent(level + 1)}VStack(alignment: ${swiftAlign}) {\n${childBlock}\n${indent(level + 1)}}`
-      : `${indent(level + 1)}VStack { EmptyView() }`;
+      ? `${indent(level + 1)}Group {\n${childBlock}\n${indent(level + 2)}.frame(maxWidth: .infinity, alignment: ${swiftAlign})\n${indent(level + 1)}}`
+      : `${indent(level + 1)}Group { EmptyView() }`;
     return applyModifiers(inner, cellMods, level + 1);
   }
 
@@ -393,8 +593,10 @@ function resolvedVisualProps(
   });
 }
 
-function parseGridColumns(gridTemplateColumns: string | number | boolean | undefined): { kind: 'fixed-columns'; widths: string[] } | { kind: 'adaptive'; minWidth: number } | null {
+function parseGridColumns(gridTemplateColumns: string | number | boolean | undefined): { kind: 'fixed-columns'; widths: string[] } | { kind: 'adaptive'; minWidth: number } | { kind: 'equal-columns'; count: number } | null {
   if (!gridTemplateColumns || typeof gridTemplateColumns !== 'string') return null;
+  const equalRepeatMatch = gridTemplateColumns.match(/repeat\((\d+),\s*minmax\(0,\s*1fr\)\)/);
+  if (equalRepeatMatch) return { kind: 'equal-columns', count: Number(equalRepeatMatch[1]) };
   const adaptiveMatch = gridTemplateColumns.match(/repeat\(auto-fit,\s*minmax\((\d+)px/);
   if (adaptiveMatch) return { kind: 'adaptive', minWidth: Number(adaptiveMatch[1]) };
   const parts = gridTemplateColumns.trim().split(/\s+/);
@@ -427,6 +629,9 @@ function renderComponent(
       if (parsed?.kind === 'adaptive') {
         return renderGridAdaptive(node, level, itemScope, renderNested, ctx, modifiers, parsed.minWidth);
       }
+      if (parsed?.kind === 'equal-columns') {
+        return renderGridEqualColumns(node, level, itemScope, renderNested, ctx, modifiers, parsed.count);
+      }
       if (parsed?.kind === 'fixed-columns') {
         return renderGridFixedColumns(node, level, itemScope, renderNested, ctx, modifiers, parsed.widths);
       }
@@ -437,7 +642,7 @@ function renderComponent(
       const gapLit = propLiteral(node.props, 'gap');
       const gap = typeof gapLit === 'number' ? gapLit : (typeof resolved.gap === 'number' ? resolved.gap : 0);
       const inner = `${indent(level + 1)}HStack(alignment: .top, spacing: ${gap}) {\n${childBlock}\n${indent(level + 1)}}`;
-      return applyModifiers(inner, [...modifiers, '.frame(maxWidth: .infinity, alignment: .leading)'], level + 1);
+      return applyModifiers(inner, modifiers, level + 1);
     }
   }
 
@@ -454,9 +659,21 @@ function renderGridAdaptive(
 ): string {
   const gapLit = propLiteral(node.props, 'gap');
   const gap = typeof gapLit === 'number' ? gapLit : 16;
-  const childBlock = renderChildren(node.children, level + 2, renderNested, ctx, itemScope);
-  const inner = `${indent(level + 1)}LazyVGrid(columns: [GridItem(.adaptive(minimum: ${minWidth}))], spacing: ${gap}) {\n${childBlock}\n${indent(level + 1)}}`;
-  return applyModifiers(inner, [...modifiers, '.frame(maxWidth: .infinity)'], level + 1);
+  const childBlock = renderGridChildBlock(node.children, level, renderNested, ctx, itemScope);
+  const inner = `${indent(level + 1)}LazyVGrid(columns: [GridItem(.adaptive(minimum: ${minWidth}))], spacing: ${gap}) {\n${childBlock}\n${indent(level + 1)}}\n${indent(level + 1)}.frame(maxWidth: .infinity, alignment: .topLeading)`;
+  return applyModifiers(inner, modifiers, level + 1);
+}
+
+function renderGridEqualColumns(
+  node: IrComponentNode, level: number, itemScope: string | undefined,
+  renderNested: NodeRenderer, ctx: SwiftUIRenderContext, modifiers: string[], count: number,
+): string {
+  const gapLit = propLiteral(node.props, 'gap');
+  const gap = typeof gapLit === 'number' ? gapLit : 16;
+  const columns = `Array(repeating: GridItem(.flexible(), spacing: ${gap}), count: ${count})`;
+  const childBlock = renderGridChildBlock(node.children, level, renderNested, ctx, itemScope);
+  const inner = `${indent(level + 1)}LazyVGrid(columns: ${columns}, spacing: ${gap}) {\n${childBlock}\n${indent(level + 1)}}\n${indent(level + 1)}.frame(maxWidth: .infinity, alignment: .topLeading)`;
+  return applyModifiers(inner, modifiers, level + 1);
 }
 
 function resolveBackgroundColor(child: IrNode, ctx: SwiftUIRenderContext): string | null {
@@ -492,10 +709,12 @@ function renderGridFixedColumns(
     const pxMatch = w?.match(/^(\d+)px$/);
     if (pxMatch) {
       rendered += `\n${indent(level + 2)}.frame(width: ${Number(pxMatch[1])}, alignment: .topLeading)`;
-      rendered += `\n${indent(level + 2)}.frame(maxHeight: .infinity)`;
+      rendered += `\n${indent(level + 2)}.frame(maxHeight: .infinity, alignment: .topLeading)`;
       const bgColor = resolveBackgroundColor(child, ctx);
       if (bgColor) rendered += `\n${indent(level + 2)}.background(${bgColor})`;
     } else if (w === '1fr') {
+      // Content inside ScrollView must explicitly fill width
+      rendered += `\n${indent(level + 3)}.frame(maxWidth: .infinity, alignment: .topLeading)`;
       rendered = `${indent(level + 2)}ScrollView {\n${rendered}\n${indent(level + 2)}}`;
       rendered += `\n${indent(level + 2)}.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)`;
     }
@@ -503,7 +722,7 @@ function renderGridFixedColumns(
   }
   const childBlock = parts.join('\n');
   const inner = `${indent(level + 1)}HStack(spacing: 0) {\n${childBlock}\n${indent(level + 1)}}`;
-  return applyModifiers(inner, [...modifiers, '.frame(maxWidth: .infinity, maxHeight: .infinity)'], level + 1);
+  return applyModifiers(inner, [...modifiers, '.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)'], level + 1);
 }
 
 function renderViewRef(node: IrViewRefNode, level: number, itemScope: string | undefined, ctx: SwiftUIRenderContext): string {

package/renderers/swiftui/lowering/modifiers.ts

@@ -49,6 +49,10 @@ function swiftFontWeight(value: string | number | boolean): string | null {
     semibold: '.fontWeight(.semibold)',
     medium: '.fontWeight(.medium)',
     regular: '.fontWeight(.regular)',
+    '700': '.fontWeight(.bold)',
+    '600': '.fontWeight(.semibold)',
+    '500': '.fontWeight(.medium)',
+    '400': '.fontWeight(.regular)',
   };
   return map[value] ?? null;
 }
@@ -56,8 +60,15 @@ function swiftFontWeight(value: string | number | boolean): string | null {
 /**
  * Convert merged DSL visual props to a single SwiftUI modifier chain.
  *
- * Correct SwiftUI order:
+ * SwiftUI modifier order for fill elements:
+ *   foreground / font → padding → frame(fill) → background → clipShape → shadow → overlay → frame(fixed) → opacity
+ *
+ * For non-fill elements:
  *   foreground / font → padding → background → clipShape → shadow → overlay → frame → opacity
+ *
+ * The key insight: .frame(maxWidth: .infinity) MUST come BEFORE .background()
+ * so the background fills the expanded area. Otherwise the background only
+ * covers the natural content width.
  */
 export function visualPropSetToModifiers(merged: VisualPropSet): string[] {
   const modifiers: string[] = [];
@@ -90,7 +101,43 @@ export function visualPropSetToModifiers(merged: VisualPropSet): string[] {
     }
   }
 
-  // 3. Background (fills the padded area)
+  // Pre-compute frame/size values needed to determine fill vs fixed
+  const width = merged.width;
+  const height = merged.height;
+  const minHeight = merged.minHeight;
+  const maxWidth = merged.maxWidth;
+  const maxHeight = merged.maxHeight;
+  const margin = merged.margin;
+  const hasCenteringMargin = margin === '0 auto';
+
+  const needsFillWidth = width === '100%' || width === 'fill' || maxWidth === 'fill';
+  const needsFillHeight = height === '100%' || height === 'fill' || minHeight === '100vh';
+
+  // 2.5. Fill frame constraints — BEFORE background so bg fills the expanded area
+  // alignment: .leading/.top/.topLeading ensures content stays at top-left (matching CSS block behavior)
+  const maxWidthPx = maxWidth === 'fill' ? null : (maxWidth !== undefined ? parsePx(maxWidth) : null);
+
+  if (needsFillWidth && needsFillHeight) {
+    if (maxWidthPx !== null) {
+      modifiers.push(`.frame(maxWidth: ${maxWidthPx}, maxHeight: .infinity, alignment: .topLeading)`);
+    } else {
+      modifiers.push('.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)');
+    }
+  } else if (needsFillWidth) {
+    if (maxWidthPx !== null) {
+      modifiers.push(`.frame(maxWidth: ${maxWidthPx}, alignment: .leading)`);
+    } else {
+      modifiers.push('.frame(maxWidth: .infinity, alignment: .leading)');
+    }
+  } else if (needsFillHeight) {
+    modifiers.push('.frame(maxHeight: .infinity, alignment: .top)');
+  }
+
+  if (!needsFillHeight && minHeight === '100vh') {
+    modifiers.push('.frame(maxHeight: .infinity, alignment: .top)');
+  }
+
+  // 3. Background (fills the frame area — now expanded for fill elements)
   const background = merged.background;
   if (typeof background === 'string' && background !== 'transparent') {
     const color = parseHexColor(background);
@@ -115,17 +162,49 @@ export function visualPropSetToModifiers(merged: VisualPropSet): string[] {
     modifiers.push(`.overlay(RoundedRectangle(cornerRadius: ${radius ?? 0}).stroke(${colorExpr}, lineWidth: ${borderWidth}))`);
   }
 
-  // 7. Frame constraints
-  const minHeight = merged.minHeight;
-  if (minHeight !== undefined) {
-    const px = parsePx(minHeight);
-    if (px !== null) modifiers.push(`.frame(minHeight: ${px})`);
+  // 7. Non-fill frame constraints (fixed sizes, maxWidth cap without fill)
+  if (!needsFillWidth) {
+    if (typeof width === 'number') {
+      modifiers.push(`.frame(width: ${width})`);
+    } else if (width !== undefined && width !== 'wrap') {
+      const px = parsePx(width);
+      if (px !== null) modifiers.push(`.frame(width: ${px})`);
+    }
+    if (maxWidth !== undefined && maxWidth !== 'fill') {
+      const px = parsePx(maxWidth);
+      if (px !== null) modifiers.push(`.frame(maxWidth: ${px})`);
+    }
   }
 
-  const maxWidth = merged.maxWidth;
-  if (maxWidth !== undefined) {
-    const px = parsePx(maxWidth);
-    if (px !== null) modifiers.push(`.frame(maxWidth: ${px})`);
+  if (!needsFillHeight) {
+    if (typeof height === 'number') {
+      modifiers.push(`.frame(height: ${height})`);
+    } else if (height !== undefined && height !== 'wrap') {
+      const px = parsePx(height);
+      if (px !== null) modifiers.push(`.frame(height: ${px})`);
+    }
+    if (minHeight !== undefined && minHeight !== '100vh') {
+      if (typeof minHeight === 'number') {
+        modifiers.push(`.frame(minHeight: ${minHeight})`);
+      } else {
+        const px = parsePx(minHeight);
+        if (px !== null) modifiers.push(`.frame(minHeight: ${px})`);
+      }
+    }
+    if (maxHeight !== undefined && maxHeight !== 'fill') {
+      const px = parsePx(maxHeight);
+      if (px !== null) modifiers.push(`.frame(maxHeight: ${px})`);
+    }
+  }
+
+  // margin: 0 auto → center within parent by expanding outer frame (positioning, not sizing)
+  if (hasCenteringMargin) {
+    modifiers.push('.frame(maxWidth: .infinity, alignment: .center)');
+  } else if (typeof margin === 'number') {
+    modifiers.push(`.padding(${margin})`);
+  } else if (margin !== undefined) {
+    const px = parsePx(margin);
+    if (px !== null) modifiers.push(`.padding(${px})`);
   }
 
   // 8. Opacity (last — affects everything)

package/renderers/swiftui/renderRuntime.ts

@@ -9,6 +9,51 @@ import { renderSwiftTheme } from './renderTheme.js';
 import { renderSwiftComponent } from './renderComponents.js';
 import { loadPreviewMockYaml, previewMockFilePath, pathExists } from '../../src/preview/previewMock.js';
 
+const FLOW_LAYOUT_SWIFT = `import SwiftUI
+
+/// CSS flex-wrap equivalent: wraps children to next line when horizontal space runs out.
+struct FlowLayout: Layout {
+    var spacing: CGFloat = 8
+
+    func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) -> CGSize {
+        let containerWidth = proposal.width ?? .infinity
+        var x: CGFloat = 0
+        var y: CGFloat = 0
+        var rowHeight: CGFloat = 0
+
+        for subview in subviews {
+            let size = subview.sizeThatFits(.unspecified)
+            if x + size.width > containerWidth && x > 0 {
+                y += rowHeight + spacing
+                x = 0
+                rowHeight = 0
+            }
+            x += size.width + spacing
+            rowHeight = max(rowHeight, size.height)
+        }
+        return CGSize(width: containerWidth, height: y + rowHeight)
+    }
+
+    func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) {
+        var x = bounds.minX
+        var y = bounds.minY
+        var rowHeight: CGFloat = 0
+
+        for subview in subviews {
+            let size = subview.sizeThatFits(.unspecified)
+            if x + size.width > bounds.maxX && x > bounds.minX {
+                y += rowHeight + spacing
+                x = bounds.minX
+                rowHeight = 0
+            }
+            subview.place(at: CGPoint(x: x, y: y), proposal: ProposedViewSize(size))
+            x += size.width + spacing
+            rowHeight = max(rowHeight, size.height)
+        }
+    }
+}
+`;
+
 function swiftuiTemplatesDir(): string {
   return resolve(packageRoot(), 'renderers/swiftui/templates');
 }
@@ -33,6 +78,9 @@ export async function renderSwiftUIRuntime(
     );
   }
 
+  // FlowLayout helper (CSS flex-wrap equivalent)
+  await writeFile(resolve(swiftuiDir, 'FlowLayout.swift'), FLOW_LAYOUT_SWIFT, 'utf-8');
+
   if (compiledDocs && design) {
     for (const partial of compiledDocs.partials) {
       try {