From 6d534d312f06ead99d932072fe677194cbfb2963 Mon Sep 17 00:00:00 2001
From: Dmitry Yankowski <dmitry@snoculars.com>
Date: Tue, 25 Feb 2020 00:32:03 -0500
Subject: [PATCH] Fix auto scroll

Wasn't actually working with the last PR. This one fixes it.
---
 pages/graphql.vue | 14 +++++++++++---
 pages/index.vue   | 37 ++++++++++++++++++++++++++-----------
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/pages/graphql.vue b/pages/graphql.vue
index 233b16336..ab2b1990e 100644
--- a/pages/graphql.vue
+++ b/pages/graphql.vue
@@ -346,6 +346,14 @@ export default {
       doneButton: '<i class="material-icons">done</i>',
       expandResponse: false,
       responseBodyMaxLines: 16,
+      
+      settings: {
+        SCROLL_INTO_ENABLED:
+          typeof this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED !==
+          "undefined"
+            ? this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED
+            : true,
+      }
     }
   },
 
@@ -417,7 +425,7 @@ export default {
       const rootTypeName = this.resolveRootType(type).name
 
       const target = document.getElementById(`type_${rootTypeName}`)
-      if (target && this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED) {
+      if (target && this.settings.SCROLL_INTO_ENABLED) {
         target.scrollIntoView({
           behavior: "smooth",
         })
@@ -472,7 +480,7 @@ export default {
 
       this.$nuxt.$loading.start()
       this.response = this.$t("loading")
-      this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED && this.scrollInto("response")
+      this.settings.SCROLL_INTO_ENABLED && this.scrollInto("response")
 
       try {
         let headers = {}
@@ -515,7 +523,7 @@ export default {
     async getSchema() {
       const startTime = Date.now()
       this.schema = this.$t("loading")
-      this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED && this.scrollInto("schema")
+      this.settings.SCROLL_INTO_ENABLED && this.scrollInto("schema")
 
       // Start showing the loading bar as soon as possible.
       // The nuxt axios module will hide it when the request is made.
diff --git a/pages/index.vue b/pages/index.vue
index 2448bfa9f..83b37cc71 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1437,7 +1437,15 @@ export default {
       files: [],
       filenames: "",
       navigatorShare: navigator.share,
-    }
+
+      settings: {
+        SCROLL_INTO_ENABLED:
+          typeof this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED !==
+          "undefined"
+            ? this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED
+            : true
+      }
+    };
   },
   watch: {
     urlExcludes: {
@@ -1959,14 +1967,21 @@ export default {
         behavior: "smooth",
       })
     },
-    handleUseHistory({ label, method, url, path, usesScripts, preRequestScript }) {
-      this.label = label
-      this.method = method
-      this.url = url
-      this.path = path
-      this.showPreRequestScript = usesScripts
-      this.preRequestScript = preRequestScript
-      this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED && this.scrollInto("request")
+    handleUseHistory({
+      label,
+      method,
+      url,
+      path,
+      usesScripts,
+      preRequestScript
+    }) {
+      this.label = label;
+      this.method = method;
+      this.url = url;
+      this.path = path;
+      this.showPreRequestScript = usesScripts;
+      this.preRequestScript = preRequestScript;
+      this.settings.SCROLL_INTO_ENABLED && this.scrollInto("request");
     },
     getVariablesFromPreRequestScript() {
       if (!this.preRequestScript) {
@@ -2001,8 +2016,8 @@ export default {
       return await sendNetworkRequest(requestOptions, this.$store)
     },
     async sendRequest() {
-      this.$toast.clear()
-      this.$store.state.postwoman.settings.SCROLL_INTO_ENABLED && this.scrollInto("response")
+      this.$toast.clear();
+      this.settings.SCROLL_INTO_ENABLED && this.scrollInto("response");
 
       if (!this.isValidURL) {
         this.$toast.error(this.$t("url_invalid_format"), {