DynamoDS
diff --git a/‎src/Dynamo.All.sln
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions b/‎src/Dynamo.All.sln
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎src/DynamoCore/Properties/AssemblyInfo.cs
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/‎src/DynamoCore/Properties/AssemblyInfo.cs
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
Copy file name to clipboard
+6-2Lines changed: 6 additions & 2 deletions b/‎src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
Copy file name to clipboard
+6-2Lines changed: 6 additions & 2 deletions
diff --git a/‎src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs
Copy file name to clipboard
+5-4Lines changed: 5 additions & 4 deletions b/‎src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs
Copy file name to clipboard
+5-4Lines changed: 5 additions & 4 deletions
diff --git a/‎src/DynamoCoreWpf/Utilities/ResourceUtilities.cs
Copy file name to clipboard
+32-10Lines changed: 32 additions & 10 deletions b/‎src/DynamoCoreWpf/Utilities/ResourceUtilities.cs
Copy file name to clipboard
+32-10Lines changed: 32 additions & 10 deletions
diff --git a/‎src/LibraryViewExtensionMSWebBrowser/LibraryViewExtensionMSWebBrowser.csproj
Copy file name to clipboard
+6-7Lines changed: 6 additions & 7 deletions b/‎src/LibraryViewExtensionMSWebBrowser/LibraryViewExtensionMSWebBrowser.csproj
Copy file name to clipboard
+6-7Lines changed: 6 additions & 7 deletions
diff --git a/‎src/LibraryViewExtensionWebView2/EventObserver.cs
Copy file name to clipboard
+167Lines changed: 167 additions & 0 deletions b/‎src/LibraryViewExtensionWebView2/EventObserver.cs
Copy file name to clipboard
+167Lines changed: 167 additions & 0 deletions
@@ -245,6 +245,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GraphNodeManagerViewExtensi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamoFeatureFlags", "Tools\DynamoFeatureFlags\DynamoFeatureFlags.csproj", "{94CF053D-BB66-4FC7-883B-48F072701BA9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibraryViewExtensionWebView2", "LibraryViewExtensionWebView2\LibraryViewExtensionWebView2.csproj", "{43A01382-85CC-41E5-A414-F27D51EE9D24}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -929,6 +931,14 @@ Global
 		{94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|x64.ActiveCfg = Release|Any CPU
 		{94CF053D-BB66-4FC7-883B-48F072701BA9}.Release|x64.Build.0 = Release|Any CPU
+		{43A01382-85CC-41E5-A414-F27D51EE9D24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43A01382-85CC-41E5-A414-F27D51EE9D24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43A01382-85CC-41E5-A414-F27D51EE9D24}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{43A01382-85CC-41E5-A414-F27D51EE9D24}.Debug|x64.Build.0 = Debug|Any CPU
+		{43A01382-85CC-41E5-A414-F27D51EE9D24}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43A01382-85CC-41E5-A414-F27D51EE9D24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43A01382-85CC-41E5-A414-F27D51EE9D24}.Release|x64.ActiveCfg = Release|Any CPU
+		{43A01382-85CC-41E5-A414-F27D51EE9D24}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1016,6 +1026,7 @@ Global
 		{F382C3F8-C55C-4350-800A-3D13A94F8E13} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1}
 		{1E92CDB0-644C-4EAA-8AB8-EFDD193A0484} = {88D45B00-E564-41DB-B57C-9509646CAA49}
 		{94CF053D-BB66-4FC7-883B-48F072701BA9} = {D114C59C-CF66-4CC2-980F-9301FB4EA4E1}
+		{43A01382-85CC-41E5-A414-F27D51EE9D24} = {88D45B00-E564-41DB-B57C-9509646CAA49}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {89CB19C6-BF0A-4E6A-BFDA-79D143EAB59D}
 
@@ -35,6 +35,7 @@
 [assembly: InternalsVisibleTo("PythonNodeModelsWpf")]
 [assembly: InternalsVisibleTo("PythonNodeModels")]
 [assembly: InternalsVisibleTo("LibraryViewExtensionMSWebBrowser")]
+[assembly: InternalsVisibleTo("LibraryViewExtensionWebView2")]
 [assembly: InternalsVisibleTo("PythonMigrationViewExtension")]
 [assembly: InternalsVisibleTo("NodeDocumentationMarkdownGenerator")]
 [assembly: InternalsVisibleTo("LintingViewExtension")]
 
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -7,6 +7,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using Dynamo.Controls;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Properties;
 using Dynamo.Wpf.ViewModels.GuidedTour;
