Merge branch 'master' of git://github.com/Code-DJ/BlazorWebFormsComponents into Code-DJ-master

csharpfritz · csharpfritz · commit d1e232659935 · 2020-01-13T11:02:09.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -330,3 +330,8 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
diff --git a/samples/AfterBlazorServerSide/Pages/ControlSamples/DataList/ComplexStyle.razor b/samples/AfterBlazorServerSide/Pages/ControlSamples/DataList/ComplexStyle.razor
@@ -1,5 +1,5 @@
 ﻿@page "/ControlSamples/DataList/ComplexStyle"
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 @using static BlazorWebFormsComponents.Enums.BorderStyle
 
 <h2>DataList HeaderStyle sample</h2>
@@ -11,7 +11,7 @@
 <DataList @ref="simpleDataList"
 					runat="server"
 					EnableViewState="false"
-					BackColor="Gray"
+					BackColor="@("#808080")"
 					BorderColor="Firebrick"
 					BorderStyle="Groove"
 					BorderWidth="2"
diff --git a/samples/AfterBlazorServerSide/Pages/ControlSamples/DataList/HeaderStyle.razor b/samples/AfterBlazorServerSide/Pages/ControlSamples/DataList/HeaderStyle.razor
@@ -1,5 +1,5 @@
 ﻿@page "/ControlSamples/DataList/HeaderStyle"
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 
 <h2>DataList HeaderStyle sample</h2>
 
@@ -27,7 +27,7 @@
 					runat="server"
 					EnableViewState="false"
 					Context="Item"
-					HeaderStyle-BackColor="Blue"
+					HeaderStyle-BackColor="@("#C84630")"
 					HeaderStyle-ForeColor="White"
 					HeaderStyle-BorderColor="White"
 					HeaderStyle-BorderStyle="Solid"
diff --git a/samples/AfterBlazorServerSide/Pages/ControlSamples/DataList/Index.razor b/samples/AfterBlazorServerSide/Pages/ControlSamples/DataList/Index.razor
@@ -1,5 +1,5 @@
 ﻿@page "/ControlSamples/DataList"
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 
 <h2>DataList Component homepage</h2>
 
diff --git a/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/HeaderStyle.razor b/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/HeaderStyle.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 @using static BlazorWebFormsComponents.Enums.BorderStyle
 @using BlazorWebFormsComponents
 
diff --git a/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/HeaderStyleCss.razor b/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/HeaderStyleCss.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 @using static BlazorWebFormsComponents.Enums.BorderStyle
 @using BlazorWebFormsComponents
 
diff --git a/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/HeaderStyleFont.razor b/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/HeaderStyleFont.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 @using static BlazorWebFormsComponents.Enums.BorderStyle
 @using BlazorWebFormsComponents
 
diff --git a/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/InlineHeaderStyle.razor b/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/InlineHeaderStyle.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 
 
 <Fixture Test="FirstTest">
diff --git a/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/ItemStyle.razor b/src/BlazorWebFormsComponents.Test/DataList/FlowLayout/ItemStyle.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 
 
 <Fixture Test="FirstTest">
diff --git a/src/BlazorWebFormsComponents.Test/DataList/TableLayout/ComplexStyle.razor b/src/BlazorWebFormsComponents.Test/DataList/TableLayout/ComplexStyle.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 
 
 
@@ -10,7 +10,7 @@
 							CellSpacing="2"
 							CellPadding="3"
 							RepeatLayout="Table"
-							BackColor="Red"
+							BackColor="@("#ff0000")"
 							Context="Item">
 			<HeaderTemplate>My Widget List</HeaderTemplate>
 			<ItemTemplate>@Item.Name</ItemTemplate>
diff --git a/src/BlazorWebFormsComponents.Test/DataList/TableLayout/FontStyle.razor b/src/BlazorWebFormsComponents.Test/DataList/TableLayout/FontStyle.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 
 
 
diff --git a/src/BlazorWebFormsComponents.Test/DataList/TableLayout/HeaderStyle.razor b/src/BlazorWebFormsComponents.Test/DataList/TableLayout/HeaderStyle.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 @using static BlazorWebFormsComponents.Enums.BorderStyle
 @using BlazorWebFormsComponents
 
@@ -11,7 +11,7 @@
 							RepeatLayout="Table"
 							Context="Item">
 			<ChildContent>
-				<HeaderStyle BackColor="Blue" BorderStyle="Solid" BorderColor="Black" BorderWidth="2"></HeaderStyle>
+				<HeaderStyle BackColor="@("#0000ff")" BorderStyle="Solid" BorderColor="Black" BorderWidth="2"></HeaderStyle>
 			</ChildContent>
 			<HeaderTemplate>My Widget List</HeaderTemplate>
 			<ItemTemplate>@Item.Name</ItemTemplate>
