Adjusted property mapper to work when the viewhandler doesn't subclas…

…s the view.
dotnet · Jul 5, 2019 · c34ad88 · c34ad88
1 parent 33df813
commit c34ad88
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/HotUI/PropertyMapper.cs b/src/HotUI/PropertyMapper.cs
@@ -3,18 +3,24 @@
 
 namespace HotUI
 {
-    public class PropertyMapper<TVirtualView, TBaseNativeView, TNativeView> : Dictionary<string, Func<TNativeView, TVirtualView, bool>> where TVirtualView:View where TNativeView:TBaseNativeView
+    public class PropertyMapper<TVirtualView, TBaseNativeView, TNativeView> : Dictionary<string, Func<TNativeView, TVirtualView, bool>> where TVirtualView:View where TBaseNativeView:class
     {
         private readonly PropertyMapper<View, TBaseNativeView, TBaseNativeView> _chained;
+        private readonly Func<TNativeView, TBaseNativeView> _toBase;
 
         public PropertyMapper()
         {
+        }
 
+        public PropertyMapper(PropertyMapper<View, TBaseNativeView, TBaseNativeView> chained) 
+        {
+            _chained = chained;
         }
 
-        public PropertyMapper(PropertyMapper<View, TBaseNativeView, TBaseNativeView> chained)
+        public PropertyMapper(PropertyMapper<View, TBaseNativeView, TBaseNativeView> chained, Func<TNativeView, TBaseNativeView> getNative)
         {
             _chained = chained;
+            _toBase = getNative;
         }
 
         public void UpdateProperties( TNativeView nativeView, TVirtualView virtualView)
@@ -23,8 +29,11 @@ public void UpdateProperties( TNativeView nativeView, TVirtualView virtualView)
                 return;
 
             if (_chained != null)
-                _chained.UpdateProperties(nativeView, virtualView);
-
+            {
+                TBaseNativeView native = _toBase?.Invoke(nativeView) ?? nativeView as TBaseNativeView;
+                _chained.UpdateProperties(native, virtualView);
+            }
+
             foreach (var entry in this)
                 entry.Value.Invoke(nativeView, virtualView);
         }