- fixed expanding items conflicts when ids are duplicated

Author: derpdead

README.md

@@ -156,8 +156,8 @@ Example:
         <template #body>
             <!-- Might be added custom body which will overwrite DOM virtualization - useful for presenting placeholders in case that there is no data -->
         </template>
-        <template #item="{ item, index, onExpand }">
-            <div v-text="item" @click="onExpand" />
+        <template #item="{ item, onExpand }">
+            <div v-text="item" @click="onExpand(item)" />
         </template>
         <template #footer>
             <!-- Might be added sticky / floating footer -->

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-windowing",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Set of components used for virtualizing DOM",
   "author": {
     "name": "Maciej Kaczorowski",

src/components/ExpandingList.vue

@@ -60,6 +60,10 @@ export default {
       const expandedParents = {};
 
       this.flattenedItems.forEach((item) => {
+        if (typeof expandedParents[item.id] !== 'undefined') {
+          delete expandedParents[item.id];
+        }
+
         if (item.expanded) {
           expandedParents[item.id] = true;
         }
@@ -84,7 +88,10 @@ export default {
   },
   methods: {
     onExpandItem(item) {
-      const itemIndex = this.flattenedItems.findIndex(({ id }) => id === item.id);
+      const itemIndex = this.flattenedItems.findIndex(({
+        id,
+        rootId,
+      }) => id === item.id && rootId === item.rootId);
 
       if (itemIndex !== -1) {
         this.flattenedItems[itemIndex].expanded = !this.flattenedItems[itemIndex].expanded;
@@ -93,7 +100,7 @@ export default {
           let i = itemIndex + 1;
 
           while (i < this.flattenedItems.length - 1
-            && this.flattenedItems[i].rootIndex > this.flattenedItems[itemIndex].rootIndex) {
+            && this.flattenedItems[i].level > this.flattenedItems[itemIndex].level) {
             this.flattenedItems[i].expanded = false;
 
             i += 1;

src/utils/index.js

@@ -32,9 +32,9 @@ export const getExpandingFlattenedItems = ({
   items.forEach((item) => {
     const { children = [], ...rest } = item;
 
-    const isExpanded = typeof expanded === 'object'
+    const isExpanded = Boolean(typeof expanded === 'object'
       ? expanded[rest.id]
-      : expanded;
+      : expanded);
 
     flattenedItems.push({
       ...rest,