Merge pull request #6 from Blazorade/feature/5-builder

Redesigned the builder infrastructure to include only one type of bui…

Author: MikaBerglund

Blazorade.Core/Blazorade.Core.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RazorLangVersion>3.0</RazorLangVersion>
-    <Version>1.1.1</Version>
+    <Version>1.3.0-preview3</Version>
     <Authors>Mika Berglund</Authors>
     <Company>Blazorade</Company>
     <Description>Provides core functionality for your Blazor component libraries as well as many of the Blazorade libraries, such as Blazorade Bootstrap.</Description>

Blazorade.Core/Blazorade.Core.xml

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -29,24 +30,15 @@ protected BlazoradeComponentBase()
         [Parameter(CaptureUnmatchedValues = true)]
         public IDictionary<string, object> Attributes { get; set; }
 
-        /// <summary>
-        /// An attribute builder that is used when building attributes for the element before rendering.
-        /// </summary>
         [Parameter]
-        public IAttributeBuilder AttributeBuilder { get; set; }
+        public IComponentBuilder Builder { get; set; }
 
         /// <summary>
         /// Enables child content for the control.
         /// </summary>
         [Parameter]
         public virtual RenderFragment ChildContent { get; set; }
 
-        /// <summary>
-        /// A class builder that is used when building the class names for the element before rendering.
-        /// </summary>
-        [Parameter]
-        public IClassBuilder ClassBuilder { get; set; }
-
         /// <summary>
         /// Returns a read-only copy of the classes defined on the component. 
         /// </summary>
@@ -57,12 +49,6 @@ protected BlazoradeComponentBase()
         /// </summary>
         public IReadOnlyDictionary<string, string> Styles { get; set; }
 
-        /// <summary>
-        /// A style builder that is used when building styles for the element before rendering.
-        /// </summary>
-        [Parameter]
-        public IStyleBuilder StyleBuilder { get; set; }
-
 
 
         /// <summary>
@@ -139,22 +125,21 @@ protected BlazoradeComponentBase AddStyle(string styleName, string value)
         /// </remarks>
         protected override void OnParametersSet()
         {
-            
-            foreach(var a in this.AttributeBuilder?.Build() ?? new KeyValuePair<string, object>[0])
-            {
-                this.AddAttribute(a.Key, a.Value);
-            }
+            var builderAttributes = this.Builder?.BuildAttributes();
+            var builderStyles = this.Builder?.BuildStyles();
 
-            if (null != this.ClassBuilder)
+            foreach(var key in builderAttributes?.Keys ?? new string[0])
             {
-                this.AddClasses(this.ClassBuilder.Build().ToArray());
+                this.AddAttribute(key, builderAttributes[key]);
             }
 
-            foreach(var s in this.StyleBuilder?.Build() ?? new KeyValuePair<string, string>[0])
+            foreach(var key in builderStyles?.Keys ?? new string[0])
             {
-                this.AddStyle(s.Key, s.Value);
+                this.AddStyle(key, builderStyles[key]);
             }
 
+            this.AddClasses((this.Builder?.BuildClasses() ?? new string[0]).ToArray());
+
             base.OnParametersSet();
         }