From 7b6247777c1ad824e2fdb8d756e8be52541b9f79 Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Sun, 27 Mar 2022 00:35:02 +1100
Subject: Separate settings icon code from settings pane

---
 src/components/Settings.vue | 196 +++++++++++++++++---------------------------
 src/components/TileTree.vue |  47 +++++++++--
 2 files changed, 117 insertions(+), 126 deletions(-)

(limited to 'src')

diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index d35549e..c364924 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -4,14 +4,10 @@ import type {LayoutOptions} from '../lib';
 
 export default defineComponent({
 	props: {
-		isOpen: {type: Boolean, required: true},
 		layoutOptions: {type: Object as PropType<LayoutOptions>, required: true},
 		componentOptions: {type: Object, required: true},
 	},
 	methods: {
-		openClicked(){
-			this.$emit('settings-open');
-		},
 		closeClicked(evt: Event){
 			if (evt.target == this.$el || evt.target == this.$refs.closeIcon){
 				this.$emit('settings-close');
@@ -37,126 +33,84 @@ export default defineComponent({
 			this.onLayoutOptChg();
 		},
 	},
-	emits: ['settings-open', 'settings-close', 'layout-option-change', ],
+	emits: ['settings-close', 'layout-option-change', ],
 });
 </script>
 
 <template>
-<div class="fixed left-0 top-0 w-full h-full overflow-hidden invisible"
-	@click="closeClicked">
-	<!-- outer div prevents overflow from transitioning to/from off-screen -->
-	<transition name="slide-bottom-right">
-		<div v-if="isOpen"
-			class="absolute bottom-4 right-4 min-w-[5cm] p-3 bg-stone-50 visible rounded-md shadow shadow-black">
-			<svg v-if="isOpen"
-				class="block absolute top-2 right-2 w-6 h-6 hover:cursor-pointer"
-				@click="closeClicked" ref="closeIcon"
-				xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
-				stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-			  <line x1="18" y1="6" x2="6" y2="18"/>
-			  <line x1="6" y1="6" x2="18" y2="18"/>
-			</svg>
-			<h1 class="text-xl font-bold mb-2">Settings</h1>
-			<hr class="border-stone-400"/>
-			<div>
-				<label>Tile Spacing <input type="range" min="0" max="20" class="mx-2 w-[3cm]"
-					v-model.number="layoutOptions.tileSpacing" @input="onLayoutOptChg"/></label>
-			</div>
-			<hr class="border-stone-400"/>
-			<div>
-				<label>
-					<span class="inline-block w-[3cm]">Min Tile Size</span>
-					<input type="range" min="0" max="400" v-model.number="layoutOptions.minTileSz" class="w-[3cm]"
-						@input="onMinTileSzChg" ref="minTileSzInput"/>
-				</label>
-			</div>
-			<div>
-				<label>
-					<span class="inline-block w-[3cm]">Max Tile Size</span>
-					<input type="range" min="0" max="400" v-model.number="layoutOptions.maxTileSz" class="w-[3cm]"
-						@input="onMaxTileSzChg" ref="maxTileSzInput"/>
-				</label>
-			</div>
-			<hr class="border-stone-400"/>
-			<div>
-				Layout Method
-				<ul>
-					<li>
-						<label> <input type="radio" v-model="layoutOptions.layoutType" value="sqr"
-							@change="onLayoutOptChg"/> Squares </label>
-					</li>
-					<li>
-						<label> <input type="radio" v-model="layoutOptions.layoutType" value="rect"
-							@change="onLayoutOptChg"/> Rectangles </label>
-					</li>
-					<li>
-						<label> <input type="radio" v-model="layoutOptions.layoutType" value="sweep"
-							@change="onLayoutOptChg"/> Sweep to side </label>
-					</li>
-				</ul>
-			</div>
-			<hr class="border-stone-400"/>
-			<div>
-				Sweep Mode
-				<ul>
-					<li>
-						<label> <input type="radio" v-model="layoutOptions.sweepMode" value="left"
-							@change="onLayoutOptChg"/> To left </label>
-					</li>
-					<li>
-						<label> <input type="radio" v-model="layoutOptions.sweepMode" value="top"
-							@change="onLayoutOptChg"/> To top </label>
-					</li>
-					<li>
-						<label> <input type="radio" v-model="layoutOptions.sweepMode" value="shorter"
-							@change="onLayoutOptChg"/> To shorter </label>
-					</li>
-					<li>
-						<label> <input type="radio" v-model="layoutOptions.sweepMode" value="auto"
-							@change="onLayoutOptChg"/> Auto </label>
-					</li>
-				</ul>
-			</div>
-			<hr class="border-stone-400"/>
-			<div>
-				<label>Animation Speed <input type="range" min="0" max="1000" class="mx-2 w-[3cm]"
-					v-model.number="componentOptions.transitionDuration"/></label>
-			</div>
-		</div>
-		<div v-else class="absolute bottom-0 right-0 w-[100px] h-[100px]">
-			<!-- outer div prevents transition interference with inner rotate -->
-			<div class="absolute bottom-[-50px] right-[-50px] w-[100px] h-[100px] visible -rotate-45
-				bg-black text-white hover:cursor-pointer" @click="openClicked">
-				<svg class="w-6 h-6 mx-auto mt-2"
-					xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
-					stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
-					<circle cx="12" cy="12" r="3"/>
-					<path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0
-						0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2
-						2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0
-						0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65
-						1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1
-						2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2
-						0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65
-						1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0
-						1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0
-						2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2
-						2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/>
-				</svg>
-			</div>
-		</div>
-	</transition>
+<div class="absolute bottom-4 right-4 min-w-[5cm] p-3 bg-stone-50 visible rounded-md shadow shadow-black">
+	<svg class="block absolute top-2 right-2 w-6 h-6 hover:cursor-pointer"
+		@click="closeClicked" ref="closeIcon"
+		xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
+		stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+		<line x1="18" y1="6" x2="6" y2="18"/>
+		<line x1="6" y1="6" x2="18" y2="18"/>
+	</svg>
+	<h1 class="text-xl font-bold mb-2">Settings</h1>
+	<hr class="border-stone-400"/>
+	<div>
+		<label>Tile Spacing <input type="range" min="0" max="20" class="mx-2 w-[3cm]"
+			v-model.number="layoutOptions.tileSpacing" @input="onLayoutOptChg"/></label>
+	</div>
+	<hr class="border-stone-400"/>
+	<div>
+		<label>
+			<span class="inline-block w-[3cm]">Min Tile Size</span>
+			<input type="range" min="0" max="400" v-model.number="layoutOptions.minTileSz" class="w-[3cm]"
+				@input="onMinTileSzChg" ref="minTileSzInput"/>
+		</label>
+	</div>
+	<div>
+		<label>
+			<span class="inline-block w-[3cm]">Max Tile Size</span>
+			<input type="range" min="0" max="400" v-model.number="layoutOptions.maxTileSz" class="w-[3cm]"
+				@input="onMaxTileSzChg" ref="maxTileSzInput"/>
+		</label>
+	</div>
+	<hr class="border-stone-400"/>
+	<div>
+		Layout Method
+		<ul>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.layoutType" value="sqr"
+					@change="onLayoutOptChg"/> Squares </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.layoutType" value="rect"
+					@change="onLayoutOptChg"/> Rectangles </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.layoutType" value="sweep"
+					@change="onLayoutOptChg"/> Sweep to side </label>
+			</li>
+		</ul>
+	</div>
+	<hr class="border-stone-400"/>
+	<div>
+		Sweep Mode
+		<ul>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="left"
+					@change="onLayoutOptChg"/> To left </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="top"
+					@change="onLayoutOptChg"/> To top </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="shorter"
+					@change="onLayoutOptChg"/> To shorter </label>
+			</li>
+			<li>
+				<label> <input type="radio" v-model="layoutOptions.sweepMode" value="auto"
+					@change="onLayoutOptChg"/> Auto </label>
+			</li>
+		</ul>
+	</div>
+	<hr class="border-stone-400"/>
+	<div>
+		<label>Animation Speed <input type="range" min="0" max="1000" class="mx-2 w-[3cm]"
+			v-model.number="componentOptions.transitionDuration"/></label>
+	</div>
 </div>
 </template>
-
-<style>
-.slide-bottom-right-enter-from, .slide-bottom-right-leave-to {
-	transform: translate(100%, 100%);
-	opacity: 0;
-}
-.slide-bottom-right-enter-active, .slide-bottom-right-leave-active {
-	transition-property: transform, opacity;
-	transition-duration: 300ms;
-	transition-timing-function: ease-in-out;
-}
-</style>
diff --git a/src/components/TileTree.vue b/src/components/TileTree.vue
index 46cb8b3..a5ed75a 100644
--- a/src/components/TileTree.vue
+++ b/src/components/TileTree.vue
@@ -238,7 +238,7 @@ export default defineComponent({
 			this.infoModalNode = null;
 		},
 		//
-		onSettingsOpen(){
+		onSettingsIconClick(){
 			this.closeModalsAndSettings();
 			this.settingsOpen = true;
 		},
@@ -267,6 +267,7 @@ export default defineComponent({
 			this.infoModalNode = null;
 			this.searchOpen = false;
 			this.settingsOpen = false;
+			this.helpOpen = false;
 		},
 		onKeyUp(evt: KeyboardEvent){
 			if (evt.key == 'Escape'){
@@ -466,10 +467,37 @@ export default defineComponent({
 	<parent-bar v-if="sepdParents != null"
 		:pos="[0,0]" :dims="parentBarDims" :nodes="sepdParents" :options="componentOptions"
 		@sepd-parent-clicked="onSepdParentClicked" @info-icon-clicked="onInnerInfoIconClicked"/>
-	<!-- Settings and Icons -->
-	<settings :isOpen="settingsOpen" :layoutOptions="layoutOptions" :componentOptions="componentOptions"
-		@settings-open="onSettingsOpen" @settings-close="onSettingsClose"
-		@layout-option-change="onLayoutOptionChange"/>
+	<!-- Settings -->
+		<!-- outer div prevents overflow from transitioning to/from off-screen -->
+	<div class="fixed left-0 top-0 w-full h-full overflow-hidden invisible" @click="closeClicked">
+		<transition name="slide-bottom-right">
+			<settings v-if="settingsOpen" :layoutOptions="layoutOptions" :componentOptions="componentOptions"
+				@settings-close="onSettingsClose" @layout-option-change="onLayoutOptionChange"/>
+			<!-- outer div prevents transition interference with inner rotate -->
+			<div v-else class="absolute bottom-0 right-0 w-[100px] h-[100px]">
+				<div class="absolute bottom-[-50px] right-[-50px] w-[100px] h-[100px] visible -rotate-45
+					bg-black text-white hover:cursor-pointer" @click="onSettingsIconClick">
+					<svg class="w-6 h-6 mx-auto mt-2"
+						xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
+						stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+						<circle cx="12" cy="12" r="3"/>
+						<path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0
+							0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2
+							2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0
+							0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65
+							1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1
+							2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2
+							0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65
+							1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0
+							1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0
+							2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2
+							2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/>
+					</svg>
+				</div>
+			</div>
+		</transition>
+	</div>
+	<!-- Icons -->
 	<svg @click="onSearchIconClick"
 		class="absolute top-[6px] right-[54px] w-[18px] h-[18px] text-white/40 hover:text-white hover:cursor-pointer"
 		xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"
@@ -553,4 +581,13 @@ export default defineComponent({
 	transition-duration: 300ms;
 	transition-timing-function: ease-out;
 }
+.slide-bottom-right-enter-from, .slide-bottom-right-leave-to {
+	transform: translate(100%, 100%);
+	opacity: 0;
+}
+.slide-bottom-right-enter-active, .slide-bottom-right-leave-active {
+	transition-property: transform, opacity;
+	transition-duration: 300ms;
+	transition-timing-function: ease-in-out;
+}
 </style>
-- 
cgit v1.2.3