From d54772033bc994f50c32e31768fcc41b63885923 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 27 Oct 2015 23:32:41 +0100
Subject: [PATCH] Added DropDown theme in XAML.

Something weird is happening where selected items are removed from the
tree somehow.
---
 samples/XamlTestApplicationPcl/DropDown.paml  | 13 +++---
 samples/XamlTestApplicationPcl/PopupRoot.paml | 11 +++++
 samples/XamlTestApplicationPcl/Window.paml    |  2 +-
 .../XamlTestApplicationPcl/XamlTestApp.paml   |  1 +
 .../XamlTestApplicationPcl.csproj             |  3 ++
 .../Perspex.Markup.Xaml/Data/Binding.cs       | 10 ++++-
 .../Perspex.Markup/Data/ExpressionObserver.cs | 44 +++++++++++++++----
 src/Perspex.Controls/DropDown.cs              |  4 +-
 .../ExpressionObserverTests_Property.cs       | 15 +++++++
 9 files changed, 83 insertions(+), 20 deletions(-)
 create mode 100644 samples/XamlTestApplicationPcl/PopupRoot.paml

diff --git a/samples/XamlTestApplicationPcl/DropDown.paml b/samples/XamlTestApplicationPcl/DropDown.paml
index 289cfec8e1..2105970365 100644
--- a/samples/XamlTestApplicationPcl/DropDown.paml
+++ b/samples/XamlTestApplicationPcl/DropDown.paml
@@ -1,7 +1,7 @@
 <Styles xmlns="https://github.com/perspex">
   <Style Selector="DropDown">
-    <Setter Property="BorderBrush" Value="Black"/>
-    <Setter Property="BorderThickness" Value="1"/>
+    <Setter Property="BorderBrush" Value="#ff707070"/>
+    <Setter Property="BorderThickness" Value="2"/>
     <Setter Property="HorizontalContentAlignment" Value="Center"/>
     <Setter Property="VerticalContentAlignment" Value="Center"/>
     <Setter Property="Template">
@@ -18,15 +18,15 @@
                           BorderThickness="0"
                           Background="Transparent"
                           ClickMode="Press"
-                          Focusable="False">
+                          Focusable="False"
+                          Grid.Column="1">
               <Path Fill="Black"
                     Width="8"
                     Height="4"
                     Stretch="Uniform"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z"
-                    Grid.Column="1"/>
+                    Data="F1 M 301.14,-189.041L 311.57,-189.041L 306.355,-182.942L 301.14,-189.041 Z"/>
             </ToggleButton>
             <Popup Name="PART_Popup"
                    IsOpen="{TemplateBinding Path=IsDropDownOpen, Mode=TwoWay}"
@@ -36,7 +36,8 @@
               <Border BorderBrush="Black"
                       BorderThickness="1"
                       Padding="4">
-                <ItemsPresenter Items="{TemplateBinding Items}" 
+                <ItemsPresenter Name="PART_ItemsPresenter"
+                                Items="{TemplateBinding Items}" 
                                 MemberSelector="{TemplateBinding MemberSelector}"/>
               </Border>
             </Popup>
diff --git a/samples/XamlTestApplicationPcl/PopupRoot.paml b/samples/XamlTestApplicationPcl/PopupRoot.paml
new file mode 100644
index 0000000000..61a1c33cfb
--- /dev/null
+++ b/samples/XamlTestApplicationPcl/PopupRoot.paml
@@ -0,0 +1,11 @@
+<Style xmlns="https://github.com/perspex" Selector="PopupRoot">
+  <Setter Property="Template">
+    <ControlTemplate>
+      <Border Background="{TemplateBinding Background}">
+        <ContentPresenter Name="PART_ContentPresenter" 
+                          Content="{TemplateBinding Content}" 
+                          Margin="{TemplateBinding Padding}"/>
+      </Border>
+    </ControlTemplate>
+  </Setter>
+</Style>
\ No newline at end of file
diff --git a/samples/XamlTestApplicationPcl/Window.paml b/samples/XamlTestApplicationPcl/Window.paml
index 513f5418cd..0ef9473a22 100644
--- a/samples/XamlTestApplicationPcl/Window.paml
+++ b/samples/XamlTestApplicationPcl/Window.paml
@@ -5,7 +5,7 @@
     <ControlTemplate>
       <Border Background="{TemplateBinding Background}">
         <AdornerDecorator>
-          <ContentPresenter Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}"/>
+          <ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}"/>
         </AdornerDecorator>
       </Border>
     </ControlTemplate>
diff --git a/samples/XamlTestApplicationPcl/XamlTestApp.paml b/samples/XamlTestApplicationPcl/XamlTestApp.paml
index 999ab3d3d1..1a8fbd5e41 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApp.paml
+++ b/samples/XamlTestApplicationPcl/XamlTestApp.paml
@@ -10,6 +10,7 @@
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ItemsControl.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ListBox.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ListBoxItem.paml"/>
+    <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.PopupRoot.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.RadioButton.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ScrollBar.paml"/>
     <StyleInclude Source="resource://application/XamlTestApplicationPcl/XamlTestApplication.ScrollViewer.paml"/>
diff --git a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
index 2a348d6130..040b5360d5 100644
--- a/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
+++ b/samples/XamlTestApplicationPcl/XamlTestApplicationPcl.csproj
@@ -188,6 +188,9 @@
     <EmbeddedResource Include="ContentControl.paml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="PopupRoot.paml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Markup/Perspex.Markup.Xaml/Data/Binding.cs b/src/Markup/Perspex.Markup.Xaml/Data/Binding.cs
