tesses50
/
Ooui-tws-port
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Select and Option to use textContent instead of label 

This also fixes getting the initial value of the select.

Fixes #103
This commit is contained in:
Frank A. Krueger 2018-03-23 15:06:17 -07:00
parent d7d7290c87
commit d08dd3a2bf
No known key found for this signature in database
GPG Key ID: 0471C67474FFE664
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Ooui/Select.cs
View File

@ -1,12 +1,21 @@
using System;
using System.Linq;
namespace Ooui
{
public class Select : FormControl
{
bool gotValue = false;
public string Value {
get => GetStringAttribute ("value", "");
set => SetAttributeProperty ("value", value ?? "");
get {
if (gotValue) return GetStringAttribute ("value", "");
return GetDefaultValue ();
}
set {
gotValue = true;
SetAttributeProperty ("value", value ?? "");
}
}
public event TargetEventHandler Change {
@ -23,28 +32,29 @@ namespace Ooui
: base ("select")
{
// Subscribe to the change event so we always get up-to-date values
Change += (s, e) => { };
Change += (s, e) => { gotValue = true; };
}
public void AddOption (string label, string value)
{
AppendChild (new Option { Label = label, Value = value });
AppendChild (new Option { Text = label, Value = value });
}
protected override void OnChildInsertedBefore (Node newChild, Node referenceChild)
string GetDefaultValue ()
{
base.OnChildInsertedBefore (newChild, referenceChild);
var val = Value;
if (string.IsNullOrEmpty (val) && newChild is Option o && !string.IsNullOrEmpty (o.Value)) {
val = o.Value;
}
var options = Children.OfType<Option> ();
var r = options.FirstOrDefault (x => x.DefaultSelected);
if (r != null)
return r.Value;
r = options.FirstOrDefault ();
return r?.Value ?? "";
}
protected override bool TriggerEventFromMessage (Message message)
{
if (message.TargetId == Id && message.MessageType == MessageType.Event && (message.Key == "change" || message.Key == "input")) {
SetAttribute ("value", message.Value != null ? Convert.ToString (message.Value) : "");
OnPropertyChanged ("Value");
if (message.TargetId == Id && message.MessageType == MessageType.Event && (message.Key == "change" || message.Key == "input" || message.Key == "keyup")) {
gotValue = true;
UpdateAttributeProperty ("value", message.Value != null ? Convert.ToString (message.Value) : "", "Value");
}
return base.TriggerEventFromMessage (message);
}

2
Samples/DrawSample.cs
View File

@ -19,7 +19,7 @@ namespace Samples
var heading = new Heading ("Draw");
var subtitle = new Paragraph ("Click to draw a masterpiece");
var toolSel = new Select ();
toolSel.AppendChild (new Option { Label = "Boxes", Value = "box" });
toolSel.AppendChild (new Option { Text = "Boxes", Value = "box" });
toolSel.AddOption ("Circles", "circle");
var canvas = new Canvas {
Width = 320,