From 286041a923b07b968a4d3bde7e02b86990986639 Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Thu, 16 Jun 2022 01:31:47 +1000
Subject: Fix jump-to-hidden-ancestor-child layout-fail bug

---
 src/App.vue | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/App.vue b/src/App.vue
index 6f8f7a8..50c2ae4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -201,7 +201,7 @@ export default defineComponent({
 				return new Promise((resolve, reject) => resolve(doExpansion()));
 			}
 		},
-		onNonleafClick(layoutNode: LayoutNode){
+		onNonleafClick(layoutNode: LayoutNode, skipClean = false){
 			if (!this.handleActionForTutorial('collapse')){
 				return false;
 			}
@@ -218,16 +218,18 @@ export default defineComponent({
 				if (this.overflownRoot){
 					this.overflownRoot = false;
 				}
-				// Clear out excess nodes when a threshold is reached
-				let numNodes = this.tolMap.size;
-				let extraNodes = numNodes - this.layoutMap.size;
-				if (extraNodes > this.excessTolNodeThreshold){
-					for (let n of this.tolMap.keys()){
-						if (!this.layoutMap.has(n)){
-							this.tolMap.delete(n)
+				// Possibly clear out excess nodes when a threshold is reached
+				if (!skipClean){
+					let numNodes = this.tolMap.size;
+					let extraNodes = numNodes - this.layoutMap.size;
+					if (extraNodes > this.excessTolNodeThreshold){
+						for (let n of this.tolMap.keys()){
+							if (!this.layoutMap.has(n)){
+								this.tolMap.delete(n)
+							}
 						}
+						console.log(`Cleaned up tolMap (removed ${numNodes - this.tolMap.size} out of ${numNodes})`);
 					}
-					console.log(`Cleaned up tolMap (removed ${numNodes - this.tolMap.size} out of ${numNodes})`);
 				}
 			}
 			return success;
@@ -297,7 +299,7 @@ export default defineComponent({
 			this.activeRoot = layoutNode;
 			this.updateAreaDims().then(() => this.relayoutWithCollapse());
 		},
-		onDetachedAncestorClick(layoutNode: LayoutNode){
+		onDetachedAncestorClick(layoutNode: LayoutNode, skipRelayout = false){
 			if (!this.handleActionForTutorial('unhideAncestor')){
 				return;
 			}
@@ -305,7 +307,9 @@ export default defineComponent({
 			LayoutNode.showDownward(layoutNode);
 			this.activeRoot = layoutNode;
 			this.overflownRoot = false;
-			this.updateAreaDims().then(() => this.relayoutWithCollapse());
+			if (!skipRelayout){
+				this.updateAreaDims().then(() => this.relayoutWithCollapse());
+			}
 		},
 		// For tile-info events
 		onInfoIconClick(nodeName: string){
@@ -357,13 +361,15 @@ export default defineComponent({
 				while (!this.detachedAncestors!.includes(nodeInAncestryBar)){
 					nodeInAncestryBar = nodeInAncestryBar.parent!;
 				}
-				if (!this.uiOpts.jumpToSearchedNode || nodeInAncestryBar.name == name){
+				if (!this.uiOpts.jumpToSearchedNode){
 					this.onDetachedAncestorClick(nodeInAncestryBar!);
 					setTimeout(() => this.expandToNode(name), this.uiOpts.tileChgDuration);
-					return;
-				} else {
-					LayoutNode.showDownward(nodeInAncestryBar);
+				} else{
+					this.onDetachedAncestorClick(nodeInAncestryBar, true);
+					this.onNonleafClick(nodeInAncestryBar, true);
+					this.expandToNode(name);
 				}
+				return;
 			}
 			// Attempt tile-expand
 			if (this.uiOpts.jumpToSearchedNode){
-- 
cgit v1.2.3