Skip to content
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

5.0.2 #1168

Merged
merged 41 commits into from
Jan 10, 2024
Merged

5.0.2 #1168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
15a4147
2023-12-04 EoD
MarkStega Dec 4, 2023
baef1eb
2023-12-06 BoD
MarkStega Dec 6, 2023
3c8d989
2023-12-06 EoD
MarkStega Dec 6, 2023
6ca4d2b
2023-12-07 MoD
MarkStega Dec 7, 2023
09a5ae9
2023-12-07 MoD #2
MarkStega Dec 7, 2023
680387a
2023-12-07 MoD #3
MarkStega Dec 7, 2023
8a50ae5
2023-12-07 MoD #4
MarkStega Dec 7, 2023
6943456
Remove js and alternate theme builds from M.B.W.MD3
MarkStega Dec 8, 2023
63cd1f1
Restore alternate theme build
MarkStega Dec 8, 2023
a1eb96b
Enabled first buildscripts command
MarkStega Dec 8, 2023
e3890eb
Cleaned npm install everywhere
MarkStega Dec 8, 2023
106c602
Added js builds
MarkStega Dec 8, 2023
fb186e1
Remove all hints of JS build
MarkStega Dec 8, 2023
2481ab8
Remove extraneous logging & reinstate JS build
MarkStega Dec 8, 2023
fc69b72
Working build sans JS production
MarkStega Dec 8, 2023
fe8e0f9
2023-12-12 BoD
MarkStega Dec 12, 2023
977b935
2023-12-12 EoD
MarkStega Dec 12, 2023
79f4ea8
Removed js build
MarkStega Dec 12, 2023
7e9a244
2023-12-13 Commit prior to MBDateField restructuring
MarkStega Dec 13, 2023
261f885
2023-12-15 Numeric field restructuring
MarkStega Dec 15, 2023
ec4cdc1
2023-12-16 Update website with numeric field demos
MarkStega Dec 16, 2023
2da507e
2023-12-18 Functional DateTimeField with new TextField
MarkStega Dec 18, 2023
2d6271e
2023-12-18 Partial DecimalField
MarkStega Dec 18, 2023
ca50b95
2023-12-19 EoD
MarkStega Dec 19, 2023
71e9b7e
2023-12-22 EoD
MarkStega Dec 22, 2023
f5ed52a
2023-12-26 EoD
MarkStega Dec 26, 2023
15d09ec
2028-12-28 BoD
MarkStega Dec 28, 2023
2261ca1
Attempt to split build/publish of MD3 website
MarkStega Dec 28, 2023
dc9abf4
No help with split build/publish steps, publish still deletes static …
MarkStega Dec 28, 2023
ad92c57
2023-12-30 BoD
MarkStega Dec 30, 2023
2dcb463
2023-12-30 EoD
MarkStega Dec 30, 2023
d857667
2023-12-31 Tabs update
MarkStega Dec 31, 2023
b0630f5
2023-12-31 Repaired gitignore
MarkStega Dec 31, 2023
a76ab4c
2024-01-01 MBGrid
MarkStega Jan 1, 2024
7878d05
2024-01-02 MoD
MarkStega Jan 2, 2024
2b6ea7d
2024-01-02 EoD
MarkStega Jan 2, 2024
2e311c6
MBMenu.ts
MarkStega Jan 3, 2024
6530bc4
2024-01-04 EoD
MarkStega Jan 4, 2024
e20e3f4
2024-01-07 EoD
MarkStega Jan 8, 2024
8898f41
2024-01-10 8.0.1 security
MarkStega Jan 10, 2024
b31e31e
Release notes update for 5.0.2
MarkStega Jan 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/GithubActionsRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
38 changes: 25 additions & 13 deletions .github/workflows/GithubActionsWIP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand All @@ -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}}
Expand All @@ -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}}
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 4 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion LocalBuild.cmd
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
5 changes: 4 additions & 1 deletion Material.Blazor.MD3/Articles/PlusComponents.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 0 additions & 26 deletions Material.Blazor.MD3/Components.MD2/DataTable/MBDataTable.razor
Original file line number Diff line number Diff line change
Expand Up @@ -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>
49 changes: 2 additions & 47 deletions Material.Blazor.MD3/Components.MD2/DataTable/MBDataTable.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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);
}
}
17 changes: 1 addition & 16 deletions Material.Blazor.MD3/Components.MD2/DataTable/MBDataTable.ts
Original file line number Diff line number Diff line change
@@ -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();
}
}
Loading
Loading