Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- now builds from the latest npm package - webView2 swapped to DynamoWebView2 class
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ | |
| using Dynamo.UI.Controls; | ||
| using Dynamo.Utilities; | ||
| using Dynamo.Wpf.UI.GuidedTour; | ||
| using Dynamo.Wpf.Utilities; | ||
| using DynamoUtilities; | ||
| using Microsoft.Web.WebView2.Core; | ||
| using Microsoft.Web.WebView2.Wpf; | ||
|
|
@@ -25,9 +26,8 @@ namespace Dynamo.UI.Views | |
| /// </summary> | ||
| public partial class HomePage : UserControl, IDisposable | ||
|
Check failure on line 27 in src/DynamoCoreWpf/Views/HomePage/HomePage.xaml.cs
|
||
| { | ||
| private static readonly string htmlEmbeddedFile = "Dynamo.Wpf.Packages.DynamoHome.build.index.html"; | ||
| private static readonly string jsEmbeddedFile = "Dynamo.Wpf.Packages.DynamoHome.build.index.bundle.js"; | ||
| private static readonly string fontStylePath = "Dynamo.Wpf.Views.GuidedTour.HtmlPages.Resources.ArtifaktElement-Regular.woff"; | ||
| private static readonly string virtualFolderName = "embeddedFonts"; | ||
| private static readonly string virtualFolderPath = Path.Combine(Path.GetTempPath(), virtualFolderName); | ||
|
|
@@ -39,7 +39,7 @@ public partial class HomePage : UserControl, IDisposable | |
| /// <summary> | ||
| /// The WebView2 Browser instance used to display splash screen | ||
| /// </summary> | ||
| internal DynamoWebView2 dynWebView; | ||
|
|
||
| internal Action<string> RequestOpenFile; | ||
| internal Action<string> RequestShowGuidedTour; | ||
|
|
@@ -63,12 +63,12 @@ public HomePage() | |
| InitializeComponent(); | ||
| InitializeGuideTourItems(); | ||
|
|
||
| dynWebView = new DynamoWebView2(); | ||
|
|
||
| dynWebView.Margin = new System.Windows.Thickness(0); // Set margin to zero | ||
| dynWebView.ZoomFactor = 1.0; // Set zoom factor (optional) | ||
|
|
||
| HostGrid.Children.Add(dynWebView); | ||
|
|
||
| // Bind event handlers | ||
| RequestOpenFile = OpenFile; | ||
|
|
@@ -111,9 +111,9 @@ private void OnDataContextChanged(object sender, DependencyPropertyChangedEventA | |
|
|
||
| private void DynamoViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) | ||
| { | ||
| if(dynWebView?.CoreWebView2 != null && e.PropertyName.Equals(nameof(startPage.DynamoViewModel.ShowStartPage))) | ||
| { | ||
| dynWebView.CoreWebView2.ExecuteScriptAsync(@$"window.setShowStartPageChanged('{startPage.DynamoViewModel.ShowStartPage}')"); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -140,18 +140,18 @@ private async void UserControl_Loaded(object sender, System.Windows.RoutedEventA | |
| PathHelper.CreateFolderIfNotExist(userDataDir.ToString()); | ||
| var webBrowserUserDataFolder = userDataDir.Exists ? userDataDir : null; | ||
|
|
||
| dynWebView.CreationProperties = new CoreWebView2CreationProperties | ||
| { | ||
| UserDataFolder = webBrowserUserDataFolder.FullName | ||
| }; | ||
|
|
||
| //ContentRendered ensures that the webview2 component is visible. | ||
| await dynWebView.Initialize(); | ||
| // Context menu disabled | ||
| this.dynWebView.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false; | ||
| // Zoom control disabled | ||
| this.dynWebView.CoreWebView2.Settings.IsZoomControlEnabled = false; | ||
| this.dynWebView.CoreWebView2.Settings.AreDevToolsEnabled = true; | ||
|
|
||
| var assembly = Assembly.GetExecutingAssembly(); | ||
|
|
||
|
|
@@ -186,21 +186,21 @@ private async void UserControl_Loaded(object sender, System.Windows.RoutedEventA | |
| } | ||
|
|
||
| // Set up virtual host name to folder mapping | ||
| dynWebView.CoreWebView2.SetVirtualHostNameToFolderMapping(virtualFolderName, virtualFolderPath, CoreWebView2HostResourceAccessKind.DenyCors); | ||
|
|
||
| htmlString = htmlString.Replace("mainJs", jsonString); | ||
|
|
||
| try | ||
| { | ||
| dynWebView.NavigateToString(htmlString); | ||
| } | ||
| catch (Exception ex) | ||
| { | ||
| Debug.WriteLine(ex.Message); | ||
| } | ||
|
|
||
| // Exposing commands to the React front-end | ||
| dynWebView.CoreWebView2.AddHostObjectToScript("scriptObject", | ||
| new ScriptHomeObject(RequestOpenFile, | ||
| RequestNewWorkspace, | ||
| RequestOpenWorkspace, | ||
|
|
@@ -227,9 +227,9 @@ internal async void LoadingDone() | |
|
|
||
| var userLocale = "en"; | ||
|
|
||
| if (dynWebView?.CoreWebView2 != null) | ||
| { | ||
| await dynWebView.CoreWebView2.ExecuteScriptAsync(@$"window.setLocale('{userLocale}');"); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -242,9 +242,9 @@ private async void LoadGraphs(ObservableCollection<StartPageListItem> data) | |
| { | ||
| string jsonData = JsonSerializer.Serialize(data); | ||
|
|
||
| if (dynWebView?.CoreWebView2 != null) | ||
| { | ||
| await dynWebView.CoreWebView2.ExecuteScriptAsync(@$"window.receiveGraphDataFromDotNet({jsonData})"); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -257,9 +257,9 @@ private async void SendSamplesData() | |
|
|
||
| string jsonData = JsonSerializer.Serialize(this.startPage.SampleFiles); | ||
|
|
||
| if (dynWebView?.CoreWebView2 != null) | ||
| { | ||
| await dynWebView.CoreWebView2.ExecuteScriptAsync(@$"window.receiveSamplesDataFromDotNet({jsonData})"); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -273,9 +273,9 @@ private async void SendGuidesData() | |
|
|
||
| string jsonData = JsonSerializer.Serialize(this.GuidedTourItems); | ||
|
|
||
| if (dynWebView?.CoreWebView2 != null) | ||
| { | ||
| await dynWebView.CoreWebView2.ExecuteScriptAsync(@$"window.receiveInteractiveGuidesDataFromDotNet({jsonData})"); | ||
| } | ||
| } | ||
| #endregion | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters