@dongmingzhixiu/vuexir-compiler 0.7.4 → 0.7.6

package/dist/codegen/compose.js

@@ -1163,6 +1163,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 +1212,10 @@ 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;
         return nd.children
             .map((c) => {
             const cp = (c.props ?? {});
@@ -1235,7 +1243,12 @@ 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;
+            // 纵向 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' };
             const result = emitNode(c, childCtx, d, loop, false, stretch);
             if (childCtx.needsScope)
@@ -1436,7 +1449,8 @@ function emitNodeInner(node, ctx, depth, loop, useParamModifier = false, parentS
             return out;
         }
         case 'button': {
-            const chain = modChain([...stretchModifiers(parentStretch, node), ...sizeModifiers(p, ctx), ...absM(p), ...clipModifiers(p), ...visualModifiers(p), ...borderModifiers(p), ...paddingModifiers(p), ...alphaArr, ...transformModifiers(p)], pad + '            ');
+            const flex = p.flex !== undefined ? flexModifier(p, ctx) : '';
+            const chain = modChain([...stretchModifiers(parentStretch, node), ...sizeModifiers(p, ctx), flex, ...absM(p), ...clipModifiers(p), ...visualModifiers(p), ...borderModifiers(p), ...paddingModifiers(p), ...alphaArr, ...transformModifiers(p)], pad + '            ');
             // R108：动态按钮文案（props.bind）优先；Kotlin 里用字符串模板插值
             const label = p.bind !== undefined ? String(p.bind) : (p.label ?? '');
             const click = kotlinClickAction(p, ctx, loop);

package/dist/transform/vue2ir.js

@@ -2369,9 +2369,9 @@ function walkElement(node, classProps, comboRules, scopedRules, pseudoRules, war
         mapping = { type: 'group' };
     if (mapping.type === 'text' && content.length === 0 && ['i', 'span', 'b'].includes(node.tag))
         mapping = { type: 'spacer' };
-    // R108：button 只接受 label/bind —— 布局属性丢弃、缺 label 时占位（避免整页失败）
+    // R108：button 文案使用 label/bind，保留作为父容器子项的 flex。
     if (mapping.type === 'button') {
-        const badProps = ['flexDirection', 'justifyContent', 'alignItems', 'gap', 'flex', 'textAlign', 'lineHeight', 'lineHeightMultiplier', 'overflow', 'clip'];
+        const badProps = ['flexDirection', 'justifyContent', 'alignItems', 'gap', 'textAlign', 'lineHeight', 'lineHeightMultiplier', 'overflow', 'clip'];
         for (const k of badProps)
             delete props[k];
     }

package/package.json

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