Merge branch 'rel-1.7'

Megabit · Dec 6, 2024 · 2d9ed18 · 2d9ed18
2 parents cbd97e3 + 0aeb89e
commit 2d9ed18
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 23 deletions.
diff --git a/...zorise.Docs/Pages/Docs/Guides/AntDesign/Examples/AntDesignGuideSourceFilesExample.snippet b/...zorise.Docs/Pages/Docs/Guides/AntDesign/Examples/AntDesignGuideSourceFilesExample.snippet
@@ -1,5 +1,5 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/antd/4.24.15/antd.min.css" integrity="sha512-Ac6zlwN6S+uQSinFAcV27Gd/TtKEDt7XWXn2xWO4Xi9dTbbpT9/vJb+VT5af6nZywrgBD3qUFTb5y1VN4YD94Q==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-<link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css" rel="stylesheet">
+<link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css?v=1.7.0.0" rel="stylesheet">
 
-<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
-<link href="_content/Blazorise.AntDesign/blazorise.antdesign.css" rel="stylesheet" />
+<link href="_content/Blazorise/blazorise.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.AntDesign/blazorise.antdesign.css?v=1.7.0.0" rel="stylesheet" />
diff --git a/...zorise.Docs/Pages/Docs/Guides/Bootstrap/Examples/BootstrapGuideSourceFilesExample.snippet b/...zorise.Docs/Pages/Docs/Guides/Bootstrap/Examples/BootstrapGuideSourceFilesExample.snippet
@@ -1,5 +1,5 @@
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
 <link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css" rel="stylesheet">
 
-<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
-<link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css" rel="stylesheet" />
+<link href="_content/Blazorise/blazorise.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.Bootstrap/blazorise.bootstrap.css?v=1.7.0.0" rel="stylesheet" />
diff --git a/...rise.Docs/Pages/Docs/Guides/Bootstrap5/Examples/Bootstrap5GuideSourceFilesExample.snippet b/...rise.Docs/Pages/Docs/Guides/Bootstrap5/Examples/Bootstrap5GuideSourceFilesExample.snippet
@@ -1,5 +1,5 @@
 <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
 <link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css" rel="stylesheet">
 
-<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
-<link href="_content/Blazorise.Bootstrap5/blazorise.bootstrap5.css" rel="stylesheet" />
+<link href="_content/Blazorise/blazorise.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.Bootstrap5/blazorise.bootstrap5.css?v=1.7.0.0" rel="stylesheet" />
diff --git a/...tion/Blazorise.Docs/Pages/Docs/Guides/Bulma/Examples/BulmaGuideSourceFilesExample.snippet b/...tion/Blazorise.Docs/Pages/Docs/Guides/Bulma/Examples/BulmaGuideSourceFilesExample.snippet
@@ -1,5 +1,5 @@
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css" />
-<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
-<link href="_content/Blazorise.Bulma/blazorise.bulma.css" rel="stylesheet" />
+<link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css" rel="stylesheet">
 
-<link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css" rel="stylesheet">
+<link href="_content/Blazorise/blazorise.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.Bulma/blazorise.bulma.css?v=1.7.0.0" rel="stylesheet" />
diff --git a/...orise.Docs/Pages/Docs/Guides/FluentUI2/Examples/FluentUI2GuideSourceFiles1Example.snippet b/...orise.Docs/Pages/Docs/Guides/FluentUI2/Examples/FluentUI2GuideSourceFiles1Example.snippet
@@ -1,5 +1,5 @@
-<link href="_content/Blazorise.Icons.FluentUI/FluentSystemIcons-Resizable.css" rel="stylesheet" />
+<link href="_content/Blazorise.Icons.FluentUI/FluentSystemIcons-Resizable.css?v=1.7.0.0" rel="stylesheet" />
 
-<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
-<link href="_content/Blazorise.FluentUI2/reboot.css" rel="stylesheet" />
-<link href="_content/Blazorise.FluentUI2/blazorise.fluentui2.css" rel="stylesheet" />
+<link href="_content/Blazorise/blazorise.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.FluentUI2/reboot.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.FluentUI2/blazorise.fluentui2.css?v=1.7.0.0" rel="stylesheet" />
diff --git a/...lazorise.Docs/Pages/Docs/Guides/Material/Examples/MaterialGuideSourceFilesExample.snippet b/...lazorise.Docs/Pages/Docs/Guides/Material/Examples/MaterialGuideSourceFilesExample.snippet
@@ -5,9 +5,9 @@
 <link href="https://fonts.googleapis.com/css?family=Roboto:300,300i,400,400i,500,500i,700,700i|Roboto+Mono:300,400,700|Roboto+Slab:300,400,700" rel="stylesheet">
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
-<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
-<link href="_content/Blazorise.Material/blazorise.material.css" rel="stylesheet" />
-<link href="_content/Blazorise.Icons.Material/blazorise.icons.material.css" rel="stylesheet" />
+<link href="_content/Blazorise/blazorise.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.Material/blazorise.material.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.Icons.Material/blazorise.icons.material.css?v=1.7.0.0" rel="stylesheet" />
 
 <!-- Optional JavaScript -->
 <!-- These are the standard js dependencies this provider typically dependes upon, but Blazorise deems these as optional as Blazorise Components should work correctly without these  -->
@@ -18,4 +18,4 @@
 
 <!-- Mandatory JavaScript -->
 <script src="js/material.min.js"></script>
-<script src="_content/Blazorise.Material/blazorise.material.js"></script>
+<script src="_content/Blazorise.Material/blazorise.material.js?v=1.7.0.0"></script>
diff --git a/...azorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles1Example.snippet b/...azorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles1Example.snippet
@@ -5,5 +5,5 @@
 <script src="https://cdn.tailwindcss.com"></script>
 <script src="_content/Blazorise.Tailwind/blazorise.tailwind.config.js?v=1.7.0.0"></script>
 
-<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
-<link href="_content/Blazorise.Tailwind/blazorise.tailwind.css" rel="stylesheet" />
+<link href="_content/Blazorise/blazorise.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.Tailwind/blazorise.tailwind.css?v=1.7.0.0" rel="stylesheet" />
diff --git a/...azorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles3Example.snippet b/...azorise.Docs/Pages/Docs/Guides/Tailwind/Examples/TailwindGuideSourceFiles3Example.snippet
@@ -2,5 +2,5 @@
 <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/flowbite.min.css" />
 <link href="_content/Blazorise.Icons.FontAwesome/v6/css/all.min.css" rel="stylesheet">
 
-<link href="_content/Blazorise/blazorise.css" rel="stylesheet" />
-<link href="_content/Blazorise.Tailwind/blazorise.tailwind.prod.css" rel="stylesheet" />
+<link href="_content/Blazorise/blazorise.css?v=1.7.0.0" rel="stylesheet" />
+<link href="_content/Blazorise.Tailwind/blazorise.tailwind.prod.css?v=1.7.0.0" rel="stylesheet" />
diff --git 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 )

diff --git 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
@@ -72,6 +72,11 @@ public class MarkdownJSOptions
     /// </summary>
     public IEnumerable<object> Toolbar { get; set; }
 
+    /// <summary>
+    /// 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.
+    /// </summary>
+    public string ToolbarButtonClassPrefix { get; set; }
+
     /// <summary>
     /// Gets or sets a value indicating whether tooltips are shown on the toolbar.
     /// </summary>