5.0.2 (#1168)

* 2023-12-04 EoD * 2023-12-06 BoD * 2023-12-06 EoD * 2023-12-07 MoD * 2023-12-07 MoD #2 * 2023-12-07 MoD #3 * 2023-12-07 MoD #4 * Remove js and alternate theme builds from M.B.W.MD3 * Restore alternate theme build * Enabled first buildscripts command * Cleaned npm install everywhere * Added js builds * Remove all hints of JS build * Remove extraneous logging & reinstate JS build * Working build sans JS production * 2023-12-12 BoD * 2023-12-12 EoD * Removed js build * 2023-12-13 Commit prior to MBDateField restructuring * 2023-12-15 Numeric field restructuring * 2023-12-16 Update website with numeric field demos * 2023-12-18 Functional DateTimeField with new TextField * 2023-12-18 Partial DecimalField * 2023-12-19 EoD * 2023-12-22 EoD * 2023-12-26 EoD * 2028-12-28 BoD * Attempt to split build/publish of MD3 website * No help with split build/publish steps, publish still deletes static assets * 2023-12-30 BoD * 2023-12-30 EoD * 2023-12-31 Tabs update * 2023-12-31 Repaired gitignore * 2024-01-01 MBGrid * 2024-01-02 MoD * 2024-01-02 EoD * MBMenu.ts * 2024-01-04 EoD * 2024-01-07 EoD * 2024-01-10 8.0.1 security * Release notes update for 5.0.2
Material-Blazor · Jan 10, 2024 · c450245 · c450245
1 parent 609a46e
commit c450245
Show file tree

Hide file tree

Showing 154 changed files with 12,603 additions and 2,833 deletions.
diff --git a/.github/workflows/GithubActionsRelease.yml b/.github/workflows/GithubActionsRelease.yml
@@ -92,7 +92,7 @@ jobs:
         DOCFX_SOURCE_BRANCH_NAME: main   
 
     - name: Upload Documentation Artifacts 🔺 # The project is then uploaded as an artifact named 'siteDocFx'.
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: siteDocFx
         path: siteDocFx       
@@ -127,7 +127,7 @@ jobs:
         --framework net8.0
 
     - name: Upload Website Artifacts 🔺 # The website is then uploaded as an artifact named 'siteWeb'.
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: siteWeb
         path: siteWeb      
@@ -151,13 +151,13 @@ jobs:
         dotnet-version: '8.x'
 
     - name: Download Artifacts 🔻 # The documentation is downloaded into the 'siteDocFx' folder.
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: siteDocFx
         path: siteDocFx
 
     - name: Download Artifacts 🔻 # The built project is downloaded into the 'siteWeb' folder.
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: siteWeb
         path: siteWeb
@@ -274,7 +274,7 @@ jobs:
         DOCFX_SOURCE_BRANCH_NAME: main   
 
     - name: Upload Documentation Artifacts 🔺
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: siteDocFxMD3
         path: siteDocFxMD3       
@@ -310,7 +310,7 @@ jobs:
         --framework net8.0
 
     - name: Upload Website Artifacts 🔺 # The website is then uploaded as an artifact named 'siteWeb'.
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: siteWebMD3
         path: siteWebMD3
@@ -334,13 +334,13 @@ jobs:
         dotnet-version: '8.x'
 
     - name: Download Artifacts 🔻 # The built project is downloaded into the 'siteWeb' folder.
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: siteDocFxMD3
         path: siteDocFxMD3
 
     - name: Download Artifacts 🔻 # The built project is downloaded into the 'siteWeb' folder.
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: siteWebMD3
         path: siteWebMD3

diff --git a/.github/workflows/GithubActionsWIP.yml b/.github/workflows/GithubActionsWIP.yml
@@ -126,7 +126,7 @@ jobs:
       run: dir siteDocFx
 
     - name: Upload Documentation Artifacts 🔺 # The documentation site is then uploaded as an artifact named 'siteDocFx'.
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: siteDocFx
         path: siteDocFx
@@ -185,7 +185,7 @@ jobs:
       run: dir ${{env.outputWeb}}/wwwroot/_content/Material.Blazor
 
     - name: Upload Website Artifacts 🔺 # The website is then uploaded as an artifact named 'siteWeb'.
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: siteWeb
         path: siteWeb
@@ -240,13 +240,13 @@ jobs:
         persist-credentials: false
 
     - name: Download Artifacts 🔻 # The built project is downloaded into the 'site' folder.
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: siteDocFx
         path: siteDocFx
 
     - name: Download Artifacts 🔻 # The built project is downloaded into the 'site' folder.
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: siteWeb
         path: siteWeb
@@ -347,7 +347,7 @@ jobs:
     #         cat trimmed_meta_report.md tail.md > meta_report.md
     #     fi
     # - name: Upload comparison & report artifact
-    #   uses: actions/upload-artifact@v3
+    #   uses: actions/upload-artifact@v4
     #   with:
     #     name: comparison_report
     #     path: |
@@ -437,7 +437,7 @@ jobs:
       run: dir siteDocFxMD3
 
     - name: Upload Documentation Artifacts 🔺 # The project is then uploaded as an artifact named 'siteDocFx'.
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: siteDocFxMD3
         path: siteDocFxMD3
@@ -463,6 +463,15 @@ jobs:
       with:
         dotnet-version: '8.x'
 
+    # - name: Display wwwroot M.B.W.MD3
+    #   run: dir ${{github.workspace}}/Material.Blazor.Website.MD3/wwwroot
+
+    # - name: Display wwwroot/icons M.B.W.MD3
+    #   run: dir ${{github.workspace}}/Material.Blazor.Website.MD3/wwwroot/icons
+
+    # - name: Display wwwroot/images M.B.W.MD3
+    #   run: dir ${{github.workspace}}/Material.Blazor.Website.MD3/wwwroot/images
+
     - name: Build  & Publish Website 🔧
       run: >
         dotnet publish ${{env.projectWebMD3}}
@@ -480,8 +489,11 @@ jobs:
     # - name: Display workspace Ꙫ
     #   run: dir ${{github.workspace}}
 
-    - name: Display wwwroot Ꙫ
-      run: dir ${{github.workspace}}/Material.Blazor.MD3/wwwroot
+    # - name: Display wwwroot M.B.MD3
+    #   run: dir ${{github.workspace}}/Material.Blazor.MD3/wwwroot
+
+    # - name: Display wwwroot M.B.W.MD3
+    #   run: dir ${{github.workspace}}/Material.Blazor.Website.MD3/wwwroot
 
     # - name: Display MaterialBlazorMD3 package output Ꙫ
     #   run: dir ${{env.outputWebMD3}}
@@ -492,11 +504,11 @@ jobs:
     # - name: Display MaterialBlazorMD3 package output wwwroot _content Ꙫ
     #   run: dir ${{env.outputWebMD3}}/wwwroot/_content
 
-    - name: Display MaterialBlazorMD3 package output wwwroot _content Material.Blazor.MD3 Ꙫ
-      run: dir ${{env.outputWebMD3}}/wwwroot/_content/Material.Blazor.MD3
+    # - name: Display MaterialBlazorMD3 package output wwwroot _content Material.Blazor.MD3 Ꙫ
+    #   run: dir ${{env.outputWebMD3}}/wwwroot/_content/Material.Blazor.MD3
 
     - name: Upload Website Artifacts 🔺 # The website is then uploaded as an artifact named 'siteWeb'.
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: siteWebMD3
         path: siteWebMD3
@@ -551,13 +563,13 @@ jobs:
         persist-credentials: false
 
     - name: Download Artifacts 🔻 # The built project is downloaded into the 'site' folder.
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: siteDocFxMD3
         path: siteDocFxMD3
 
     - name: Download Artifacts 🔻 # The built project is downloaded into the 'site' folder.
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: siteWebMD3
         path: siteWebMD3

diff --git a/.gitignore b/.gitignore
@@ -2,14 +2,11 @@
 
 #Generated CSS and JS files
 **/Material.Blazor/wwwroot/*.*
+**/Material.Blazor.MD3/wwwroot/*.*
 **/Material.Blazor.Website/wwwroot/css/*.*
 **/Material.Blazor.Website/wwwroot/js/*.*
-**/Material.Blazor.MD3/wwwroot/*.*
 **/Material.Blazor.Website.MD3/wwwroot/css/*.*
-**/Material.Blazor.Website.MD3/wwwroot/js/*.*
-
-# DocFx tool
-!**/DocFx/*.*
+# TEMPORARY REMOVAL WHILE PUBLISH DELETES STATIC ASSETS **/Material.Blazor.Website.MD3/wwwroot/js/*.*
 
 # Generated by DocFx build
 /docfx.json
@@ -213,8 +210,8 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
+#*.pubxml
+#*.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
 # checkin your Azure Web App publish settings, but sensitive information contained

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -9,11 +9,15 @@
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Server'">
-		<DefineConstants>BLAZOR_SERVER</DefineConstants>
+		<DefineConstants>BLAZOR_SERVER,LOGGING</DefineConstants>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='WebAssembly'">
 		<DefineConstants>BLAZOR_WEBASSEMBLY</DefineConstants>
 	</PropertyGroup>
 
+	<PropertyGroup>
+		<AccelerateBuildsInVisualStudio>false</AccelerateBuildsInVisualStudio>
+	</PropertyGroup>
+
 </Project>
diff --git a/LICENSE.md b/LICENSE.md
@@ -2,7 +2,7 @@
 uid: A.License
 title: License
 ---
-Copyright (c) 2023 Material-Blazor, a GitHub organization
+Copyright (c) 2020-2024 Material-Blazor, a GitHub organization
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

diff --git a/LocalBuild.cmd b/LocalBuild.cmd
@@ -1,6 +1,6 @@
 @echo off
 set argVersion=%1
-if "%1" == "" set argVersion=5.0.5
+if "%1" == "" set argVersion=5.0.6
 set argDestination=%2
 if "%2" == "" set argDestination="c:\solutions\local nuget packages"
 

diff --git a/Material.Blazor.MD3/Articles/PlusComponents.md b/Material.Blazor.MD3/Articles/PlusComponents.md
@@ -11,7 +11,10 @@ implements further Blazor/Material Theme hybrid components that we term "Plus Co
 
 | Component | Notes |
 | :-------- | :---- |
-| [MBNumericField](xref:C.MBNumericField) | A numeric typed text field |
+| [MBDateTimeField](xref:C.MBDateTimeField) | A date or date/time typed text field |
+| [MBDecimalField](xref:C.MBDecimalField) | A numeric decimal text field. |
+| [MBDoubleField](xref:C.MBDoubleField) | A numeric double text field. |
+| [MBGrid](xref:C.MBGrideld) | A data driven table with grouping, sorting, and various data display options. |
 | [MBRadioButtonGroup](xref:C.MBRadioButtonGroup) | A collection of radio buttons with a single selection |
 
 ## Experimental Component List

diff --git a/Material.Blazor.MD3/Components.MD2/DataTable/MBDataTable.razor b/Material.Blazor.MD3/Components.MD2/DataTable/MBDataTable.razor
@@ -33,30 +33,4 @@
         </table>
     </div>
 
-    @if (HasProgressBar)
-    {
-        <div class="mdc-data-table__progress-indicator">
-            <div class="mdc-data-table__scrim"></div>
-            <div class="mdc-linear-progress mdc-linear-progress--indeterminate mdc-data-table__linear-progress" role="progressbar" aria-label="Data is being loaded...">
-                <div class="mdc-linear-progress__buffer">
-                    <div class="mdc-linear-progress__buffer-bar"></div>
-                    <div class="mdc-linear-progress__buffer-dots"></div>
-                </div>
-                <div class="mdc-linear-progress__bar mdc-linear-progress__primary-bar">
-                    <span class="mdc-linear-progress__bar-inner"></span>
-                </div>
-                <div class="mdc-linear-progress__bar mdc-linear-progress__secondary-bar">
-                    <span class="mdc-linear-progress__bar-inner"></span>
-                </div>
-            </div>
-        </div>
-    }
-
-    @if (Paginator != null)
-    {
-        <CascadingValue Name="IsWithinDataTable" Value="true" IsFixed="true">
-            @Paginator
-        </CascadingValue>
-    }
-
 </div>
diff --git a/Material.Blazor.MD3/Components.MD2/DataTable/MBDataTable.razor.cs b/Material.Blazor.MD3/Components.MD2/DataTable/MBDataTable.razor.cs
@@ -36,31 +36,6 @@ public partial class MBDataTable<TItem> : ComponentFoundation
     [Parameter] public RenderFragment<TItem> TableRow { get; set; }
 
 
-    /// <summary>
-    /// Render fragment to contain an <see cref="MBPaginator"/>.
-    /// </summary>
-    [Parameter] public RenderFragment Paginator { get; set; }
-
-
-    /// <summary>
-    /// Determines whether the data table has a progress bar.
-    /// </summary>
-    [Parameter] public bool HasProgressBar { get; set; }
-
-
-    /// <summary>
-    /// If true, makes the header sticky.
-    /// </summary>
-    [Parameter] public bool StickyHeader { get; set; }
-
-
-    /// <summary>
-    /// Determines whether the data table has a progress bar.
-    /// </summary>
-    [Parameter] public bool ShowProgress { get; set; }
-    private bool _cachedShowProgress;
-
-
     /// <summary>
     /// The data table's density.
     /// </summary>
@@ -72,39 +47,19 @@ public partial class MBDataTable<TItem> : ComponentFoundation
     private Func<TItem, object> KeyGenerator { get; set; }
 
 
-    // Would like to use <inheritdoc/> however DocFX cannot resolve to references outside Material.Blazor
-    protected override async Task OnInitializedAsync()
-    {
-        await base.OnInitializedAsync();
-
-        ConditionalCssClasses
-            //.AddIf(DensityInfo.CssClassName, () => DensityInfo.ApplyCssClass)
-            .AddIf("mdc-data-table--sticky-header", () => StickyHeader);
-    }
-
-
+
     // Would like to use <inheritdoc/> however DocFX cannot resolve to references outside Material.Blazor
     protected override async Task OnParametersSetAsync()
     {
         await base.OnParametersSetAsync();
 
-        if (_cachedShowProgress != ShowProgress)
-        {
-            _cachedShowProgress = ShowProgress;
-
-            if (HasProgressBar && HasInstantiated)
-            {
-                EnqueueJSInteropAction(() => InvokeJsVoidAsync("MaterialBlazor.MBDataTable.setProgress", ElementReference, ShowProgress));
-            }
-        }
-
         KeyGenerator = GetKeysFunc ?? delegate (TItem item) { return item; };
     }
 
 
     /// <inheritdoc/>
     internal override Task InstantiateMcwComponent()
     {
-        return InvokeJsVoidAsync("MaterialBlazor.MBDataTable.init", ElementReference, HasProgressBar, ShowProgress);
+        return InvokeJsVoidAsync("MaterialBlazor.MBDataTable.init", ElementReference);
     }
 }
diff --git a/Material.Blazor.MD3/Components.MD2/DataTable/MBDataTable.ts b/Material.Blazor.MD3/Components.MD2/DataTable/MBDataTable.ts
@@ -1,23 +1,8 @@
 import { MDCDataTable } from '@material/data-table';
 
-export function init(elem, hasProgress, showProgress) {
+export function init(elem) {
     if (!elem) {
         return;
     }
     elem._dataTable = MDCDataTable.attachTo(elem);
-    if (hasProgress) {
-       setProgress(elem, showProgress);
-    }
-}
-
-export function setProgress(elem, showProgress) {
-    if (!elem) {
-        return;
-    }
-    if (showProgress) {
-        elem._dataTable.showProgress();
-    }
-    else {
-        elem._dataTable.hideProgress();
-    }
 }