provide a custom clipboard service (#224)

Co-authored-by: kuzmins-85 <[email protected]>
MyNihongo · Dec 11, 2023 · ecd3d8d · ecd3d8d
1 parent a2b89c9
commit ecd3d8d
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -41,13 +41,19 @@ public void ConfigureServices(IServiceCollection services)
 {
     services.AddMudServices();
     services.AddMudMarkdownServices();
+    // Optionally if default clipboard functionality fails it is possible to add a custom service
+    // NB! MauiClipboardService is just an example
+    builder.Services.AddMudMarkdownClipboardService<MauiClipboardService>();
 }
 ```
 For the Blazor WebAssembly in the `Program.cs` add this method.
 ```cs
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
 builder.Services.AddMudServices();
 builder.Services.AddMudMarkdownServices();
+// Optionally if default clipboard functionality fails it is possible to add a custom service
+// NB! MauiClipboardService is just an example
+builder.Services.AddMudMarkdownClipboardService<MauiClipboardService>();
 ```
 ## Using the component
 ```razor

diff --git a/samples/MudBlazor.Markdown.Core/MudBlazor.Markdown.Core.csproj b/samples/MudBlazor.Markdown.Core/MudBlazor.Markdown.Core.csproj
@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Blazored.LocalStorage" Version="4.4.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
 		<PackageReference Include="System.Reactive" Version="6.0.0" />
 	</ItemGroup>
 

diff --git a/samples/Server/MudBlazor.Markdown.Server.csproj b/samples/Server/MudBlazor.Markdown.Server.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ReactiveUI.Blazor" Version="19.4.1" />
+		<PackageReference Include="ReactiveUI.Blazor" Version="19.5.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/samples/WebAssembly/MudBlazor.Markdown.Wasm.csproj b/samples/WebAssembly/MudBlazor.Markdown.Wasm.csproj
@@ -8,9 +8,9 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.10" />
-		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.10" PrivateAssets="all" />
-		<PackageReference Include="ReactiveUI.Blazor" Version="19.4.1" />
-		<PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
+		<PackageReference Include="ReactiveUI.Blazor" Version="19.5.1" />
+		<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/MudBlazor.Markdown/Components/MudCodeHighlight.razor.cs b/src/MudBlazor.Markdown/Components/MudCodeHighlight.razor.cs
@@ -135,7 +135,18 @@ await Js.InvokeVoidAsync("setHighlightStylesheet", stylesheetPath)
 
 	private async Task CopyTextToClipboardAsync(MouseEventArgs args)
 	{
-		await Js.InvokeVoidAsync("navigator.clipboard.writeText", Text)
+		var ok = await Js.InvokeAsync<bool>("copyTextToClipboard", Text)
 			.ConfigureAwait(false);
+
+		if (ok)
+			return;
+
+		var clipboardService = ServiceProvider?.GetService<IMudMarkdownClipboardService>();
+
+		if (clipboardService != null)
+		{
+			await clipboardService.CopyToClipboardAsync(Text)
+				.ConfigureAwait(false);
+		}
 	}
 }
diff --git a/src/MudBlazor.Markdown/MudBlazor.Markdown.csproj b/src/MudBlazor.Markdown/MudBlazor.Markdown.csproj
@@ -5,7 +5,7 @@
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<RootNamespace>MudBlazor</RootNamespace>
-		<Version>0.1.2</Version>
+		<Version>0.1.3</Version>
 		<Authors>MyNihongo</Authors>
 		<Description>Markdown component for MudBlazor (https://mudblazor.com/)</Description>
 		<Copyright>Copyright © 2023 MyNihongo</Copyright>

diff --git a/src/MudBlazor.Markdown/Resources/MudBlazor.Markdown.js b/src/MudBlazor.Markdown/Resources/MudBlazor.Markdown.js
@@ -76,3 +76,12 @@ window.refreshMathJaxScript = function () {
 		// swallow since in some cases MathJax might not be initialized
 	}
 }
+
+window.copyTextToClipboard = async function (text) {
+	try {
+		await navigator.clipboard.writeText(text);
+		return true;
+	} catch (e) {
+		return false;
+	}
+}
diff --git a/src/MudBlazor.Markdown/Services/Interfaces/IMudMarkdownClipboardService.cs b/src/MudBlazor.Markdown/Services/Interfaces/IMudMarkdownClipboardService.cs
@@ -0,0 +1,6 @@
+namespace MudBlazor;
+
+public interface IMudMarkdownClipboardService
+{
+	ValueTask CopyToClipboardAsync(string text);
+}
diff --git a/src/MudBlazor.Markdown/Services/Registration/ServiceCollectionEx.cs b/src/MudBlazor.Markdown/Services/Registration/ServiceCollectionEx.cs
@@ -4,8 +4,12 @@ public static class ServiceCollectionEx
 {
 	public static IServiceCollection AddMudMarkdownServices(this IServiceCollection @this)
 	{
-		@this.AddScoped<IMudMarkdownThemeService, MudMarkdownThemeService>();
+		return @this.AddScoped<IMudMarkdownThemeService, MudMarkdownThemeService>();
+	}
 
-		return @this;
+	public static IServiceCollection AddMudMarkdownClipboardService<T>(this IServiceCollection @this)
+		where T : class, IMudMarkdownClipboardService
+	{
+		return @this.AddScoped<IMudMarkdownClipboardService, T>();
 	}
-}
+}