Extract webvieweditor to share between compose page and signature editor (#578)
* initial work for webview editor control * moved more stuff to editor itself * revert packages.props indention changes * move alignment logic * Migrate signature editor to new control * move background to editor control * Some polishing * Fixed the corner glitch issue with dark theme. --------- Co-authored-by: Burak Kaan Köse <bkaankose@outlook.com>
This commit is contained in:
Aleh Khantsevich
@@ -1,64 +1,65 @@
|
|||||||
<Project>
|
<Project>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageVersion Include="ColorHashSharp" Version="1.0.0" />
|
<PackageVersion Include="ColorHashSharp" Version="1.0.0" />
|
||||||
<PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
|
<PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
|
||||||
<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
|
<PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
|
||||||
<PackageVersion Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
|
<PackageVersion Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
|
||||||
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
<PackageVersion Include="CommunityToolkit.Labs.Uwp.DependencyPropertyGenerator" Version="0.1.250206-build.2040" />
|
||||||
<PackageVersion Include="CommunityToolkit.Uwp.Animations" Version="8.2.250129-preview2" />
|
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
||||||
<PackageVersion Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.250129-preview2" />
|
<PackageVersion Include="CommunityToolkit.Uwp.Animations" Version="8.2.250129-preview2" />
|
||||||
<PackageVersion Include="CommunityToolkit.Uwp.Controls.Segmented" Version="8.2.250129-preview2" />
|
<PackageVersion Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.250129-preview2" />
|
||||||
<PackageVersion Include="CommunityToolkit.Uwp.Controls.SettingsControls" Version="8.2.250129-preview2" />
|
<PackageVersion Include="CommunityToolkit.Uwp.Controls.Segmented" Version="8.2.250129-preview2" />
|
||||||
<PackageVersion Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.2.250129-preview2" />
|
<PackageVersion Include="CommunityToolkit.Uwp.Controls.SettingsControls" Version="8.2.250129-preview2" />
|
||||||
<PackageVersion Include="CommunityToolkit.Uwp.Controls.TabbedCommandBar" Version="8.2.250129-preview2" />
|
<PackageVersion Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.2.250129-preview2" />
|
||||||
<PackageVersion Include="CommunityToolkit.Uwp.Controls.TokenizingTextBox" Version="8.2.250129-preview2" />
|
<PackageVersion Include="CommunityToolkit.Uwp.Controls.TabbedCommandBar" Version="8.2.250129-preview2" />
|
||||||
<PackageVersion Include="CommunityToolkit.Uwp.Extensions" Version="8.2.250129-preview2" />
|
<PackageVersion Include="CommunityToolkit.Uwp.Controls.TokenizingTextBox" Version="8.2.250129-preview2" />
|
||||||
<PackageVersion Include="EmailValidation" Version="1.2.0" />
|
<PackageVersion Include="CommunityToolkit.Uwp.Extensions" Version="8.2.250129-preview2" />
|
||||||
<PackageVersion Include="HtmlAgilityPack" Version="1.11.72" />
|
<PackageVersion Include="EmailValidation" Version="1.2.0" />
|
||||||
<PackageVersion Include="Ical.Net" Version="4.3.1" />
|
<PackageVersion Include="HtmlAgilityPack" Version="1.11.72" />
|
||||||
<PackageVersion Include="IsExternalInit" Version="1.0.3" />
|
<PackageVersion Include="Ical.Net" Version="4.3.1" />
|
||||||
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
|
<PackageVersion Include="IsExternalInit" Version="1.0.3" />
|
||||||
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
|
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
|
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
|
||||||
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
|
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
|
||||||
<PackageVersion Include="Microsoft.Graph" Version="5.69.0" />
|
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
|
||||||
<PackageVersion Include="Microsoft.Identity.Client" Version="4.68.0" />
|
<PackageVersion Include="Microsoft.Graph" Version="5.69.0" />
|
||||||
<PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.68.0" />
|
<PackageVersion Include="Microsoft.Identity.Client" Version="4.68.0" />
|
||||||
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.68.0" />
|
<PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.68.0" />
|
||||||
<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
|
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.68.0" />
|
||||||
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.7" />
|
<PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
|
||||||
<PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0" />
|
<PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.7" />
|
||||||
<PackageVersion Include="MimeKit" Version="4.10.0" />
|
<PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0" />
|
||||||
<PackageVersion Include="morelinq" Version="4.4.0" />
|
<PackageVersion Include="MimeKit" Version="4.10.0" />
|
||||||
<PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
|
<PackageVersion Include="morelinq" Version="4.4.0" />
|
||||||
<PackageVersion Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
|
<PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
|
||||||
<PackageVersion Include="NodaTime" Version="3.2.1" />
|
<PackageVersion Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
|
||||||
<PackageVersion Include="Serilog" Version="4.2.0" />
|
<PackageVersion Include="NodaTime" Version="3.2.1" />
|
||||||
<PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
|
<PackageVersion Include="Serilog" Version="4.2.0" />
|
||||||
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
|
<PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
|
||||||
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
|
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
|
||||||
<PackageVersion Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
|
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
|
||||||
<PackageVersion Include="SkiaSharp" Version="3.116.1" />
|
<PackageVersion Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
|
||||||
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
|
<PackageVersion Include="SkiaSharp" Version="3.116.1" />
|
||||||
<PackageVersion Include="SqlKata" Version="4.0.1" />
|
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
|
||||||
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
|
<PackageVersion Include="SqlKata" Version="4.0.1" />
|
||||||
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.2" />
|
<PackageVersion Include="System.Private.Uri" Version="4.3.2" />
|
||||||
<PackageVersion Include="System.Text.Json" Version="9.0.2" />
|
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.2" />
|
||||||
<PackageVersion Include="Win2D.uwp" Version="1.28.2" />
|
<PackageVersion Include="System.Text.Json" Version="9.0.2" />
|
||||||
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
|
<PackageVersion Include="Win2D.uwp" Version="1.28.2" />
|
||||||
<PackageVersion Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
|
<PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
|
||||||
<PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
|
<PackageVersion Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
|
||||||
<PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3667" />
|
<PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
|
||||||
<PackageVersion Include="Google.Apis.Gmail.v1" Version="1.68.0.3427" />
|
<PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3667" />
|
||||||
<PackageVersion Include="Google.Apis.PeopleService.v1" Version="1.68.0.3359" />
|
<PackageVersion Include="Google.Apis.Gmail.v1" Version="1.68.0.3427" />
|
||||||
<PackageVersion Include="HtmlKit" Version="1.2.0" />
|
<PackageVersion Include="Google.Apis.PeopleService.v1" Version="1.68.0.3359" />
|
||||||
<PackageVersion Include="MailKit" Version="4.10.0" />
|
<PackageVersion Include="HtmlKit" Version="1.2.0" />
|
||||||
<PackageVersion Include="TimePeriodLibrary.NET" Version="2.1.5" />
|
<PackageVersion Include="MailKit" Version="4.10.0" />
|
||||||
<PackageVersion Include="System.Reactive" Version="6.0.1" />
|
<PackageVersion Include="TimePeriodLibrary.NET" Version="2.1.5" />
|
||||||
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.2" />
|
<PackageVersion Include="System.Reactive" Version="6.0.1" />
|
||||||
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.2" />
|
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.2" />
|
||||||
</ItemGroup>
|
<PackageVersion Include="System.Text.Encodings.Web" Version="9.0.2" />
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Collections.Generic;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
using Wino.Core.Domain.Models.AutoDiscovery;
|
using Wino.Core.Domain.Models.AutoDiscovery;
|
||||||
using Wino.Core.Domain.Models.Personalization;
|
using Wino.Core.Domain.Models.Personalization;
|
||||||
using Wino.Core.Domain.Models.Reader;
|
using Wino.Core.Domain.Models.Reader;
|
||||||
@@ -8,4 +9,5 @@ namespace Wino.Core.Domain.Models;
|
|||||||
[JsonSerializable(typeof(AutoDiscoverySettings))]
|
[JsonSerializable(typeof(AutoDiscoverySettings))]
|
||||||
[JsonSerializable(typeof(CustomThemeMetadata))]
|
[JsonSerializable(typeof(CustomThemeMetadata))]
|
||||||
[JsonSerializable(typeof(WebViewMessage))]
|
[JsonSerializable(typeof(WebViewMessage))]
|
||||||
|
[JsonSerializable(typeof(List<ImageInfo>))]
|
||||||
public partial class DomainModelsJsonContext: JsonSerializerContext;
|
public partial class DomainModelsJsonContext: JsonSerializerContext;
|
||||||
|
|||||||
@@ -29,4 +29,17 @@ public static class WebViewExtensions
|
|||||||
|
|
||||||
return string.Empty;
|
return string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static async Task<string> ExecuteScriptSafeAsync(this Microsoft.UI.Xaml.Controls.WebView2 Chromium, string script)
|
||||||
|
{
|
||||||
|
if (Chromium == null) return string.Empty;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return await Chromium.ExecuteScriptAsync(script);
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
<ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/Segmented/Segmented.xaml" />
|
<ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Segmented/Segmented/Segmented.xaml" />
|
||||||
<ResourceDictionary Source="Styles/ItemContainerStyles.xaml" />
|
<ResourceDictionary Source="Styles/ItemContainerStyles.xaml" />
|
||||||
<ResourceDictionary Source="Styles/ImagePreviewControl.xaml" />
|
<ResourceDictionary Source="Styles/ImagePreviewControl.xaml" />
|
||||||
|
<ResourceDictionary Source="Styles/WebViewEditorControl.xaml" />
|
||||||
|
|
||||||
<styles:WinoExpanderStyle />
|
<styles:WinoExpanderStyle />
|
||||||
|
|
||||||
|
|||||||
362
Wino.Mail/Controls/WebViewEditorControl.cs
Normal file
362
Wino.Mail/Controls/WebViewEditorControl.cs
Normal file
@@ -0,0 +1,362 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using CommunityToolkit.WinUI;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
using Microsoft.Web.WebView2.Core;
|
||||||
|
using Windows.UI.ViewManagement.Core;
|
||||||
|
using Windows.UI.Xaml;
|
||||||
|
using Windows.UI.Xaml.Controls;
|
||||||
|
using Windows.UI.Xaml.Markup;
|
||||||
|
using Windows.UI.Xaml.Media;
|
||||||
|
using Wino.Core.Domain;
|
||||||
|
using Wino.Core.Domain.Interfaces;
|
||||||
|
using Wino.Core.Domain.Models;
|
||||||
|
using Wino.Core.Domain.Models.Reader;
|
||||||
|
using Wino.Core.UWP.Extensions;
|
||||||
|
|
||||||
|
namespace Wino.Mail.Controls;
|
||||||
|
public sealed partial class WebViewEditorControl : Control, IDisposable
|
||||||
|
{
|
||||||
|
private readonly INativeAppService _nativeAppService = App.Current.Services.GetService<INativeAppService>();
|
||||||
|
private readonly IFontService _fontService = App.Current.Services.GetService<IFontService>();
|
||||||
|
private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>();
|
||||||
|
private readonly IUnderlyingThemeService _underlyingThemeService = App.Current.Services.GetService<IUnderlyingThemeService>();
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorDarkMode { get; set; }
|
||||||
|
async partial void OnIsEditorDarkModeChanged(bool newValue)
|
||||||
|
{
|
||||||
|
await UpdateEditorThemeAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorBold { get; set; }
|
||||||
|
private bool _isEditorBoldInternal;
|
||||||
|
async partial void OnIsEditorBoldChanged(bool newValue)
|
||||||
|
{
|
||||||
|
if (newValue != _isEditorBoldInternal)
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("bold", BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorItalic { get; set; }
|
||||||
|
private bool _isEditorItalicInternal;
|
||||||
|
async partial void OnIsEditorItalicChanged(bool newValue)
|
||||||
|
{
|
||||||
|
if (newValue != _isEditorItalicInternal)
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("italic", BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorUnderline { get; set; }
|
||||||
|
private bool _isEditorUnderlineInternal;
|
||||||
|
async partial void OnIsEditorUnderlineChanged(bool newValue)
|
||||||
|
{
|
||||||
|
if (newValue != _isEditorUnderlineInternal)
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("underline", BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorStrikethrough { get; set; }
|
||||||
|
private bool _isEditorStrikethroughInternal;
|
||||||
|
async partial void OnIsEditorStrikethroughChanged(bool newValue)
|
||||||
|
{
|
||||||
|
if (newValue != _isEditorStrikethroughInternal)
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("strikethrough", BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorOl { get; set; }
|
||||||
|
private bool _isEditorOlInternal;
|
||||||
|
async partial void OnIsEditorOlChanged(bool newValue)
|
||||||
|
{
|
||||||
|
if (newValue != _isEditorOlInternal)
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("insertorderedlist", BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorUl { get; set; }
|
||||||
|
private bool _isEditorUlInternal;
|
||||||
|
async partial void OnIsEditorUlChanged(bool newValue)
|
||||||
|
{
|
||||||
|
if (newValue != _isEditorUlInternal)
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("insertunorderedlist", BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorIndentEnabled { get; private set; }
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorOutdentEnabled { get; private set; }
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial int EditorAlignmentSelectedIndex { get; set; }
|
||||||
|
private int _editorAlignmentSelectedIndexInternal;
|
||||||
|
async partial void OnEditorAlignmentSelectedIndexChanged(int newValue)
|
||||||
|
{
|
||||||
|
if (newValue != _editorAlignmentSelectedIndexInternal)
|
||||||
|
{
|
||||||
|
var alignmentAction = newValue switch
|
||||||
|
{
|
||||||
|
0 => "justifyleft",
|
||||||
|
1 => "justifycenter",
|
||||||
|
2 => "justifyright",
|
||||||
|
3 => "justifyfull",
|
||||||
|
_ => throw new ArgumentOutOfRangeException(nameof(newValue))
|
||||||
|
};
|
||||||
|
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize(alignmentAction, BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[GeneratedDependencyProperty]
|
||||||
|
public partial bool IsEditorWebViewEditor { get; set; }
|
||||||
|
|
||||||
|
async partial void OnIsEditorWebViewEditorChanged(bool newValue)
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("toggleToolbar", JsonSerializer.Serialize(newValue, BasicTypesJsonContext.Default.Boolean));
|
||||||
|
}
|
||||||
|
|
||||||
|
private const string PART_WebView = "WebView";
|
||||||
|
private WebView2 _chromium;
|
||||||
|
private bool _disposedValue;
|
||||||
|
private readonly TaskCompletionSource<bool> _domLoadedTask = new();
|
||||||
|
|
||||||
|
public WebViewEditorControl()
|
||||||
|
{
|
||||||
|
this.DefaultStyleKey = typeof(WebViewEditorControl);
|
||||||
|
|
||||||
|
IsEditorIndentEnabled = true;
|
||||||
|
|
||||||
|
IsEditorDarkMode = _underlyingThemeService.IsUnderlyingThemeDark();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override async void OnApplyTemplate()
|
||||||
|
{
|
||||||
|
base.OnApplyTemplate();
|
||||||
|
|
||||||
|
_chromium = GetTemplateChild(PART_WebView) as WebView2;
|
||||||
|
|
||||||
|
await InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task InitializeComponent()
|
||||||
|
{
|
||||||
|
Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
|
||||||
|
Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,msOverlayScrollbarWinStyle,msOverlayScrollbarWinStyleAnimation");
|
||||||
|
_chromium.CoreWebView2Initialized += ChromiumInitialized;
|
||||||
|
|
||||||
|
await _chromium.EnsureCoreWebView2Async();
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void EditorIndentAsync()
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("indent", BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void EditorOutdentAsync()
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("editor.execCommand", JsonSerializer.Serialize("outdent", BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ToggleEditorTheme()
|
||||||
|
{
|
||||||
|
IsEditorDarkMode = !IsEditorDarkMode;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<string> GetHtmlBodyAsync()
|
||||||
|
{
|
||||||
|
var editorContent = await _chromium.ExecuteScriptFunctionSafeAsync("GetHTMLContent");
|
||||||
|
|
||||||
|
return JsonSerializer.Deserialize(editorContent, BasicTypesJsonContext.Default.String);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void ShowImagePicker()
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("imageInput.click");
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task InsertImagesAsync(List<ImageInfo> images)
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("insertImages", JsonSerializer.Serialize(images, DomainModelsJsonContext.Default.ListImageInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
public async void ShowEmojiPicker()
|
||||||
|
{
|
||||||
|
CoreInputView.GetForCurrentView().TryShow(CoreInputViewKind.Emoji);
|
||||||
|
|
||||||
|
await FocusEditorAsync(focusControlAsWell: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public WebView2 GetUnderlyingWebView() => _chromium;
|
||||||
|
|
||||||
|
public async Task RenderHtmlAsync(string htmlBody)
|
||||||
|
{
|
||||||
|
await _domLoadedTask.Task;
|
||||||
|
|
||||||
|
await UpdateEditorThemeAsync();
|
||||||
|
await InitializeEditorAsync();
|
||||||
|
|
||||||
|
await _chromium.ExecuteScriptFunctionAsync("RenderHTML", parameters: JsonSerializer.Serialize(string.IsNullOrEmpty(htmlBody) ? " " : htmlBody, BasicTypesJsonContext.Default.String));
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<string> InitializeEditorAsync()
|
||||||
|
{
|
||||||
|
var fonts = _fontService.GetFonts();
|
||||||
|
var composerFont = _preferencesService.ComposerFont;
|
||||||
|
int composerFontSize = _preferencesService.ComposerFontSize;
|
||||||
|
var readerFont = _preferencesService.ReaderFont;
|
||||||
|
int readerFontSize = _preferencesService.ReaderFontSize;
|
||||||
|
return await _chromium.ExecuteScriptFunctionAsync("initializeJodit", false,
|
||||||
|
JsonSerializer.Serialize(fonts, BasicTypesJsonContext.Default.ListString),
|
||||||
|
JsonSerializer.Serialize(composerFont, BasicTypesJsonContext.Default.String),
|
||||||
|
JsonSerializer.Serialize(composerFontSize, BasicTypesJsonContext.Default.Int32),
|
||||||
|
JsonSerializer.Serialize(readerFont, BasicTypesJsonContext.Default.String),
|
||||||
|
JsonSerializer.Serialize(readerFontSize, BasicTypesJsonContext.Default.Int32));
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void ChromiumInitialized(WebView2 sender, CoreWebView2InitializedEventArgs args)
|
||||||
|
{
|
||||||
|
var editorBundlePath = (await _nativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty);
|
||||||
|
|
||||||
|
_chromium.CoreWebView2.SetVirtualHostNameToFolderMapping("app.editor", editorBundlePath, CoreWebView2HostResourceAccessKind.Allow);
|
||||||
|
_chromium.Source = new Uri("https://app.editor/editor.html");
|
||||||
|
|
||||||
|
_chromium.CoreWebView2.DOMContentLoaded += DomLoaded;
|
||||||
|
|
||||||
|
_chromium.CoreWebView2.WebMessageReceived += ScriptMessageReceived;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task UpdateEditorThemeAsync()
|
||||||
|
{
|
||||||
|
await _domLoadedTask.Task;
|
||||||
|
|
||||||
|
if (IsEditorDarkMode)
|
||||||
|
{
|
||||||
|
_chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Dark;
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("SetDarkEditor");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
|
||||||
|
await _chromium.ExecuteScriptFunctionSafeAsync("SetLightEditor");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Places the cursor in the composer.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="focusControlAsWell">Whether control itself should be focused as well or not.</param>
|
||||||
|
public async Task FocusEditorAsync(bool focusControlAsWell)
|
||||||
|
{
|
||||||
|
await _chromium.ExecuteScriptSafeAsync("editor.selection.setCursorIn(editor.editor.firstChild, true)");
|
||||||
|
|
||||||
|
if (focusControlAsWell)
|
||||||
|
{
|
||||||
|
_chromium.Focus(FocusState.Keyboard);
|
||||||
|
_chromium.Focus(FocusState.Programmatic);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ScriptMessageReceived(CoreWebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)
|
||||||
|
{
|
||||||
|
var change = JsonSerializer.Deserialize(args.WebMessageAsJson, DomainModelsJsonContext.Default.WebViewMessage);
|
||||||
|
|
||||||
|
if (change.Type == "bold")
|
||||||
|
{
|
||||||
|
_isEditorBoldInternal = change.Value == "true";
|
||||||
|
IsEditorBold = _isEditorBoldInternal;
|
||||||
|
}
|
||||||
|
else if (change.Type == "italic")
|
||||||
|
{
|
||||||
|
_isEditorItalicInternal = change.Value == "true";
|
||||||
|
IsEditorItalic = _isEditorItalicInternal;
|
||||||
|
}
|
||||||
|
else if (change.Type == "underline")
|
||||||
|
{
|
||||||
|
_isEditorUnderlineInternal = change.Value == "true";
|
||||||
|
IsEditorUnderline = _isEditorUnderlineInternal;
|
||||||
|
}
|
||||||
|
else if (change.Type == "strikethrough")
|
||||||
|
{
|
||||||
|
_isEditorStrikethroughInternal = change.Value == "true";
|
||||||
|
IsEditorStrikethrough = _isEditorStrikethroughInternal;
|
||||||
|
}
|
||||||
|
else if (change.Type == "ol")
|
||||||
|
{
|
||||||
|
_isEditorOlInternal = change.Value == "true";
|
||||||
|
IsEditorOl = _isEditorOlInternal;
|
||||||
|
}
|
||||||
|
else if (change.Type == "ul")
|
||||||
|
{
|
||||||
|
_isEditorUlInternal = change.Value == "true";
|
||||||
|
IsEditorUl = _isEditorUlInternal;
|
||||||
|
}
|
||||||
|
else if (change.Type == "indent")
|
||||||
|
{
|
||||||
|
IsEditorIndentEnabled = change.Value != "disabled";
|
||||||
|
}
|
||||||
|
else if (change.Type == "outdent")
|
||||||
|
{
|
||||||
|
IsEditorOutdentEnabled = change.Value != "disabled";
|
||||||
|
}
|
||||||
|
else if (change.Type == "alignment")
|
||||||
|
{
|
||||||
|
var parsedValue = change.Value switch
|
||||||
|
{
|
||||||
|
"jodit-icon_left" => 0,
|
||||||
|
"jodit-icon_center" => 1,
|
||||||
|
"jodit-icon_right" => 2,
|
||||||
|
"jodit-icon_justify" => 3,
|
||||||
|
_ => 0
|
||||||
|
};
|
||||||
|
_editorAlignmentSelectedIndexInternal = parsedValue;
|
||||||
|
EditorAlignmentSelectedIndex = _editorAlignmentSelectedIndexInternal;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DomLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args) => _domLoadedTask.TrySetResult(true);
|
||||||
|
|
||||||
|
private void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (!_disposedValue)
|
||||||
|
{
|
||||||
|
if (disposing && _chromium != null)
|
||||||
|
{
|
||||||
|
_chromium.CoreWebView2Initialized -= ChromiumInitialized;
|
||||||
|
|
||||||
|
if (_chromium.CoreWebView2 != null)
|
||||||
|
{
|
||||||
|
_chromium.CoreWebView2.DOMContentLoaded -= DomLoaded;
|
||||||
|
_chromium.CoreWebView2.WebMessageReceived -= ScriptMessageReceived;
|
||||||
|
}
|
||||||
|
|
||||||
|
_chromium.Close();
|
||||||
|
}
|
||||||
|
_disposedValue = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
|
||||||
|
Dispose(disposing: true);
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,6 +5,7 @@
|
|||||||
xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
|
xmlns:accounts="using:Wino.Core.Domain.Models.Accounts"
|
||||||
xmlns:controls="using:Wino.Controls"
|
xmlns:controls="using:Wino.Controls"
|
||||||
xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
|
xmlns:controls1="using:CommunityToolkit.WinUI.Controls"
|
||||||
|
xmlns:controls2="using:Wino.Mail.Controls"
|
||||||
xmlns:coreControls="using:Wino.Core.UWP.Controls"
|
xmlns:coreControls="using:Wino.Core.UWP.Controls"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:domain="using:Wino.Core.Domain"
|
xmlns:domain="using:Wino.Core.Domain"
|
||||||
@@ -55,10 +56,10 @@
|
|||||||
IsOpen="False">
|
IsOpen="False">
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="InvertComposerThemeClicked"
|
Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
|
||||||
LabelPosition="Collapsed"
|
LabelPosition="Collapsed"
|
||||||
ToolTipService.ToolTip="Light Theme"
|
ToolTipService.ToolTip="Light Theme"
|
||||||
Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay}">
|
Visibility="{x:Bind WebViewEditor.IsEditorDarkMode, Mode=OneWay}">
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
<coreControls:WinoFontIcon Icon="LightEditor" />
|
<coreControls:WinoFontIcon Icon="LightEditor" />
|
||||||
</AppBarButton.Icon>
|
</AppBarButton.Icon>
|
||||||
@@ -66,10 +67,10 @@
|
|||||||
|
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="InvertComposerThemeClicked"
|
Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
|
||||||
LabelPosition="Collapsed"
|
LabelPosition="Collapsed"
|
||||||
ToolTipService.ToolTip="Dark Theme"
|
ToolTipService.ToolTip="Dark Theme"
|
||||||
Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
|
Visibility="{x:Bind WebViewEditor.IsEditorDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
<coreControls:WinoFontIcon Icon="DarkEditor" />
|
<coreControls:WinoFontIcon Icon="DarkEditor" />
|
||||||
</AppBarButton.Icon>
|
</AppBarButton.Icon>
|
||||||
@@ -78,9 +79,8 @@
|
|||||||
<AppBarSeparator />
|
<AppBarSeparator />
|
||||||
|
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton
|
||||||
x:Name="BoldButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="BoldButtonClicked"
|
IsChecked="{x:Bind WebViewEditor.IsEditorBold, Mode=TwoWay}"
|
||||||
Label="Bold"
|
Label="Bold"
|
||||||
ToolTipService.ToolTip="Bold">
|
ToolTipService.ToolTip="Bold">
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
@@ -88,9 +88,8 @@
|
|||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
</AppBarToggleButton>
|
</AppBarToggleButton>
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton
|
||||||
x:Name="ItalicButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="ItalicButtonClicked"
|
IsChecked="{x:Bind WebViewEditor.IsEditorItalic, Mode=TwoWay}"
|
||||||
Label="Italic"
|
Label="Italic"
|
||||||
ToolTipService.ToolTip="Italic">
|
ToolTipService.ToolTip="Italic">
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
@@ -98,9 +97,8 @@
|
|||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
</AppBarToggleButton>
|
</AppBarToggleButton>
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton
|
||||||
x:Name="UnderlineButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="UnderlineButtonClicked"
|
IsChecked="{x:Bind WebViewEditor.IsEditorUnderline, Mode=TwoWay}"
|
||||||
Label="Underline"
|
Label="Underline"
|
||||||
ToolTipService.ToolTip="Underline">
|
ToolTipService.ToolTip="Underline">
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
@@ -108,9 +106,8 @@
|
|||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
</AppBarToggleButton>
|
</AppBarToggleButton>
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton
|
||||||
x:Name="StrokeButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="StrokeButtonClicked"
|
IsChecked="{x:Bind WebViewEditor.IsEditorStrikethrough, Mode=TwoWay}"
|
||||||
Label="Stroke"
|
Label="Stroke"
|
||||||
ToolTipService.ToolTip="Stroke">
|
ToolTipService.ToolTip="Stroke">
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
@@ -119,9 +116,8 @@
|
|||||||
</AppBarToggleButton>
|
</AppBarToggleButton>
|
||||||
<AppBarSeparator />
|
<AppBarSeparator />
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton
|
||||||
x:Name="BulletListButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="BulletListButtonClicked"
|
IsChecked="{x:Bind WebViewEditor.IsEditorUl, Mode=TwoWay}"
|
||||||
Label="Bullet List"
|
Label="Bullet List"
|
||||||
ToolTipService.ToolTip="Bullet List">
|
ToolTipService.ToolTip="Bullet List">
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
@@ -129,9 +125,8 @@
|
|||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
</AppBarToggleButton>
|
</AppBarToggleButton>
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton
|
||||||
x:Name="OrderedListButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="OrderedListButtonClicked"
|
IsChecked="{x:Bind WebViewEditor.IsEditorOl, Mode=TwoWay}"
|
||||||
Label="Ordered List"
|
Label="Ordered List"
|
||||||
ToolTipService.ToolTip="Ordered List">
|
ToolTipService.ToolTip="Ordered List">
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
@@ -142,9 +137,9 @@
|
|||||||
<AppBarSeparator />
|
<AppBarSeparator />
|
||||||
|
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
x:Name="DecreaseIndentButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="DecreaseIndentClicked"
|
Click="{x:Bind WebViewEditor.EditorOutdentAsync}"
|
||||||
|
IsEnabled="{x:Bind WebViewEditor.IsEditorOutdentEnabled, Mode=OneWay}"
|
||||||
Label="Decrease Indent"
|
Label="Decrease Indent"
|
||||||
ToolTipService.ToolTip="Decrease Indent">
|
ToolTipService.ToolTip="Decrease Indent">
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
@@ -152,9 +147,9 @@
|
|||||||
</AppBarButton.Icon>
|
</AppBarButton.Icon>
|
||||||
</AppBarButton>
|
</AppBarButton>
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
x:Name="IncreaseIndentButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="IncreaseIndentClicked"
|
Click="{x:Bind WebViewEditor.EditorIndentAsync}"
|
||||||
|
IsEnabled="{x:Bind WebViewEditor.IsEditorIndentEnabled, Mode=OneWay}"
|
||||||
Label="Increase Indent"
|
Label="Increase Indent"
|
||||||
ToolTipService.ToolTip="Increase Indent">
|
ToolTipService.ToolTip="Increase Indent">
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
@@ -164,10 +159,9 @@
|
|||||||
|
|
||||||
<AppBarElementContainer VerticalAlignment="Center">
|
<AppBarElementContainer VerticalAlignment="Center">
|
||||||
<ComboBox
|
<ComboBox
|
||||||
x:Name="AlignmentListView"
|
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderBrush="Transparent"
|
BorderBrush="Transparent"
|
||||||
SelectionChanged="AlignmentChanged">
|
SelectedIndex="{x:Bind WebViewEditor.EditorAlignmentSelectedIndex, Mode=TwoWay}">
|
||||||
<ComboBoxItem IsSelected="True" Tag="left">
|
<ComboBoxItem IsSelected="True" Tag="left">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="8">
|
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||||
<Viewbox Width="16">
|
<Viewbox Width="16">
|
||||||
@@ -207,9 +201,8 @@
|
|||||||
</AppBarElementContainer>
|
</AppBarElementContainer>
|
||||||
<AppBarSeparator />
|
<AppBarSeparator />
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
x:Name="AddImageButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="AddImageClicked"
|
Click="{x:Bind WebViewEditor.ShowImagePicker}"
|
||||||
Label="Add Image"
|
Label="Add Image"
|
||||||
ToolTipService.ToolTip="{x:Bind domain:Translator.Photos}">
|
ToolTipService.ToolTip="{x:Bind domain:Translator.Photos}">
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
@@ -225,9 +218,8 @@
|
|||||||
</AppBarButton.Content>
|
</AppBarButton.Content>
|
||||||
</AppBarButton>
|
</AppBarButton>
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
x:Name="EmojiButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="EmojiButtonClicked"
|
Click="{x:Bind WebViewEditor.ShowEmojiPicker}"
|
||||||
Label="Add Emoji"
|
Label="Add Emoji"
|
||||||
ToolTipService.ToolTip="{x:Bind domain:Translator.Emoji}">
|
ToolTipService.ToolTip="{x:Bind domain:Translator.Emoji}">
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
@@ -236,9 +228,8 @@
|
|||||||
</AppBarButton>
|
</AppBarButton>
|
||||||
|
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton
|
||||||
x:Name="WebviewToolBarButton"
|
|
||||||
Width="48"
|
Width="48"
|
||||||
Click="WebViewToggleButtonClicked"
|
IsChecked="{x:Bind WebViewEditor.IsEditorWebViewEditor, Mode=TwoWay}"
|
||||||
Label="Webview ToolBar"
|
Label="Webview ToolBar"
|
||||||
ToolTipService.ToolTip="Webview ToolBar">
|
ToolTipService.ToolTip="Webview ToolBar">
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
@@ -252,11 +243,7 @@
|
|||||||
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
|
BorderBrush="{StaticResource CardStrokeColorDefaultBrush}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="3">
|
CornerRadius="3">
|
||||||
<Grid CornerRadius="3">
|
<controls2:WebViewEditorControl x:Name="WebViewEditor" />
|
||||||
<Grid Background="White" Visibility="{x:Bind IsComposerDarkMode, Converter={StaticResource ReverseBooleanToVisibilityConverter}, Mode=OneWay}" />
|
|
||||||
|
|
||||||
<muxc:WebView2 x:Name="Chromium" />
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -1,48 +1,20 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Microsoft.Web.WebView2.Core;
|
|
||||||
using Windows.UI.ViewManagement.Core;
|
|
||||||
using Windows.UI.Xaml;
|
|
||||||
using Windows.UI.Xaml.Controls;
|
using Windows.UI.Xaml.Controls;
|
||||||
using Wino.Core.Domain;
|
using Wino.Core.Domain;
|
||||||
using Wino.Core.Domain.Entities.Mail;
|
using Wino.Core.Domain.Entities.Mail;
|
||||||
using Wino.Core.Domain.Interfaces;
|
|
||||||
using Wino.Core.Domain.Models;
|
|
||||||
using Wino.Core.Domain.Models.Reader;
|
|
||||||
using Wino.Core.UWP.Extensions;
|
|
||||||
using Wino.Views.Settings;
|
|
||||||
|
|
||||||
namespace Wino.Dialogs;
|
namespace Wino.Dialogs;
|
||||||
|
|
||||||
public sealed partial class SignatureEditorDialog : ContentDialog
|
public sealed partial class SignatureEditorDialog : ContentDialog
|
||||||
{
|
{
|
||||||
private Func<Task<string>> _getHTMLBodyFunction;
|
|
||||||
private readonly TaskCompletionSource<bool> _domLoadedTask = new TaskCompletionSource<bool>();
|
|
||||||
|
|
||||||
private readonly INativeAppService _nativeAppService = App.Current.Services.GetService<INativeAppService>();
|
|
||||||
private readonly IFontService _fontService = App.Current.Services.GetService<IFontService>();
|
|
||||||
private readonly IPreferencesService _preferencesService = App.Current.Services.GetService<IPreferencesService>();
|
|
||||||
|
|
||||||
public AccountSignature Result;
|
public AccountSignature Result;
|
||||||
|
|
||||||
public bool IsComposerDarkMode
|
|
||||||
{
|
|
||||||
get { return (bool)GetValue(IsComposerDarkModeProperty); }
|
|
||||||
set { SetValue(IsComposerDarkModeProperty, value); }
|
|
||||||
}
|
|
||||||
|
|
||||||
public static readonly DependencyProperty IsComposerDarkModeProperty = DependencyProperty.Register(nameof(IsComposerDarkMode), typeof(bool), typeof(SignatureManagementPage), new PropertyMetadata(false, OnIsComposerDarkModeChanged));
|
|
||||||
|
|
||||||
public SignatureEditorDialog()
|
public SignatureEditorDialog()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
SignatureNameTextBox.Header = Translator.SignatureEditorDialog_SignatureName_TitleNew;
|
SignatureNameTextBox.Header = Translator.SignatureEditorDialog_SignatureName_TitleNew;
|
||||||
Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
|
|
||||||
Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,msOverlayScrollbarWinStyle,msOverlayScrollbarWinStyleAnimation,FontAccess");
|
|
||||||
|
|
||||||
// TODO: Should be added additional logic to enable/disable primary button when webview content changed.
|
// TODO: Should be added additional logic to enable/disable primary button when webview content changed.
|
||||||
IsPrimaryButtonEnabled = true;
|
IsPrimaryButtonEnabled = true;
|
||||||
@@ -62,8 +34,6 @@ public sealed partial class SignatureEditorDialog : ContentDialog
|
|||||||
MailAccountId = signatureModel.MailAccountId,
|
MailAccountId = signatureModel.MailAccountId,
|
||||||
HtmlBody = signatureModel.HtmlBody
|
HtmlBody = signatureModel.HtmlBody
|
||||||
};
|
};
|
||||||
Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
|
|
||||||
Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,msOverlayScrollbarWinStyle,msOverlayScrollbarWinStyleAnimation");
|
|
||||||
|
|
||||||
// TODO: Should be added additional logic to enable/disable primary button when webview content changed.
|
// TODO: Should be added additional logic to enable/disable primary button when webview content changed.
|
||||||
IsPrimaryButtonEnabled = true;
|
IsPrimaryButtonEnabled = true;
|
||||||
@@ -71,39 +41,17 @@ public sealed partial class SignatureEditorDialog : ContentDialog
|
|||||||
|
|
||||||
private async void SignatureDialogOpened(ContentDialog sender, ContentDialogOpenedEventArgs args)
|
private async void SignatureDialogOpened(ContentDialog sender, ContentDialogOpenedEventArgs args)
|
||||||
{
|
{
|
||||||
Chromium.CoreWebView2Initialized -= ChromiumInitialized;
|
await WebViewEditor.RenderHtmlAsync(Result?.HtmlBody ?? string.Empty);
|
||||||
Chromium.CoreWebView2Initialized += ChromiumInitialized;
|
|
||||||
|
|
||||||
await Chromium.EnsureCoreWebView2Async();
|
|
||||||
|
|
||||||
_getHTMLBodyFunction = new Func<Task<string>>(async () =>
|
|
||||||
{
|
|
||||||
var editorContent = await Chromium.ExecuteScriptFunctionSafeAsync("GetHTMLContent");
|
|
||||||
|
|
||||||
return JsonSerializer.Deserialize(editorContent, BasicTypesJsonContext.Default.String);
|
|
||||||
});
|
|
||||||
|
|
||||||
var underlyingThemeService = App.Current.Services.GetService<IUnderlyingThemeService>();
|
|
||||||
|
|
||||||
IsComposerDarkMode = underlyingThemeService.IsUnderlyingThemeDark();
|
|
||||||
|
|
||||||
await RenderInternalAsync(Result?.HtmlBody ?? string.Empty);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void DialogClosed(ContentDialog sender, ContentDialogClosedEventArgs args)
|
private void DialogClosed(ContentDialog sender, ContentDialogClosedEventArgs args)
|
||||||
{
|
{
|
||||||
Chromium.CoreWebView2Initialized -= ChromiumInitialized;
|
WebViewEditor.Dispose();
|
||||||
|
|
||||||
if (Chromium.CoreWebView2 != null)
|
|
||||||
{
|
|
||||||
Chromium.CoreWebView2.DOMContentLoaded -= DOMLoaded;
|
|
||||||
Chromium.CoreWebView2.WebMessageReceived -= ScriptMessageReceived;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
|
private async void SaveClicked(ContentDialog sender, ContentDialogButtonClickEventArgs args)
|
||||||
{
|
{
|
||||||
var newSignature = Regex.Unescape(await _getHTMLBodyFunction());
|
var newSignature = Regex.Unescape(await WebViewEditor.GetHtmlBodyAsync());
|
||||||
|
|
||||||
if (Result == null)
|
if (Result == null)
|
||||||
{
|
{
|
||||||
@@ -128,249 +76,5 @@ public sealed partial class SignatureEditorDialog : ContentDialog
|
|||||||
Hide();
|
Hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void BoldButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('bold')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void ItalicButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('italic')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void UnderlineButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('underline')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void StrokeButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('strikethrough')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void BulletListButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('insertunorderedlist')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void OrderedListButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('insertorderedlist')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void IncreaseIndentClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('indent')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void DecreaseIndentClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('outdent')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void AlignmentChanged(object sender, SelectionChangedEventArgs e)
|
|
||||||
{
|
|
||||||
var selectedItem = AlignmentListView.SelectedItem as ComboBoxItem;
|
|
||||||
var alignment = selectedItem.Tag.ToString();
|
|
||||||
|
|
||||||
switch (alignment)
|
|
||||||
{
|
|
||||||
case "left":
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('justifyleft')");
|
|
||||||
break;
|
|
||||||
case "center":
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('justifycenter')");
|
|
||||||
break;
|
|
||||||
case "right":
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('justifyright')");
|
|
||||||
break;
|
|
||||||
case "justify":
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('justifyfull')");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<string> InvokeScriptSafeAsync(string function)
|
|
||||||
{
|
|
||||||
if (Chromium == null) return string.Empty;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
|
|
||||||
return await Chromium.ExecuteScriptAsync(function);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine(ex.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Empty;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void AddImageClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("imageInput.click();");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task FocusEditorAsync()
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.selection.focus();");
|
|
||||||
|
|
||||||
Chromium.Focus(FocusState.Keyboard);
|
|
||||||
Chromium.Focus(FocusState.Programmatic);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void EmojiButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
CoreInputView.GetForCurrentView().TryShow(CoreInputViewKind.Emoji);
|
|
||||||
|
|
||||||
await FocusEditorAsync();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<string> TryGetSelectedTextAsync()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return await Chromium.ExecuteScriptAsync("getSelectedText();");
|
|
||||||
}
|
|
||||||
catch { }
|
|
||||||
|
|
||||||
return string.Empty;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void WebViewToggleButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
var enable = WebviewToolBarButton.IsChecked == true ? "true" : "false";
|
|
||||||
await InvokeScriptSafeAsync($"toggleToolbar('{enable}');");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task UpdateEditorThemeAsync()
|
|
||||||
{
|
|
||||||
await _domLoadedTask.Task;
|
|
||||||
|
|
||||||
if (IsComposerDarkMode)
|
|
||||||
{
|
|
||||||
Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Dark;
|
|
||||||
await InvokeScriptSafeAsync("SetDarkEditor();");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
|
|
||||||
await InvokeScriptSafeAsync("SetLightEditor();");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task RenderInternalAsync(string htmlBody)
|
|
||||||
{
|
|
||||||
await _domLoadedTask.Task;
|
|
||||||
|
|
||||||
await UpdateEditorThemeAsync();
|
|
||||||
await InitializeEditorAsync();
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(htmlBody))
|
|
||||||
{
|
|
||||||
await Chromium.ExecuteScriptFunctionAsync("RenderHTML", parameters: JsonSerializer.Serialize(" ", BasicTypesJsonContext.Default.String));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
await Chromium.ExecuteScriptFunctionAsync("RenderHTML", parameters: JsonSerializer.Serialize(htmlBody, BasicTypesJsonContext.Default.String));
|
|
||||||
|
|
||||||
await FocusEditorAsync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<string> InitializeEditorAsync()
|
|
||||||
{
|
|
||||||
var fonts = _fontService.GetFonts();
|
|
||||||
var composerFont = _preferencesService.ComposerFont;
|
|
||||||
int composerFontSize = _preferencesService.ComposerFontSize;
|
|
||||||
var readerFont = _preferencesService.ReaderFont;
|
|
||||||
int readerFontSize = _preferencesService.ReaderFontSize;
|
|
||||||
return await Chromium.ExecuteScriptFunctionAsync("initializeJodit", false,
|
|
||||||
JsonSerializer.Serialize(fonts, BasicTypesJsonContext.Default.ListString),
|
|
||||||
JsonSerializer.Serialize(composerFont, BasicTypesJsonContext.Default.String),
|
|
||||||
JsonSerializer.Serialize(composerFontSize, BasicTypesJsonContext.Default.Int32),
|
|
||||||
JsonSerializer.Serialize(readerFont, BasicTypesJsonContext.Default.String),
|
|
||||||
JsonSerializer.Serialize(readerFontSize, BasicTypesJsonContext.Default.Int32));
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void ChromiumInitialized(Microsoft.UI.Xaml.Controls.WebView2 sender, Microsoft.UI.Xaml.Controls.CoreWebView2InitializedEventArgs args)
|
|
||||||
{
|
|
||||||
var editorBundlePath = (await _nativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty);
|
|
||||||
|
|
||||||
Chromium.CoreWebView2.SetVirtualHostNameToFolderMapping("app.editor", editorBundlePath, CoreWebView2HostResourceAccessKind.Allow);
|
|
||||||
Chromium.Source = new Uri("https://app.editor/editor.html");
|
|
||||||
|
|
||||||
Chromium.CoreWebView2.DOMContentLoaded -= DOMLoaded;
|
|
||||||
Chromium.CoreWebView2.DOMContentLoaded += DOMLoaded;
|
|
||||||
|
|
||||||
Chromium.CoreWebView2.WebMessageReceived -= ScriptMessageReceived;
|
|
||||||
Chromium.CoreWebView2.WebMessageReceived += ScriptMessageReceived;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async void OnIsComposerDarkModeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
|
|
||||||
{
|
|
||||||
if (obj is SignatureEditorDialog dialog)
|
|
||||||
{
|
|
||||||
await dialog.UpdateEditorThemeAsync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ScriptMessageReceived(CoreWebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)
|
|
||||||
{
|
|
||||||
var change = JsonSerializer.Deserialize(args.WebMessageAsJson, DomainModelsJsonContext.Default.WebViewMessage);
|
|
||||||
|
|
||||||
if (change.Type == "bold")
|
|
||||||
{
|
|
||||||
BoldButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "italic")
|
|
||||||
{
|
|
||||||
ItalicButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "underline")
|
|
||||||
{
|
|
||||||
UnderlineButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "strikethrough")
|
|
||||||
{
|
|
||||||
StrokeButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "ol")
|
|
||||||
{
|
|
||||||
OrderedListButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "ul")
|
|
||||||
{
|
|
||||||
BulletListButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "indent")
|
|
||||||
{
|
|
||||||
IncreaseIndentButton.IsEnabled = change.Value == "disabled" ? false : true;
|
|
||||||
}
|
|
||||||
else if (change.Type == "outdent")
|
|
||||||
{
|
|
||||||
DecreaseIndentButton.IsEnabled = change.Value == "disabled" ? false : true;
|
|
||||||
}
|
|
||||||
else if (change.Type == "alignment")
|
|
||||||
{
|
|
||||||
var parsedValue = change.Value switch
|
|
||||||
{
|
|
||||||
"jodit-icon_left" => 0,
|
|
||||||
"jodit-icon_center" => 1,
|
|
||||||
"jodit-icon_right" => 2,
|
|
||||||
"jodit-icon_justify" => 3,
|
|
||||||
_ => 0
|
|
||||||
};
|
|
||||||
AlignmentListView.SelectionChanged -= AlignmentChanged;
|
|
||||||
AlignmentListView.SelectedIndex = parsedValue;
|
|
||||||
AlignmentListView.SelectionChanged += AlignmentChanged;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void DOMLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args) => _domLoadedTask.TrySetResult(true);
|
|
||||||
|
|
||||||
private void SignatureNameTextBoxTextChanged(object sender, TextChangedEventArgs e) => IsPrimaryButtonEnabled = !string.IsNullOrWhiteSpace(SignatureNameTextBox.Text);
|
private void SignatureNameTextBoxTextChanged(object sender, TextChangedEventArgs e) => IsPrimaryButtonEnabled = !string.IsNullOrWhiteSpace(SignatureNameTextBox.Text);
|
||||||
|
|
||||||
private void InvertComposerThemeClicked(object sender, RoutedEventArgs e) => IsComposerDarkMode = !IsComposerDarkMode;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ function SetDarkEditor() {
|
|||||||
|
|
||||||
function toggleToolbar(enable) {
|
function toggleToolbar(enable) {
|
||||||
const toolbar = document.querySelector('.jodit-toolbar__box');
|
const toolbar = document.querySelector('.jodit-toolbar__box');
|
||||||
if (enable == 'true') {
|
if (enable) {
|
||||||
toolbar.style.display = 'flex';
|
toolbar.style.display = 'flex';
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
21
Wino.Mail/Styles/WebViewEditorControl.xaml
Normal file
21
Wino.Mail/Styles/WebViewEditorControl.xaml
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<ResourceDictionary
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:controls="using:Wino.Mail.Controls"
|
||||||
|
xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
|
||||||
|
|
||||||
|
<Style TargetType="controls:WebViewEditorControl">
|
||||||
|
<Style.Setters>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="controls:WebViewEditorControl">
|
||||||
|
<Grid CornerRadius="3">
|
||||||
|
<Grid Background="White" Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=IsEditorDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}" />
|
||||||
|
<muxc:WebView2 x:Name="WebView" />
|
||||||
|
</Grid>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style.Setters>
|
||||||
|
</Style>
|
||||||
|
</ResourceDictionary>
|
||||||
@@ -4,6 +4,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:abstract="using:Wino.Views.Abstract"
|
xmlns:abstract="using:Wino.Views.Abstract"
|
||||||
xmlns:controls="using:Wino.Controls"
|
xmlns:controls="using:Wino.Controls"
|
||||||
|
xmlns:controls1="using:Wino.Mail.Controls"
|
||||||
xmlns:coreControls="using:Wino.Core.UWP.Controls"
|
xmlns:coreControls="using:Wino.Core.UWP.Controls"
|
||||||
xmlns:customcontrols="using:Wino.Core.UWP.Controls.CustomControls"
|
xmlns:customcontrols="using:Wino.Core.UWP.Controls.CustomControls"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
@@ -189,20 +190,20 @@
|
|||||||
IsDynamicOverflowEnabled="True"
|
IsDynamicOverflowEnabled="True"
|
||||||
OverflowButtonAlignment="Left">
|
OverflowButtonAlignment="Left">
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
Click="InvertComposerThemeClicked"
|
Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
|
||||||
LabelPosition="Collapsed"
|
LabelPosition="Collapsed"
|
||||||
ToolTipService.ToolTip="Light Theme"
|
ToolTipService.ToolTip="Light Theme"
|
||||||
Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay}">
|
Visibility="{x:Bind WebViewEditor.IsEditorDarkMode, Mode=OneWay}">
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
<coreControls:WinoFontIcon Icon="LightEditor" />
|
<coreControls:WinoFontIcon Icon="LightEditor" />
|
||||||
</AppBarButton.Icon>
|
</AppBarButton.Icon>
|
||||||
</AppBarButton>
|
</AppBarButton>
|
||||||
|
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
Click="InvertComposerThemeClicked"
|
Click="{x:Bind WebViewEditor.ToggleEditorTheme}"
|
||||||
LabelPosition="Collapsed"
|
LabelPosition="Collapsed"
|
||||||
ToolTipService.ToolTip="Dark Theme"
|
ToolTipService.ToolTip="Dark Theme"
|
||||||
Visibility="{x:Bind IsComposerDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
|
Visibility="{x:Bind WebViewEditor.IsEditorDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}">
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
<coreControls:WinoFontIcon Icon="DarkEditor" />
|
<coreControls:WinoFontIcon Icon="DarkEditor" />
|
||||||
</AppBarButton.Icon>
|
</AppBarButton.Icon>
|
||||||
@@ -222,34 +223,22 @@
|
|||||||
</toolkit:TabbedCommandBar.PaneCustomContent>
|
</toolkit:TabbedCommandBar.PaneCustomContent>
|
||||||
<toolkit:TabbedCommandBar.MenuItems>
|
<toolkit:TabbedCommandBar.MenuItems>
|
||||||
<toolkit:TabbedCommandBarItem DefaultLabelPosition="Collapsed" Header="{x:Bind domain:Translator.EditorToolbarOption_Format}">
|
<toolkit:TabbedCommandBarItem DefaultLabelPosition="Collapsed" Header="{x:Bind domain:Translator.EditorToolbarOption_Format}">
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorBold, Mode=TwoWay}" Label="Bold">
|
||||||
x:Name="BoldButton"
|
|
||||||
Click="BoldButtonClicked"
|
|
||||||
Label="Bold">
|
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
<PathIcon Data="{StaticResource BoldPathIcon}" />
|
<PathIcon Data="{StaticResource BoldPathIcon}" />
|
||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
</AppBarToggleButton>
|
</AppBarToggleButton>
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorItalic, Mode=TwoWay}" Label="Italic">
|
||||||
x:Name="ItalicButton"
|
|
||||||
Click="ItalicButtonClicked"
|
|
||||||
Label="Italic">
|
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
<PathIcon Data="{StaticResource ItalicPathIcon}" />
|
<PathIcon Data="{StaticResource ItalicPathIcon}" />
|
||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
</AppBarToggleButton>
|
</AppBarToggleButton>
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorUnderline, Mode=TwoWay}" Label="Underline">
|
||||||
x:Name="UnderlineButton"
|
|
||||||
Click="UnderlineButtonClicked"
|
|
||||||
Label="Underline">
|
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
<PathIcon Data="{StaticResource UnderlinePathIcon}" />
|
<PathIcon Data="{StaticResource UnderlinePathIcon}" />
|
||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
</AppBarToggleButton>
|
</AppBarToggleButton>
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorStrikethrough, Mode=TwoWay}" Label="Stroke">
|
||||||
x:Name="StrokeButton"
|
|
||||||
Click="StrokeButtonClicked"
|
|
||||||
Label="Stroke">
|
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
<PathIcon Data="{StaticResource StrikePathIcon}" />
|
<PathIcon Data="{StaticResource StrikePathIcon}" />
|
||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
@@ -257,19 +246,13 @@
|
|||||||
|
|
||||||
<AppBarSeparator />
|
<AppBarSeparator />
|
||||||
|
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorUl, Mode=TwoWay}" Label="Bullet List">
|
||||||
x:Name="BulletListButton"
|
|
||||||
Click="BulletListButtonClicked"
|
|
||||||
Label="Bullet List">
|
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
<PathIcon Data="{StaticResource BulletedListPathIcon}" />
|
<PathIcon Data="{StaticResource BulletedListPathIcon}" />
|
||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
</AppBarToggleButton>
|
</AppBarToggleButton>
|
||||||
|
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton IsChecked="{x:Bind WebViewEditor.IsEditorOl, Mode=TwoWay}" Label="Ordered List">
|
||||||
x:Name="OrderedListButton"
|
|
||||||
Click="OrderedListButtonClicked"
|
|
||||||
Label="Ordered List">
|
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
<PathIcon Data="{StaticResource OrderedListPathIcon}" />
|
<PathIcon Data="{StaticResource OrderedListPathIcon}" />
|
||||||
</AppBarToggleButton.Icon>
|
</AppBarToggleButton.Icon>
|
||||||
@@ -278,8 +261,8 @@
|
|||||||
<AppBarSeparator />
|
<AppBarSeparator />
|
||||||
|
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
x:Name="DecreaseIndentButton"
|
Click="{x:Bind WebViewEditor.EditorOutdentAsync}"
|
||||||
Click="DecreaseIndentClicked"
|
IsEnabled="{x:Bind WebViewEditor.IsEditorOutdentEnabled, Mode=OneWay}"
|
||||||
Label="Outdent">
|
Label="Outdent">
|
||||||
<AppBarButton.Content>
|
<AppBarButton.Content>
|
||||||
<Viewbox Width="16">
|
<Viewbox Width="16">
|
||||||
@@ -289,8 +272,8 @@
|
|||||||
</AppBarButton>
|
</AppBarButton>
|
||||||
|
|
||||||
<AppBarButton
|
<AppBarButton
|
||||||
x:Name="IncreaseIndentButton"
|
Click="{x:Bind WebViewEditor.EditorIndentAsync}"
|
||||||
Click="IncreaseIndentClicked"
|
IsEnabled="{x:Bind WebViewEditor.IsEditorIndentEnabled, Mode=OneWay}"
|
||||||
Label="Indent">
|
Label="Indent">
|
||||||
<AppBarButton.Content>
|
<AppBarButton.Content>
|
||||||
<Viewbox Width="16">
|
<Viewbox Width="16">
|
||||||
@@ -305,7 +288,7 @@
|
|||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderBrush="Transparent"
|
BorderBrush="Transparent"
|
||||||
SelectionChanged="AlignmentChanged">
|
SelectedIndex="{x:Bind WebViewEditor.EditorAlignmentSelectedIndex, Mode=TwoWay}">
|
||||||
<ComboBoxItem IsSelected="True" Tag="left">
|
<ComboBoxItem IsSelected="True" Tag="left">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="8">
|
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||||
<Viewbox Width="16">
|
<Viewbox Width="16">
|
||||||
@@ -347,8 +330,7 @@
|
|||||||
<AppBarSeparator />
|
<AppBarSeparator />
|
||||||
|
|
||||||
<AppBarToggleButton
|
<AppBarToggleButton
|
||||||
x:Name="WebviewToolBarButton"
|
IsChecked="{x:Bind WebViewEditor.IsEditorWebViewEditor, Mode=TwoWay}"
|
||||||
Click="WebViewToggleButtonClicked"
|
|
||||||
Label="{x:Bind domain:Translator.EditorTooltip_WebViewEditor}"
|
Label="{x:Bind domain:Translator.EditorTooltip_WebViewEditor}"
|
||||||
ToolTipService.ToolTip="{x:Bind domain:Translator.EditorTooltip_WebViewEditor}">
|
ToolTipService.ToolTip="{x:Bind domain:Translator.EditorTooltip_WebViewEditor}">
|
||||||
<AppBarToggleButton.Icon>
|
<AppBarToggleButton.Icon>
|
||||||
@@ -368,19 +350,13 @@
|
|||||||
</AppBarButton.Icon>
|
</AppBarButton.Icon>
|
||||||
</AppBarButton>
|
</AppBarButton>
|
||||||
|
|
||||||
<AppBarButton
|
<AppBarButton Click="{x:Bind WebViewEditor.ShowImagePicker}" Label="{x:Bind domain:Translator.Photos}">
|
||||||
x:Name="AddImageButton"
|
|
||||||
Click="AddImageClicked"
|
|
||||||
Label="{x:Bind domain:Translator.Photos}">
|
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
<PathIcon Data="{StaticResource AddPhotoPathIcon}" />
|
<PathIcon Data="{StaticResource AddPhotoPathIcon}" />
|
||||||
</AppBarButton.Icon>
|
</AppBarButton.Icon>
|
||||||
</AppBarButton>
|
</AppBarButton>
|
||||||
|
|
||||||
<AppBarButton
|
<AppBarButton Click="{x:Bind WebViewEditor.ShowEmojiPicker}" Label="{x:Bind domain:Translator.Emoji}">
|
||||||
x:Name="EmojiButton"
|
|
||||||
Click="EmojiButtonClicked"
|
|
||||||
Label="{x:Bind domain:Translator.Emoji}">
|
|
||||||
<AppBarButton.Icon>
|
<AppBarButton.Icon>
|
||||||
<PathIcon Data="{StaticResource EmojiPathIcon}" />
|
<PathIcon Data="{StaticResource EmojiPathIcon}" />
|
||||||
</AppBarButton.Icon>
|
</AppBarButton.Icon>
|
||||||
@@ -630,9 +606,7 @@
|
|||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="7">
|
CornerRadius="7">
|
||||||
<Grid Margin="1" CornerRadius="7">
|
<Grid Margin="1" CornerRadius="7">
|
||||||
<Grid Background="White" Visibility="{x:Bind IsComposerDarkMode, Converter={StaticResource ReverseBooleanToVisibilityConverter}, Mode=OneWay}" />
|
<controls1:WebViewEditorControl x:Name="WebViewEditor" />
|
||||||
|
|
||||||
<muxc:WebView2 x:Name="Chromium" />
|
|
||||||
|
|
||||||
<!-- Dropzone for images -->
|
<!-- Dropzone for images -->
|
||||||
<Grid
|
<Grid
|
||||||
|
|||||||
@@ -1,33 +1,24 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.ObjectModel;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using CommunityToolkit.Mvvm.Messaging;
|
using CommunityToolkit.Mvvm.Messaging;
|
||||||
using CommunityToolkit.WinUI.Controls;
|
using CommunityToolkit.WinUI.Controls;
|
||||||
using EmailValidation;
|
using EmailValidation;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using Microsoft.Web.WebView2.Core;
|
|
||||||
using MimeKit;
|
using MimeKit;
|
||||||
using Windows.ApplicationModel.DataTransfer;
|
using Windows.ApplicationModel.DataTransfer;
|
||||||
using Windows.Foundation;
|
using Windows.Foundation;
|
||||||
using Windows.Storage;
|
using Windows.Storage;
|
||||||
using Windows.UI.Core.Preview;
|
using Windows.UI.Core.Preview;
|
||||||
using Windows.UI.ViewManagement.Core;
|
|
||||||
using Windows.UI.Xaml;
|
using Windows.UI.Xaml;
|
||||||
using Windows.UI.Xaml.Controls;
|
using Windows.UI.Xaml.Controls;
|
||||||
using Windows.UI.Xaml.Input;
|
using Windows.UI.Xaml.Input;
|
||||||
using Windows.UI.Xaml.Media.Animation;
|
|
||||||
using Windows.UI.Xaml.Navigation;
|
using Windows.UI.Xaml.Navigation;
|
||||||
using Wino.Core.Domain;
|
using Wino.Core.Domain;
|
||||||
using Wino.Core.Domain.Entities.Shared;
|
using Wino.Core.Domain.Entities.Shared;
|
||||||
using Wino.Core.Domain.Interfaces;
|
|
||||||
using Wino.Core.Domain.Models;
|
|
||||||
using Wino.Core.Domain.Models.Reader;
|
using Wino.Core.Domain.Models.Reader;
|
||||||
using Wino.Core.UWP.Extensions;
|
using Wino.Core.UWP.Extensions;
|
||||||
using Wino.Mail.ViewModels.Data;
|
using Wino.Mail.ViewModels.Data;
|
||||||
@@ -41,27 +32,15 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
IRecipient<CreateNewComposeMailRequested>,
|
IRecipient<CreateNewComposeMailRequested>,
|
||||||
IRecipient<ApplicationThemeChanged>
|
IRecipient<ApplicationThemeChanged>
|
||||||
{
|
{
|
||||||
public bool IsComposerDarkMode
|
public WebView2 GetWebView() => WebViewEditor.GetUnderlyingWebView();
|
||||||
{
|
|
||||||
get { return (bool)GetValue(IsComposerDarkModeProperty); }
|
|
||||||
set { SetValue(IsComposerDarkModeProperty, value); }
|
|
||||||
}
|
|
||||||
|
|
||||||
public static readonly DependencyProperty IsComposerDarkModeProperty = DependencyProperty.Register(nameof(IsComposerDarkMode), typeof(bool), typeof(ComposePage), new PropertyMetadata(false, OnIsComposerDarkModeChanged));
|
private readonly List<IDisposable> _disposables = [];
|
||||||
public WebView2 GetWebView() => Chromium;
|
|
||||||
|
|
||||||
private readonly TaskCompletionSource<bool> _domLoadedTask = new TaskCompletionSource<bool>();
|
|
||||||
|
|
||||||
private readonly List<IDisposable> _disposables = new List<IDisposable>();
|
|
||||||
private readonly SystemNavigationManagerPreview _navManagerPreview = SystemNavigationManagerPreview.GetForCurrentView();
|
private readonly SystemNavigationManagerPreview _navManagerPreview = SystemNavigationManagerPreview.GetForCurrentView();
|
||||||
|
|
||||||
public ComposePage()
|
public ComposePage()
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
_navManagerPreview.CloseRequested += OnClose;
|
_navManagerPreview.CloseRequested += OnClose;
|
||||||
|
|
||||||
Environment.SetEnvironmentVariable("WEBVIEW2_DEFAULT_BACKGROUND_COLOR", "00FFFFFF");
|
|
||||||
Environment.SetEnvironmentVariable("WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS", "--enable-features=OverlayScrollbar,msOverlayScrollbarWinStyle,msOverlayScrollbarWinStyleAnimation");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void GlobalFocusManagerGotFocus(object sender, FocusManagerGotFocusEventArgs e)
|
private async void GlobalFocusManagerGotFocus(object sender, FocusManagerGotFocusEventArgs e)
|
||||||
@@ -71,17 +50,9 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
// This is not done on the WebView2 handlers, because somehow it is
|
// This is not done on the WebView2 handlers, because somehow it is
|
||||||
// repeatedly focusing itself, even though when it has the focus already.
|
// repeatedly focusing itself, even though when it has the focus already.
|
||||||
|
|
||||||
if (e.NewFocusedElement == Chromium)
|
if (e.NewFocusedElement == WebViewEditor)
|
||||||
{
|
{
|
||||||
await FocusEditorAsync(false);
|
await WebViewEditor.FocusEditorAsync(false);
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static async void OnIsComposerDarkModeChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
|
|
||||||
{
|
|
||||||
if (obj is ComposePage page)
|
|
||||||
{
|
|
||||||
await page.UpdateEditorThemeAsync();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -216,7 +187,7 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await InvokeScriptSafeAsync($"insertImages({JsonSerializer.Serialize(imagesInformation, ComposerPageJsonContext.Default.ListImageInfo)});");
|
await WebViewEditor.InsertImagesAsync(imagesInformation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// State should be reset even when an exception occurs, otherwise the UI will be stuck in a dragging state.
|
// State should be reset even when an exception occurs, otherwise the UI will be stuck in a dragging state.
|
||||||
@@ -245,299 +216,41 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool IsValidImageFile(StorageFile file)
|
private static bool IsValidImageFile(StorageFile file)
|
||||||
{
|
{
|
||||||
string[] allowedTypes = new string[] { ".jpg", ".jpeg", ".png" };
|
string[] allowedTypes = [".jpg", ".jpeg", ".png"];
|
||||||
var fileType = file.FileType.ToLower();
|
var fileType = file.FileType.ToLower();
|
||||||
|
|
||||||
return allowedTypes.Contains(fileType);
|
return allowedTypes.Contains(fileType);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void BoldButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('bold')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void ItalicButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('italic')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void UnderlineButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('underline')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void StrokeButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('strikethrough')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void BulletListButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('insertunorderedlist')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void OrderedListButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('insertorderedlist')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void IncreaseIndentClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('indent')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void DecreaseIndentClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('outdent')");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void AlignmentChanged(object sender, SelectionChangedEventArgs e)
|
|
||||||
{
|
|
||||||
var selectedItem = AlignmentListView.SelectedItem as ComboBoxItem;
|
|
||||||
var alignment = selectedItem.Tag.ToString();
|
|
||||||
|
|
||||||
switch (alignment)
|
|
||||||
{
|
|
||||||
case "left":
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('justifyleft')");
|
|
||||||
break;
|
|
||||||
case "center":
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('justifycenter')");
|
|
||||||
break;
|
|
||||||
case "right":
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('justifyright')");
|
|
||||||
break;
|
|
||||||
case "justify":
|
|
||||||
await InvokeScriptSafeAsync("editor.execCommand('justifyfull')");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void WebViewToggleButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
var enable = WebviewToolBarButton.IsChecked == true ? "true" : "false";
|
|
||||||
await InvokeScriptSafeAsync($"toggleToolbar('{enable}');");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<string> InvokeScriptSafeAsync(string function)
|
|
||||||
{
|
|
||||||
if (Chromium == null) return string.Empty;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return await Chromium.ExecuteScriptAsync(function);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine(ex.Message);
|
|
||||||
}
|
|
||||||
|
|
||||||
return string.Empty;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void AddImageClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("imageInput.click();");
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Places the cursor in the composer.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="focusControlAsWell">Whether control itself should be focused as well or not.</param>
|
|
||||||
private async Task FocusEditorAsync(bool focusControlAsWell)
|
|
||||||
{
|
|
||||||
await InvokeScriptSafeAsync("editor.selection.setCursorIn(editor.editor.firstChild, true)");
|
|
||||||
|
|
||||||
if (focusControlAsWell)
|
|
||||||
{
|
|
||||||
Chromium.Focus(FocusState.Keyboard);
|
|
||||||
Chromium.Focus(FocusState.Programmatic);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void EmojiButtonClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
CoreInputView.GetForCurrentView().TryShow(CoreInputViewKind.Emoji);
|
|
||||||
|
|
||||||
await FocusEditorAsync(focusControlAsWell: true);
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task UpdateEditorThemeAsync()
|
|
||||||
{
|
|
||||||
await _domLoadedTask.Task;
|
|
||||||
|
|
||||||
if (IsComposerDarkMode)
|
|
||||||
{
|
|
||||||
Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Dark;
|
|
||||||
await InvokeScriptSafeAsync("SetDarkEditor();");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Chromium.CoreWebView2.Profile.PreferredColorScheme = CoreWebView2PreferredColorScheme.Light;
|
|
||||||
await InvokeScriptSafeAsync("SetLightEditor();");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task RenderInternalAsync(string htmlBody)
|
|
||||||
{
|
|
||||||
await _domLoadedTask.Task;
|
|
||||||
|
|
||||||
await UpdateEditorThemeAsync();
|
|
||||||
await InitializeEditorAsync();
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(htmlBody))
|
|
||||||
{
|
|
||||||
await Chromium.ExecuteScriptFunctionAsync("RenderHTML", parameters: JsonSerializer.Serialize(" ", BasicTypesJsonContext.Default.String));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
await Chromium.ExecuteScriptFunctionAsync("RenderHTML", parameters: JsonSerializer.Serialize(htmlBody, BasicTypesJsonContext.Default.String));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<string> InitializeEditorAsync()
|
|
||||||
{
|
|
||||||
var fonts = ViewModel.FontService.GetFonts();
|
|
||||||
var composerFont = ViewModel.PreferencesService.ComposerFont;
|
|
||||||
int composerFontSize = ViewModel.PreferencesService.ComposerFontSize;
|
|
||||||
var readerFont = ViewModel.PreferencesService.ReaderFont;
|
|
||||||
int readerFontSize = ViewModel.PreferencesService.ReaderFontSize;
|
|
||||||
return await Chromium.ExecuteScriptFunctionAsync("initializeJodit",
|
|
||||||
false,
|
|
||||||
JsonSerializer.Serialize(fonts, BasicTypesJsonContext.Default.ListString),
|
|
||||||
JsonSerializer.Serialize(composerFont, BasicTypesJsonContext.Default.String),
|
|
||||||
JsonSerializer.Serialize(composerFontSize, BasicTypesJsonContext.Default.Int32),
|
|
||||||
JsonSerializer.Serialize(readerFont, BasicTypesJsonContext.Default.String),
|
|
||||||
JsonSerializer.Serialize(readerFontSize, BasicTypesJsonContext.Default.Int32));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void DisposeWebView2()
|
|
||||||
{
|
|
||||||
if (Chromium == null) return;
|
|
||||||
|
|
||||||
Chromium.CoreWebView2Initialized -= ChromiumInitialized;
|
|
||||||
|
|
||||||
if (Chromium.CoreWebView2 != null)
|
|
||||||
{
|
|
||||||
Chromium.CoreWebView2.DOMContentLoaded -= DOMLoaded;
|
|
||||||
Chromium.CoreWebView2.WebMessageReceived -= ScriptMessageReceived;
|
|
||||||
}
|
|
||||||
|
|
||||||
Chromium.Close();
|
|
||||||
GC.Collect();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void DisposeDisposables()
|
private void DisposeDisposables()
|
||||||
{
|
{
|
||||||
if (_disposables.Any())
|
if (_disposables.Count != 0)
|
||||||
_disposables.ForEach(a => a.Dispose());
|
_disposables.ForEach(a => a.Dispose());
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override async void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
base.OnNavigatedTo(e);
|
base.OnNavigatedTo(e);
|
||||||
|
|
||||||
FocusManager.GotFocus += GlobalFocusManagerGotFocus;
|
FocusManager.GotFocus += GlobalFocusManagerGotFocus;
|
||||||
|
|
||||||
var anim = ConnectedAnimationService.GetForCurrentView().GetAnimation("WebViewConnectedAnimation");
|
// TODO: disabled animation for now, since it's still not working properly.
|
||||||
anim?.TryStart(Chromium);
|
//var anim = ConnectedAnimationService.GetForCurrentView().GetAnimation("WebViewConnectedAnimation");
|
||||||
|
//anim?.TryStart(GetWebView());
|
||||||
DisposeDisposables();
|
|
||||||
|
|
||||||
_disposables.Add(GetSuggestionBoxDisposable(ToBox));
|
_disposables.Add(GetSuggestionBoxDisposable(ToBox));
|
||||||
_disposables.Add(GetSuggestionBoxDisposable(CCBox));
|
_disposables.Add(GetSuggestionBoxDisposable(CCBox));
|
||||||
_disposables.Add(GetSuggestionBoxDisposable(BccBox));
|
_disposables.Add(GetSuggestionBoxDisposable(BccBox));
|
||||||
|
_disposables.Add(WebViewEditor);
|
||||||
|
|
||||||
Chromium.CoreWebView2Initialized -= ChromiumInitialized;
|
ViewModel.GetHTMLBodyFunction = WebViewEditor.GetHtmlBodyAsync;
|
||||||
Chromium.CoreWebView2Initialized += ChromiumInitialized;
|
|
||||||
|
|
||||||
await Chromium.EnsureCoreWebView2Async();
|
|
||||||
|
|
||||||
ViewModel.GetHTMLBodyFunction = new Func<Task<string>>(async () =>
|
|
||||||
{
|
|
||||||
var editorContent = await InvokeScriptSafeAsync("GetHTMLContent();");
|
|
||||||
|
|
||||||
return JsonSerializer.Deserialize(editorContent, BasicTypesJsonContext.Default.String);
|
|
||||||
});
|
|
||||||
|
|
||||||
var underlyingThemeService = App.Current.Services.GetService<IUnderlyingThemeService>();
|
|
||||||
|
|
||||||
IsComposerDarkMode = underlyingThemeService.IsUnderlyingThemeDark();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void ChromiumInitialized(Microsoft.UI.Xaml.Controls.WebView2 sender, Microsoft.UI.Xaml.Controls.CoreWebView2InitializedEventArgs args)
|
|
||||||
{
|
|
||||||
var editorBundlePath = (await ViewModel.NativeAppService.GetEditorBundlePathAsync()).Replace("editor.html", string.Empty);
|
|
||||||
|
|
||||||
Chromium.CoreWebView2.SetVirtualHostNameToFolderMapping("app.editor", editorBundlePath, CoreWebView2HostResourceAccessKind.Allow);
|
|
||||||
Chromium.Source = new Uri("https://app.editor/editor.html");
|
|
||||||
|
|
||||||
Chromium.CoreWebView2.DOMContentLoaded -= DOMLoaded;
|
|
||||||
Chromium.CoreWebView2.DOMContentLoaded += DOMLoaded;
|
|
||||||
|
|
||||||
Chromium.CoreWebView2.WebMessageReceived -= ScriptMessageReceived;
|
|
||||||
Chromium.CoreWebView2.WebMessageReceived += ScriptMessageReceived;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ScriptMessageReceived(CoreWebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)
|
|
||||||
{
|
|
||||||
var change = JsonSerializer.Deserialize(args.WebMessageAsJson, DomainModelsJsonContext.Default.WebViewMessage);
|
|
||||||
|
|
||||||
if (change.Type == "bold")
|
|
||||||
{
|
|
||||||
BoldButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "italic")
|
|
||||||
{
|
|
||||||
ItalicButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "underline")
|
|
||||||
{
|
|
||||||
UnderlineButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "strikethrough")
|
|
||||||
{
|
|
||||||
StrokeButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "ol")
|
|
||||||
{
|
|
||||||
OrderedListButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "ul")
|
|
||||||
{
|
|
||||||
BulletListButton.IsChecked = change.Value == "true";
|
|
||||||
}
|
|
||||||
else if (change.Type == "indent")
|
|
||||||
{
|
|
||||||
IncreaseIndentButton.IsEnabled = change.Value == "disabled" ? false : true;
|
|
||||||
}
|
|
||||||
else if (change.Type == "outdent")
|
|
||||||
{
|
|
||||||
DecreaseIndentButton.IsEnabled = change.Value == "disabled" ? false : true;
|
|
||||||
}
|
|
||||||
else if (change.Type == "alignment")
|
|
||||||
{
|
|
||||||
var parsedValue = change.Value switch
|
|
||||||
{
|
|
||||||
"jodit-icon_left" => 0,
|
|
||||||
"jodit-icon_center" => 1,
|
|
||||||
"jodit-icon_right" => 2,
|
|
||||||
"jodit-icon_justify" => 3,
|
|
||||||
_ => 0
|
|
||||||
};
|
|
||||||
AlignmentListView.SelectionChanged -= AlignmentChanged;
|
|
||||||
AlignmentListView.SelectedIndex = parsedValue;
|
|
||||||
AlignmentListView.SelectionChanged += AlignmentChanged;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void DOMLoaded(CoreWebView2 sender, CoreWebView2DOMContentLoadedEventArgs args) => _domLoadedTask.TrySetResult(true);
|
|
||||||
|
|
||||||
async void IRecipient<CreateNewComposeMailRequested>.Receive(CreateNewComposeMailRequested message)
|
async void IRecipient<CreateNewComposeMailRequested>.Receive(CreateNewComposeMailRequested message)
|
||||||
{
|
{
|
||||||
await RenderInternalAsync(message.RenderModel.RenderHtml);
|
await WebViewEditor.RenderHtmlAsync(message.RenderModel.RenderHtml);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ShowCCBCCClicked(object sender, RoutedEventArgs e)
|
private void ShowCCBCCClicked(object sender, RoutedEventArgs e)
|
||||||
@@ -548,7 +261,6 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
private async void TokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
|
private async void TokenItemAdding(TokenizingTextBox sender, TokenItemAddingEventArgs args)
|
||||||
{
|
{
|
||||||
// Check is valid email.
|
// Check is valid email.
|
||||||
|
|
||||||
if (!EmailValidator.Validate(args.TokenText))
|
if (!EmailValidator.Validate(args.TokenText))
|
||||||
{
|
{
|
||||||
args.Cancel = true;
|
args.Cancel = true;
|
||||||
@@ -557,18 +269,15 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var deferal = args.GetDeferral();
|
var deferral = args.GetDeferral();
|
||||||
|
|
||||||
AccountContact addedItem = null;
|
var addedItem = (sender.Tag?.ToString()) switch
|
||||||
|
{
|
||||||
var boxTag = sender.Tag?.ToString();
|
"ToBox" => await ViewModel.GetAddressInformationAsync(args.TokenText, ViewModel.ToItems),
|
||||||
|
"CCBox" => await ViewModel.GetAddressInformationAsync(args.TokenText, ViewModel.CCItems),
|
||||||
if (boxTag == "ToBox")
|
"BCCBox" => await ViewModel.GetAddressInformationAsync(args.TokenText, ViewModel.BCCItems),
|
||||||
addedItem = await ViewModel.GetAddressInformationAsync(args.TokenText, ViewModel.ToItems);
|
_ => null
|
||||||
else if (boxTag == "CCBox")
|
};
|
||||||
addedItem = await ViewModel.GetAddressInformationAsync(args.TokenText, ViewModel.CCItems);
|
|
||||||
else if (boxTag == "BCCBox")
|
|
||||||
addedItem = await ViewModel.GetAddressInformationAsync(args.TokenText, ViewModel.BCCItems);
|
|
||||||
|
|
||||||
if (addedItem == null)
|
if (addedItem == null)
|
||||||
{
|
{
|
||||||
@@ -580,17 +289,12 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
args.Item = addedItem;
|
args.Item = addedItem;
|
||||||
}
|
}
|
||||||
|
|
||||||
deferal.Complete();
|
deferral.Complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
void IRecipient<ApplicationThemeChanged>.Receive(ApplicationThemeChanged message)
|
void IRecipient<ApplicationThemeChanged>.Receive(ApplicationThemeChanged message)
|
||||||
{
|
{
|
||||||
IsComposerDarkMode = message.IsUnderlyingThemeDark;
|
WebViewEditor.IsEditorDarkMode = message.IsUnderlyingThemeDark;
|
||||||
}
|
|
||||||
|
|
||||||
private void InvertComposerThemeClicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
IsComposerDarkMode = !IsComposerDarkMode;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ImportanceClicked(object sender, RoutedEventArgs e)
|
private void ImportanceClicked(object sender, RoutedEventArgs e)
|
||||||
@@ -600,9 +304,7 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
|
|
||||||
if (sender is Button senderButton)
|
if (sender is Button senderButton)
|
||||||
{
|
{
|
||||||
var selectedImportance = (MessageImportance)senderButton.Tag;
|
ViewModel.SelectedMessageImportance = (MessageImportance)senderButton.Tag;
|
||||||
|
|
||||||
ViewModel.SelectedMessageImportance = selectedImportance;
|
|
||||||
((ImportanceSplitButton.Content as Viewbox).Child as SymbolIcon).Symbol = (senderButton.Content as SymbolIcon).Symbol;
|
((ImportanceSplitButton.Content as Viewbox).Child as SymbolIcon).Symbol = (senderButton.Content as SymbolIcon).Symbol;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -613,23 +315,21 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
|
|
||||||
if (sender is TokenizingTextBox tokenizingTextBox)
|
if (sender is TokenizingTextBox tokenizingTextBox)
|
||||||
{
|
{
|
||||||
if (!(tokenizingTextBox.Items.LastOrDefault() is ITokenStringContainer info)) return;
|
if (tokenizingTextBox.Items.LastOrDefault() is not ITokenStringContainer info) return;
|
||||||
|
|
||||||
var currentText = info.Text;
|
var currentText = info.Text;
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(currentText) && EmailValidator.Validate(currentText))
|
if (!string.IsNullOrEmpty(currentText) && EmailValidator.Validate(currentText))
|
||||||
{
|
{
|
||||||
var boxTag = tokenizingTextBox.Tag?.ToString();
|
var addressCollection = tokenizingTextBox.Tag?.ToString() switch
|
||||||
|
{
|
||||||
|
"ToBox" => ViewModel.ToItems,
|
||||||
|
"CCBox" => ViewModel.CCItems,
|
||||||
|
"BCCBox" => ViewModel.BCCItems,
|
||||||
|
_ => null
|
||||||
|
};
|
||||||
|
|
||||||
AccountContact addedItem = null;
|
AccountContact addedItem = null;
|
||||||
ObservableCollection<AccountContact> addressCollection = null;
|
|
||||||
|
|
||||||
if (boxTag == "ToBox")
|
|
||||||
addressCollection = ViewModel.ToItems;
|
|
||||||
else if (boxTag == "CCBox")
|
|
||||||
addressCollection = ViewModel.CCItems;
|
|
||||||
else if (boxTag == "BCCBox")
|
|
||||||
addressCollection = ViewModel.BCCItems;
|
|
||||||
|
|
||||||
if (addressCollection != null)
|
if (addressCollection != null)
|
||||||
addedItem = await ViewModel.GetAddressInformationAsync(currentText, addressCollection);
|
addedItem = await ViewModel.GetAddressInformationAsync(currentText, addressCollection);
|
||||||
@@ -676,7 +376,6 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
await ViewModel.UpdateMimeChangesAsync();
|
await ViewModel.UpdateMimeChangesAsync();
|
||||||
|
|
||||||
DisposeDisposables();
|
DisposeDisposables();
|
||||||
DisposeWebView2();
|
|
||||||
}
|
}
|
||||||
private async void OnClose(object sender, SystemNavigationCloseRequestedPreviewEventArgs e)
|
private async void OnClose(object sender, SystemNavigationCloseRequestedPreviewEventArgs e)
|
||||||
{
|
{
|
||||||
@@ -689,6 +388,3 @@ public sealed partial class ComposePage : ComposePageAbstract,
|
|||||||
finally { deferral.Complete(); }
|
finally { deferral.Complete(); }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[JsonSerializable(typeof(List<ImageInfo>))]
|
|
||||||
public partial class ComposerPageJsonContext : JsonSerializerContext;
|
|
||||||
|
|||||||
@@ -79,6 +79,7 @@
|
|||||||
<PackageReference Include="CommunityToolkit.Common" />
|
<PackageReference Include="CommunityToolkit.Common" />
|
||||||
<PackageReference Include="CommunityToolkit.Diagnostics" />
|
<PackageReference Include="CommunityToolkit.Diagnostics" />
|
||||||
<PackageReference Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" />
|
<PackageReference Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" />
|
||||||
|
<PackageReference Include="CommunityToolkit.Labs.Uwp.DependencyPropertyGenerator" />
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" />
|
<PackageReference Include="CommunityToolkit.Mvvm" />
|
||||||
<PackageReference Include="CommunityToolkit.Uwp.Animations" />
|
<PackageReference Include="CommunityToolkit.Uwp.Animations" />
|
||||||
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" />
|
<PackageReference Include="CommunityToolkit.Uwp.Behaviors" />
|
||||||
|
|||||||
Reference in New Issue
Block a user