Fixed start and offset prop data change reactive #188

tangbc · Apr 22, 2020 · 427bdff · 427bdff
1 parent c0f6423
commit 427bdff
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 27 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1,5 +1,5 @@
 /*!
- * vue-virtual-scroll-list v2.0.8
+ * vue-virtual-scroll-list v2.0.9
  * open source under the MIT license
  * https://github.com/tangbc/vue-virtual-scroll-list#readme
  */
@@ -113,7 +113,7 @@
     }, {
       key: "getOffset",
       value: function getOffset(start) {
-        return this.getIndexOffset(start);
+        return start < 1 ? 0 : this.getIndexOffset(start);
       }
     }, {
       key: "updateParam",
@@ -581,6 +581,12 @@
           this.virtual.updateParam('uniqueIds', this.getUniqueIdFromDataSources());
           this.virtual.handleDataSourcesChange();
         }
+      },
+      start: function start(newValue) {
+        this.scrollToIndex(newValue);
+      },
+      offset: function offset(newValue) {
+        this.scrollToOffset(newValue);
       }
     },
     created: function created() {
@@ -620,11 +626,8 @@
       },
       // set current scroll position to a expectant index
       scrollToIndex: function scrollToIndex(index) {
-        // scroll to top
-        if (index <= 0) {
-          this.scrollToOffset(0);
-        } else if (index >= this.dataSources.length - 1) {
-          // scroll to bottom
+        // scroll to bottom
+        if (index >= this.dataSources.length - 1) {
           this.scrollToBottom();
         } else {
           var offset = this.virtual.getOffset(index);
@@ -748,20 +751,24 @@
           var dataSource = this.dataSources[index];
 
           if (dataSource) {
-            slots.push(h(Item, {
-              "class": this.itemClass,
-              props: {
-                tag: this.itemTag,
-                event: EVENT_TYPE.ITEM,
-                horizontal: this.isHorizontal,
-                uniqueKey: dataSource[this.dataKey],
-                source: dataSource,
-                extraProps: this.extraProps,
-                component: this.dataComponent
-              }
-            }));
+            if (dataSource[this.dataKey]) {
+              slots.push(h(Item, {
+                "class": this.itemClass,
+                props: {
+                  tag: this.itemTag,
+                  event: EVENT_TYPE.ITEM,
+                  horizontal: this.isHorizontal,
+                  uniqueKey: dataSource[this.dataKey],
+                  source: dataSource,
+                  extraProps: this.extraProps,
+                  component: this.dataComponent
+                }
+              }));
+            } else {
+              console.warn("Cannot get the data-key '".concat(this.dataKey, "' from data-sources."));
+            }
           } else {
-            console.warn("Cannot get the index ".concat(index, " from data-sources."));
+            console.warn("Cannot get the index '".concat(index, "' from data-sources."));
           }
         }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-virtual-scroll-list",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "A vue component support big amount data list with high scroll performance.",
   "main": "dist/index.js",
   "files": [

diff --git a/src/index.js b/src/index.js
@@ -31,6 +31,14 @@ const VirtualList = Vue.component('virtual-list', {
         this.virtual.updateParam('uniqueIds', this.getUniqueIdFromDataSources())
         this.virtual.handleDataSourcesChange()
       }
+    },
+
+    start (newValue) {
+      this.scrollToIndex(newValue)
+    },
+
+    offset (newValue) {
+      this.scrollToOffset(newValue)
     }
   },
 
@@ -78,11 +86,8 @@ const VirtualList = Vue.component('virtual-list', {
 
     // set current scroll position to a expectant index
     scrollToIndex (index) {
-      // scroll to top
-      if (index <= 0) {
-        this.scrollToOffset(0)
-      } else if (index >= this.dataSources.length - 1) {
-        // scroll to bottom
+      // scroll to bottom
+      if (index >= this.dataSources.length - 1) {
         this.scrollToBottom()
       } else {
         const offset = this.virtual.getOffset(index)

diff --git a/src/virtual.js b/src/virtual.js
@@ -70,7 +70,7 @@ export default class Virtual {
 
   // return start index offset
   getOffset (start) {
-    return this.getIndexOffset(start)
+    return start < 1 ? 0 : this.getIndexOffset(start)
   }
 
   updateParam (key, value) {