🐛 fix: change modifierBuilder from static to instance variable

masastack · Oct 16, 2024 · 7ebc3c1 · 7ebc3c1
1 parent cead085
commit 7ebc3c1
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 29 deletions.
diff --git a/src/Masa.Blazor/Components/Breadcrumbs/MBreadcrumbs.razor.cs b/src/Masa.Blazor/Components/Breadcrumbs/MBreadcrumbs.razor.cs
@@ -72,7 +72,7 @@ protected override void OnParametersSet()
     }
 
     private static Block _block = new("m-breadcrumbs");
-    private static ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
+    private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
 
     protected override IEnumerable<string> BuildComponentClass()
     {

diff --git a/src/Masa.Blazor/Components/Breadcrumbs/MBreadcrumbsItem.razor.cs b/src/Masa.Blazor/Components/Breadcrumbs/MBreadcrumbsItem.razor.cs
@@ -104,5 +104,5 @@ protected override async ValueTask DisposeAsyncCore()
     }
 
     private static Block _block = new("m-breadcrumbs__item");
-    private static ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
+    private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
 }
diff --git a/src/Masa.Blazor/Components/DatePicker/MDatePickerTitle.razor b/src/Masa.Blazor/Components/DatePicker/MDatePickerTitle.razor
@@ -11,7 +11,7 @@
     internal static RenderFragment GenPickerButton(EventCallback<MouseEventArgs> click, RenderFragment content, bool active, bool @readonly, string? @class = null) => builder =>
     {
         builder.OpenElement(0, "div");
-        builder.AddAttribute(1, "class", _btnModiferBuilder.Add(active).Add("readonly", @readonly).AddClass(@class).Build());
+        builder.AddAttribute(1, "class", _btnBlock.CreateModifierBuilder().Add(active).Add("readonly", @readonly).AddClass(@class).Build());
         builder.AddAttribute(2, "onclick", click);
         builder.AddAttribute(3, "__internal_stopPropagation_ondragover", true);
         builder.AddContent(4, content);

diff --git a/src/Masa.Blazor/Components/DatePicker/MDatePickerTitle.razor.cs b/src/Masa.Blazor/Components/DatePicker/MDatePickerTitle.razor.cs
@@ -68,7 +68,7 @@ protected override void RegisterWatchers(PropertyWatcher watcher)
     private static Block _block = new Block("m-date-picker-title");
     private ModifierBuilder _modifierBuilder =_block.CreateModifierBuilder();
     private static Block _btnBlock = new Block("m-picker__title__btn");
-    private static ModifierBuilder _btnModiferBuilder = _btnBlock.CreateModifierBuilder();
+    private ModifierBuilder _btnModiferBuilder = _btnBlock.CreateModifierBuilder();
 
     protected override IEnumerable<string> BuildComponentClass()
     {

diff --git a/src/Masa.Blazor/Components/Dialog/MDialog.razor.cs b/src/Masa.Blazor/Components/Dialog/MDialog.razor.cs
@@ -306,7 +306,7 @@ protected override void OnParametersSet()
         private static Block _block = new("m-dialog");
         private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
         private ModifierBuilder _containerModifierBuilder = _block.Element("container").CreateModifierBuilder();
-        private static ModifierBuilder _contentModifierBuilder = _block.Element("content").CreateModifierBuilder();
+        private ModifierBuilder _contentModifierBuilder = _block.Element("content").CreateModifierBuilder();
 
         protected override bool NoClass => true;
         protected override bool NoStyle => true;

diff --git a/src/Masa.Blazor/Components/Menu/MMenu.razor.cs b/src/Masa.Blazor/Components/Menu/MMenu.razor.cs
@@ -51,8 +51,8 @@ public bool CloseOnContentClick
         [Parameter] public bool Light { get; set; }
 
         private static Block _block = new("m-menu");
-        private static ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
-        private static ModifierBuilder _contentModifierBuilder = _block.Element("content").CreateModifierBuilder();
+        private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
+        private ModifierBuilder _contentModifierBuilder = _block.Element("content").CreateModifierBuilder();
 
         private readonly string _contentId = $"menu-{Guid.NewGuid():N}";
         private readonly List<IDependent> _dependents = new();

diff --git a/src/Masa.Blazor/Components/OtpInput/MOtpInput.razor.cs b/src/Masa.Blazor/Components/OtpInput/MOtpInput.razor.cs
@@ -165,7 +165,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
     private static Block _block = new("m-otp-input");
     private static Block _textFieldBlock = new("m-text-field");
     private static Block _inputBlock = new("m-input");
-    private static ModifierBuilder _inputModifierBuilder = _inputBlock.CreateModifierBuilder();
+    private ModifierBuilder _inputModifierBuilder = _inputBlock.CreateModifierBuilder();
 
     protected override IEnumerable<string> BuildComponentClass()
     {

diff --git a/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs b/src/Masa.Blazor/Components/Pagination/MPagination.razor.cs
@@ -66,9 +66,9 @@ public bool IsDark
     }
 
     private static Block _block = new("m-pagination");
-    private static ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
-    private static ModifierBuilder _navigationModifierBuilder = _block.Element("navigation").CreateModifierBuilder();
-    private static ModifierBuilder _itemModifierBuilder = _block.Element("item").CreateModifierBuilder();
+    private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
+    private ModifierBuilder _navigationModifierBuilder = _block.Element("navigation").CreateModifierBuilder();
+    private ModifierBuilder _itemModifierBuilder = _block.Element("item").CreateModifierBuilder();
 
     public bool PrevDisabled => Value <= 1;
 

diff --git a/src/Masa.Blazor/Components/Picker/MPicker.razor.cs b/src/Masa.Blazor/Components/Picker/MPicker.razor.cs
@@ -35,9 +35,9 @@ public partial class MPicker : MasaComponentBase
 
     private static Block _block = new("m-picker");
     private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
-    private static ModifierBuilder _titleModifierBuilder = _block.Element("title").CreateModifierBuilder();
-    private static ModifierBuilder _bodyModifierBuilder = _block.Element("body").CreateModifierBuilder();
-    private static ModifierBuilder _actionsModifierBuilder = _block.Element("actions").CreateModifierBuilder();
+    private ModifierBuilder _titleModifierBuilder = _block.Element("title").CreateModifierBuilder();
+    private ModifierBuilder _bodyModifierBuilder = _block.Element("body").CreateModifierBuilder();
+    private ModifierBuilder _actionsModifierBuilder = _block.Element("actions").CreateModifierBuilder();
 
 
     public bool IsDark

diff --git a/src/Masa.Blazor/Components/Select/MSelect.razor.cs b/src/Masa.Blazor/Components/Select/MSelect.razor.cs
@@ -416,7 +416,7 @@ protected override void OnParametersSet()
 
     private static Block _block = new("m-select");
     private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
-    private static ModifierBuilder _selectionModifierBuilder = _block.Element("selection").CreateModifierBuilder();
+    private ModifierBuilder _selectionModifierBuilder = _block.Element("selection").CreateModifierBuilder();
 
     protected override IEnumerable<string> BuildComponentClass()
     {

diff --git a/src/Masa.Blazor/Components/Snackbar/MSnackbar.razor.cs b/src/Masa.Blazor/Components/Snackbar/MSnackbar.razor.cs
@@ -113,9 +113,9 @@ protected override void OnParametersSet()
         }
     }
 
-    private static Block _block = new(ROOT_CSS);
+    private static Block _block =  new(ROOT_CSS);
     private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
-    private static ModifierBuilder _wrapperModifierBuilder = _block.Element("wrapper").CreateModifierBuilder();
+    private ModifierBuilder _wrapperModifierBuilder = _block.Element("wrapper").CreateModifierBuilder();
 
     protected override IEnumerable<string> BuildComponentClass()
     {

diff --git a/src/Masa.Blazor/Components/Splitter/MSplitter.razor.cs b/src/Masa.Blazor/Components/Splitter/MSplitter.razor.cs
@@ -23,7 +23,7 @@ public partial class MSplitter
     private static Block _block = new("m-splitter");
     private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
     private static Element _pane = _block.Element("pane");
-    private static ModifierBuilder _barModifierBuilder = _block.Element("bar").CreateModifierBuilder();
+    private ModifierBuilder _barModifierBuilder = _block.Element("bar").CreateModifierBuilder();
 
     private readonly Collection<MSplitterPane> _panes = new();
 

diff --git a/src/Masa.Blazor/Components/Switch/MSwitch.razor.cs b/src/Masa.Blazor/Components/Switch/MSwitch.razor.cs
@@ -26,7 +26,7 @@ public partial class MSwitch<TValue> : MSelectable<TValue> where TValue : notnul
         public string? TrackColor { get; set; }
 
         public override bool HasColor => IsActive || HasText;
-        
+
         public string? ComputedTrackColor => HasText ? TrackColor ?? ValidationState : null;
 
         // according to spec, should still show
@@ -68,9 +68,8 @@ protected override void OnInternalValueChange(TValue val)
 
         private static Block _block = new("m-input--switch");
         private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
-        private static ModifierBuilder _trackModifierBuilder = _block.Element("track").CreateModifierBuilder();
-        private static ModifierBuilder _thumbModifierBuilder = _block.Element("thumb").CreateModifierBuilder();
-
+        private ModifierBuilder _trackModifierBuilder = _block.Element("track").CreateModifierBuilder();
+        private ModifierBuilder _thumbModifierBuilder = _block.Element("thumb").CreateModifierBuilder();
 
         protected override IEnumerable<string> BuildComponentClass()
         {

diff --git a/src/Masa.Blazor/Components/Tabs/MTabs.razor.cs b/src/Masa.Blazor/Components/Tabs/MTabs.razor.cs
@@ -137,7 +137,7 @@ protected override void OnParametersSet()
 #endif
 
         private static Block _block = new("m-tabs");
-        private static ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
+        private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
 
         protected override IEnumerable<string> BuildComponentClass()
         {

diff --git a/src/Masa.Blazor/Components/TextField/MTextField.razor.cs b/src/Masa.Blazor/Components/TextField/MTextField.razor.cs
@@ -324,7 +324,7 @@ public bool DownButtonEnabled
 
     private static Block _block = new("m-text-field");
     private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
-    private static ModifierBuilder _numberModifierBuilder = _block.Element("number").CreateModifierBuilder();
+    private ModifierBuilder _numberModifierBuilder = _block.Element("number").CreateModifierBuilder();
 
     protected override IEnumerable<string> BuildComponentClass()
     {

diff --git a/src/Masa.Blazor/Components/TimePicker/MTimePickerClock.razor.cs b/src/Masa.Blazor/Components/TimePicker/MTimePickerClock.razor.cs
@@ -298,8 +298,8 @@ protected override void OnParametersSet()
 
     private static Block _block = new("m-time-picker-clock");
     private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
-    private static ModifierBuilder _handModifierBuilder = _block.Element("hand").CreateModifierBuilder();
-    private static ModifierBuilder _itemModifierBuilder = _block.Element("item").CreateModifierBuilder();
+    private ModifierBuilder _handModifierBuilder = _block.Element("hand").CreateModifierBuilder();
+    private ModifierBuilder _itemModifierBuilder = _block.Element("item").CreateModifierBuilder();
 
     protected override IEnumerable<string> BuildComponentClass()
     {

diff --git a/src/Masa.Blazor/Components/Timeline/MTimeline.cs b/src/Masa.Blazor/Components/Timeline/MTimeline.cs
@@ -26,7 +26,7 @@ protected override void OnParametersSet()
 #endif
 
         private static Block _block = new("m-timeline");
-        private static ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
+        private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
 
         protected override IEnumerable<string> BuildComponentClass()
         {

diff --git a/src/Masa.Blazor/Components/Window/MWindow.razor.cs b/src/Masa.Blazor/Components/Window/MWindow.razor.cs
@@ -96,7 +96,7 @@ protected override void OnParametersSet()
 
     private static Block _block = new("m-window");
     private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
-    private static ModifierBuilder _containerModifierBuilder = _block.Element("container").CreateModifierBuilder();
+    private ModifierBuilder _containerModifierBuilder = _block.Element("container").CreateModifierBuilder();
 
     protected override IEnumerable<string> BuildComponentClass()
     {

diff --git a/src/Masa.Blazor/Presets/PageStack/PPageStackItem.razor.cs b/src/Masa.Blazor/Presets/PageStack/PPageStackItem.razor.cs
@@ -80,7 +80,7 @@ int ComputeBarHeight()
     internal RenderFragment? ActionContent { get; set; }
 
     private static Block _block = new("m-page-stack-item");
-    private static ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
+    private ModifierBuilder _modifierBuilder = _block.CreateModifierBuilder();
 
     protected override IEnumerable<string> BuildComponentClass()
     {