Merge pull request #1862 from riganti/fix-capabilities-inherited

capabilities: fix Get of inherited property
riganti · Oct 10, 2024 · ef57d78 · ef57d78
2 parents d2816a9 + 0ca1511
commit ef57d78
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/Framework/Framework/Binding/DotvvmCapabilityProperty.CodeGeneration.cs b/src/Framework/Framework/Binding/DotvvmCapabilityProperty.CodeGeneration.cs
@@ -192,19 +192,17 @@ public static (LambdaExpression getter, LambdaExpression setter) CreatePropertyA
                     if (canUseDirectAccess && unwrappedType.IsValueType)
                     {
                         getValue = Call(typeof(Helpers), nameof(Helpers.GetStructValueDirect), new Type[] { unwrappedType }, currentControlParameter, Constant(property));
-                        if (type.IsNullable())
+                        if (!type.IsNullable())
                             getValue = Expression.Property(getValue, "Value");
                     }
                     else
                     {
                         getValue = Call(currentControlParameter, getValueMethod, Constant(property), Constant(property.IsValueInherited));
+                        getValue = Convert(getValue, type);
                     }
                     return (
                         Expression.Lambda(
-                            Expression.Convert(
-                                Expression.Call(currentControlParameter, getValueMethod, Expression.Constant(property), Expression.Constant(false)),
-                                type
-                            ),
+                            getValue,
                             currentControlParameter
                         ),
                         Expression.Lambda(

diff --git a/src/Framework/Framework/Binding/DotvvmCapabilityProperty.Helpers.cs b/src/Framework/Framework/Binding/DotvvmCapabilityProperty.Helpers.cs
@@ -101,6 +101,8 @@ public static void SetValueOrBindingSlow<T>(DotvvmBindableObject c, DotvvmProper
             public static T? GetStructValueDirect<T>(DotvvmBindableObject c, DotvvmProperty p)
                 where T: struct
             {
+                // T being a struct allows us to invert the rather expensive `is IBinding` typecheck in EvalPropertyValue
+                // to a simpler is T check, as T is a single type checkable with a simple comparison
                 if (c.properties.TryGet(p, out var x))
                 {
                     if (x is null)

diff --git a/src/Tests/Runtime/CapabilityPropertyTests.cs b/src/Tests/Runtime/CapabilityPropertyTests.cs
@@ -214,6 +214,28 @@ public void BitMoreComplexCapability_WeirdProperties_GetterAndSetter()
             Assert.AreEqual(32, controlF2.GetValue<int>("Nullable"));
         }
 
+        [TestMethod]
+        public void BitMoreComplexCapability_InheritedProperties()
+        {
+            var control1 = new TestControlInheritedProps();
+            var control2 = new TestControlInheritedProps();
+            control1.Children.Add(control2);
+
+            control1.NotNullable = 1;
+            control1.Nullable = 2;
+
+            Assert.AreEqual(1, control2.NotNullable);
+            Assert.AreEqual(2, control2.Nullable);
+
+            Assert.AreEqual(1, control1.GetCapability<BitMoreComplexCapability>().NotNullable);
+            Assert.AreEqual(2, control1.GetCapability<BitMoreComplexCapability>().Nullable);
+            Assert.AreEqual(1, control2.GetCapability<BitMoreComplexCapability>().NotNullable);
+            Assert.AreEqual(2, control2.GetCapability<BitMoreComplexCapability>().Nullable);
+
+            control2.SetCapability(new BitMoreComplexCapability { NotNullable = 3, Nullable = null });
+            Assert.AreEqual(3, control2.NotNullable);
+            Assert.AreEqual(null, control2.Nullable);
+        }
 
         [DataTestMethod]
         [DataRow(typeof(TestControl6))]