From 873f489feca962e37ffc1857a287aab012135346 Mon Sep 17 00:00:00 2001
From: Matthew Kilgore <tankerkiller125@gmail.com>
Date: Tue, 4 Aug 2020 20:02:59 -0400
Subject: [PATCH] update: common/helpers/listItems

---
 js/src/common/helpers/listItems.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/js/src/common/helpers/listItems.js b/js/src/common/helpers/listItems.js
index 2f16c8d62..dc58cfc5e 100644
--- a/js/src/common/helpers/listItems.js
+++ b/js/src/common/helpers/listItems.js
@@ -30,21 +30,29 @@ export default function listItems(items) {
   if (!(items instanceof Array)) items = [items];
 
   return withoutUnnecessarySeparators(items).map((item) => {
-    const isListItem = item.component && item.component.isListItem;
-    const active = item.component && item.component.isActive && item.component.isActive(item.props);
-    const className = item.props ? item.props.itemClassName : item.itemClassName;
+    const isListItem = item.tag && item.tag.isListItem;
+    const active = item.tag && item.tag.isActive && item.tag.isActive(item.attrs);
+    const className = (item.attrs && item.attrs.itemClassName) || item.itemClassName;
 
     if (isListItem) {
       item.attrs = item.attrs || {};
       item.attrs.key = item.attrs.key || item.itemName;
+      item.key = item.attrs.key;
     }
 
-    return isListItem ? (
+    const node = isListItem ? (
       item
     ) : (
-      <li className={classList([item.itemName ? 'item-' + item.itemName : '', className, active ? 'active' : ''])} key={item.itemName}>
+      <li
+        className={classList(className, item.itemName && `item-${item.itemName}`, active && 'active')}
+        key={(item.attrs && item.attrs.key) || item.itemName}
+      >
         {item}
       </li>
     );
+
+    node.state = node.state || {};
+
+    return node;
   });
 }