From 0d0833cbb9c237f377631c4aa4b4eb5c78133b39 Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Wed, 29 Jun 2022 19:10:33 +1000
Subject: Refactor to provide default-option access to non-top-level components

---
 src/components/AncestryBar.vue   |  3 ++-
 src/components/SearchModal.vue   |  3 ++-
 src/components/SettingsModal.vue | 16 ++++++++++++----
 src/components/Tile.vue          |  3 ++-
 src/components/TileInfoModal.vue |  4 ++--
 5 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'src/components')

diff --git a/src/components/AncestryBar.vue b/src/components/AncestryBar.vue
index 38d51c3..78972b2 100644
--- a/src/components/AncestryBar.vue
+++ b/src/components/AncestryBar.vue
@@ -9,8 +9,9 @@
 <script lang="ts">
 import {defineComponent, PropType} from 'vue';
 import Tile from './Tile.vue'
-import {TolMap, UiOptions} from '../lib';
+import {TolMap} from '../tol';
 import {LayoutNode, LayoutOptions} from '../layout';
+import {UiOptions} from '../lib';
 
 export default defineComponent({
 	props: {
diff --git a/src/components/SearchModal.vue b/src/components/SearchModal.vue
index cb062e3..d866c91 100644
--- a/src/components/SearchModal.vue
+++ b/src/components/SearchModal.vue
@@ -38,8 +38,9 @@ import {defineComponent, PropType} from 'vue';
 import SearchIcon from './icon/SearchIcon.vue';
 import LogInIcon from './icon/LogInIcon.vue';
 import InfoIcon from './icon/InfoIcon.vue';
-import {TolNode, TolMap, getServerResponse, SearchSugg, SearchSuggResponse, UiOptions} from '../lib';
+import {TolNode, TolMap} from '../tol';
 import {LayoutNode, LayoutOptions} from '../layout';
+import {getServerResponse, SearchSugg, SearchSuggResponse, UiOptions} from '../lib';
 
 export default defineComponent({
 	props: {
diff --git a/src/components/SettingsModal.vue b/src/components/SettingsModal.vue
index b11c84c..2e4d217 100644
--- a/src/components/SettingsModal.vue
+++ b/src/components/SettingsModal.vue
@@ -93,7 +93,7 @@
 import {defineComponent, PropType} from 'vue';
 import SButton from './SButton.vue';
 import CloseIcon from './icon/CloseIcon.vue';
-import {UiOptions, OptionType} from '../lib';
+import {UiOptions, OptionType, getDefaultLytOpts, getDefaultUiOpts} from '../lib';
 import {LayoutOptions} from '../layout';
 
 export default defineComponent({
@@ -141,11 +141,11 @@ export default defineComponent({
 					this.$emit('setting-chg', 'LYT', 'minTileSz', {save: false});
 				}
 			}
-			//
+			// Notify App
 			this.$emit('setting-chg', optionType, option,
 				{save, relayout: optionType == 'LYT', reinit: optionType == 'UI' && option == 'useReducedTree'});
+			// Possibly make saved-indicator appear/animate
 			if (save){
-				// Make saved-indicator appear/animate
 				if (!this.saved){
 					this.saved = true;
 				} else {
@@ -157,7 +157,15 @@ export default defineComponent({
 			}
 		},
 		onReset(){
-			this.$emit('reset');
+			// Restore default options
+			let defaultLytOpts = getDefaultLytOpts();
+			let defaultUiOpts = getDefaultUiOpts(defaultLytOpts);
+			let needReinit = this.uiOpts.useReducedTree != defaultUiOpts.useReducedTree;
+			Object.assign(this.lytOpts, defaultLytOpts);
+			Object.assign(this.uiOpts, defaultUiOpts);
+			// Notify App
+			this.$emit('reset', needReinit);
+			// Clear saved-indicator
 			this.saved = false;
 		},
 		pxToDisplayStr(px: number): string {
diff --git a/src/components/Tile.vue b/src/components/Tile.vue
index 15b1b48..7b24590 100644
--- a/src/components/Tile.vue
+++ b/src/components/Tile.vue
@@ -51,8 +51,9 @@
 <script lang="ts">
 import {defineComponent, PropType} from 'vue';
 import InfoIcon from './icon/InfoIcon.vue';
-import {TolNode, TolMap, getImagePath, UiOptions} from '../lib';
+import {TolNode, TolMap} from '../tol';
 import {LayoutNode, LayoutOptions} from '../layout';
+import {getImagePath, UiOptions} from '../lib';
 import {capitalizeWords} from '../util';
 
 const scrimGradient = 'linear-gradient(to bottom, rgba(0,0,0,0.4), #0000 40%)';
diff --git a/src/components/TileInfoModal.vue b/src/components/TileInfoModal.vue
index c7b6305..c5f46ec 100644
--- a/src/components/TileInfoModal.vue
+++ b/src/components/TileInfoModal.vue
@@ -68,9 +68,9 @@
 import {defineComponent, PropType} from 'vue';
 import CloseIcon from './icon/CloseIcon.vue';
 import ExternalLinkIcon from './icon/ExternalLinkIcon.vue';
+import {TolNode, TolMap} from '../tol';
 import {LayoutNode, LayoutOptions} from '../layout';
-import {TolNode, TolMap, getServerResponse, getImagePath,
-	DescInfo, ImgInfo, NodeInfo, InfoResponse, UiOptions} from '../lib';
+import {getServerResponse, getImagePath, DescInfo, ImgInfo, NodeInfo, InfoResponse, UiOptions} from '../lib';
 import {capitalizeWords} from '../util';
 
 export default defineComponent({
-- 
cgit v1.2.3