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

Use attributes instead of properties

This commit is contained in:
Frank A. Krueger 2018-02-01 18:43:23 -08:00
parent f05f232d5b
commit 7b9bf65496
16 changed files with 197 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Ooui.Forms/Renderers/WebViewRenderer.cs
View File

@ -24,7 +24,7 @@ namespace Ooui.Forms.Renderers
if (_iframe != null) if (_iframe != null)
{ {
_iframe.Src = html; _iframe.Source = html;
} }
} }
catch (Exception ex) catch (Exception ex)
@ -47,7 +47,7 @@ namespace Ooui.Forms.Renderers
if (_iframe != null) if (_iframe != null)
{ {
_iframe.Src = url; _iframe.Source = url;
} }
} }
catch (Exception ex) catch (Exception ex)

5
Ooui/Anchor.cs
View File

@ -4,10 +4,9 @@ namespace Ooui
{ {
public class Anchor : Element public class Anchor : Element
{ {
string href = "";
public string HRef { public string HRef {
get => href; get => GetStringAttribute ("href", "");
set => SetProperty (ref href, value ?? "", "href"); set => SetAttributeProperty ("href", value);
} }
public Anchor () public Anchor ()

4
Ooui/Button.cs
View File

@ -9,8 +9,8 @@ namespace Ooui
{ {
ButtonType typ = ButtonType.Submit; ButtonType typ = ButtonType.Submit;
public ButtonType Type { public ButtonType Type {
get => typ; get => GetAttribute ("type", ButtonType.Submit);
set => SetProperty (ref typ, value, "type"); set => SetAttributeProperty ("type", value);
} }
public Button () public Button ()

10
Ooui/Canvas.cs
View File

@ -7,16 +7,14 @@ namespace Ooui
CanvasRenderingContext2D context2d = new CanvasRenderingContext2D (); CanvasRenderingContext2D context2d = new CanvasRenderingContext2D ();
int gotContext2d = 0; int gotContext2d = 0;
int width = 300;
public int Width { public int Width {
get => width; get => GetAttribute ("width", 300);
set => SetProperty (ref width, value <= 0 ? 150 : value, "width"); set => SetAttributeProperty ("width", value < 0 ? 0 : value);
} }
int height = 150;
public int Height { public int Height {
get => height; get => GetAttribute ("height", 150);
set => SetProperty (ref height, value <= 0 ? 150 : value, "height"); set => SetAttributeProperty ("width", value < 0 ? 0 : value);
} }
public Canvas () public Canvas ()

131
Ooui/Element.cs
View File

@ -1,28 +1,29 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
namespace Ooui namespace Ooui
{ {
public abstract class Element : Node public abstract class Element : Node
{ {
string className = ""; readonly Dictionary<string, object> attributes = new Dictionary<string, object> ();
public string ClassName { public string ClassName {
get => className; get => GetStringAttribute ("class", "");
set => SetProperty (ref className, value, "className"); set => SetAttributeProperty ("class", value);
} }
public Style Style { get; private set; } = new Style (); public Style Style { get; private set; } = new Style ();
string title = "";
public string Title { public string Title {
get => title; get => GetStringAttribute ("title", "");
set => SetProperty (ref title, value, "title"); set => SetAttributeProperty ("title", value);
} }
bool hidden = false; bool hidden = false;
public bool IsHidden { public bool IsHidden {
get => hidden; get => GetBooleanAttribute ("hidden");
set => SetProperty (ref hidden, value, "hidden"); set => SetBooleanAttributeProperty ("hidden", value);
} }
public event TargetEventHandler Click { public event TargetEventHandler Click {
@ -102,8 +103,64 @@ namespace Ooui
Style.PropertyChanged += HandleStylePropertyChanged; Style.PropertyChanged += HandleStylePropertyChanged;
} }
public void SetAttribute (string attributeName, string value) protected bool SetAttributeProperty (string attributeName, object newValue, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
{ {
var old = GetAttribute (attributeName);
if (old != null && old.Equals (newValue))
return false;
SetAttribute (attributeName, newValue);
OnPropertyChanged (propertyName);
return true;
}
protected bool SetBooleanAttributeProperty (string attributeName, bool newValue, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
{
var old = GetAttribute (attributeName) != null;
if (old != newValue)
return false;
if (newValue)
SetAttribute (attributeName, string.Empty);
else
RemoveAttribute (attributeName);
OnPropertyChanged (propertyName);
return true;
}
protected bool UpdateAttributeProperty (string attributeName, object newValue, string propertyName)
{
lock (attributes) {
if (attributes.TryGetValue (attributeName, out var oldValue)) {
if (newValue != null && newValue.Equals (oldValue))
return false;
}
attributes[attributeName] = newValue;
}
OnPropertyChanged (propertyName);
return true;
}
protected bool UpdateBooleanAttributeProperty (string attributeName, bool newValue, string propertyName)
{
lock (attributes) {
var oldValue = attributes.ContainsKey (attributeName);
if (newValue == oldValue)
return false;
if (newValue) {
attributes[attributeName] = "";
}
else {
attributes.Remove (attributeName);
}
}
OnPropertyChanged (propertyName);
return true;
}
public void SetAttribute (string attributeName, object value)
{
lock (attributes) {
attributes[attributeName] = value;
}
Send (new Message { Send (new Message {
MessageType = MessageType.SetAttribute, MessageType = MessageType.SetAttribute,
TargetId = Id, TargetId = Id,
@ -112,6 +169,62 @@ namespace Ooui
}); });
} }
public object GetAttribute (string attributeName)
{
lock (attributes) {
attributes.TryGetValue (attributeName, out var v);
return v;
}
}
public T GetAttribute<T> (string attributeName, T defaultValue)
{
lock (attributes) {
attributes.TryGetValue (attributeName, out var v);
if (v is T) {
return (T)v;
}
else {
return defaultValue;
}
}
}
public bool GetBooleanAttribute (string attributeName)
{
lock (attributes) {
return attributes.TryGetValue (attributeName, out var _);
}
}
public string GetStringAttribute (string attributeName, string defaultValue)
{
lock (attributes) {
if (attributes.TryGetValue (attributeName, out var v)) {
if (v == null) return "null";
else return v.ToString ();
}
else {
return defaultValue;
}
}
}
public void RemoveAttribute (string attributeName)
{
bool removed;
lock (attributes) {
removed = attributes.Remove (attributeName);
}
if (removed) {
Send (new Message {
MessageType = MessageType.RemoveAttribute,
TargetId = Id,
Key = attributeName,
});
}
}
void HandleStylePropertyChanged (object sender, PropertyChangedEventArgs e) void HandleStylePropertyChanged (object sender, PropertyChangedEventArgs e)
{ {
SendSet ("style." + Style.GetJsName (e.PropertyName), Style[e.PropertyName]); SendSet ("style." + Style.GetJsName (e.PropertyName), Style[e.PropertyName]);

13
Ooui/EventTarget.cs
View File

@ -83,12 +83,12 @@ namespace Ooui
} }
} }
protected bool SetProperty<T> (ref T backingStore, T newValue, string attributeName, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "") protected bool SetProperty<T> (ref T backingStore, T newValue, string jsPropertyName, [System.Runtime.CompilerServices.CallerMemberName] string propertyName = "")
{ {
if (EqualityComparer<T>.Default.Equals (backingStore, newValue)) if (EqualityComparer<T>.Default.Equals (backingStore, newValue))
return false; return false;
backingStore = newValue; backingStore = newValue;
SendSet (attributeName, newValue); SendSet (jsPropertyName, newValue);
OnPropertyChanged (propertyName); OnPropertyChanged (propertyName);
return true; return true;
} }
@ -120,12 +120,12 @@ namespace Ooui
Send (Message.Call (Id, methodName, args)); Send (Message.Call (Id, methodName, args));
} }
protected void SendSet (string attributeName, object value) protected void SendSet (string jsPropertyName, object value)
{ {
Send (new Message { Send (new Message {
MessageType = MessageType.Set, MessageType = MessageType.Set,
TargetId = Id, TargetId = Id,
Key = attributeName, Key = jsPropertyName,
Value = value, Value = value,
}); });
} }
@ -169,6 +169,11 @@ namespace Ooui
state.Add (message); state.Add (message);
}); });
break; break;
case MessageType.RemoveAttribute:
this.UpdateStateMessages (state => {
state.RemoveAll (x => x.MessageType == MessageType.SetAttribute && x.Key == message.Key);
});
return true;
case MessageType.Listen: case MessageType.Listen:
AddStateMessage (message); AddStateMessage (message);
break; break;

14
Ooui/Form.cs
View File

@ -6,20 +6,18 @@ namespace Ooui
{ {
string action = ""; string action = "";
public string Action { public string Action {
get => action; get => GetStringAttribute ("action", "");
set => SetProperty (ref action, value ?? "", "action"); set => SetAttributeProperty ("action", value ?? "");
} }
string method = "GET";
public string Method { public string Method {
get => method; get => GetStringAttribute ("method", "GET");
set => SetProperty (ref method, value ?? "", "method"); set => SetAttributeProperty ("method", value ?? "");
} }
string enctype = "application/x-www-form-urlencoded";
public string EncodingType { public string EncodingType {
get => enctype; get => GetStringAttribute ("enctype", "application/x-www-form-urlencoded");
set => SetProperty (ref enctype, value ?? "", "enctype"); set => SetAttributeProperty ("enctype", value ?? "");
} }
public event TargetEventHandler Submit { public event TargetEventHandler Submit {

9
Ooui/FormControl.cs
View File

@ -4,16 +4,15 @@ namespace Ooui
{ {
public abstract class FormControl : Element public abstract class FormControl : Element
{ {
string name = "";
public string Name { public string Name {
get => name; get => GetStringAttribute ("name", "");
set => SetProperty (ref name, value, "name"); set => SetAttributeProperty ("name", value);
} }
bool isDisabled = false; bool isDisabled = false;
public bool IsDisabled { public bool IsDisabled {
get => isDisabled; get => GetBooleanAttribute ("disabled");
set => SetProperty (ref isDisabled, value, "disabled"); set => SetBooleanAttributeProperty ("disabled", value);
} }
public FormControl (string tagName) public FormControl (string tagName)

14
Ooui/Iframe.cs
View File

@ -2,17 +2,15 @@
{ {
public class Iframe : Element public class Iframe : Element
{ {
public string Source
{
get => GetStringAttribute ("src", null);
set => SetAttributeProperty ("src", value);
}
public Iframe () public Iframe ()
: base ("iframe") : base ("iframe")
{ {
}
string src = null;
public string Src
{
get => src;
set => SetProperty(ref src, value, "src");
} }
} }
} }

8
Ooui/Image.cs
View File

@ -4,10 +4,10 @@ namespace Ooui
{ {
public class Image : Element public class Image : Element
{ {
string src = ""; public string Source
public string Source { {
get => src; get => GetStringAttribute ("src", null);
set => SetProperty (ref src, value ?? "", "src"); set => SetAttributeProperty ("src", value);
} }
public Image () public Image ()

42
Ooui/Input.cs
View File

@ -7,16 +7,14 @@ namespace Ooui
{ {
public class Input : FormControl public class Input : FormControl
{ {
InputType typ = InputType.Text;
public InputType Type { public InputType Type {
get => typ; get => GetAttribute ("type", InputType.Text);
set => SetProperty (ref typ, value, "type"); set => SetAttributeProperty ("type", value);
} }
string val = "";
public string Value { public string Value {
get => val; get => GetStringAttribute ("value", "");
set => SetProperty (ref val, value ?? "", "value"); set => SetAttributeProperty ("value", value ?? "");
} }
public double NumberValue { public double NumberValue {
@ -35,37 +33,33 @@ namespace Ooui
remove => RemoveEventListener ("change", value); remove => RemoveEventListener ("change", value);
} }
string placeholder = "";
public string Placeholder { public string Placeholder {
get => placeholder; get => GetStringAttribute ("placeholder", "");
set => SetProperty (ref placeholder, value, "placeholder"); set => SetAttributeProperty ("placeholder", value ?? "");
} }
bool isChecked = false;
public bool IsChecked { public bool IsChecked {
get => isChecked; get => GetBooleanAttribute ("checked");
set { set {
SetProperty (ref isChecked, value, "checked"); if (SetBooleanAttributeProperty ("checked", value)) {
TriggerEventFromMessage (Message.Event (Id, "change", isChecked)); TriggerEventFromMessage (Message.Event (Id, "change", IsChecked));
}
} }
} }
double minimum = 0;
public double Minimum { public double Minimum {
get => minimum; get => GetAttribute ("min", 0.0);
set => SetProperty (ref minimum, value, "min"); set => SetAttributeProperty ("min", value);
} }
double maximum = 100;
public double Maximum { public double Maximum {
get => maximum; get => GetAttribute ("max", 100.0);
set => SetProperty (ref maximum, value, "max"); set => SetAttributeProperty ("max", value);
} }
double step = 1;
public double Step { public double Step {
get => step; get => GetAttribute ("step", 1.0);
set => SetProperty (ref step, value, "step"); set => SetAttributeProperty ("step", value);
} }
public Input () public Input ()
@ -86,10 +80,10 @@ namespace Ooui
if (message.TargetId == Id && message.MessageType == MessageType.Event && (message.Key == "change" || message.Key == "input")) { if (message.TargetId == Id && message.MessageType == MessageType.Event && (message.Key == "change" || message.Key == "input")) {
// Don't need to notify here because the base implementation will fire the event // Don't need to notify here because the base implementation will fire the event
if (Type == InputType.Checkbox) { if (Type == InputType.Checkbox) {
isChecked = message.Value != null ? Convert.ToBoolean (message.Value) : false; UpdateBooleanAttributeProperty ("checked", message.Value != null ? Convert.ToBoolean (message.Value) : false, "IsChecked");
} }
else { else {
val = message.Value != null ? Convert.ToString (message.Value) : ""; UpdateAttributeProperty ("value", message.Value != null ? Convert.ToString (message.Value) : "", "Value");
} }
} }
return base.TriggerEventFromMessage (message); return base.TriggerEventFromMessage (message);

5
Ooui/Label.cs
View File

@ -4,10 +4,9 @@ namespace Ooui
{ {
public class Label : Element public class Label : Element
{ {
Element htmlFor = null;
public Element For { public Element For {
get => htmlFor; get => GetAttribute<Element> ("for", null);
set => SetProperty (ref htmlFor, value, "htmlFor"); set => SetAttributeProperty ("for", value);
} }
public Label () public Label ()

2
Ooui/Message.cs
View File

@ -48,6 +48,8 @@ namespace Ooui
Set, Set,
[EnumMember (Value = "setAttr")] [EnumMember (Value = "setAttr")]
SetAttribute, SetAttribute,
[EnumMember(Value = "remAttr")]
RemoveAttribute,
[EnumMember(Value = "call")] [EnumMember(Value = "call")]
Call, Call,
[EnumMember(Value = "listen")] [EnumMember(Value = "listen")]

15
Ooui/Option.cs
View File

@ -4,22 +4,19 @@ namespace Ooui
{ {
public class Option : Element public class Option : Element
{ {
string val = "";
public string Value { public string Value {
get => val; get => GetStringAttribute ("value", "");
set => SetProperty (ref val, value ?? "", "value"); set => SetAttributeProperty ("value", value ?? "");
} }
string label = "";
public string Label { public string Label {
get => label; get => GetStringAttribute ("label", "");
set => SetProperty (ref label, value ?? "", "label"); set => SetAttributeProperty ("label", value ?? "");
} }
bool defaultSelected = false;
public bool DefaultSelected { public bool DefaultSelected {
get => defaultSelected; get => GetBooleanAttribute ("selected");
set => SetProperty (ref defaultSelected, value, "defaultSelected"); set => SetBooleanAttributeProperty ("selected", value);
} }
public Option () public Option ()

9
Ooui/Select.cs
View File

@ -4,10 +4,9 @@ namespace Ooui
{ {
public class Select : FormControl public class Select : FormControl
{ {
string val = "";
public string Value { public string Value {
get => val; get => GetStringAttribute ("value", "");
set => SetProperty (ref val, value ?? "", "value"); set => SetAttributeProperty ("value", value ?? "");
} }
public event TargetEventHandler Change { public event TargetEventHandler Change {
@ -35,6 +34,7 @@ namespace Ooui
protected override void OnChildInsertedBefore (Node newChild, Node referenceChild) protected override void OnChildInsertedBefore (Node newChild, Node referenceChild)
{ {
base.OnChildInsertedBefore (newChild, referenceChild); base.OnChildInsertedBefore (newChild, referenceChild);
var val = Value;
if (string.IsNullOrEmpty (val) && newChild is Option o && !string.IsNullOrEmpty (o.Value)) { if (string.IsNullOrEmpty (val) && newChild is Option o && !string.IsNullOrEmpty (o.Value)) {
val = o.Value; val = o.Value;
} }
@ -43,7 +43,8 @@ namespace Ooui
protected override bool TriggerEventFromMessage (Message message) protected override bool TriggerEventFromMessage (Message message)
{ {
if (message.TargetId == Id && message.MessageType == MessageType.Event && (message.Key == "change" || message.Key == "input")) { if (message.TargetId == Id && message.MessageType == MessageType.Event && (message.Key == "change" || message.Key == "input")) {
val = message.Value != null ? Convert.ToString (message.Value) : ""; SetAttribute ("value", message.Value != null ? Convert.ToString (message.Value) : "");
OnPropertyChanged ("Value");
} }
return base.TriggerEventFromMessage (message); return base.TriggerEventFromMessage (message);
} }

9
Ooui/TextArea.cs
View File

@ -20,16 +20,15 @@ namespace Ooui
set => SetProperty (ref val, value ?? "", "value"); set => SetProperty (ref val, value ?? "", "value");
} }
int rows = 2;
public int Rows { public int Rows {
get => rows; get => GetAttribute ("rows", 2);
set => SetProperty (ref rows, value, "rows"); set => SetAttributeProperty ("rows", value);
} }
int cols = 20; int cols = 20;
public int Columns { public int Columns {
get => cols; get => GetAttribute ("cols", 20);
set => SetProperty (ref cols, value, "cols"); set => SetAttributeProperty ("cols", value);
} }
public TextArea () public TextArea ()