1.0.0-preview8-03

chanan · Aug 15, 2019 · 176226d · 176226d
1 parent 4ca882c
commit 176226d
Show file tree

Hide file tree

Showing 65 changed files with 603 additions and 285 deletions.
diff --git a/docs/_content/SampleCore/components2.html b/docs/_content/SampleCore/components2.html
@@ -1,4 +1,4 @@
-<Styled @bind-Classname="button">
+<Styled @bind-Classname="@button">
     font-size:16px;
     margin:18px;
     border:none;
@@ -11,25 +11,28 @@
     color:#fff;
     box-shadow:0 4px 6px rgba(50,50,93,.11), 0 1px 3px rgba(0,0,0,.08);
     background-color:@Color;
-    &:hover {
-        opacity: 0.7;
-        transform:translateY(-1px);
-        box-shadow:0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08);
-    }
-    &:focus {
-        outline:0;
-    }
-    &:active {
-        transform:translateY(1px);
-    }
+</Styled>
+
+<Styled Classname="@button" PseudoClass="PseudoClasses.Hover">
+    opacity: 0.7;
+    transform:translateY(-1px);
+    box-shadow:0 7px 14px rgba(50,50,93,.1), 0 3px 6px rgba(0,0,0,.08);
+</Styled>
+
+<Styled Classname="@button" PseudoClass="PseudoClasses.Focus">
+    outline:0;
+</Styled>
+
+<Styled Classname="@button" PseudoClass="PseudoClasses.Active">
+    transform:translateY(1px);
 </Styled>
 
 <button class="@button" @onclick="@OnClick">@ChildContent</button>
 
 @code {
-    [Parameter] private RenderFragment ChildContent { get; set; }
-    [Parameter] private EventCallback<UIMouseEventArgs> OnClick { get; set; }
-    [Parameter] private string Color { get; set; } = "green";
+    [Parameter] public RenderFragment ChildContent { get; set; }
+    [Parameter] public EventCallback<UIMouseEventArgs> OnClick { get; set; }
+    [Parameter] public string Color { get; set; } = "green";
 
     private string button;
 }
diff --git a/docs/_content/SampleCore/index1.html b/docs/_content/SampleCore/index1.html
@@ -4,9 +4,10 @@
     background-color: hotpink;
     font-size: 24px;
     border-radius: 4px;
-    &:hover {
-        color: @color;
-    }
+</Styled>
+
+<Styled Classname="@hover" PseudoClass="PseudoClasses.Hover">
+    color: @color;
 </Styled>
 
 <div class="@hover">

diff --git a/docs/_content/SampleCore/install5.html b/docs/_content/SampleCore/install5.html
@@ -0,0 +1,33 @@
+public class Startup
+{
+    public void ConfigureServices(IServiceCollection services)
+    {
+        services.AddRazorPages();
+        services.AddServerSideBlazor();
+        services.AddBlazorStyled();
+    }
+
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        if (env.IsDevelopment())
+        {
+            app.UseDeveloperExceptionPage();
+        }
+        else
+        {
+            app.UseExceptionHandler("/Home/Error");
+            app.UseHsts();
+        }
+
+        app.UseHttpsRedirection();
+        app.UseStaticFiles();
+
+        app.UseRouting();
+
+        app.UseEndpoints(endpoints =>
+        {
+            endpoints.MapBlazorHub();
+            endpoints.MapFallbackToPage("/_Host");
+        });
+    }
+}
diff --git a/docs/_content/SampleCore/install6.html b/docs/_content/SampleCore/install6.html
@@ -0,0 +1,19 @@
+@page "/"
+@namespace ServerSideSample.Pages
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>BlazorStyled Server-Side Sample</title>
+    <base href="~/" />
+    @(await Html.RenderComponentAsync<BlazorStyled.ServerSideStyled>())
+</head>
+<body>
+    <app>@(await Html.RenderComponentAsync<SampleCore.App>())</app>
+
+    <script src="_framework/blazor.server.js"></script>
+</body>
+</html>
diff --git a/docs/_content/SampleCore/keyframes1.html b/docs/_content/SampleCore/keyframes1.html
@@ -17,7 +17,7 @@
 </Styled>
 
 <Styled @bind-Classname="@example">
-    animation: vlzl-qdd 1s ease infinite;
+    animation: @bounce 1s ease infinite;
 </Styled>
 
 <div class="@example">Some bouncing text!</div>

