mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-16 14:26:25 +02:00
Code Issues Releases Wiki Activity

Fix listItems to unbrick admin extension pages

Browse Source 
https://github.com/flarum/core/pull/3176 accidentially stopped adding a `key` attribute to wrappers of non-vnode inputs. This resulted in "all or no vnodes must have keys" errors.
This commit is contained in:
Alexander Skvortsov
2021-12-13 01:34:05 -05:00
parent d2a952d264
commit f51fc7b502
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
framework/core/js/src/common/helpers/listItems.tsx
View File

@@ -65,15 +65,7 @@ export default function listItems<Attrs extends ComponentAttrs>(
return withoutUnnecessarySeparators(items).map((item) => { return withoutUnnecessarySeparators(items).map((item) => {
const classes = [item.itemName && `item-${item.itemName}`]; const classes = [item.itemName && `item-${item.itemName}`];
if (!isVnode(item)) { if (isVnode(item) && item.tag.isListItem) {
return (
<Tag className={classList(classes)} {...attributes}>
{item}
</Tag>
);
}
if (item.tag.isListItem) {
item.attrs = item.attrs || {}; item.attrs = item.attrs || {};
item.attrs.key = item.attrs.key || item.itemName; item.attrs.key = item.attrs.key || item.itemName;
item.key = item.attrs.key; item.key = item.attrs.key;
@@ -81,14 +73,18 @@ export default function listItems<Attrs extends ComponentAttrs>(
return item; return item;
} }
classes.push(item.attrs?.itemClassName || item.itemClassName); if (isVnode(item)) {
classes.push(item.attrs?.itemClassName || item.itemClassName);
if (item.tag.isActive?.(item.attrs)) {
classes.push('active'); if (item.tag.isActive?.(item.attrs)) {
classes.push('active');
}
} }
const key = isVnode(item) && item?.attrs?.key || item.itemName;
return ( return (
<Tag className={classList(classes)} key={item?.attrs?.key || item.itemName} {...attributes}> <Tag className={classList(classes)} key={key} {...attributes}>
{item} {item}
</Tag> </Tag>
); );