From 07c3211989dbf519e27015227ca164c94deb5770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E9=9B=A8?= <rainyday66@sina.com>
Date: Wed, 26 Dec 2018 14:02:43 +0800
Subject: [PATCH] perf[ScrollPane]: refine moveToTarget code (#1460)

---
 src/components/ScrollPane/index.vue | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/components/ScrollPane/index.vue b/src/components/ScrollPane/index.vue
index 89998e8..172afcc 100644
--- a/src/components/ScrollPane/index.vue
+++ b/src/components/ScrollPane/index.vue
@@ -28,8 +28,6 @@ export default {
 
       let firstTag = null
       let lastTag = null
-      let prevTag = null
-      let nextTag = null
 
       // find first tag and last tag
       if (tagList.length > 0) {
@@ -37,26 +35,15 @@ export default {
         lastTag = tagList[tagList.length - 1]
       }
 
-      // find preTag and nextTag
-      for (let i = 0; i < tagList.length; i++) {
-        if (tagList[i] === currentTag) {
-          if (i === 0) {
-            nextTag = tagList[i].length > 1 && tagList[i + 1]
-          } else if (i === tagList.length - 1) {
-            prevTag = tagList[i].length > 1 && tagList[i - 1]
-          } else {
-            prevTag = tagList[i - 1]
-            nextTag = tagList[i + 1]
-          }
-          break
-        }
-      }
-
       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
 
-- 
GitLab