Adjust component event names

7 files changed, 26 insertions, 26 deletions

diff --git a/src/components/AncestryBar.vue b/src/components/AncestryBar.vue
index 497c11c..e11725f 100644
--- a/src/components/AncestryBar.vue
+++ b/src/components/AncestryBar.vue
@@ -48,10 +48,10 @@ export default defineComponent({
 	},
 	methods: {
 		onTileClick(node: LayoutNode){
-			this.$emit('detached-ancestor-click', node);
+			this.$emit('ancestor-click', node);
 		},
 		onInfoIconClick(data: string){
-			this.$emit('info-icon-click', data);
+			this.$emit('info-click', data);
 		},
 		onWheelEvt(evt: WheelEvent){
 			// Possibly convert vertical scroll to horizontal
@@ -71,7 +71,7 @@ export default defineComponent({
 		this.scrollToEnd();
 	},
 	components: {Tile, },
-	emits: ['detached-ancestor-click', 'info-icon-click', ],
+	emits: ['ancestor-click', 'info-click', ],
 });
 </script>
 
@@ -79,6 +79,6 @@ export default defineComponent({
 <div :style="styles" @wheel.stop="onWheelEvt">
 	<tile v-for="(node, idx) in usedNodes" :key="node.name" class="shrink-0"
 		:layoutNode="node" :tolMap="tolMap" :nonAbsPos="true" :lytOpts="lytOpts" :uiOpts="uiOpts"
-		@leaf-click="onTileClick(nodes[idx])" @info-icon-click="onInfoIconClick"/>
+		@leaf-click="onTileClick(nodes[idx])" @info-click="onInfoIconClick"/>
 </div>
 </template>
diff --git a/src/components/HelpModal.vue b/src/components/HelpModal.vue
index 298711b..009f694 100644
--- a/src/components/HelpModal.vue
+++ b/src/components/HelpModal.vue
@@ -11,16 +11,16 @@ export default defineComponent({
 	methods: {
 		onCloseClick(evt: Event){
 			if (evt.target == this.$el || (this.$refs.closeIcon as typeof CloseIcon).$el.contains(evt.target)){
-				this.$emit('help-modal-close');
+				this.$emit('close');
 			}
 		},
 		onStartTutorial(){
 			this.$emit('start-tutorial');
-			this.$emit('help-modal-close');
+			this.$emit('close');
 		},
 	},
 	components: {CloseIcon, RButton, },
-	emits: ['help-modal-close', 'start-tutorial', ],
+	emits: ['close', 'start-tutorial', ],
 });
 </script>
 
diff --git a/src/components/SearchModal.vue b/src/components/SearchModal.vue
index 4ea5cea..93f7a59 100644
--- a/src/components/SearchModal.vue
+++ b/src/components/SearchModal.vue
@@ -36,7 +36,7 @@ export default defineComponent({
 	methods: {
 		onCloseClick(evt: Event){
 			if (evt.target == this.$el || (this.$refs.searchIcon as typeof SearchIcon).$el.contains(evt.target)){
-				this.$emit('search-close');
+				this.$emit('close');
 			}
 		},
 		onEnter(){
@@ -63,7 +63,7 @@ export default defineComponent({
 								this.tolMap.set(key, obj[key])
 							}
 						});
-						this.$emit('search-node', tolNodeName);
+						this.$emit('search', tolNodeName);
 					} else {
 						// Trigger failure animation
 						let input = this.$refs.searchInput as HTMLInputElement;
@@ -153,14 +153,14 @@ export default defineComponent({
 			}
 		},
 		onInfoIconClick(nodeName: string){
-			this.$emit('info-icon-click', nodeName);
+			this.$emit('info-click', nodeName);
 		},
 	},
 	mounted(){
 		(this.$refs.searchInput as HTMLInputElement).focus();
 	},
 	components: {SearchIcon, InfoIcon, },
-	emits: ['search-node', 'search-close', 'info-icon-click'],
+	emits: ['search', 'close', 'info-click'],
 });
 </script>
 
diff --git a/src/components/SettingsModal.vue b/src/components/SettingsModal.vue
index 3a8f34a..e95dc34 100644
--- a/src/components/SettingsModal.vue
+++ b/src/components/SettingsModal.vue
@@ -14,11 +14,11 @@ export default defineComponent({
 		onCloseClick(evt: Event){
 			if (evt.target == this.$el || (this.$refs.closeIcon as typeof CloseIcon).$el.contains(evt.target)){
 				this.saveSettings();
-				this.$emit('settings-close');
+				this.$emit('close');
 			}
 		},
 		onLytOptChg(){
-			this.$emit('layout-option-change');
+			this.$emit('layout-setting-chg');
 		},
 		onMinTileSzChg(){
 			let minInput = this.$refs.minTileSzInput as HTMLInputElement;
@@ -37,7 +37,7 @@ export default defineComponent({
 			this.onLytOptChg();
 		},
 		onTreeChg(){
-			this.$emit('tree-change');
+			this.$emit('tree-chg');
 		},
 		saveSettings(){
 			const savedLytOpts = ['tileSpacing', 'minTileSz', 'maxTileSz', 'layoutType', 'sweepMode', 'sweepToParent', ];
@@ -52,12 +52,12 @@ export default defineComponent({
 		},
 		onReset(){
 			localStorage.clear();
-			this.$emit('reset-settings');
+			this.$emit('reset');
 			console.log('Settings reset');
 		},
 	},
 	components: {CloseIcon, RButton, },
-	emits: ['settings-close', 'layout-option-change', 'tree-change', 'reset-settings', ],
+	emits: ['close', 'layout-setting-chg', 'tree-chg', 'reset', ],
 });
 </script>
 
diff --git a/src/components/Tile.vue b/src/components/Tile.vue
index bcfebe0..3407b3f 100644
--- a/src/components/Tile.vue
+++ b/src/components/Tile.vue
@@ -181,7 +181,7 @@ export default defineComponent({
 		leafHeaderStyles(): Record<string,string> {
 			let numChildren = this.tolNode.children.length;
 			let headerColor = this.uiOpts.headerColor;
-			for (let [threshold, color] of this.uiOpts.tipThresholds){
+			for (let [threshold, color] of this.uiOpts.childThresholds){
 				if (numChildren >= threshold){
 					headerColor = color;
 				} else {
@@ -399,7 +399,7 @@ export default defineComponent({
 			this.$emit(this.isLeaf ? 'leaf-click-held' : 'nonleaf-click-held', this.layoutNode);
 		},
 		onInfoIconClick(evt: Event){
-			this.$emit('info-icon-click', this.layoutNode.name);
+			this.$emit('info-click', this.layoutNode.name);
 		},
 		// Mouse hover handling
 		onMouseEnter(evt: Event){
@@ -426,7 +426,7 @@ export default defineComponent({
 			this.$emit('nonleaf-click-held', node);
 		},
 		onInnerInfoIconClick(nodeName: string){
-			this.$emit('info-icon-click', nodeName);
+			this.$emit('info-click', nodeName);
 		},
 		onScroll(evt: Event){
 			if (this.pendingScrollHdlr == 0){
@@ -469,7 +469,7 @@ export default defineComponent({
 	},
 	name: 'tile', // Note: Need this to use self in template
 	components: {InfoIcon, },
-	emits: ['leaf-click', 'nonleaf-click', 'leaf-click-held', 'nonleaf-click-held', 'info-icon-click', ],
+	emits: ['leaf-click', 'nonleaf-click', 'leaf-click-held', 'nonleaf-click-held', 'info-click', ],
 });
 </script>
 
@@ -512,7 +512,7 @@ export default defineComponent({
 			:layoutNode="child" :tolMap="tolMap" :lytOpts="lytOpts" :uiOpts="uiOpts" :overflownDim="overflownDim"
 			@leaf-click="onInnerLeafClick" @nonleaf-click="onInnerNonleafClick"
 			@leaf-click-held="onInnerLeafClickHeld" @nonleaf-click-held="onInnerNonleafClickHeld"
-			@info-icon-click="onInnerInfoIconClick"/>
+			@info-click="onInnerInfoIconClick"/>
 	</div>
 </div>
 </template>
diff --git a/src/components/TileInfoModal.vue b/src/components/TileInfoModal.vue
index 7e2f81d..83155ba 100644
--- a/src/components/TileInfoModal.vue
+++ b/src/components/TileInfoModal.vue
@@ -59,7 +59,7 @@ export default defineComponent({
 	methods: {
 		onCloseClick(evt: Event){
 			if (evt.target == this.$el || (this.$refs.closeIcon as typeof CloseIcon).$el.contains(evt.target)){
-				this.$emit('info-modal-close');
+				this.$emit('close');
 			}
 		},
 		getImgStyles(imgName: string | null){
@@ -128,7 +128,7 @@ export default defineComponent({
 			});
 	},
 	components: {CloseIcon, Tile, },
-	emits: ['info-modal-close', ],
+	emits: ['close', ],
 });
 </script>
 
diff --git a/src/components/TutorialPane.vue b/src/components/TutorialPane.vue
index 18628f8..d34456d 100644
--- a/src/components/TutorialPane.vue
+++ b/src/components/TutorialPane.vue
@@ -58,7 +58,7 @@ export default defineComponent({
 			this.sendEnabledFeatures();
 		},
 		onClose(){
-			this.$emit('tutorial-close');
+			this.$emit('close');
 		},
 		sendEnabledFeatures(){
 			const stageActions = [
@@ -72,7 +72,7 @@ export default defineComponent({
 			}
 			disabledActions.delete(stageActions[this.stage] as Action);
 			let triggerAction = stageActions[this.stage] as Action;
-			this.$emit('tutorial-stage-chg', disabledActions, triggerAction);
+			this.$emit('stage-chg', disabledActions, triggerAction);
 		},
 	},
 	created(){
@@ -81,7 +81,7 @@ export default defineComponent({
 		}
 	},
 	components: {CloseIcon, RButton, },
-	emits: ['tutorial-close', 'tutorial-stage-chg', ],
+	emits: ['close', 'stage-chg', ],
 });
 </script>