From 49d3aa29d8b5466f36cc2c7ffd9aad99bdd0f78c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mladen=20Macanovi=C4=87?= Date: Wed, 4 Dec 2024 14:59:30 +0100 Subject: [PATCH 1/3] ComponentActivator: fix for parameterless constructor (#5877) --- Source/Blazorise/ComponentActivator.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Blazorise/ComponentActivator.cs b/Source/Blazorise/ComponentActivator.cs index b3703a5fdc..52be8c8ef2 100644 --- a/Source/Blazorise/ComponentActivator.cs +++ b/Source/Blazorise/ComponentActivator.cs @@ -1,6 +1,7 @@ #region Using directives using System; using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.DependencyInjection; #endregion namespace Blazorise; @@ -37,7 +38,7 @@ public IComponent CreateInstance( Type componentType ) if ( instance is null ) { - instance = Activator.CreateInstance( componentType ); + instance = ActivatorUtilities.CreateInstance( ServiceProvider, componentType ); } if ( instance is not IComponent component ) From 42bcafaf5eda159e927f7b41fbe4228f3759f1c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mladen=20Macanovi=C4=87?= Date: Wed, 4 Dec 2024 20:49:21 +0100 Subject: [PATCH 2/3] Markdown: add missing ToolbarButtonClassPrefix JS option (#5880) --- Source/Extensions/Blazorise.Markdown/Markdown.razor.cs | 1 + Source/Extensions/Blazorise.Markdown/MarkdownJSOptions.cs | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Source/Extensions/Blazorise.Markdown/Markdown.razor.cs b/Source/Extensions/Blazorise.Markdown/Markdown.razor.cs index 4cc9b66d0c..2aeb47587c 100644 --- a/Source/Extensions/Blazorise.Markdown/Markdown.razor.cs +++ b/Source/Extensions/Blazorise.Markdown/Markdown.razor.cs @@ -102,6 +102,7 @@ protected override async Task OnFirstAfterRenderAsync() Toolbar = Toolbar != null && toolbarButtons?.Count > 0 ? MarkdownActionProvider.Serialize( toolbarButtons ) : null, + ToolbarButtonClassPrefix = ToolbarButtonClassPrefix, ToolbarTips = ToolbarTips, UploadImage = UploadImage, ImageMaxSize = ImageMaxSize, diff --git a/Source/Extensions/Blazorise.Markdown/MarkdownJSOptions.cs b/Source/Extensions/Blazorise.Markdown/MarkdownJSOptions.cs index 701178164a..2ec5bf4b59 100644 --- a/Source/Extensions/Blazorise.Markdown/MarkdownJSOptions.cs +++ b/Source/Extensions/Blazorise.Markdown/MarkdownJSOptions.cs @@ -72,6 +72,11 @@ public class MarkdownJSOptions /// public IEnumerable Toolbar { get; set; } + /// + /// Gets or sets a prefix to the toolbar button classes when set. For example, a value of `"mde"` results in `"mde-bold"` for the Bold button. + /// + public string ToolbarButtonClassPrefix { get; set; } + /// /// Gets or sets a value indicating whether tooltips are shown on the toolbar. /// From 0aeb89e49aa9b31461bf854dd209f068e2bbefa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Tesa=C5=99?= <33880579+tesar-tech@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:26:37 +0000 Subject: [PATCH 3/3] Docs: Adds version number to all Blazorise resources in examples #5858 (#5886) --- .../Examples/AntDesignGuideSourceFilesExample.snippet | 6 +++--- .../Examples/BootstrapGuideSourceFilesExample.snippet | 4 ++-- .../Examples/Bootstrap5GuideSourceFilesExample.snippet | 4 ++-- .../Bulma/Examples/BulmaGuideSourceFilesExample.snippet | 6 +++--- .../Examples/FluentUI2GuideSourceFiles1Example.snippet | 8 ++++---- .../Examples/MaterialGuideSourceFilesExample.snippet | 8 ++++---- .../Examples/TailwindGuideSourceFiles1Example.snippet | 4 ++-- .../Examples/TailwindGuideSourceFiles3Example.snippet | 4 ++-- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Guides/AntDesign/Examples/AntDesignGuideSourceFilesExample.snippet b/Documentation/Blazorise.Docs/Pages/Docs/Guides/AntDesign/Examples/AntDesignGuideSourceFilesExample.snippet index 1cbf29a243..7e8d059ab7 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Guides/AntDesign/Examples/AntDesignGuideSourceFilesExample.snippet +++ b/Documentation/Blazorise.Docs/Pages/Docs/Guides/AntDesign/Examples/AntDesignGuideSourceFilesExample.snippet @@ -1,5 +1,5 @@  - + - - \ No newline at end of file + + \ No newline at end of file diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bootstrap/Examples/BootstrapGuideSourceFilesExample.snippet b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bootstrap/Examples/BootstrapGuideSourceFilesExample.snippet index b782da8fd9..b4e07fcd44 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bootstrap/Examples/BootstrapGuideSourceFilesExample.snippet +++ b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bootstrap/Examples/BootstrapGuideSourceFilesExample.snippet @@ -1,5 +1,5 @@  - - \ No newline at end of file + + \ No newline at end of file diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bootstrap5/Examples/Bootstrap5GuideSourceFilesExample.snippet b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bootstrap5/Examples/Bootstrap5GuideSourceFilesExample.snippet index 514f155c54..f869f720d5 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bootstrap5/Examples/Bootstrap5GuideSourceFilesExample.snippet +++ b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bootstrap5/Examples/Bootstrap5GuideSourceFilesExample.snippet @@ -1,5 +1,5 @@  - - \ No newline at end of file + + \ No newline at end of file diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bulma/Examples/BulmaGuideSourceFilesExample.snippet b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bulma/Examples/BulmaGuideSourceFilesExample.snippet index 43d9875ebd..bdeb2d5d96 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bulma/Examples/BulmaGuideSourceFilesExample.snippet +++ b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Bulma/Examples/BulmaGuideSourceFilesExample.snippet @@ -1,5 +1,5 @@  - - + - \ No newline at end of file + + \ No newline at end of file diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Guides/FluentUI2/Examples/FluentUI2GuideSourceFiles1Example.snippet b/Documentation/Blazorise.Docs/Pages/Docs/Guides/FluentUI2/Examples/FluentUI2GuideSourceFiles1Example.snippet index 30013bba13..a2009296d0 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Guides/FluentUI2/Examples/FluentUI2GuideSourceFiles1Example.snippet +++ b/Documentation/Blazorise.Docs/Pages/Docs/Guides/FluentUI2/Examples/FluentUI2GuideSourceFiles1Example.snippet @@ -1,5 +1,5 @@ - + - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Material/Examples/MaterialGuideSourceFilesExample.snippet b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Material/Examples/MaterialGuideSourceFilesExample.snippet index ae481cf661..48cf7d2eda 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Material/Examples/MaterialGuideSourceFilesExample.snippet +++ b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Material/Examples/MaterialGuideSourceFilesExample.snippet @@ -5,9 +5,9 @@ - - - + + + @@ -18,4 +18,4 @@ - + diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles1Example.snippet b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles1Example.snippet index 8b2f94e125..9435e57d24 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles1Example.snippet +++ b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles1Example.snippet @@ -5,5 +5,5 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles3Example.snippet b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles3Example.snippet index f61842f205..90ac33eb87 100644 --- a/Documentation/Blazorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles3Example.snippet +++ b/Documentation/Blazorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles3Example.snippet @@ -2,5 +2,5 @@ - - \ No newline at end of file + + \ No newline at end of file