move special case "data" to itemrenderer where it belongs

haxeui · Aug 11, 2024 · 85a7e74 · 85a7e74
1 parent 7a9235b
commit 85a7e74
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/haxe/ui/core/ItemRenderer.hx b/haxe/ui/core/ItemRenderer.hx
@@ -264,8 +264,13 @@ class ItemRenderer extends Box {
                 }
                 if (!isLayoutProp) {
                     try {
-                        if (RTTI.hasPrimitiveClassProperty(this.className, f)) {
-                            Reflect.setProperty(this, f, v);
+                        // "data" is a special case exception here as if the item renderer contained a "data" property
+                        // it would overwrite the item renderers data property, which is, for sure, NOT 
+                        // what we want to happen... ever.
+                        if (f != "data") {
+                            if (RTTI.hasPrimitiveClassProperty(this.className, f)) {
+                                Reflect.setProperty(this, f, v);
+                            }
                         }
                     } catch (e:Dynamic) { }
                 } else if (allowLayoutProperties) {

diff --git a/haxe/ui/util/RTTI.hx b/haxe/ui/util/RTTI.hx
@@ -174,9 +174,6 @@ class RTTI {
     }
 
     private static function isPrimitiveProperty(prop:RTTIProperty):Bool {
-        if (prop.propertyName == "data") {
-            return false;
-        }
         if (prop.propertyType == "bool" || prop.propertyType == "int" || prop.propertyType == "float" || prop.propertyType == "string" || prop.propertyType == "variant" || prop.propertyType == "dynamic") {
             return true;
         }