Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Controls/src/Core/Picker/Picker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,10 @@ string GetDisplayMember(object item)

static object CoerceSelectedIndex(BindableObject bindable, object value)
{
var picker = (Picker)bindable;
return picker.Items == null ? -1 : ((int)value).Clamp(-1, picker.Items.Count - 1);
var picker = (Picker)bindable;
if (picker.Items == null || !picker.Items.Any())
return value; // Do not coerce if Items are not set yet
return ((int)value).Clamp(-1, picker.Items.Count - 1);
}

void OnItemDisplayBindingChanged(BindingBase oldValue, BindingBase newValue)
Expand Down
28 changes: 28 additions & 0 deletions src/Controls/src/Xaml/XamlNode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,21 @@ public ElementNode(XmlType type, string namespaceURI, IXmlNamespaceResolver name
public NameScopeRef NameScopeRef { get; set; }

public override void Accept(IXamlNodeVisitor visitor, INode parentNode)
Dictionary<XmlName, object> deferredProperties = new Dictionary<XmlName, object>();

public void DeferProperty(XmlName propertyName, object value)
{
deferredProperties[propertyName] = value;
}

public void ApplyDeferredProperties()
{
foreach (var kvp in deferredProperties)
{
Properties[kvp.Key] = (INode)kvp.Value;
}
deferredProperties.Clear();
}
{
if (visitor.VisitingMode == TreeVisitingMode.TopDown && !SkipVisitNode(visitor, parentNode))
visitor.Visit(this, parentNode);
Expand Down Expand Up @@ -210,6 +225,19 @@ public override INode Clone()
{
var clone = new ElementNode(XmlType, NamespaceURI, NamespaceResolver, LineNumber, LinePosition)
{
if (!SkipChildren(visitor, this, parentNode))
{
// Check if ItemsSource or Items is being set and apply deferred SelectedIndex if any
if (Properties.ContainsKey(XmlName.xItemsSource) || Properties.ContainsKey(XmlName.xItems))
{
ApplyDeferredProperties();
}

foreach (var node in Properties.Values.ToArray())
node.Accept(visitor, this);
foreach (var node in CollectionItems.ToArray())
node.Accept(visitor, this);
}
IgnorablePrefixes = IgnorablePrefixes
};
foreach (var kvp in Properties)
Expand Down