better auto type conversion (based on property type)

haxeui · Oct 10, 2024 · a534c97 · a534c97
1 parent 718786e
commit a534c97
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/haxe/ui/macros/ComponentMacros.hx b/haxe/ui/macros/ComponentMacros.hx
@@ -1110,9 +1110,15 @@ class ComponentMacros {
                         propType = propInfo.propertyType;
                     }
                     //var propExpr = macro $v{TypeConverter.convertTo(TypeConverter.convertFrom(propValue), propType)};
-                    var pos = Context.currentPos();
-                    var propExpr = macro @:pos(pos) $v{TypeConverter.convertFrom(propValue)};
-                    builder.add(macro $i{varName}.$propName = $propExpr);
+                    if (propType != null) {
+                        var pos = Context.currentPos();
+                        var propExpr = macro @:pos(pos) $v{TypeConverter.convertTo(propValue, propType)};
+                        builder.add(macro $i{varName}.$propName = $propExpr);
+                    } else {
+                        var pos = Context.currentPos();
+                        var propExpr = macro @:pos(pos) $v{TypeConverter.convertFrom(propValue)};
+                        builder.add(macro $i{varName}.$propName = $propExpr);
+                    }
                 } else {
 
                     var propExpr = macro $v{TypeConverter.convertFrom(propValue)};