Fix collapase menu and popup position (#12501)

DynamoDS · Jan 20, 2022 · 1155086 · 1155086
1 parent 3dbf969
commit 1155086
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs b/src/DynamoCoreWpf/UI/GuidedTour/GuidesValidationMethods.cs
@@ -438,7 +438,7 @@ internal static void CollapseExpandPackage(Step stepInfo)
         {
             CurrentExecutingStep = stepInfo;
             var firstUIAutomation = stepInfo.UIAutomation.FirstOrDefault();
-            if (firstUIAutomation == null) return;
+            if (firstUIAutomation == null || firstUIAutomation.JSParameters.Count == 0) return;
             object[] parametersInvokeScript = new object[] { firstUIAutomation.JSFunctionName, new object[] { firstUIAutomation.JSParameters.FirstOrDefault() } };
             ResourceUtilities.ExecuteJSFunction(stepInfo.MainWindow, stepInfo.HostPopupInfo, parametersInvokeScript);
         }

diff --git a/src/DynamoCoreWpf/UI/GuidedTour/dynamo_guides.json b/src/DynamoCoreWpf/UI/GuidedTour/dynamo_guides.json
@@ -738,7 +738,7 @@
 						"Name": "SubscribeNextButtonClickEvent",
 						"Action": "execute",
 						"JSFunctionName": "collapseExpandPackage",
-						"JSParameters": [ "SampleLibraryUI" ],
+						"JSParameters": [ "SampleLibraryUI", "LibraryItemText" ],
 						"AutomaticHandlers": [
 							{
 								"HandlerElement": "NextButton",
@@ -795,7 +795,7 @@
 				"Type": "tooltip",
 				"TooltipPointerDirection": "top_left",
 				"Width": 480,
-				"Height": 490,
+				"Height": 400,
 				"ShowLibrary": true,
 				"StepContent": {
 					"Title": "PackagesGuidePackagesNodeTitle",
@@ -806,8 +806,8 @@
 					"DynamicHostWindow": true,
 					"HostUIElementString": "sidebarGrid",
 					"WindowName": "LibraryView",
-					"VerticalPopupOffset": 300,
-					"HorizontalPopupOffset": 300,
+					"VerticalPopupOffset": 450,
+					"HorizontalPopupOffset": 320,
 					"HtmlPage": {
 						"FileName": "nodePackage.html",
 						"Resources": {
@@ -830,7 +830,23 @@
 						"Name": "InvokeJSFunction",
 						"Action": "execute",
 						"JSFunctionName": "collapseExpandPackage",
-						"JSParameters": [ "Revit" ]
+						"JSParameters": [ "SampleLibraryUI", "LibraryItemText" ]
+					},
+					{
+						"Sequence": 2,
+						"ControlType": "JSFunction",
+						"Name": "InvokeJSFunction",
+						"Action": "execute",
+						"JSFunctionName": "collapseExpandPackage",
+						"JSParameters": [ "Examples", "LibraryItemGroupText" ]
+					},
+					{
+						"Sequence": 3,
+						"ControlType": "function",
+						"Name": "LibraryScrollToBottom",
+						"JSFunctionName": "scrollToBottom",
+						"JSParameters": [],
+						"Action": "execute"
 					}
 				]
 			},
@@ -853,7 +869,7 @@
 				"HostPopupInfo": {
 					"PopupPlacement": "center",
 					"HostUIElementString": "WorkspaceTabs",
-					"VerticalPopupOffset": 0			
+					"VerticalPopupOffset": 0
 				}
 			}
 		]

diff --git a/src/LibraryViewExtensionMSWebBrowser/web/library/library.html b/src/LibraryViewExtensionMSWebBrowser/web/library/library.html
@@ -308,9 +308,9 @@
         }
 
         //This will find the <div> that contains the package information
-        function findPackageDiv(packageName) {
+        function findPackageDiv(packageName, libraryClassName) {
             var found_div = null;
-            var libraryItemsText = document.getElementsByClassName("LibraryItemText");
+            var libraryItemsText = document.getElementsByClassName(libraryClassName);
             for (var i = 0; i < libraryItemsText.length; i++) {
                 if (libraryItemsText[i].textContent.toLowerCase() == packageName.toLowerCase()) {
                     found_div = libraryItemsText[i];
@@ -321,13 +321,13 @@
         }
 
         //This will execute a click over a specific <div> that contains the package content
-        function collapseExpandPackage(packageName) {
-            var found_div = findPackageDiv(packageName);
+        function collapseExpandPackage(packageName, libraryClassName) {
+            var found_div = findPackageDiv(packageName, libraryClassName);
             if (found_div == null) {
                 return;
             }
             var containerCatDiv = found_div.parentNode.parentNode;
-            var itemBodyContainer = containerCatDiv.getElementsByClassName("LibraryItemText")[0];
+            var itemBodyContainer = containerCatDiv.getElementsByClassName(libraryClassName)[0];
             itemBodyContainer.click();
         }