Merge branch 'master' of https://github.com/reactiveui/ReactiveUI

Author: anaisbetts

ReactiveUI.Platforms/Cocoa/CocoaDefaultPropertyBinding.cs

@@ -19,7 +19,7 @@ public Tuple<string, int> GetPropertyForControl(object control)
             // NB: These are intentionally arranged in priority order from most
             // specific to least specific.
 #if UIKIT
-			var items = new[] {
+            var items = new[] {
                 new { Type = typeof(UISlider), Property = "Value" },
                 new { Type = typeof(UITextView), Property = "Text" },
                 new { Type = typeof(UITextField), Property = "Text" },

ReactiveUI.Platforms/Cocoa/KVOObservableForProperty.cs

@@ -26,11 +26,42 @@ namespace ReactiveUI.Cocoa
     /// </summary>
     public class KVOObservableForProperty : ICreatesObservableForProperty
     {
+        static readonly MemoizingMRUCache<Tuple<Type, string>, bool> declaredInNSObject;
+
+        static KVOObservableForProperty()
+        {
+            var monotouchAssemblyName = typeof(NSObject).Assembly.FullName;
+
+            declaredInNSObject = new MemoizingMRUCache<Tuple<Type, string>, bool>((pair, _) => {
+                var thisType = pair.Item1;
+
+                // Types that aren't NSObjects at all are uninteresting to us
+                if (typeof(NSObject).IsAssignableFrom(thisType) == false) {
+                    return false;
+                }
+
+                while(thisType != null) {
+                    if (thisType.GetMembers(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly).Any(x => x.Name == pair.Item2)) {
+                        // NB: This is a not-completely correct way to detect if
+                        // an object is defined in an Obj-C class (it will fail if
+                        // you're using a binding to a 3rd-party Obj-C library).
+                        return thisType.Assembly.FullName == monotouchAssemblyName;
+                    }
+
+                    thisType = thisType.BaseType;
+                }
+
+                // The property doesn't exist at all
+                return false;
+            }, RxApp.BigCacheLimit);
+        }
+
+
         public int GetAffinityForObject(Type type, string propertyName, bool beforeChanged = false)
         {
-            // NB: There is no way to know up-front whether a given property is
-            // KVO-observable. This is Unfortunate™.
-            return typeof (NSObject).IsAssignableFrom(type) ? 4 : 0;
+            lock (declaredInNSObject) {
+                return declaredInNSObject.Get(Tuple.Create(type, propertyName)) ? 15 : 0;
+            }
         }
 
         public IObservable<IObservedChange<object, object>> GetNotificationForProperty(object sender, string propertyName, bool beforeChanged = false)

ReactiveUI.Platforms/Cocoa/UIKitObservableForProperty.cs

@@ -16,18 +16,18 @@ public class UIKitObservableForProperty : UIKitObservableForPropertyBase
 
         public UIKitObservableForProperty ()
         {
-            Register(typeof(UIControl), "Value", 9, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
-            Register(typeof(UITextField), "Text", 10, (s, p) => ObservableFromNotification(s, p, UITextField.TextFieldTextDidChangeNotification));
-            Register(typeof(UIDatePicker), "Date", 10, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
-            Register(typeof(UISegmentedControl), "SelectedSegment", 10, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
-            Register(typeof(UISwitch), "On", 10, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
-            Register(typeof(UISegmentedControl), "SelectedSegment", 10, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
+            Register(typeof(UIControl), "Value", 20, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
+            Register(typeof(UITextField), "Text", 30, (s, p) => ObservableFromNotification(s, p, UITextField.TextFieldTextDidChangeNotification));
+            Register(typeof(UIDatePicker), "Date", 30, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
+            Register(typeof(UISegmentedControl), "SelectedSegment", 30, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
+            Register(typeof(UISwitch), "On", 30, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
+            Register(typeof(UISegmentedControl), "SelectedSegment", 30, (s, p)=> ObservableFromUIControlEvent(s, p, UIControlEvent.ValueChanged));
 
             // Warning: This will stomp the Control's delegate
-            Register(typeof(UITabBar), "SelectedItem", 10, (s, p) => ObservableFromEvent(s, p, "ItemSelected"));
+            Register(typeof(UITabBar), "SelectedItem", 30, (s, p) => ObservableFromEvent(s, p, "ItemSelected"));
 
             // Warning: This will stomp the Control's delegate
-            Register(typeof(UISearchBar), "Text", 10, (s, p) => ObservableFromEvent(s, p, "TextChanged"));
+            Register(typeof(UISearchBar), "Text", 30, (s, p) => ObservableFromEvent(s, p, "TextChanged"));
         }
     }
 }

ReactiveUI.Tests/Cocoa/KVOBindingTests.cs

@@ -0,0 +1,33 @@
+using System;
+using Xunit;
+using ReactiveUI.Cocoa;
+
+namespace ReactiveUI.Tests
+{
+    public class FooController : ReactiveViewController, IViewFor<PropertyBindViewModel>
+    {
+        PropertyBindViewModel _ViewModel;
+        public PropertyBindViewModel ViewModel {
+            get { return _ViewModel; }
+            set { this.RaiseAndSetIfChanged(ref _ViewModel, value); }
+        }
+
+        object IViewFor.ViewModel {
+            get { return ViewModel; }
+            set { ViewModel = (PropertyBindViewModel)value; }
+        }
+    }
+
+    public class KVOBindingTests
+    {
+        [Fact]
+        public void MakeSureKVOBindingsBindToKVOThings()
+        {
+            var input = new FooController();
+            var fixture = new KVOObservableForProperty();
+
+            Assert.NotEqual(0, fixture.GetAffinityForObject(typeof(FooController), "View"));
+            Assert.Equal(0, fixture.GetAffinityForObject(typeof(FooController), "ViewModel"));
+        }
+    }
+}

ReactiveUI.Tests/ReactiveUI.Tests_Monotouch.csproj

@@ -10,7 +10,6 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>ReactiveUI.Tests</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>ReactiveUI_Tests_Monotouch</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -147,6 +146,7 @@
     <Compile Include="ReactiveNotifyPropertyChangedMixinTest.cs" />
     <Compile Include="Cocoa\PropertyBindingTestViews.cs" />
     <Compile Include="PropertyBindingTest.cs" />
+    <Compile Include="Cocoa\KVOBindingTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ReactiveUI.Platforms\ReactiveUI.Cocoa_Monotouch.csproj">