@@ -193,7 +194,10 @@ private void TourStarted(GuidedTourStateEventArgs args)
                 guideBackgroundElement.Visibility = Visibility.Visible;
                 currentGuide.GuideBackgroundElement = guideBackgroundElement;
                 currentGuide.MainWindow = mainRootElement;
-                currentGuide.LibraryView = GuideUtilities.FindChild(mainRootElement, libraryViewName);
+                var dynamoView = (mainRootElement as DynamoView);
+                if (dynamoView == null) return;
+                currentGuide.LibraryView = dynamoView.sidebarGrid.Children.OfType<UserControl>().FirstOrDefault();
+
                 currentGuide.Initialize();
                 currentGuide.Play();
                 GuidesValidationMethods.CurrentExecutingGuide = currentGuide;
 
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Reflection;
 using System.Windows;
@@ -593,7 +593,7 @@ internal static void ExecuteViewDetailsSideBar(Step stepInfo, StepUIAutomation u
         /// <summary>
         /// This method will calculate the Popup location based in a item from the Library
         /// </summary>
-        internal static void CalculateLibraryItemLocation(Step stepInfo, StepUIAutomation uiAutomationData, bool enableFunction, GuideFlow currentFlow)
+        internal static async void CalculateLibraryItemLocation(Step stepInfo, StepUIAutomation uiAutomationData, bool enableFunction, GuideFlow currentFlow)
         {
             CurrentExecutingStep = stepInfo;
             if (uiAutomationData == null) return;
@@ -602,10 +602,11 @@ internal static void CalculateLibraryItemLocation(Step stepInfo, StepUIAutomatio
             //Create the array for the paramateres that will be sent to the WebBrowser.InvokeScript Method
             object[] parametersInvokeScript = new object[] { jsFunctionName, jsParameters };
             //Execute the JS function with the provided parameters
-            var returnedObject = ResourceUtilities.ExecuteJSFunction(CurrentExecutingStep.MainWindow, CurrentExecutingStep.HostPopupInfo, parametersInvokeScript);
+            var returnedObject = await ResourceUtilities.ExecuteJSFunction(CurrentExecutingStep.MainWindow, CurrentExecutingStep.HostPopupInfo, parametersInvokeScript);
             if (returnedObject == null) return;
             //Due that the returned object is a json then we get the values from the json
-            JObject json = JObject.Parse(returnedObject.ToString());
+            string jsonString = returnedObject.ToString().Replace("\\\"", "'").Replace("\"", "");
+            JObject json = JObject.Parse(jsonString);
             double top = Convert.ToDouble(json["client"]["top"].ToString());
             double bottom = Convert.ToDouble(json["client"]["bottom"].ToString());
             //We calculate the Vertical location taking the average position "(top + bottom) / 2" and the height of the popup
 
@@ -1,4 +1,4 @@
-using Dynamo.Logging;
+using Dynamo.Logging;
 using Dynamo.Wpf.Properties;
 using Dynamo.Wpf.UI.GuidedTour;
 using Dynamo.Wpf.Utilities;
@@ -9,6 +9,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Interop;
@@ -291,16 +292,34 @@ public static string ConvertToBase64(Stream stream)
         /// <param name="MainWindow">MainWindow in which the LibraryView is located</param>
         /// <param name="popupInfo">Popup Information about the Step </param>
         /// <param name="parametersInvokeScript">Parameters for the WebBrowser.InvokeScript() function</param>
-        internal static object ExecuteJSFunction(UIElement MainWindow, HostControlInfo popupInfo, object[] parametersInvokeScript)
+        internal static async Task<object> ExecuteJSFunction(UIElement MainWindow, HostControlInfo popupInfo, object[] parametersInvokeScript)
         {
-            const string webBrowserString = "Browser";
-            const string invokeScriptFunction = "InvokeScript";
+            const string invokeScriptFunction = "ExecuteScriptAsync";
             object resultJSHTML = null;
+            Task<string> resutlJS = null;
 
             //Try to find the grid that contains the LibraryView
             var sidebarGrid = (MainWindow as Window).FindName(popupInfo.HostUIElementString) as Grid;
             if (sidebarGrid == null) return null;
 
+            var functionName = parametersInvokeScript[0] as string;
+            object[] functionParameters = parametersInvokeScript[1] as object[];
+            List<string> functionParametersList = new List<string>();
+            foreach(var parameter in functionParameters)
+            {
+                string strParameter = string.Empty;
+                //If we try to use boolVariable.ToString() returns "True" or "False" but the expected parameter in the js function is "true" or "false"
+                if (parameter is bool)
+                    strParameter = parameter.ToString().Equals("True") ? "true" : "false";
+                //The parameter expected in the js method is a string so we need to add the quotes at the beginning and at the end
+                else
+                    strParameter = "\"" + parameter + "\"";
+
+                functionParametersList.Add(strParameter);
+            }
+            //Due that the method WebView2.ExecuteScriptAsync() is expecting just one string parameter, we will need to contatecate the function name and the parameters in parentesis
+            var parametersExecuteScriptString = string.Join(",", functionParametersList);
+
             //We need to iterate every child in the grid due that we need to apply reflection to get the Type and find the LibraryView (a reference to LibraryViewExtensionMSWebBrowser cannot be added).
             foreach (var child in sidebarGrid.Children)
             {
@@ -309,14 +328,17 @@ internal static object ExecuteJSFunction(UIElement MainWindow, HostControlInfo p
                 {
                     var libraryView = child as UserControl;
                     //get the WebBrowser instance inside the LibraryView
-                    var browser = libraryView.FindName(webBrowserString);
+                    var browser = libraryView.ChildOfType<WebView2>();
                     if (browser == null) return null;
-
                     Type typeBrowser = browser.GetType();
-                    //Due that there are 2 methods with the same name "InvokeScript", then we need to get the one with 2 parameters
-                    MethodInfo methodInvokeScriptInfo = typeBrowser.GetMethods().Single(m => m.Name == invokeScriptFunction && m.GetParameters().Length == 2);
-                    //Invoke the JS method located in library.html
-                    resultJSHTML = methodInvokeScriptInfo.Invoke(browser, parametersInvokeScript);
+                    MethodInfo methodInvokeScriptInfo = typeBrowser.GetMethods().Single(m => m.Name == invokeScriptFunction && m.GetParameters().Length == 1);
+                    //Due that WebView2.ExecuteScriptAsync() method is async we need to wait until we get a response
+                    resutlJS = (Task<string>)methodInvokeScriptInfo.Invoke(browser, new object[] { functionName + "(" + parametersExecuteScriptString + ")" });
+                    await resutlJS;
+                    var resultProperty = resutlJS.GetType().GetProperty("Result");
+                    resultJSHTML = resultProperty.GetValue(resutlJS);
+                    if (resultJSHTML.ToString().Equals("null"))
+                        resultJSHTML = null;
                     break;
                 }
             }
 
@@ -9,6 +9,12 @@
     <RootNamespace>Dynamo.LibraryViewExtensionMSWebBrowser</RootNamespace>
     <AssemblyName>LibraryViewExtensionMSWebBrowser</AssemblyName>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>bin\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Practices.Prism">
       <HintPath>..\..\extern\prism\Microsoft.Practices.Prism.dll</HintPath>
@@ -285,11 +291,4 @@
       <LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <!-- Copy the library view extension manifest file to the default folder for Dynamo-->
-  <Target Name="AfterBuildOps" AfterTargets="Build">
-    <ItemGroup>
-      <ExtensionDefinition Include="Library_ViewExtensionDefinition.xml" />
-    </ItemGroup>
-    <Copy SourceFiles="@(ExtensionDefinition)" DestinationFolder="$(OutputPath)\viewExtensions\" />
-  </Target>
 </Project>
@@ -0,0 +1,167 @@
+using System;
+using System.Threading;
+
+namespace Dynamo.LibraryViewExtensionWebView2
+{
+    /// <summary>
+    /// A class that observes an event and notifies the clients with a transformed 
+    /// data as configured using reduce function.
+    /// </summary>
+    /// <typeparam name="TValue">Type of value passed when event is raised</typeparam>
+    /// <typeparam name="TResult">Type of transformed data to notify to the client</typeparam>
+    class EventObserver<TValue, TResult> : IDisposable
+    {
+        private Timer throttler = null;
+        private TimeSpan duetime;
+        private bool accumulate = false;
+        private bool disposed = false;
+
+        private TResult result;
+        private Func<TResult, TValue, TResult> reducer;
+        private Action<TResult> observer;
+
+        private object root = new object();
+
+        /// <summary>
+        /// This event is fired when this object is disposed, clients can 
+        /// register a callback for Dispose.
+        /// </summary>
+        public event Action Disposed;
+
+        /// <summary>
+        /// Creates the event observer with a registered observe action and 
+        /// a reduce function for notification.
+        /// </summary>
+        /// <param name="observe">This action will be invoked to notify the client</param>
+        /// <param name="reduce">This function will be invoked to reduce the 
+        /// actual event parameter together with last reduced value returned by this reducer.</param>
+        public EventObserver(Action<TResult> observe, Func<TResult, TValue, TResult> reduce)
+        {
+            observer = observe;
+            reducer = reduce;
+            accumulate = true;
+            result = default(TResult);
+        }
+
+        /// <summary>
+        /// Creates the event observer with a registered observe action and 
+        /// a reduce function for notification.
+        /// </summary>
+        /// <param name="observe">This action will be invoked to notify the client</param>
+        /// <param name="transform">This function will be invoked to transform the 
+        /// actual event parameter.</param>
+        public EventObserver(Action<TResult> observe, Func<TValue, TResult> transform)
+        {
+            observer = observe;
+            reducer = (x, y) => transform(y);
+            result = default(TResult);
+        }
+
+        public static TValue Identity(TValue last, TValue current)
+        {
+            return current;
+        }
+
+        /// <summary>
+        /// The client need to register this method as an event callback for 
+        /// the event that needs to be observed.
+        /// </summary>
+        /// <param name="value">Event parameter passed</param>
+        public void OnEvent(TValue value)
+        {
+            if (disposed) return; 
+
+            lock (root) { result = reducer(result, value); }
+
+            OnEventCore(value);
+        }
+
+        /// <summary>
+        /// The core implementation for OnEvent, if throttle is active it will
+        /// update the throttle timer with the due time, so that if no subsequent 
+        /// event is raised within the given throttle due time, the client will 
+        /// be notified.
+        /// </summary>
+        /// <param name="value"></param>
+        protected virtual void OnEventCore(TValue value)
+        {
+            if (throttler != null)
+            {
+                throttler.Change(duetime, TimeSpan.FromMilliseconds(0));
+            }
+            else
+            {
+                Notify(this);
+            }
+        }
+
+        /// <summary>
+        /// Creates an observer that throttle the stream of notification 
+        /// for a given duetime i.e. notification will be fired only if duetime
+        /// is ellapsed from the last event trigger, if the event trigger is
+        /// sooner then the observer will again wait for the given duetime
+        /// to notify the client.
+        /// </summary>
+        /// <param name="duetime">Due time for throttle</param>
+        /// <returns>The modified event Observer which throttle the events</returns>
+        public EventObserver<TValue, TResult> Throttle(TimeSpan duetime)
+        {
+            if (disposed) throw new ObjectDisposedException("EventObserver");
+
+            this.duetime = duetime;
+            this.throttler = new Timer(Notify, this, Timeout.Infinite, Timeout.Infinite);
+            //when throttled, reset the result after notification is fired.
+            accumulate = false;
+            return this;
+        }
+
+        /// <summary>
+        /// Notify the client, could be triggered from throttle timer or 
+        /// called directly by passing this object as state.
+        /// </summary>
+        /// <param name="state"></param>
+        protected void Notify(object state)
+        {
+            if (disposed) throw new ObjectDisposedException("EventObserver");
+
+            TResult r;
+            lock (root)
+            {
+                r = result;
+                if (!accumulate) result = default(TResult);
+            }
+            observer(r);
+        }
+
+        public void Dispose()
+        {
+            if (!disposed)
+            {
+                disposed = true;
+                if (Disposed != null) { Disposed(); }
+                Disposed = null;
+                observer = null;
+                reducer = null;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Implements IDisposable to invoke a given dispose action on Dispose().
+    /// </summary>
+    class AnonymousDisposable : IDisposable
+    {
+        private Action dispose;
+
+        public AnonymousDisposable(Action dispose)
+        {
+            this.dispose = dispose;
+        }
+
+        public void Dispose()
+        {
+            if(dispose != null) { dispose(); }
+            dispose = null;
+        }
+    }
+}