diff --git a/src/BlazorWebFormsComponents.Test/DataList/TableLayout/HeaderStyleCss.razor b/src/BlazorWebFormsComponents.Test/DataList/TableLayout/HeaderStyleCss.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 @using static BlazorWebFormsComponents.Enums.BorderStyle
 @using BlazorWebFormsComponents
 
diff --git a/src/BlazorWebFormsComponents.Test/DataList/TableLayout/HeaderStyleFont.razor b/src/BlazorWebFormsComponents.Test/DataList/TableLayout/HeaderStyleFont.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 @using static BlazorWebFormsComponents.Enums.BorderStyle
 @using BlazorWebFormsComponents
 
diff --git a/src/BlazorWebFormsComponents.Test/DataList/TableLayout/InlineHeaderStyle.razor b/src/BlazorWebFormsComponents.Test/DataList/TableLayout/InlineHeaderStyle.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 
 
 <Fixture Test="FirstTest">
diff --git a/src/BlazorWebFormsComponents.Test/DataList/TableLayout/ItemStyle.razor b/src/BlazorWebFormsComponents.Test/DataList/TableLayout/ItemStyle.razor
@@ -1,5 +1,5 @@
 ﻿@inherits TestComponentBase
-@using static System.Drawing.Color
+@using static BlazorWebFormsComponents.WebColor
 
 
 <Fixture Test="FirstTest">
diff --git a/src/BlazorWebFormsComponents/DataList.razor.cs b/src/BlazorWebFormsComponents/DataList.razor.cs
@@ -98,8 +98,8 @@ protected string? CalculatedGridLines {  get {
 
 		protected string CalculatedStyle { get; set; }
 
-		[Parameter] public Color BackColor { get; set; }
-		[Parameter] public Color BorderColor { get; set; }
+		[Parameter] public WebColor BackColor { get; set; }
+		[Parameter] public WebColor BorderColor { get; set; }
 		[Parameter]public BorderStyle BorderStyle { get; set; }
 		[Parameter]public Unit BorderWidth { get; set; }
 		[Parameter]public string CssClass { get; set; }
@@ -110,7 +110,7 @@ protected string? CalculatedGridLines {  get {
 		[Parameter]public FontUnit Font_Size { get; set; }
 		[Parameter]public bool Font_Strikeout { get; set; }
 		[Parameter]public bool Font_Underline { get; set; }
-		[Parameter]public Color ForeColor { get; set; }
+		[Parameter]public WebColor ForeColor { get; set; }
 		[Parameter]public Unit Height { get; set; }
 		[Parameter]public HorizontalAlign HorizontalAlign { get; set; }
 		[Parameter]public VerticalAlign VerticalAlign { get; set; }
diff --git a/src/BlazorWebFormsComponents/Extensions/ColorHelpers.cs b/src/BlazorWebFormsComponents/Extensions/ColorHelpers.cs
@@ -1,23 +1,30 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace System.Drawing
+﻿namespace System.Drawing
 {
 	public static class ColorHelpers
 	{
-
 		public static Color GetColorFromHtml(this object obj)
 		{
-
 			if (obj is Color) return (Color)obj;
 			if (!(obj is string)) return Color.Empty;
 
 			var theString = obj.ToString();
 			if (theString.Contains("#")) return ColorTranslator.FromHtml(theString);
 			return Color.FromName(theString);
-
 		}
-
 	}
 }
+
+namespace BlazorWebFormsComponents
+{
+    public static class ColorHelpers
+    {
+        public static WebColor GetWebColorFromHtml(this object obj)
+		{
+			if (obj is WebColor) return (WebColor)obj;
+			if (!(obj is string)) return WebColor.Empty;
+
+			var theString = obj.ToString();
+			return new WebColor(theString);
+		}
+    }
+}
diff --git a/src/BlazorWebFormsComponents/IHasStyle.cs b/src/BlazorWebFormsComponents/IHasStyle.cs
@@ -15,17 +15,17 @@ public interface IHasLayoutStyle
 		// Cheer 100 ramblinggeek 07/1/20 
 
 
-		Color BackColor { get; set; }
+		WebColor BackColor { get; set; }
 
-		Color BorderColor { get; set; }
+		WebColor BorderColor { get; set; }
 
 		BorderStyle BorderStyle { get; set; }
 
 		Unit BorderWidth { get; set; }
 
 		string CssClass { get; set; }
 
-		Color ForeColor { get; set; }
+		WebColor ForeColor { get; set; }
 
 		Unit Height { get; set; }
 
@@ -72,12 +72,12 @@ public static string ToStyleString(this IHasStyle hasStyle)
 		public static StringBuilder ToStyleString(this IHasStyle hasStyle, StringBuilder sb)
 		{
 
-			if (hasStyle.BackColor != default(Color)) sb.Append($"background-color:{ColorTranslator.ToHtml(hasStyle.BackColor).Trim()};");
-			if (hasStyle.ForeColor != default(Color)) sb.Append($"color:{ColorTranslator.ToHtml(hasStyle.ForeColor)};");
-			if (hasStyle.BorderStyle != BorderStyle.None && hasStyle.BorderStyle != BorderStyle.NotSet && hasStyle.BorderWidth.Value > 0 && hasStyle.BorderColor != default(Color))
+			if (hasStyle.BackColor != default(WebColor)) sb.Append($"background-color:{ColorTranslator.ToHtml(hasStyle.BackColor.ToColor()).Trim()};");
+			if (hasStyle.ForeColor != default(WebColor)) sb.Append($"color:{ColorTranslator.ToHtml(hasStyle.ForeColor.ToColor())};");
+			if (hasStyle.BorderStyle != BorderStyle.None && hasStyle.BorderStyle != BorderStyle.NotSet && hasStyle.BorderWidth.Value > 0 && hasStyle.BorderColor != default(WebColor))
 			{
 
-				sb.Append($"border:{hasStyle.BorderWidth.ToString()} {hasStyle.BorderStyle.ToString().ToLowerInvariant()} {ColorTranslator.ToHtml(hasStyle.BorderColor)};");
+				sb.Append($"border:{hasStyle.BorderWidth.ToString()} {hasStyle.BorderStyle.ToString().ToLowerInvariant()} {ColorTranslator.ToHtml(hasStyle.BorderColor.ToColor())};");
 
 			}
 
diff --git a/src/BlazorWebFormsComponents/TableItemStyle.cs b/src/BlazorWebFormsComponents/TableItemStyle.cs
@@ -1,10 +1,8 @@
 ﻿using BlazorWebFormsComponents.Enums;
-using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using System.Text;
 
 namespace BlazorWebFormsComponents
 {
@@ -13,9 +11,9 @@ public class TableItemStyle : IHasStyle
 
 		internal TableItemStyle() { }
 
-		public Color BackColor { get; set; }
+		public WebColor BackColor { get; set; }
 
-		public Color BorderColor { get; set; }
+		public WebColor BorderColor { get; set; }
 
 		public BorderStyle BorderStyle { get; set; }
 
@@ -37,7 +35,7 @@ internal TableItemStyle() { }
 
 		public bool Font_Underline { get; set; }
 
-		public Color ForeColor { get; set; }
+		public WebColor ForeColor { get; set; }
 
 		public Unit Height { get; set; }
 
@@ -87,7 +85,7 @@ private void FromAttributes(IEnumerable<KeyValuePair<string,object>> attributes)
 				var outValue = propInfo.PropertyType switch
 				{
 					null => null,
-					{ Name: nameof(Color) } => itemStyle.Value.GetColorFromHtml(),
+					{ Name: nameof(WebColor) } => itemStyle.Value.GetWebColorFromHtml(),
 					{ Name: nameof(Unit) } => new Unit(itemStyle.Value.ToString()),
 					{ Name: nameof(FontUnit) } => FontUnit.Parse(itemStyle.Value.ToString()),
 					{ IsEnum: true } => Enum.Parse(propInfo.PropertyType, itemStyle.Value.ToString()),
diff --git a/src/BlazorWebFormsComponents/UiStyle.cs b/src/BlazorWebFormsComponents/UiStyle.cs
@@ -1,7 +1,6 @@
 ﻿using BlazorWebFormsComponents.Enums;
 using Microsoft.AspNetCore.Components;
 using System.Collections.Generic;
-using System.Drawing;
 
 namespace BlazorWebFormsComponents
 {
@@ -15,10 +14,10 @@ public abstract class UiStyle : ComponentBase, IHasLayoutStyle
 		public Dictionary<string, object> AdditionalAttributes { get; set; }
 
 		[Parameter]
-		public Color BackColor { get; set; }
+		public WebColor BackColor { get; set; }
 
 		[Parameter]
-		public Color BorderColor { get; set; }
+		public WebColor BorderColor { get; set; }
 
 		[Parameter]
 		public BorderStyle BorderStyle { get; set; }
@@ -30,7 +29,7 @@ public abstract class UiStyle : ComponentBase, IHasLayoutStyle
 		public string CssClass { get; set; }
 
 		[Parameter]
-		public Color ForeColor { get; set; }
+		public WebColor ForeColor { get; set; }
 
 		[Parameter]
 		public Unit Height { get; set; }
diff --git a/src/BlazorWebFormsComponents/WebColor.cs b/src/BlazorWebFormsComponents/WebColor.cs