diff --git a/docs/_content/SampleCore/media1.html b/docs/_content/SampleCore/media1.html
@@ -1,6 +1,6 @@
 <Styled @bind-Classname="@p1">
     font-size: 30px;
-    @@media (min-width: 420px) {
+    @@media (min-width: 480px) {
         font-size: 50px;
     }
 </Styled>

diff --git a/docs/_content/SampleCore/media2.html b/docs/_content/SampleCore/media2.html
@@ -7,7 +7,7 @@
 
     private int[] breakpoints = new int[] { 576, 768, 992, 1200 };
 
-    protected override void OnInit()
+    protected override void OnInitialized()
     {
         var mq = (from b in breakpoints
                   select $"@media (min-width: {b}px)").ToArray();

diff --git a/docs/_content/SampleCore/media4.html b/docs/_content/SampleCore/media4.html
@@ -0,0 +1,13 @@
+<Styled @bind-Classname="@p1">
+    font-size: 30px;
+</Styled>
+
+<Styled Classname="@p1" MediaQuery="MediaQueries.LargerThanMobile">
+    font-size: 50px;
+</Styled>
+
+<p class="@p1">Some text!</p>
+
+@code {
+    private string p1;
+}
diff --git a/docs/_content/SampleCore/nested1.html b/docs/_content/SampleCore/nested1.html
@@ -1,8 +1,8 @@
 <Styled @bind-Classname="@nested">
     color: turquoise;
     & a {
-    border-bottom: 1px solid currentColor;
-    cursor:pointer;
+        border-bottom: 1px solid currentColor;
+        cursor:pointer;
     }
 </Styled>
 

diff --git a/docs/_content/SampleCore/nested2.html b/docs/_content/SampleCore/nested2.html
@@ -1,7 +1,7 @@
 <Styled @bind-Classname="@paragraph">
     color: turquoise;
     header & {
-    color: green;
+        color: green;
     }
 </Styled>
 

diff --git a/docs/_content/SampleCore/nested3.html b/docs/_content/SampleCore/nested3.html
@@ -0,0 +1,19 @@
+<Styled @bind-Classname="@hover">
+    label: hover-example;
+    padding: 32px;
+    background-color: hotpink;
+    font-size: 24px;
+    border-radius: 4px;
+    &:hover {
+        color: @color;
+    }
+</Styled>
+
+<div class="@hover">
+    Hover to change color.
+</div>
+
+@code {
+    private string hover;
+    private string color = "white";
+}
diff --git a/docs/_content/SampleCore/polished1.html b/docs/_content/SampleCore/polished1.html
@@ -9,7 +9,7 @@
 @code {
     private string arrow, gradient;
 
-    protected override void OnInit()
+    protected override void OnInitialized()
     {
         arrow = Styled.Css(Mixins.Triangle(new TriangleConfiguration
         {

diff --git a/docs/_content/SampleCore/theming1.html b/docs/_content/SampleCore/theming1.html
@@ -9,7 +9,7 @@
 @code {
     private string example;
 
-    protected override void OnInit()
+    protected override void OnInitialized()
     {
         //Normally this would be defined else where such as in MainLayout.cs
         Styled.Theme.Values.Add("colors.primary", "hotpink");

diff --git a/docs/_framework/_bin/BlazorPrettyCode.dll b/docs/_framework/_bin/BlazorPrettyCode.dll
diff --git a/docs/_framework/_bin/BlazorStyled.dll b/docs/_framework/_bin/BlazorStyled.dll
diff --git a/docs/_framework/_bin/BlazorStyled.pdb b/docs/_framework/_bin/BlazorStyled.pdb
diff --git a/docs/_framework/_bin/BlazorTypography.dll b/docs/_framework/_bin/BlazorTypography.dll
diff --git a/docs/_framework/_bin/ClientSideSample.dll b/docs/_framework/_bin/ClientSideSample.dll
diff --git a/docs/_framework/_bin/ClientSideSample.pdb b/docs/_framework/_bin/ClientSideSample.pdb
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Authorization.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Authorization.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Blazor.HttpClient.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Blazor.HttpClient.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Blazor.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Blazor.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Components.Web.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Components.Web.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Components.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Components.dll
diff --git a/docs/_framework/_bin/Microsoft.AspNetCore.Metadata.dll b/docs/_framework/_bin/Microsoft.AspNetCore.Metadata.dll
diff --git a/docs/_framework/_bin/Microsoft.Bcl.AsyncInterfaces.dll b/docs/_framework/_bin/Microsoft.Bcl.AsyncInterfaces.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/docs/_framework/_bin/Microsoft.Extensions.DependencyInjection.Abstractions.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.DependencyInjection.dll b/docs/_framework/_bin/Microsoft.Extensions.DependencyInjection.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.Logging.Abstractions.dll b/docs/_framework/_bin/Microsoft.Extensions.Logging.Abstractions.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.Options.dll b/docs/_framework/_bin/Microsoft.Extensions.Options.dll
diff --git a/docs/_framework/_bin/Microsoft.Extensions.Primitives.dll b/docs/_framework/_bin/Microsoft.Extensions.Primitives.dll
diff --git a/docs/_framework/_bin/Microsoft.JSInterop.dll b/docs/_framework/_bin/Microsoft.JSInterop.dll
diff --git a/docs/_framework/_bin/Mono.Security.dll b/docs/_framework/_bin/Mono.Security.dll
diff --git a/docs/_framework/_bin/Mono.WebAssembly.Interop.dll b/docs/_framework/_bin/Mono.WebAssembly.Interop.dll
diff --git a/docs/_framework/_bin/SampleCore.dll b/docs/_framework/_bin/SampleCore.dll
diff --git a/docs/_framework/_bin/SampleCore.pdb b/docs/_framework/_bin/SampleCore.pdb
diff --git a/docs/_framework/_bin/System.ComponentModel.Annotations.dll b/docs/_framework/_bin/System.ComponentModel.Annotations.dll
diff --git a/docs/_framework/_bin/System.Core.dll b/docs/_framework/_bin/System.Core.dll
diff --git a/docs/_framework/_bin/System.Net.Http.dll b/docs/_framework/_bin/System.Net.Http.dll
diff --git a/docs/_framework/_bin/System.Runtime.CompilerServices.Unsafe.dll b/docs/_framework/_bin/System.Runtime.CompilerServices.Unsafe.dll
diff --git a/docs/_framework/_bin/System.Text.Encodings.Web.dll b/docs/_framework/_bin/System.Text.Encodings.Web.dll
diff --git a/docs/_framework/_bin/System.Text.Json.dll b/docs/_framework/_bin/System.Text.Json.dll
diff --git a/docs/_framework/_bin/System.dll b/docs/_framework/_bin/System.dll
diff --git a/docs/_framework/_bin/mscorlib.dll b/docs/_framework/_bin/mscorlib.dll
diff --git a/docs/_framework/blazor.boot.json b/docs/_framework/blazor.boot.json
@@ -1 +1 @@
-{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Browser.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Newtonsoft.Json.dll","Polished.net.dll","SampleCore.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.Data.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Runtime.Serialization.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","System.Xml.dll","System.Xml.Linq.dll","BlazorStyled.pdb","ClientSideSample.pdb","SampleCore.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}
+{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Blazor.HttpClient.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Components.Web.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","SampleCore.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","BlazorStyled.pdb","ClientSideSample.pdb","SampleCore.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}
diff --git a/docs/_framework/blazor.server.js b/docs/_framework/blazor.server.js
diff --git a/docs/_framework/blazor.webassembly.js b/docs/_framework/blazor.webassembly.js
diff --git a/docs/_framework/wasm/mono.js b/docs/_framework/wasm/mono.js
diff --git a/docs/_framework/wasm/mono.wasm b/docs/_framework/wasm/mono.wasm
diff --git a/src/BlazorStyled/BlazorStyled.csproj b/src/BlazorStyled/BlazorStyled.csproj
@@ -6,7 +6,7 @@
     <LangVersion>8.0</LangVersion>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <PackageId>BlazorStyled</PackageId>
-    <Version>1.0.0-preview8-02</Version>
+    <Version>1.0.0-preview8-03</Version>
     <Authors>Chanan Braunstein</Authors>
     <Title>BlazorStyled</Title>
     <Description>CSS in Blazor Components</Description>

diff --git a/src/BlazorStyled/ClientSideStyled.razor b/src/BlazorStyled/ClientSideStyled.razor
@@ -2,5 +2,5 @@
 
 @foreach (var cssClass in StyleSheet)
 {
-    <CssClass  Css="@cssClass.ToString()" />
+    <CssClass @key="@cssClass.Hash" Css="@cssClass.ToString()" />
 }
diff --git a/src/BlazorStyled/Internal/BaseRule.cs b/src/BlazorStyled/Internal/BaseRule.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStyled.Internal
 {
-    internal abstract class BaseRule : IRule
+    internal abstract class BaseRule : IRule, IEqualityComparer<IRule>, IEquatable<IRule>
     {
         protected readonly Hash _hashService = new Hash();
         private readonly List<Declaration> _declarations = new List<Declaration>();
@@ -65,5 +65,31 @@ public virtual void SetClassname()
         {
             //ignored
         }
+
+        public bool Equals(IRule x, IRule y)
+        {
+            Console.WriteLine("Equals");
+            if (object.ReferenceEquals(x, y))
+            {
+                return true;
+            }
+
+            if (x is null || y == null)
+            {
+                return false;
+            }
+
+            return x.Hash == y.Hash;
+        }
+
+        public int GetHashCode(IRule obj)
+        {
+            return Hash.GetHashCode();
+        }
+
+        public bool Equals(IRule other)
+        {
+            return Equals(this, other);
+        }
     }
 }
diff --git a/src/BlazorStyled/Internal/ImportUri.cs b/src/BlazorStyled/Internal/ImportUri.cs
@@ -10,6 +10,7 @@ public ImportUri(string uri)
         {
             _uri = uri;
             AddDeclaration(new Declaration { Property = "@import", Value = uri });
+            SetHash();
             Selector = Hash;
         }
 

diff --git a/src/BlazorStyled/Styled.cs b/src/BlazorStyled/Styled.cs
@@ -163,7 +163,7 @@ private string GetMediaQuery()
             };
         }
 
-       private string RenderAsString()
+        private string RenderAsString()
         {
             string result = string.Empty;
             try

diff --git a/src/BlazorStyled/StyledBase.cs b/src/BlazorStyled/StyledBase.cs
@@ -7,6 +7,7 @@ namespace BlazorStyled
     public class StyledBase : ComponentBase, IObserver<IStyleSheet>, IDisposable
     {
         [Inject] protected IStyleSheet StyleSheet { get; private set; }
+        protected IStyleSheet CurrentStylesheet { get; private set; }
         private string _hashCode = null;
         private bool _shouldRender = true;
 
@@ -35,9 +36,10 @@ public void OnError(Exception error)
         public void OnNext(IStyleSheet value)
         {
             //Only call state has changed if the stylesheet really changed
-            string newHashCode = StyleSheet.GetHashCodes();
+            string newHashCode = value.GetHashCodes();
             if (_hashCode != newHashCode)
             {
+                CurrentStylesheet = value;
                 _shouldRender = true;
                 InvokeAsync(StateHasChanged);
                 _hashCode = newHashCode;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Components.Browser.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Newtonsoft.Json.dll","Polished.net.dll","SampleCore.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.Data.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Runtime.Serialization.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","System.Xml.dll","System.Xml.Linq.dll","BlazorStyled.pdb","ClientSideSample.pdb","SampleCore.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}
		{"main":"ClientSideSample.dll","entryPoint":"Sample.Program::Main","assemblyReferences":["BlazorPrettyCode.dll","BlazorStyled.dll","BlazorTypography.dll","CSHTMLTokenizer.dll","Microsoft.AspNetCore.Authorization.dll","Microsoft.AspNetCore.Blazor.dll","Microsoft.AspNetCore.Blazor.HttpClient.dll","Microsoft.AspNetCore.Components.dll","Microsoft.AspNetCore.Components.Web.dll","Microsoft.AspNetCore.Metadata.dll","Microsoft.Bcl.AsyncInterfaces.dll","Microsoft.Extensions.DependencyInjection.Abstractions.dll","Microsoft.Extensions.DependencyInjection.dll","Microsoft.Extensions.Logging.Abstractions.dll","Microsoft.Extensions.Options.dll","Microsoft.Extensions.Primitives.dll","Microsoft.JSInterop.dll","Mono.Security.dll","Mono.WebAssembly.Interop.dll","mscorlib.dll","Polished.net.dll","SampleCore.dll","Stateless.dll","System.Buffers.dll","System.ComponentModel.Annotations.dll","System.Core.dll","System.dll","System.Memory.dll","System.Net.Http.dll","System.Numerics.Vectors.dll","System.Runtime.CompilerServices.Unsafe.dll","System.Text.Encodings.Web.dll","System.Text.Json.dll","System.Threading.Tasks.Extensions.dll","BlazorStyled.pdb","ClientSideSample.pdb","SampleCore.pdb"],"cssReferences":[],"jsReferences":[],"linkerEnabled":true}
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,7 +163,7 @@ private string GetMediaQuery() @@
                 };
             }
-           private string RenderAsString()
+            private string RenderAsString()
             {
                 string result = string.Empty;
                 try
@@ Expand Down @@