@dongmingzhixiu/vuexir-compiler 0.7.5 → 0.7.7

package/dist/codegen/compose.d.ts

@@ -9,6 +9,7 @@ declare const NAV_TEST_KT: (bundleId: string) => string;
 interface ComposeCtx {
     parentAxis?: 'row' | 'column' | 'box';
     inVerticalScroll?: boolean;
+    parentColumnHeightBounded?: boolean;
     runtimeAsset?: string;
     warnings: string[];
     pageId: string;

package/dist/codegen/compose.js

@@ -741,7 +741,10 @@ function borderModifiers(props) {
     return mods;
 }
 function flexModifier(props, ctx) {
-    if (ctx?.parentAxis === 'box' || (ctx?.inVerticalScroll && ctx.parentAxis !== 'row'))
+    if (ctx?.parentAxis === 'box')
+        return '';
+    if (ctx?.inVerticalScroll && ctx.parentAxis !== 'row' &&
+        (!ctx.parentColumnHeightBounded || (props.flex ?? 0) <= 0))
         return '';
     if (props.flex === undefined && props.minWidth === 0 && ctx?.parentAxis === 'row')
         return 'Modifier.weight(1f, fill = false)';
@@ -1163,6 +1166,10 @@ function stretchModifiers(parentStretch, node) {
         return [];
     return ['Modifier.fillMaxWidth()'];
 }
+function hasDeclaredWidth(props) {
+    return props.width !== undefined || props.widthFraction !== undefined ||
+        props.widthDynamic !== undefined || props.widthFractionDynamic !== undefined;
+}
 /** R-PAGESCROLL 守卫：子树内是否存在 flex / marginTopAuto（→ Modifier.weight，滚动容器内不可用） */
 function subtreeHasWeight(node) {
     const p = node.props;
@@ -1208,6 +1215,14 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
             const decorated = nd.children.flatMap((c, i) => c.props?.position === 'absolute' ? [c] : i === first ? [{ type: 'group', props: { flexDirection: p.flexDirection, alignItems: p.alignItems, justifyContent: p.justifyContent, gap: p.gap, padding: p.padding, ...((p.width !== undefined || p.widthDynamic) && (p.height !== undefined || p.heightDynamic) ? { width: 'fill', height: 'fill' } : {}) }, children: flow }] : []);
             return decorated.map((child) => emitNode(child, { ...ctx, parentAxis: 'box' }, d, loop)).join('\n');
         }
+        const columnHasWidth = nd.type === 'root' || hasDeclaredWidth(p) ||
+            (nd.type === 'group' && stretchModifiers(parentStretch, nd).length > 0) ||
+            (ctx.parentAxis === 'row' && p.flex !== undefined);
+        const rowContentWidth = ctx.parentAxis === 'row' && p.width === undefined && p.flex === undefined;
+        // 普通列的固定高度或父列分配的完整权重重新提供有限的垂直空间。
+        const columnHeightBounded = kind === 'Column' && nd.type === 'group' &&
+            (typeof p.height === 'number' ||
+                (ctx.parentAxis === 'column' && ctx.parentColumnHeightBounded === true && (p.flex ?? 0) > 0));
         return nd.children
             .map((c) => {
             const cp = (c.props ?? {});
@@ -1235,8 +1250,17 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
             if (kind === 'Column' && cp.marginBottom !== undefined && cp.marginBottom !== 0) {
                 post = post + '\n' + cpad + 'Spacer(\n' + cpad + '    modifier = Modifier.height(' + dp(cp.marginBottom) + '),\n' + cpad + ')\n';
             }
-            const stretch = kind === 'Column' && (p.alignItems === undefined || p.alignItems === 'stretch') && !(ctx.parentAxis === 'row' && p.width === undefined && p.flex === undefined) && cp.width === undefined && cp.flex === undefined && cp.position !== 'absolute' && !cp.marginLeftAuto;
-            const childCtx = { ...ctx, parentAxis: kind === 'Row' ? 'row' : kind === 'Box' ? 'box' : 'column' };
+            // 纵向 flex 只分配高度，列宽已确定时仍按交叉轴拉伸。
+            const autoWidth = cp.flex === undefined
+                ? cp.width === undefined && !rowContentWidth
+                : columnHasWidth && !hasDeclaredWidth(cp);
+            const stretch = kind === 'Column' && (p.alignItems === undefined || p.alignItems === 'stretch') &&
+                autoWidth && cp.position !== 'absolute' && !cp.marginLeftAuto;
+            const childCtx = {
+                ...ctx,
+                parentAxis: kind === 'Row' ? 'row' : kind === 'Box' ? 'box' : 'column',
+                parentColumnHeightBounded: columnHeightBounded,
+            };
             const result = emitNode(c, childCtx, d, loop, false, stretch);
             if (childCtx.needsScope)
                 ctx.needsScope = true;

package/dist/codegen/swiftui.js

@@ -510,6 +510,16 @@ export function boxModifiers(props) {
         mods.push('.clipped()');
     return mods;
 }
+function columnStretchAlignment(node) {
+    const props = node.props;
+    // 将常规行放到拉伸区域的尾端，不插入会多占一份 gap 的 Spacer。
+    if (node.type === 'group' && props?.flexDirection === 'row' && props.justifyContent === 'end' &&
+        props.widthDynamic === undefined && props.widthFraction === undefined && props.widthFractionDynamic === undefined &&
+        !props.flexWrap && !props.gridColumns && !node.children?.some((child) => child.props?.position === 'absolute')) {
+        return '.trailing';
+    }
+    return props?.textAlign === 'center' ? '.center' : props?.textAlign === 'right' ? '.trailing' : '.leading';
+}
 function emitChildren(children, axis, ctx, alignRaw = 'stretch', stretchCross = false) {
     if (!children || children.length === 0)
         return '';
@@ -562,7 +572,7 @@ function emitChildren(children, axis, ctx, alignRaw = 'stretch', stretchCross =
             // column：仅默认 stretch 时子项填满父宽（div block 语义）；显式 start/center/end → 内容宽对齐
             const explicitCol = alignRaw === 'start' || alignRaw === 'center' || alignRaw === 'end';
             if (!explicitCol) {
-                return body + '\n' + indent(ctx.level) + frameExpr('fillW', c.props?.textAlign === 'center' ? '.center' : c.props?.textAlign === 'right' ? '.trailing' : '.leading');
+                return body + '\n' + indent(ctx.level) + frameExpr('fillW', columnStretchAlignment(c));
             }
             return body;
         }
@@ -985,7 +995,7 @@ function emitNodeInner(node, ctx) {
                     // 显式 start/center/end → 子项按内容宽对齐（CSS 交叉轴对齐语义）
                     const explicitCol = (c.props?.alignSelf !== undefined && c.props.alignSelf !== 'stretch') || props.alignItems === 'start' || props.alignItems === 'center' || props.alignItems === 'end';
                     if (!explicitCol) {
-                        body.push(indent(L + 1) + frameExpr('fillW', c.props?.textAlign === 'center' ? '.center' : c.props?.textAlign === 'right' ? '.trailing' : '.leading'));
+                        body.push(indent(L + 1) + frameExpr('fillW', columnStretchAlignment(c)));
                     }
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dongmingzhixiu/vuexir-compiler",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "description": "Vue SFC → IR → 原生源码（SwiftUI / Compose）编译器核心：纯函数、零 IO",
   "type": "module",
   "license": "MIT",