From b1fc1a1ad881778134261b24a117aa81918094a0 Mon Sep 17 00:00:00 2001 From: Eugene Bekker Date: Tue, 30 Jul 2019 18:05:44 -0400 Subject: [PATCH 1/2] upgrading to Preview7 --- samples/BlazorApp/BlazorApp.csproj | 2 +- samples/BlazorApp/wwwroot/index.html | 6 +++--- samples/RazorComponentsApp/Index.cshtml | 6 +++--- samples/RazorComponentsApp/RazorComponentsApp.csproj | 2 +- .../RazorComponents.MaterialDesign.csproj | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/samples/BlazorApp/BlazorApp.csproj b/samples/BlazorApp/BlazorApp.csproj index dd0c42c..294800a 100644 --- a/samples/BlazorApp/BlazorApp.csproj +++ b/samples/BlazorApp/BlazorApp.csproj @@ -5,7 +5,7 @@ Exe 7.3 3.0 - 3.0.0-preview6.19305.13 + 3.0.0-preview7.19365.7 diff --git a/samples/BlazorApp/wwwroot/index.html b/samples/BlazorApp/wwwroot/index.html index 39a2936..7160f57 100644 --- a/samples/BlazorApp/wwwroot/index.html +++ b/samples/BlazorApp/wwwroot/index.html @@ -6,9 +6,9 @@ Component Demos - - - + + + Loading... diff --git a/samples/RazorComponentsApp/Index.cshtml b/samples/RazorComponentsApp/Index.cshtml index 9be4117..441192d 100644 --- a/samples/RazorComponentsApp/Index.cshtml +++ b/samples/RazorComponentsApp/Index.cshtml @@ -8,9 +8,9 @@ Component Demos - - - + + + @(await Html.RenderComponentAsync()) diff --git a/samples/RazorComponentsApp/RazorComponentsApp.csproj b/samples/RazorComponentsApp/RazorComponentsApp.csproj index 03fb765..6f855e9 100644 --- a/samples/RazorComponentsApp/RazorComponentsApp.csproj +++ b/samples/RazorComponentsApp/RazorComponentsApp.csproj @@ -3,7 +3,7 @@ netcoreapp3.0 7.3 - 3.0.0-preview6.19305.13 + 3.0.0-preview7.19365.7 diff --git a/src/RazorComponents.MaterialDesign/RazorComponents.MaterialDesign.csproj b/src/RazorComponents.MaterialDesign/RazorComponents.MaterialDesign.csproj index 08de47c..3848e71 100644 --- a/src/RazorComponents.MaterialDesign/RazorComponents.MaterialDesign.csproj +++ b/src/RazorComponents.MaterialDesign/RazorComponents.MaterialDesign.csproj @@ -4,7 +4,7 @@ netstandard2.0 7.3 3.0 - 3.0.0-preview6.19305.13 + 3.0.0-preview7.19365.7 From 24e18063769155f2002a1160d101f6ee3fa2bb85 Mon Sep 17 00:00:00 2001 From: Eugene Bekker Date: Tue, 30 Jul 2019 18:06:08 -0400 Subject: [PATCH 2/2] adding TextArea support and samples --- samples/BlazorApp/Pages/TextFieldSample.razor | 31 +++++++++++++++---- samples/BlazorApp/wwwroot/css/site.css | 4 +++ .../MdcTextArea.razor | 23 ++++++++++++++ 3 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 src/RazorComponents.MaterialDesign/MdcTextArea.razor diff --git a/samples/BlazorApp/Pages/TextFieldSample.razor b/samples/BlazorApp/Pages/TextFieldSample.razor index 5140917..8493f5a 100644 --- a/samples/BlazorApp/Pages/TextFieldSample.razor +++ b/samples/BlazorApp/Pages/TextFieldSample.razor @@ -4,13 +4,32 @@

See TextField.cshtml for sources.

- +
+ + @if (currentText != null) + { +

You typed: @currentText

+ } +
-@if (currentValue != null) -{ -

You typed: @currentValue

-} +
+ + @if (currentPassword != null) + { +

You typed: @currentPassword

+ } +
+ +
+ + @if (currentMultiLine != null) + { +

You typed: @currentMultiLine

+ } +
@functions { - string currentValue; + string currentText; + string currentPassword; + string currentMultiLine; } diff --git a/samples/BlazorApp/wwwroot/css/site.css b/samples/BlazorApp/wwwroot/css/site.css index b0d0a9c..aec6615 100644 --- a/samples/BlazorApp/wwwroot/css/site.css +++ b/samples/BlazorApp/wwwroot/css/site.css @@ -82,3 +82,7 @@ h1 { .mdc-drawer.mdc-drawer--open:not(.mdc-drawer--closing)+.mdc-drawer-app-content .mdc-top-app-bar { width: calc(100% - 256px); } + +.grouping { + margin: 10px; +} \ No newline at end of file diff --git a/src/RazorComponents.MaterialDesign/MdcTextArea.razor b/src/RazorComponents.MaterialDesign/MdcTextArea.razor new file mode 100644 index 0000000..362d4dc --- /dev/null +++ b/src/RazorComponents.MaterialDesign/MdcTextArea.razor @@ -0,0 +1,23 @@ +@inherits MdcInputComponentBase +@inject IJSRuntime jsRuntime + +
+