github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 09:41:49 +08:00
Code Issues Actions 46 Packages Projects 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 c2ec848744
commit d0c160923d
No known key found for this signature in database
GPG Key ID: C4E3BBF9C3412B4C
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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