Skip to content

Commit d0ad0aa

Browse files
stefanloerwaldstefanloerwald
authored
Merge pull request #8 from SamProf/develop
FF
2 parents edf8be5 + 782018a commit d0ad0aa

File tree

60 files changed

+1227
-412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1227
-412
lines changed

‎README.md

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Complete all Blazor dependencies.
3232

3333
- .NET Core 3.1
3434
- Visual Studio 2019 with the ASP.NET and web development workload selected.
35+
- Requires access to internet for CSS download
3536

3637
## Installation
3738

@@ -128,7 +129,20 @@ Also we have official [Contributors team](https://github.com/SamProf/MatBlazor/i
128129
- `MatAutocomplete` - new implementation of component
129130

130131

131-
#### MatBlazor 2.6.1 (Develop)
132+
133+
#### MatBlazor 2.7.0 (Develop)
134+
- Update MDC Web to 7.0.0
135+
- Changed DOM and JS for many components, because of changes in MDC Web 7.0.0
136+
- Fixed: Floating label in Outlined MatTextField-based components
137+
- Fixed Validation via EditContext colors
138+
139+
#### MatBlazor 2.6.3
140+
- PR: Simplify deploying js/css #657 (Thanks to [stefanloerwald](https://github.com/stefanloerwald))
141+
- PR: Update README.md (Mentioned that internet access is required in Prerequisites) #610 (Thanks to [rokx](https://github.com/rokx))
142+
- PR: Checkbox indeterminate state fixes (Thanks to [lindespang](https://github.com/lindespang))
143+
- PR: MatSlider Immediate #665 (Thanks to [stefanloerwald](https://github.com/stefanloerwald))
144+
145+
#### MatBlazor 2.6.2
132146
- PR: Update Slider to Add Pin & Markers #639 (Thanks to [enkodellc](https://github.com/enkodellc))
133147
- PR: MatTable double click #629 (Thanks to [sebestyn168](https://github.com/sebestyn168))
134148
- PR: Fix MatAutocomplete fails with tab and google autofill #614 (Thanks to [sebestyn168](https://github.com/sebestyn168))
@@ -148,7 +162,6 @@ Also we have official [Contributors team](https://github.com/SamProf/MatBlazor/i
148162
- PR: Added ForceLoad option for MatButton and MatIconButton (Fixes #330) #570 (Thanks to [Garderoben](https://github.com/Garderoben) and [enkodellc](https://github.com/enkodellc))
149163
- PR: Added LazyRendering for MatExpansionPanel + bug fix #578 (Thanks to [lindespang](https://github.com/lindespang))
150164

151-
152165
#### MatBlazor 2.6.0
153166
- Update to Latest Microsoft.AspNetCore.Components 3.1.4 and Microsoft.AspNetCore.Components.WebAssembly 3.2.0
154167
- Update MDC-Web components to 6.0.0

‎src/MatBlazor.Demo.ServerApp/Properties/launchSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"IIS Express": {
1212
"commandName": "IISExpress",
1313
"launchBrowser": true,
14-
"launchUrl": "Test",
14+
"launchUrl": "DataTable",
1515
"environmentVariables": {
1616
"ASPNETCORE_ENVIRONMENT": "Development"
1717
}

‎src/MatBlazor.Demo/Demo/DemoDataTable.razor

Lines changed: 134 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<DemoContainer Header="Basic use of Data Table">
66
<Content>
77

8-
<MatDataTable Items="@periodicElements">
9-
<Columns>
10-
<MatDataTableColumn TItem="PeriodicElement" Header="No." Value="@(i => i.Position)"></MatDataTableColumn>
11-
<MatDataTableColumn TItem="PeriodicElement" Header="Name" Value="@(i => i.Name)"></MatDataTableColumn>
12-
<MatDataTableColumn TItem="PeriodicElement" Header="Weight" Value="@(i => i.Weight)"></MatDataTableColumn>
13-
<MatDataTableColumn TItem="PeriodicElement" Header="Symbol" Value="@(i => i.Symbol)"></MatDataTableColumn>
14-
</Columns>
8+
<MatDataTable>
9+
<MatDataTableContent Items="@periodicElements">
10+
<MatDataTableColumn Header="No." Value="@context?.Position"></MatDataTableColumn>
11+
<MatDataTableColumn Header="Name" Value="@context?.Name"></MatDataTableColumn>
12+
<MatDataTableColumn Header="Weight" Value="@context?.Weight"></MatDataTableColumn>
13+
<MatDataTableColumn Header="Symbol" Value="@context?.Symbol"></MatDataTableColumn>
14+
</MatDataTableContent>
1515
</MatDataTable>
1616

1717
@code
@@ -51,13 +51,13 @@
5151
<SourceContent>
5252
<BlazorFiddle Template="MatBlazor" Code=@(@"
5353
54-
<MatDataTable Items=""@periodicElements"">
55-
<Columns>
56-
<MatDataTableColumn TItem=""PeriodicElement"" Header=""No."" Value=""@(i => i.Position)""></MatDataTableColumn>
57-
<MatDataTableColumn TItem=""PeriodicElement"" Header=""Name"" Value=""@(i => i.Name)""></MatDataTableColumn>
58-
<MatDataTableColumn TItem=""PeriodicElement"" Header=""Weight"" Value=""@(i => i.Weight)""></MatDataTableColumn>
59-
<MatDataTableColumn TItem=""PeriodicElement"" Header=""Symbol"" Value=""@(i => i.Symbol)""></MatDataTableColumn>
60-
</Columns>
54+
<MatDataTable>
55+
<MatDataTableContent Items=""@periodicElements"">
56+
<MatDataTableColumn Header=""No."" Value=""@context?.Position""></MatDataTableColumn>
57+
<MatDataTableColumn Header=""Name"" Value=""@context?.Name""></MatDataTableColumn>
58+
<MatDataTableColumn Header=""Weight"" Value=""@context?.Weight""></MatDataTableColumn>
59+
<MatDataTableColumn Header=""Symbol"" Value=""@context?.Symbol""></MatDataTableColumn>
60+
</MatDataTableContent>
6161
</MatDataTable>
6262
6363
@code
@@ -98,16 +98,112 @@
9898
</DemoContainer>
9999

100100

101+
<DemoContainer Header="Basic use of Data Table">
102+
<Content>
103+
104+
<MatDataTableOld Items="@periodicElements4">
105+
<Columns>
106+
<MatDataTableColumnOld TItem="PeriodicElement4" Header="No." Value="@(i => i.Position)"></MatDataTableColumnOld>
107+
<MatDataTableColumnOld TItem="PeriodicElement4" Header="Name" Value="@(i => i.Name)"></MatDataTableColumnOld>
108+
<MatDataTableColumnOld TItem="PeriodicElement4" Header="Weight" Value="@(i => i.Weight)"></MatDataTableColumnOld>
109+
<MatDataTableColumnOld TItem="PeriodicElement4" Header="Symbol" Value="@(i => i.Symbol)"></MatDataTableColumnOld>
110+
</Columns>
111+
</MatDataTableOld>
112+
113+
@code
114+
{
115+
class PeriodicElement4
116+
{
117+
public string Name { get; set; }
118+
public int Position { get; set; }
119+
public double Weight { get; set; }
120+
public string Symbol { get; set; }
121+
122+
public PeriodicElement4(int position, string name, double weight, string symbol)
123+
{
124+
Position = position;
125+
Name = name;
126+
Weight = weight;
127+
Symbol = symbol;
128+
}
129+
}
130+
131+
PeriodicElement4[] periodicElements4 = new PeriodicElement4[]
132+
{
133+
new PeriodicElement4(1, "Hydrogen", 1.0079, "H"),
134+
new PeriodicElement4(2, "Helium", 4.0026, "He"),
135+
new PeriodicElement4(3, "Lithium", 6.941, "Li"),
136+
new PeriodicElement4(4, "Beryllium", 9.0122, "Be"),
137+
new PeriodicElement4(5, "Boron", 10.811, "B"),
138+
new PeriodicElement4(6, "Carbon", 12.0107, "C"),
139+
new PeriodicElement4(7, "Nitrogen", 14.0067, "N"),
140+
new PeriodicElement4(8, "Oxygen", 15.9994, "O"),
141+
new PeriodicElement4(9, "Fluorine", 18.9984, "F"),
142+
new PeriodicElement4(10, "Neon", 20.1797, "Ne"),
143+
};
144+
}
145+
146+
</Content>
147+
<SourceContent>
148+
<BlazorFiddle Template="MatBlazor" Code=@(@"
149+
150+
<MatDataTableOld Items=""@periodicElements4"">
151+
<Columns>
152+
<MatDataTableColumnOld TItem=""PeriodicElement4"" Header=""No."" Value=""@(i => i.Position)""></MatDataTableColumnOld>
153+
<MatDataTableColumnOld TItem=""PeriodicElement4"" Header=""Name"" Value=""@(i => i.Name)""></MatDataTableColumnOld>
154+
<MatDataTableColumnOld TItem=""PeriodicElement4"" Header=""Weight"" Value=""@(i => i.Weight)""></MatDataTableColumnOld>
155+
<MatDataTableColumnOld TItem=""PeriodicElement4"" Header=""Symbol"" Value=""@(i => i.Symbol)""></MatDataTableColumnOld>
156+
</Columns>
157+
</MatDataTableOld>
158+
159+
@code
160+
{
161+
class PeriodicElement4
162+
{
163+
public string Name { get; set; }
164+
public int Position { get; set; }
165+
public double Weight { get; set; }
166+
public string Symbol { get; set; }
167+
168+
public PeriodicElement4(int position, string name, double weight, string symbol)
169+
{
170+
Position = position;
171+
Name = name;
172+
Weight = weight;
173+
Symbol = symbol;
174+
}
175+
}
176+
177+
PeriodicElement4[] periodicElements4 = new PeriodicElement4[]
178+
{
179+
new PeriodicElement4(1, ""Hydrogen"", 1.0079, ""H""),
180+
new PeriodicElement4(2, ""Helium"", 4.0026, ""He""),
181+
new PeriodicElement4(3, ""Lithium"", 6.941, ""Li""),
182+
new PeriodicElement4(4, ""Beryllium"", 9.0122, ""Be""),
183+
new PeriodicElement4(5, ""Boron"", 10.811, ""B""),
184+
new PeriodicElement4(6, ""Carbon"", 12.0107, ""C""),
185+
new PeriodicElement4(7, ""Nitrogen"", 14.0067, ""N""),
186+
new PeriodicElement4(8, ""Oxygen"", 15.9994, ""O""),
187+
new PeriodicElement4(9, ""Fluorine"", 18.9984, ""F""),
188+
new PeriodicElement4(10, ""Neon"", 20.1797, ""Ne""),
189+
};
190+
}
191+
192+
")></BlazorFiddle>
193+
</SourceContent>
194+
</DemoContainer>
195+
196+
101197
<DemoContainer Header="Pagination with Data Table">
102198
<Content>
103-
<MatDataTable Items="@periodicElements2" Paginator="true">
199+
<MatDataTableOld Items="@periodicElements2" Paginator="true">
104200
<Columns>
105-
<MatDataTableColumn TItem="PeriodicElement2" Header="No." Value="@(i => i.Position)"></MatDataTableColumn>
106-
<MatDataTableColumn TItem="PeriodicElement2" Header="Name" Value="@(i => i.Name)"></MatDataTableColumn>
107-
<MatDataTableColumn TItem="PeriodicElement2" Header="Weight" Value="@(i => i.Weight)"></MatDataTableColumn>
108-
<MatDataTableColumn TItem="PeriodicElement2" Header="Symbol" Value="@(i => i.Symbol)"></MatDataTableColumn>
201+
<MatDataTableColumnOld TItem="PeriodicElement2" Header="No." Value="@(i => i.Position)"></MatDataTableColumnOld>
202+
<MatDataTableColumnOld TItem="PeriodicElement2" Header="Name" Value="@(i => i.Name)"></MatDataTableColumnOld>
203+
<MatDataTableColumnOld TItem="PeriodicElement2" Header="Weight" Value="@(i => i.Weight)"></MatDataTableColumnOld>
204+
<MatDataTableColumnOld TItem="PeriodicElement2" Header="Symbol" Value="@(i => i.Symbol)"></MatDataTableColumnOld>
109205
</Columns>
110-
</MatDataTable>
206+
</MatDataTableOld>
111207

112208
@code
113209
{
@@ -145,14 +241,14 @@
145241
</Content>
146242
<SourceContent>
147243
<BlazorFiddle Template="MatBlazor" Code=@(@"
148-
<MatDataTable Items=""@periodicElements2"" Paginator=""true"">
244+
<MatDataTableOld Items=""@periodicElements2"" Paginator=""true"">
149245
<Columns>
150-
<MatDataTableColumn TItem=""PeriodicElement2"" Header=""No."" Value=""@(i => i.Position)""></MatDataTableColumn>
151-
<MatDataTableColumn TItem=""PeriodicElement2"" Header=""Name"" Value=""@(i => i.Name)""></MatDataTableColumn>
152-
<MatDataTableColumn TItem=""PeriodicElement2"" Header=""Weight"" Value=""@(i => i.Weight)""></MatDataTableColumn>
153-
<MatDataTableColumn TItem=""PeriodicElement2"" Header=""Symbol"" Value=""@(i => i.Symbol)""></MatDataTableColumn>
246+
<MatDataTableColumnOld TItem=""PeriodicElement2"" Header=""No."" Value=""@(i => i.Position)""></MatDataTableColumnOld>
247+
<MatDataTableColumnOld TItem=""PeriodicElement2"" Header=""Name"" Value=""@(i => i.Name)""></MatDataTableColumnOld>
248+
<MatDataTableColumnOld TItem=""PeriodicElement2"" Header=""Weight"" Value=""@(i => i.Weight)""></MatDataTableColumnOld>
249+
<MatDataTableColumnOld TItem=""PeriodicElement2"" Header=""Symbol"" Value=""@(i => i.Symbol)""></MatDataTableColumnOld>
154250
</Columns>
155-
</MatDataTable>
251+
</MatDataTableOld>
156252
157253
@code
158254
{
@@ -194,14 +290,14 @@
194290

195291
<DemoContainer Header="Sorting with Data Table">
196292
<Content>
197-
<MatDataTable Items="@periodicElements3">
293+
<MatDataTableOld Items="@periodicElements3">
198294
<Columns>
199-
<MatDataTableColumn TItem="PeriodicElement3" Header="No." Value="@(i => i.Position)" Sort="true"></MatDataTableColumn>
200-
<MatDataTableColumn TItem="PeriodicElement3" Header="Name" Value="@(i => i.Name)" Sort="true"></MatDataTableColumn>
201-
<MatDataTableColumn TItem="PeriodicElement3" Header="Weight" Value="@(i => i.Weight)" Sort="true"></MatDataTableColumn>
202-
<MatDataTableColumn TItem="PeriodicElement3" Header="Symbol" Value="@(i => i.Symbol)" Sort="true"></MatDataTableColumn>
295+
<MatDataTableColumnOld TItem="PeriodicElement3" Header="No." Value="@(i => i.Position)" Sort="true"></MatDataTableColumnOld>
296+
<MatDataTableColumnOld TItem="PeriodicElement3" Header="Name" Value="@(i => i.Name)" Sort="true"></MatDataTableColumnOld>
297+
<MatDataTableColumnOld TItem="PeriodicElement3" Header="Weight" Value="@(i => i.Weight)" Sort="true"></MatDataTableColumnOld>
298+
<MatDataTableColumnOld TItem="PeriodicElement3" Header="Symbol" Value="@(i => i.Symbol)" Sort="true"></MatDataTableColumnOld>
203299
</Columns>
204-
</MatDataTable>
300+
</MatDataTableOld>
205301

206302
@code
207303
{
@@ -239,14 +335,14 @@
239335
</Content>
240336
<SourceContent>
241337
<BlazorFiddle Template="MatBlazor" Code=@(@"
242-
<MatDataTable Items=""@periodicElements3"">
338+
<MatDataTableOld Items=""@periodicElements3"">
243339
<Columns>
244-
<MatDataTableColumn TItem=""PeriodicElement3"" Header=""No."" Value=""@(i => i.Position)"" Sort=""true""></MatDataTableColumn>
245-
<MatDataTableColumn TItem=""PeriodicElement3"" Header=""Name"" Value=""@(i => i.Name)"" Sort=""true""></MatDataTableColumn>
246-
<MatDataTableColumn TItem=""PeriodicElement3"" Header=""Weight"" Value=""@(i => i.Weight)"" Sort=""true""></MatDataTableColumn>
247-
<MatDataTableColumn TItem=""PeriodicElement3"" Header=""Symbol"" Value=""@(i => i.Symbol)"" Sort=""true""></MatDataTableColumn>
340+
<MatDataTableColumnOld TItem=""PeriodicElement3"" Header=""No."" Value=""@(i => i.Position)"" Sort=""true""></MatDataTableColumnOld>
341+
<MatDataTableColumnOld TItem=""PeriodicElement3"" Header=""Name"" Value=""@(i => i.Name)"" Sort=""true""></MatDataTableColumnOld>
342+
<MatDataTableColumnOld TItem=""PeriodicElement3"" Header=""Weight"" Value=""@(i => i.Weight)"" Sort=""true""></MatDataTableColumnOld>
343+
<MatDataTableColumnOld TItem=""PeriodicElement3"" Header=""Symbol"" Value=""@(i => i.Symbol)"" Sort=""true""></MatDataTableColumnOld>
248344
</Columns>
249-
</MatDataTable>
345+
</MatDataTableOld>
250346
251347
@code
252348
{

‎src/MatBlazor.Demo/Demo/DemoMatSelect.razor

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,47 @@
8282
</SourceContent>
8383
</DemoContainer>
8484

85+
86+
<MatAnchorContainer Anchor="MatSelectInt">
87+
<MatH5>MatSelect Guid?</MatH5>
88+
</MatAnchorContainer>
89+
<DemoContainer>
90+
<Content>
91+
<MatSelect Label="Pick a Food Group" @bind-Value="@guidValue">
92+
<MatOption TValue="Guid?" Value="@(null)"></MatOption>
93+
<MatOption TValue="Guid?" Value="@(new Guid("20A82054-F493-4C7B-81A4-4F9A1EDD7C2E"))">Bread, Cereal, Rice, and Pasta</MatOption>
94+
<MatOption TValue="Guid?" Value="@(new Guid("4451642D-24F7-418F-8741-BA5089A1CC65"))">Vegetables</MatOption>
95+
<MatOption TValue="Guid?" Value="@(new Guid("5717DBBE-C205-4E33-9E07-892A51F64021"))">Fruit</MatOption>
96+
</MatSelect>
97+
98+
<span>@guidValue</span>
99+
100+
@code
101+
{
102+
Guid? guidValue = new Guid("20A82054-F493-4C7B-81A4-4F9A1EDD7C2E");
103+
}
104+
105+
</Content>
106+
<SourceContent>
107+
<BlazorFiddle Template="MatBlazor" Code=@(@"
108+
<MatSelect Label=""Pick a Food Group"" @bind-Value=""@guidValue"">
109+
<MatOption TValue=""Guid?"" Value=""@(null)""></MatOption>
110+
<MatOption TValue=""Guid?"" Value=""@(new Guid(""20A82054-F493-4C7B-81A4-4F9A1EDD7C2E""))"">Bread, Cereal, Rice, and Pasta</MatOption>
111+
<MatOption TValue=""Guid?"" Value=""@(new Guid(""4451642D-24F7-418F-8741-BA5089A1CC65""))"">Vegetables</MatOption>
112+
<MatOption TValue=""Guid?"" Value=""@(new Guid(""5717DBBE-C205-4E33-9E07-892A51F64021""))"">Fruit</MatOption>
113+
</MatSelect>
114+
115+
<span>@guidValue</span>
116+
117+
@code
118+
{
119+
Guid? guidValue = new Guid(""20A82054-F493-4C7B-81A4-4F9A1EDD7C2E"");
120+
}
121+
122+
")></BlazorFiddle>
123+
</SourceContent>
124+
</DemoContainer>
125+
85126
<h5 class="mat-h5">Helper Text</h5>
86127
<DemoContainer>
87128
<Content>

0 commit comments

Comments
 (0)