-
-
Notifications
You must be signed in to change notification settings - Fork 362
feat(Cssbuilder): improve performance use StringBuilder #6799
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,14 +3,18 @@ | |
| // See the LICENSE file in the project root for more information. | ||
| // Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone | ||
|
|
||
| using System.Globalization; | ||
| using System.Text; | ||
|
|
||
| namespace BootstrapBlazor.Components; | ||
|
|
||
| /// <summary> | ||
| /// Css 生成操作类 | ||
| /// </summary> | ||
| public class CssBuilder | ||
| { | ||
| private readonly List<string> stringBuffer; | ||
| private readonly StringBuilder _builder = new(); | ||
| private bool _hasConent; | ||
|
|
||
| /// <summary> | ||
| /// Creates a CssBuilder used to define conditional CSS classes used in a component. | ||
|
|
@@ -26,8 +30,11 @@ public class CssBuilder | |
| /// <param name="value"></param> | ||
| protected CssBuilder(string? value) | ||
| { | ||
| stringBuffer = []; | ||
| AddClass(value); | ||
| if (!string.IsNullOrEmpty(value)) | ||
| { | ||
| _builder.Append(value); | ||
| _hasConent = true; | ||
|
||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
|
|
@@ -37,7 +44,18 @@ protected CssBuilder(string? value) | |
| /// <returns>CssBuilder</returns> | ||
| public CssBuilder AddClass(string? value) | ||
| { | ||
| if (!string.IsNullOrEmpty(value)) stringBuffer.Add(value); | ||
| if (!string.IsNullOrEmpty(value)) | ||
| { | ||
| if (_hasConent) | ||
|
||
| { | ||
| _builder.Append(' '); | ||
| } | ||
| else | ||
| { | ||
| _hasConent = true; | ||
|
||
| } | ||
| _builder.Append(value); | ||
| } | ||
| return this; | ||
| } | ||
|
|
||
|
|
@@ -99,76 +117,12 @@ public CssBuilder AddClassFromAttributes(IDictionary<string, object>? additional | |
| { | ||
| if (additionalAttributes != null && additionalAttributes.TryGetValue("class", out var c)) | ||
| { | ||
| var classList = c?.ToString(); | ||
| AddClass(classList); | ||
| var classString = Convert.ToString(c, CultureInfo.InvariantCulture); | ||
| AddClass(classString); | ||
| } | ||
| return this; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Adds a raw string to the builder that will be concatenated with the next style or value added to the builder. | ||
| /// </summary> | ||
| /// <param name="key">style property name</param> | ||
| /// <param name="value">CSS style to conditionally add.</param> | ||
| /// <returns>CssBuilder</returns> | ||
| public CssBuilder AddStyle(string key, string? value) | ||
| { | ||
| if (!string.IsNullOrEmpty(value)) stringBuffer.Add($"{key}: {value};"); | ||
| return this; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Adds a conditional css Style to the builder with space separator. | ||
| /// </summary> | ||
| /// <param name="key">style property name</param> | ||
| /// <param name="value">CSS style to conditionally add.</param> | ||
| /// <param name="when">Condition in which the CSS style is added.</param> | ||
| /// <returns>CssBuilder</returns> | ||
| public CssBuilder AddStyle(string key, string? value, bool when = true) => when ? AddStyle(key, value) : this; | ||
|
|
||
| /// <summary> | ||
| /// Adds a conditional css Style to the builder with space separator. | ||
| /// </summary> | ||
| /// <param name="key">style property name</param> | ||
| /// <param name="value">CSS style to conditionally add.</param> | ||
| /// <param name="when">Condition in which the CSS Style is added.</param> | ||
| /// <returns>CssBuilder</returns> | ||
| public CssBuilder AddStyle(string key, string? value, Func<bool> when) => AddStyle(key, value, when()); | ||
|
|
||
| /// <summary> | ||
| /// Adds a conditional css Style to the builder with space separator. | ||
| /// </summary> | ||
| /// <param name="key">style property name</param> | ||
| /// <param name="value">Function that returns a css Style to conditionally add.</param> | ||
| /// <param name="when">Condition in which the CSS Style is added.</param> | ||
| /// <returns>CssBuilder</returns> | ||
| public CssBuilder AddStyle(string key, Func<string?> value, bool when = true) => when ? AddStyle(key, value()) : this; | ||
|
|
||
| /// <summary> | ||
| /// Adds a conditional css Style to the builder with space separator. | ||
| /// </summary> | ||
| /// <param name="key">style property name</param> | ||
| /// <param name="value">Function that returns a css Style to conditionally add.</param> | ||
| /// <param name="when">Condition in which the CSS Style is added.</param> | ||
| /// <returns>CssBuilder</returns> | ||
| public CssBuilder AddStyle(string key, Func<string?> value, Func<bool> when) => AddStyle(key, value, when()); | ||
|
|
||
| /// <summary> | ||
| /// Adds a conditional nested CssBuilder to the builder with space separator. | ||
| /// </summary> | ||
| /// <param name="builder">CSS Style to conditionally add.</param> | ||
| /// <param name="when">Condition in which the CSS Style is added.</param> | ||
| /// <returns>CssBuilder</returns> | ||
| public CssBuilder AddStyle(CssBuilder builder, bool when = true) => when ? AddClass(builder.Build()) : this; | ||
|
|
||
| /// <summary> | ||
| /// Adds a conditional CSS Class to the builder with space separator. | ||
| /// </summary> | ||
| /// <param name="builder">CSS Class to conditionally add.</param> | ||
| /// <param name="when">Condition in which the CSS Class is added.</param> | ||
| /// <returns>CssBuilder</returns> | ||
| public CssBuilder AddStyle(CssBuilder builder, Func<bool> when) => AddClass(builder, when()); | ||
|
|
||
| /// <summary> | ||
| /// Adds a conditional css Style when it exists in a dictionary to the builder with space separator. | ||
| /// Null safe operation. | ||
|
|
@@ -179,7 +133,7 @@ public CssBuilder AddStyleFromAttributes(IDictionary<string, object>? additional | |
| { | ||
| if (additionalAttributes != null && additionalAttributes.TryGetValue("style", out var c)) | ||
| { | ||
| var styleList = c?.ToString(); | ||
| var styleList = Convert.ToString(c, CultureInfo.InvariantCulture); | ||
| AddClass(styleList); | ||
| } | ||
| return this; | ||
|
|
@@ -189,5 +143,5 @@ public CssBuilder AddStyleFromAttributes(IDictionary<string, object>? additional | |
| /// Finalize the completed CSS Classes as a string. | ||
| /// </summary> | ||
| /// <returns>string</returns> | ||
| public string? Build() => stringBuffer.Count > 0 ? string.Join(" ", stringBuffer) : null; | ||
| public string? Build() => _hasConent ? _builder.ToString() : null; | ||
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The field name
_hasConenthas a spelling error. It should be_hasContent.