From 19ac54768a1b17cf67cd2581464c6c443846e802 Mon Sep 17 00:00:00 2001
From: Tuan Duong <bacduong@gmail.com>
Date: Mon, 4 Mar 2019 01:35:06 +0900
Subject: [PATCH] Improvement - ScrollPanel should not contain any tags-view
 logic

---
 src/components/ScrollPane/index.vue      | 48 ++++--------------------
 src/views/layout/components/TagsView.vue | 29 +++++++++++++-
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/src/components/ScrollPane/index.vue b/src/components/ScrollPane/index.vue
index 172afccc..bc40129c 100644
--- a/src/components/ScrollPane/index.vue
+++ b/src/components/ScrollPane/index.vue
@@ -5,8 +5,6 @@
 </template>
 
 <script>
-const tagAndTagSpacing = 4 // tagAndTagSpacing
-
 export default {
   name: 'ScrollPane',
   data() {
@@ -14,48 +12,18 @@ export default {
       left: 0
     }
   },
+  computed: {
+    scrollWrapper() {
+      return this.$refs.scrollContainer.$refs.wrap
+    }
+  },
   methods: {
     handleScroll(e) {
       const eventDelta = e.wheelDelta || -e.deltaY * 40
-      const $scrollWrapper = this.$refs.scrollContainer.$refs.wrap
-      $scrollWrapper.scrollLeft = $scrollWrapper.scrollLeft + eventDelta / 4
+      this.scrollWrapper.scrollLeft = this.scrollWrapper.scrollLeft + eventDelta / 4
     },
-    moveToTarget(currentTag) {
-      const $container = this.$refs.scrollContainer.$el
-      const $containerWidth = $container.offsetWidth
-      const $scrollWrapper = this.$refs.scrollContainer.$refs.wrap
-      const tagList = this.$parent.$refs.tag
-
-      let firstTag = null
-      let lastTag = null
-
-      // find first tag and last tag
-      if (tagList.length > 0) {
-        firstTag = tagList[0]
-        lastTag = tagList[tagList.length - 1]
-      }
-
-      if (firstTag === currentTag) {
-        $scrollWrapper.scrollLeft = 0
-      } else if (lastTag === currentTag) {
-        $scrollWrapper.scrollLeft = $scrollWrapper.scrollWidth - $containerWidth
-      } else {
-        // find preTag and nextTag
-        const currentIndex = tagList.findIndex(item => item === currentTag)
-        const prevTag = tagList[currentIndex - 1]
-        const nextTag = tagList[currentIndex + 1]
-        // the tag's offsetLeft after of nextTag
-        const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
-
-        // the tag's offsetLeft before of prevTag
-        const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
-
-        if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $containerWidth) {
-          $scrollWrapper.scrollLeft = afterNextTagOffsetLeft - $containerWidth
-        } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
-          $scrollWrapper.scrollLeft = beforePrevTagOffsetLeft
-        }
-      }
+    scrollLeft(offsetLeft) {
+      this.scrollWrapper.scrollLeft = offsetLeft
     }
   }
 }
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index 7b7be8f7..7fbfbe37 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -29,6 +29,7 @@
 import ScrollPane from '@/components/ScrollPane'
 import { generateTitle } from '@/utils/i18n'
 import path from 'path'
+const tagAndTagSpacing = 4 // tagAndTagSpacing
 
 export default {
   components: { ScrollPane },
@@ -113,7 +114,33 @@ export default {
       this.$nextTick(() => {
         for (const tag of tags) {
           if (tag.to.path === this.$route.path) {
-            this.$refs.scrollPane.moveToTarget(tag)
+            const $scrollContainerWidth = this.$refs.scrollPane.$el.offsetWidth
+            const $scrollWrapper = this.$refs.scrollPane.scrollWrapper
+
+            const firstTag = tags[0]
+            const lastTag = tags[tags.length - 1]
+
+            if (firstTag === tag) { // Current tag is the first one
+              this.$refs.scrollPane.scrollLeft(0)
+            } else if (lastTag === tag) { // Current tag is the last one
+              this.$refs.scrollPane.scrollLeft($scrollWrapper.scrollWidth - $scrollContainerWidth)
+            } else {
+              // find preTag and nextTag
+              const currentIndex = tags.findIndex(item => item === tag)
+              const prevTag = tags[currentIndex - 1]
+              const nextTag = tags[currentIndex + 1]
+              // the tag's offsetLeft after of nextTag
+              const afterNextTagOffsetLeft = nextTag.$el.offsetLeft + nextTag.$el.offsetWidth + tagAndTagSpacing
+
+              // the tag's offsetLeft before of prevTag
+              const beforePrevTagOffsetLeft = prevTag.$el.offsetLeft - tagAndTagSpacing
+
+              if (afterNextTagOffsetLeft > $scrollWrapper.scrollLeft + $scrollContainerWidth) {
+                this.$refs.scrollPane.scrollLeft(afterNextTagOffsetLeft - $scrollContainerWidth)
+              } else if (beforePrevTagOffsetLeft < $scrollWrapper.scrollLeft) {
+                this.$refs.scrollPane.scrollLeft(beforePrevTagOffsetLeft)
+              }
+            }
 
             // when query is different then update
             if (tag.to.fullPath !== this.$route.fullPath) {