index 4452ffb684..3ef83da68a 100644
--- a/src/Markup/Perspex.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Perspex.Markup.Xaml/Data/Binding.cs
@@ -102,7 +102,7 @@ namespace Perspex.Markup.Xaml.Data
             {
                 var result = new ExpressionObserver(
                     () => dataContextHost.GetValue(Control.DataContextProperty),
-                    SourcePropertyPath);
+                    GetExpression());
                 dataContextHost.GetObservable(Control.DataContextProperty).Subscribe(x =>
                     result.UpdateRoot());
                 return result;
@@ -117,7 +117,7 @@ namespace Perspex.Markup.Xaml.Data
         {
             var result = new ExpressionObserver(
                 () => instance.GetValue(Control.TemplatedParentProperty),
-                SourcePropertyPath);
+                GetExpression());
 
             if (instance.GetValue(Control.TemplatedParentProperty) == null)
             {
@@ -131,5 +131,11 @@ namespace Perspex.Markup.Xaml.Data
 
             return result;
         }
+
+        private string GetExpression()
+        {
+            return SourcePropertyPath == null || SourcePropertyPath == "." ?
+                string.Empty : SourcePropertyPath;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Markup/Perspex.Markup/Data/ExpressionObserver.cs b/src/Markup/Perspex.Markup/Data/ExpressionObserver.cs
index 5648266e3d..62e230e843 100644
--- a/src/Markup/Perspex.Markup/Data/ExpressionObserver.cs
+++ b/src/Markup/Perspex.Markup/Data/ExpressionObserver.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Reactive;
 using System.Reactive.Disposables;
+using System.Reactive.Subjects;
 using Perspex.Markup.Data.Plugins;
 
 namespace Perspex.Markup.Data
@@ -28,6 +29,7 @@ namespace Perspex.Markup.Data
         private Func<object> _root;
         private int _count;
         private ExpressionNode _node;
+        private ISubject<object> _empty;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ExpressionObserver"/> class.
@@ -50,7 +52,12 @@ namespace Perspex.Markup.Data
             Contract.Requires<ArgumentNullException>(expression != null);
 
             _root = root;
-            _node = ExpressionNodeBuilder.Build(expression);
+
+            if (!string.IsNullOrWhiteSpace(expression))
+            {
+                _node = ExpressionNodeBuilder.Build(expression);
+            }
+
             Expression = expression;
         }
 
@@ -126,7 +133,14 @@ namespace Perspex.Markup.Data
         {
             if (_count > 0)
             {
-                _node.Target = _root();
+                if (_node != null)
+                {
+                    _node.Target = _root();
+                }
+                else if (_empty != null)
+                {
+                    _empty.OnNext(_root());
+                }
             }
         }
 
@@ -135,18 +149,30 @@ namespace Perspex.Markup.Data
         {
             IncrementCount();
 
-            var subscription = _node.Subscribe(observer);
+            if (_node != null)
+            {
+                var subscription = _node.Subscribe(observer);
 
-            return Disposable.Create(() =>
+                return Disposable.Create(() =>
+                {
+                    DecrementCount();
+                    subscription.Dispose();
+                });
+            }
+            else
             {
-                DecrementCount();
-                subscription.Dispose();
-            });
+                if (_empty == null)
+                {
+                    _empty = new BehaviorSubject<object>(_root());
+                }
+
+                return _empty.Subscribe(observer);
+            }
         }
 
         private void IncrementCount()
         {
-            if (_count++ == 0)
+            if (_count++ == 0 && _node != null)
             {
                 _node.Target = _root();
             }
@@ -154,7 +180,7 @@ namespace Perspex.Markup.Data
 
         private void DecrementCount()
         {
-            if (--_count == 0)
+            if (--_count == 0 && _node != null)
             {
                 _node.Target = null;
             }
diff --git a/src/Perspex.Controls/DropDown.cs b/src/Perspex.Controls/DropDown.cs
index 23aba16009..4af34d689d 100644
--- a/src/Perspex.Controls/DropDown.cs
+++ b/src/Perspex.Controls/DropDown.cs
@@ -132,7 +132,7 @@ namespace Perspex.Controls
                 _popup.Opened -= PopupOpened;
             }
 
-            _popup = this.GetTemplateChild<Popup>("popup");
+            _popup = this.GetTemplateChild<Popup>("PART_Popup");
             _popup.Opened += PopupOpened;
         }
 
@@ -143,7 +143,7 @@ namespace Perspex.Controls
             if (selectedIndex != -1)
             {
                 var container = ItemContainerGenerator.ContainerFromIndex(selectedIndex);
-                container.Focus();
+                container?.Focus();
             }
         }
 
diff --git a/tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_Property.cs b/tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_Property.cs
index cfb558fdde..24d0442ebb 100644
--- a/tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_Property.cs
+++ b/tests/Perspex.Markup.UnitTests/Binding/ExpressionObserverTests_Property.cs
@@ -188,6 +188,21 @@ namespace Perspex.Markup.UnitTests.Binding
             Assert.Equal(0, old.SubscriptionCount);
         }
 
+        [Fact]
+        public void Empty_Expression_Should_Track_Root()
+        {
+            var data = new Class1 { Foo = "foo" };
+            var target = new ExpressionObserver(() => data.Foo, "");
+            var result = new List<object>();
+
+            target.Subscribe(x => result.Add(x));
+
+            data.Foo = "bar";
+            target.UpdateRoot();
+
+            Assert.Equal(new[] { "foo", "bar" }, result);
+        }
+
         [Fact]
         public void SetValue_Should_Set_Simple_Property_Value()
         {