v3.0.0-alpha-07

chanan · chanan · commit 80a0a85f2a4b · 2020-05-17T12:07:49.000-06:00
diff --git a/src/BlazorStyled.Tests/BlazorStyled.Tests.csproj b/src/BlazorStyled.Tests/BlazorStyled.Tests.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.0-preview-20200309-01" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Include="coverlet.collector" Version="1.2.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
+    <PackageReference Include="coverlet.collector" Version="1.2.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
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>3.0.0-alpha-05</Version>
+    <Version>3.0.0-alpha-07</Version>
     <Authors>Chanan Braunstein</Authors>
     <Title>BlazorStyled</Title>
     <Description>CSS in Blazor Components</Description>
@@ -17,8 +17,8 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.4" />
+    <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/BlazorStyled/Internal/Cache.cs b/src/BlazorStyled/Internal/Cache.cs
@@ -2,7 +2,7 @@
 
 namespace BlazorStyled.Internal
 {
-    class Cache
+    internal class Cache
     {
         public readonly IDictionary<string, string> Seen = new SortedDictionary<string, string>();
     }
diff --git a/src/BlazorStyled/Internal/ScriptManager.cs b/src/BlazorStyled/Internal/ScriptManager.cs
@@ -42,7 +42,7 @@ internal async Task UpdatedParsedClasses(string stylesheetId, string stylesheetN
             string[] rules = parsedClasses.Select(c => c.ToString()).ToArray();
             foreach (string rule in rules)
             {
-                if(rule.IndexOf("<br") != -1)
+                if (rule.IndexOf("<br") != -1)
                 {
                     Console.WriteLine("rule");
                 }
diff --git a/src/BlazorStyled/Internal/StringExtensions.cs b/src/BlazorStyled/Internal/StringExtensions.cs
@@ -23,7 +23,7 @@ public static string RemoveDuplicateSpaces(this string source)
             for (int i = 0; i < len; i++)
             {
                 char ch = src[i];
-                if(Char.IsWhiteSpace(ch))
+                if (char.IsWhiteSpace(ch))
                 {
                     if (lastWasWS == false)
                     {
@@ -187,7 +187,7 @@ public static uint GetStableHashCode(this string str)
 
         public static string GetStableHashCodeString(this string str)
         {
-            uint i = (uint)str.GetStableHashCode();
+            uint i = str.GetStableHashCode();
             return i.ConvertToBase64Arithmetic();
         }
 
@@ -222,31 +222,21 @@ public static string ConvertToBase64Arithmetic(this uint i)
             return ret;
         }
 
-        private static uint To32BitFnv1aHash(this string toHash, bool separateUpperByte = false)
+        private static uint To32BitFnv1aHash(this string toHash)
         {
-            IEnumerable<byte> bytesToHash;
-
-            if (separateUpperByte)
-                bytesToHash = toHash.ToCharArray()
-                    .Select(c => new[] { (byte)((c - (byte)c) >> 8), (byte)c })
-                    .SelectMany(c => c);
-            else
-                bytesToHash = toHash.ToCharArray()
-                    .Select(Convert.ToByte);
-
-            //this is the actual hash function; very simple
-            uint hash = FnvConstants.FnvOffset32;
-
             unchecked
             {
-                foreach (var chunk in bytesToHash)
+                ReadOnlySpan<char> span = toHash.AsSpan();
+                uint hash = FnvConstants.FnvOffset32;
+                
+                foreach (char chunk in span)
                 {
                     hash ^= chunk;
                     hash *= FnvConstants.FnvPrime32;
                 }
+
+                return hash;
             }
-           
-            return hash;
         }
 
         private static class FnvConstants
diff --git a/src/BlazorStyled/Internal/StyledImpl.cs b/src/BlazorStyled/Internal/StyledImpl.cs
@@ -14,7 +14,7 @@ internal class StyledImpl : IStyled
         private readonly int _priority;
         private readonly Cache _cache;
 
-        public StyledImpl(ScriptManager scriptManager,Cache cache) : this(scriptManager, cache, DEFAULT, 100_000)
+        public StyledImpl(ScriptManager scriptManager, Cache cache) : this(scriptManager, cache, DEFAULT, 100_000)
         {
 
         }
@@ -32,28 +32,34 @@ public async Task<string> CssAsync(string className, string css)
             try
             {
                 string preParseHash = css.GetStableHashCodeString();
-                if(!_cache.Seen.ContainsKey(preParseHash))
+                if (!_cache.Seen.ContainsKey(preParseHash))
                 {
                     css = css.RemoveComments().RemoveDuplicateSpaces();
                     IList<ParsedClass> parsedClasses = css.GetClasses(className);
                     if (parsedClasses.Count > 0)
                     {
                         string hash = parsedClasses.First().IsMediaQuery ? parsedClasses.First().ChildClasses.First().Name.Replace(".", string.Empty) : parsedClasses.First().Name;
                         await _scriptManager.UpdatedParsedClasses(_id.GetStableHashCodeString(), _id, _priority, parsedClasses);
-                        _cache.Seen.Add(preParseHash, hash);
+                        if (!_cache.Seen.ContainsKey(preParseHash))
+                        {
+                            _cache.Seen.Add(preParseHash, hash);
+                        }
                         return hash;
                     }
                     else
                     {
-                        _cache.Seen.Add(preParseHash, string.Empty);
+                        if (!_cache.Seen.ContainsKey(preParseHash))
+                        {
+                            _cache.Seen.Add(preParseHash, string.Empty);
+                        }
                         return string.Empty;
                     }
-                } 
+                }
                 else
                 {
                     return _cache.Seen[preParseHash];
                 }
-                
+
             }
             catch (StyledException e)
             {
@@ -94,12 +100,18 @@ public string Css(string className, string css)
                     {
                         string hash = parsedClasses.First().IsMediaQuery ? parsedClasses.First().ChildClasses.First().Name.Replace(".", string.Empty) : parsedClasses.First().Name;
                         Task.Run(() => _scriptManager.UpdatedParsedClasses(_id.GetStableHashCodeString(), _id, _priority, parsedClasses));
-                        _cache.Seen.Add(preParseHash, hash);
+                        if (!_cache.Seen.ContainsKey(preParseHash))
+                        {
+                            _cache.Seen.Add(preParseHash, hash);
+                        }
                         return hash;
                     }
                     else
                     {
-                        _cache.Seen.Add(preParseHash, string.Empty);
+                        if (!_cache.Seen.ContainsKey(preParseHash))
+                        {
+                            _cache.Seen.Add(preParseHash, string.Empty);
+                        }
                         return string.Empty;
                     }
                 }
@@ -144,7 +156,10 @@ public async Task<string> KeyframesAsync(string css)
                     css = "@keyframes &{" + css.RemoveComments().RemoveDuplicateSpaces() + "}";
                     IList<ParsedClass> parsedClasses = css.GetClasses();
                     await _scriptManager.UpdatedParsedClasses(_id.GetStableHashCodeString(), _id, _priority, parsedClasses);
-                    _cache.Seen.Add(preParseHash, parsedClasses.First().Hash);
+                    if (!_cache.Seen.ContainsKey(preParseHash))
+                    {
+                        _cache.Seen.Add(preParseHash, parsedClasses.First().Hash);
+                    }
                     return parsedClasses.First().Hash;
                 }
                 else
@@ -172,7 +187,10 @@ public string Keyframes(string css)
                     css = "@keyframes &{" + css.RemoveComments().RemoveDuplicateSpaces() + "}";
                     IList<ParsedClass> parsedClasses = css.GetClasses();
                     Task.Run(() => _scriptManager.UpdatedParsedClasses(_id.GetStableHashCodeString(), _id, _priority, parsedClasses));
-                    _cache.Seen.Add(preParseHash, parsedClasses.First().Hash);
+                    if (!_cache.Seen.ContainsKey(preParseHash))
+                    {
+                        _cache.Seen.Add(preParseHash, parsedClasses.First().Hash);
+                    }
                     return parsedClasses.First().Hash;
                 }
                 else
diff --git a/src/BlazorStyled/ServiceCollectionExtensions.cs b/src/BlazorStyled/ServiceCollectionExtensions.cs
@@ -1,7 +1,6 @@
 ﻿using BlazorStyled.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using System;
-using System.Collections.Generic;
 
 namespace BlazorStyled
 {
diff --git a/src/BlazorStyled/Styled.cs b/src/BlazorStyled/Styled.cs
@@ -39,7 +39,7 @@ private async Task ProcessParameters()
         {
             IStyled styled = Id == null ? StyledService : Priority.HasValue ? StyledService.WithId(Id, Priority.Value) : StyledService.WithId(Id);
 
-            if(Classname == "blazor-styled-hide")
+            if (Classname == "blazor-styled-hide")
             {
                 Classname = null;
             }
@@ -52,41 +52,41 @@ private async Task ProcessParameters()
             {
                 if (IsKeyframes)
                 {
-                    classname = styled.Keyframes(content);
+                    classname = await styled.KeyframesAsync(content);
                 }
                 else if (Classname != null && MediaQuery == MediaQueries.None && _previousClassname == null)
                 {
                     //html elements
-                    styled.Css(ApplyPseudoClass(Classname), content);
+                    await styled.CssAsync(ApplyPseudoClass(Classname), content);
                 }
                 else if (MediaQuery != MediaQueries.None && ClassnameChanged.HasDelegate)
                 {
                     //If ClassnameChanged has a delegate then @bind-Classname was used and this is a "new" style
                     //Otherwise Classname was used and this an existing style which will be handled below
                     content = WrapWithMediaQuery("&{" + content + "}");
-                    classname = styled.Css(content);
+                    classname = await styled.CssAsync(content);
                 }
                 else if (Classname != null && MediaQuery != MediaQueries.None && !ClassnameChanged.HasDelegate && _previousClassname == null)
                 {
                     //Media query support for classes where an existing Classname already exists
                     content = WrapClass(ApplyPseudoClass(Classname), content);
-                    styled.Css(WrapWithMediaQuery(content));
+                    await styled.CssAsync(WrapWithMediaQuery(content));
                 }
                 else if (Classname == null && PseudoClass == PseudoClasses.None && MediaQuery != MediaQueries.None && _previousClassname == null)
                 {
                     //Media queries for html elements
-                    styled.Css(GetMediaQuery(), content);
+                    await styled.CssAsync(GetMediaQuery(), content);
                 }
                 else if (Classname != null && PseudoClass != PseudoClasses.None && MediaQuery == MediaQueries.None && _previousClassname == null)
                 {
                     content = WrapClass(ApplyPseudoClass(Classname), content);
-                    styled.Css(content);
+                    await styled.CssAsync(content);
                 }
                 else
                 {
                     if (PseudoClass == PseudoClasses.None && MediaQuery == MediaQueries.None)
                     {
-                        classname = styled.Css(content);
+                        classname = await styled.CssAsync(content);
                     }
                 }
                 if (ComposeAttributes == null || !ClassnameChanged.HasDelegate)
@@ -137,9 +137,8 @@ private string GetComposeClasses()
                 {
                     if (ComposeAttributes[key] != null)
                     {
-                        string ifKey = key + "if";
-                        var kvp = ComposeAttributes.FirstOrDefault(x => String.Equals(x.Key, ifKey, StringComparison.InvariantCultureIgnoreCase));
-                        if(kvp.Key != null)
+                        KeyValuePair<string, object> kvp = ComposeAttributes.FirstOrDefault(x => x.Key.StartsWith(key, StringComparison.InvariantCultureIgnoreCase) && x.Key.EndsWith("if", StringComparison.InvariantCultureIgnoreCase));
+                        if (kvp.Key != null)
                         {
                             if (bool.TryParse(kvp.Value.ToString().ToString(), out bool result) && result)
                             {
diff --git a/src/ClientSideSample/ClientSideSample.csproj b/src/ClientSideSample/ClientSideSample.csproj
@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-preview4.20210.8" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-preview4.20210.8" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-preview5.20210.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-rc1.20223.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
+    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-rc1.20217.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/HostedSample/HostedSample.Server.csproj b/src/HostedSample/HostedSample.Server.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-preview4.20210.8" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-rc1.20223.4" />
   </ItemGroup>
 
 </Project>
diff --git a/src/SampleCore/SampleCore.csproj b/src/SampleCore/SampleCore.csproj
@@ -7,9 +7,9 @@
 
   <ItemGroup>
     <PackageReference Include="BlazorPrettyCode" Version="1.5.0-alpha-03" />
-    <PackageReference Include="BlazorTypography" Version="1.5.0-alpha-04" />
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.3" />
+    <PackageReference Include="BlazorTypography" Version="1.5.0-alpha-05" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.4" />
     <PackageReference Include="Polished" Version="1.0.0" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace BlazorStyled.Internal`
`4`	`4`	`{`
`5`		`- class Cache`
	`5`	`+ internal class Cache`
`6`	`6`	`{`
`7`	`7`	`public readonly IDictionary<string, string> Seen = new SortedDictionary<string, string>();`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ internal async Task UpdatedParsedClasses(string stylesheetId, string stylesheetN`
`42`	`42`	`string[] rules = parsedClasses.Select(c => c.ToString()).ToArray();`
`43`	`43`	`foreach (string rule in rules)`
`44`	`44`	`{`
`45`		`- if(rule.IndexOf("<br") != -1)`
	`45`	`+ if (rule.IndexOf("<br") != -1)`
`46`	`46`	`{`
`47`	`47`	`Console.WriteLine("rule");`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static string RemoveDuplicateSpaces(this string source)`
`23`	`23`	`for (int i = 0; i < len; i++)`
`24`	`24`	`{`
`25`	`25`	`char ch = src[i];`
`26`		`- if(Char.IsWhiteSpace(ch))`
	`26`	`+ if (char.IsWhiteSpace(ch))`
`27`	`27`	`{`
`28`	`28`	`if (lastWasWS == false)`
`29`	`29`	`{`
`@@ -187,7 +187,7 @@ public static uint GetStableHashCode(this string str)`
`187`	`187`
`188`	`188`	`public static string GetStableHashCodeString(this string str)`
`189`	`189`	`{`
`190`		`- uint i = (uint)str.GetStableHashCode();`
	`190`	`+ uint i = str.GetStableHashCode();`
`191`	`191`	`return i.ConvertToBase64Arithmetic();`
`192`	`192`	`}`
`193`	`193`
`@@ -222,31 +222,21 @@ public static string ConvertToBase64Arithmetic(this uint i)`
`222`	`222`	`return ret;`
`223`	`223`	`}`
`224`	`224`
`225`		`- private static uint To32BitFnv1aHash(this string toHash, bool separateUpperByte = false)`
	`225`	`+ private static uint To32BitFnv1aHash(this string toHash)`
`226`	`226`	`{`
`227`		`- IEnumerable<byte> bytesToHash;`
`228`		`-`
`229`		`- if (separateUpperByte)`
`230`		`- bytesToHash = toHash.ToCharArray()`
`231`		`- .Select(c => new[] { (byte)((c - (byte)c) >> 8), (byte)c })`
`232`		`- .SelectMany(c => c);`
`233`		`- else`
`234`		`- bytesToHash = toHash.ToCharArray()`
`235`		`- .Select(Convert.ToByte);`
`236`		`-`
`237`		`- //this is the actual hash function; very simple`
`238`		`- uint hash = FnvConstants.FnvOffset32;`
`239`		`-`
`240`	`227`	`unchecked`
`241`	`228`	`{`
`242`		`- foreach (var chunk in bytesToHash)`
	`229`	`+ ReadOnlySpan<char> span = toHash.AsSpan();`
	`230`	`+ uint hash = FnvConstants.FnvOffset32;`
	`231`	`+`
	`232`	`+ foreach (char chunk in span)`
`243`	`233`	`{`
`244`	`234`	`hash ^= chunk;`
`245`	`235`	`hash *= FnvConstants.FnvPrime32;`
`246`	`236`	`}`
	`237`	`+`
	`238`	`+ return hash;`
`247`	`239`	`}`
`248`		`-`
`249`		`- return hash;`
`250`	`240`	`}`
`251`	`241`
`252`	`242`	`private static class FnvConstants`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal class StyledImpl : IStyled`
`14`	`14`	`private readonly int _priority;`
`15`	`15`	`private readonly Cache _cache;`
`16`	`16`
`17`		`- public StyledImpl(ScriptManager scriptManager,Cache cache) : this(scriptManager, cache, DEFAULT, 100_000)`
	`17`	`+ public StyledImpl(ScriptManager scriptManager, Cache cache) : this(scriptManager, cache, DEFAULT, 100_000)`
`18`	`18`	`{`
`19`	`19`
`20`	`20`	`}`
`@@ -32,28 +32,34 @@ public async Task<string> CssAsync(string className, string css)`
`32`	`32`	`try`
`33`	`33`	`{`
`34`	`34`	`string preParseHash = css.GetStableHashCodeString();`
`35`		`- if(!_cache.Seen.ContainsKey(preParseHash))`
	`35`	`+ if (!_cache.Seen.ContainsKey(preParseHash))`
`36`	`36`	`{`
`37`	`37`	`css = css.RemoveComments().RemoveDuplicateSpaces();`
`38`	`38`	`IList<ParsedClass> parsedClasses = css.GetClasses(className);`
`39`	`39`	`if (parsedClasses.Count > 0)`
`40`	`40`	`{`
`41`	`41`	`string hash = parsedClasses.First().IsMediaQuery ? parsedClasses.First().ChildClasses.First().Name.Replace(".", string.Empty) : parsedClasses.First().Name;`
`42`	`42`	`await _scriptManager.UpdatedParsedClasses(_id.GetStableHashCodeString(), _id, _priority, parsedClasses);`
`43`		`- _cache.Seen.Add(preParseHash, hash);`
	`43`	`+ if (!_cache.Seen.ContainsKey(preParseHash))`
	`44`	`+ {`
	`45`	`+ _cache.Seen.Add(preParseHash, hash);`
	`46`	`+ }`
`44`	`47`	`return hash;`
`45`	`48`	`}`
`46`	`49`	`else`
`47`	`50`	`{`
`48`		`- _cache.Seen.Add(preParseHash, string.Empty);`
	`51`	`+ if (!_cache.Seen.ContainsKey(preParseHash))`
	`52`	`+ {`
	`53`	`+ _cache.Seen.Add(preParseHash, string.Empty);`
	`54`	`+ }`
`49`	`55`	`return string.Empty;`
`50`	`56`	`}`
`51`		`- }`
	`57`	`+ }`
`52`	`58`	`else`
`53`	`59`	`{`
`54`	`60`	`return _cache.Seen[preParseHash];`
`55`	`61`	`}`
`56`		`-`
	`62`	`+`
`57`	`63`	`}`
`58`	`64`	`catch (StyledException e)`
`59`	`65`	`{`
`@@ -94,12 +100,18 @@ public string Css(string className, string css)`
`94`	`100`	`{`
`95`	`101`	`string hash = parsedClasses.First().IsMediaQuery ? parsedClasses.First().ChildClasses.First().Name.Replace(".", string.Empty) : parsedClasses.First().Name;`
`96`	`102`	`Task.Run(() => _scriptManager.UpdatedParsedClasses(_id.GetStableHashCodeString(), _id, _priority, parsedClasses));`
`97`		`- _cache.Seen.Add(preParseHash, hash);`
	`103`	`+ if (!_cache.Seen.ContainsKey(preParseHash))`
	`104`	`+ {`
	`105`	`+ _cache.Seen.Add(preParseHash, hash);`
	`106`	`+ }`
`98`	`107`	`return hash;`
`99`	`108`	`}`
`100`	`109`	`else`
`101`	`110`	`{`
`102`		`- _cache.Seen.Add(preParseHash, string.Empty);`
	`111`	`+ if (!_cache.Seen.ContainsKey(preParseHash))`
	`112`	`+ {`
	`113`	`+ _cache.Seen.Add(preParseHash, string.Empty);`
	`114`	`+ }`
`103`	`115`	`return string.Empty;`
`104`	`116`	`}`
`105`	`117`	`}`
`@@ -144,7 +156,10 @@ public async Task<string> KeyframesAsync(string css)`
`144`	`156`	`css = "@keyframes &{" + css.RemoveComments().RemoveDuplicateSpaces() + "}";`
`145`	`157`	`IList<ParsedClass> parsedClasses = css.GetClasses();`
`146`	`158`	`await _scriptManager.UpdatedParsedClasses(_id.GetStableHashCodeString(), _id, _priority, parsedClasses);`
`147`		`- _cache.Seen.Add(preParseHash, parsedClasses.First().Hash);`
	`159`	`+ if (!_cache.Seen.ContainsKey(preParseHash))`
	`160`	`+ {`
	`161`	`+ _cache.Seen.Add(preParseHash, parsedClasses.First().Hash);`
	`162`	`+ }`
`148`	`163`	`return parsedClasses.First().Hash;`
`149`	`164`	`}`
`150`	`165`	`else`
`@@ -172,7 +187,10 @@ public string Keyframes(string css)`
`172`	`187`	`css = "@keyframes &{" + css.RemoveComments().RemoveDuplicateSpaces() + "}";`
`173`	`188`	`IList<ParsedClass> parsedClasses = css.GetClasses();`
`174`	`189`	`Task.Run(() => _scriptManager.UpdatedParsedClasses(_id.GetStableHashCodeString(), _id, _priority, parsedClasses));`
`175`		`- _cache.Seen.Add(preParseHash, parsedClasses.First().Hash);`
	`190`	`+ if (!_cache.Seen.ContainsKey(preParseHash))`
	`191`	`+ {`
	`192`	`+ _cache.Seen.Add(preParseHash, parsedClasses.First().Hash);`
	`193`	`+ }`
`176`	`194`	`return parsedClasses.First().Hash;`
`177`	`195`	`}`
`178`	`196`	`else`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using BlazorStyled.Internal;`
`2`	`2`	`using Microsoft.Extensions.DependencyInjection;`
`3`	`3`	`using System;`
`4`		`-using System.Collections.Generic;`
`5`	`4`
`6`	`5`	`namespace BlazorStyled`
`7`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ private async Task ProcessParameters()`
`39`	`39`	`{`
`40`	`40`	`IStyled styled = Id == null ? StyledService : Priority.HasValue ? StyledService.WithId(Id, Priority.Value) : StyledService.WithId(Id);`
`41`	`41`
`42`		`- if(Classname == "blazor-styled-hide")`
	`42`	`+ if (Classname == "blazor-styled-hide")`
`43`	`43`	`{`
`44`	`44`	`Classname = null;`
`45`	`45`	`}`
`@@ -52,41 +52,41 @@ private async Task ProcessParameters()`
`52`	`52`	`{`
`53`	`53`	`if (IsKeyframes)`
`54`	`54`	`{`
`55`		`- classname = styled.Keyframes(content);`
	`55`	`+ classname = await styled.KeyframesAsync(content);`
`56`	`56`	`}`
`57`	`57`	`else if (Classname != null && MediaQuery == MediaQueries.None && _previousClassname == null)`
`58`	`58`	`{`
`59`	`59`	`//html elements`
`60`		`- styled.Css(ApplyPseudoClass(Classname), content);`
	`60`	`+ await styled.CssAsync(ApplyPseudoClass(Classname), content);`
`61`	`61`	`}`
`62`	`62`	`else if (MediaQuery != MediaQueries.None && ClassnameChanged.HasDelegate)`
`63`	`63`	`{`
`64`	`64`	`//If ClassnameChanged has a delegate then @bind-Classname was used and this is a "new" style`
`65`	`65`	`//Otherwise Classname was used and this an existing style which will be handled below`
`66`	`66`	`content = WrapWithMediaQuery("&{" + content + "}");`
`67`		`- classname = styled.Css(content);`
	`67`	`+ classname = await styled.CssAsync(content);`
`68`	`68`	`}`
`69`	`69`	`else if (Classname != null && MediaQuery != MediaQueries.None && !ClassnameChanged.HasDelegate && _previousClassname == null)`
`70`	`70`	`{`
`71`	`71`	`//Media query support for classes where an existing Classname already exists`
`72`	`72`	`content = WrapClass(ApplyPseudoClass(Classname), content);`
`73`		`- styled.Css(WrapWithMediaQuery(content));`
	`73`	`+ await styled.CssAsync(WrapWithMediaQuery(content));`
`74`	`74`	`}`
`75`	`75`	`else if (Classname == null && PseudoClass == PseudoClasses.None && MediaQuery != MediaQueries.None && _previousClassname == null)`
`76`	`76`	`{`
`77`	`77`	`//Media queries for html elements`
`78`		`- styled.Css(GetMediaQuery(), content);`
	`78`	`+ await styled.CssAsync(GetMediaQuery(), content);`
`79`	`79`	`}`
`80`	`80`	`else if (Classname != null && PseudoClass != PseudoClasses.None && MediaQuery == MediaQueries.None && _previousClassname == null)`
`81`	`81`	`{`
`82`	`82`	`content = WrapClass(ApplyPseudoClass(Classname), content);`
`83`		`- styled.Css(content);`
	`83`	`+ await styled.CssAsync(content);`
`84`	`84`	`}`
`85`	`85`	`else`
`86`	`86`	`{`
`87`	`87`	`if (PseudoClass == PseudoClasses.None && MediaQuery == MediaQueries.None)`
`88`	`88`	`{`
`89`		`- classname = styled.Css(content);`
	`89`	`+ classname = await styled.CssAsync(content);`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`if (ComposeAttributes == null \|\| !ClassnameChanged.HasDelegate)`
`@@ -137,9 +137,8 @@ private string GetComposeClasses()`
`137`	`137`	`{`
`138`	`138`	`if (ComposeAttributes[key] != null)`
`139`	`139`	`{`
`140`		`- string ifKey = key + "if";`
`141`		`- var kvp = ComposeAttributes.FirstOrDefault(x => String.Equals(x.Key, ifKey, StringComparison.InvariantCultureIgnoreCase));`
`142`		`- if(kvp.Key != null)`
	`140`	`+ KeyValuePair<string, object> kvp = ComposeAttributes.FirstOrDefault(x => x.Key.StartsWith(key, StringComparison.InvariantCultureIgnoreCase) && x.Key.EndsWith("if", StringComparison.InvariantCultureIgnoreCase));`
	`141`	`+ if (kvp.Key != null)`
`143`	`142`	`{`
`144`	`143`	`if (bool.TryParse(kvp.Value.ToString().ToString(), out bool result) && result)`
`145`	`144`	`{`