mirror of
https://github.com/flarum/framework.git
synced 2024-12-01 14:20:47 +08:00
3cec7e8b46
Turns out there's a little more to the regression in e5a7013
. First, we need to give the spaces in between list items a key too. Second, there's a bug in the latest Mithril code where using string keys can break the diffing algorithm. I've patched it manually in our dist JS files for now, and reported the issue: https://github.com/lhorie/mithril.js/issues/934
60 lines
1.5 KiB
JavaScript
60 lines
1.5 KiB
JavaScript
import Separator from 'flarum/components/Separator';
|
|
import classList from 'flarum/utils/classList';
|
|
|
|
function isSeparator(item) {
|
|
return item && item.component === Separator;
|
|
}
|
|
|
|
function withoutUnnecessarySeparators(items) {
|
|
const newItems = [];
|
|
let prevItem;
|
|
|
|
items.forEach((item, i) => {
|
|
if (!isSeparator(item) || (prevItem && !isSeparator(prevItem) && i !== items.length - 1)) {
|
|
prevItem = item;
|
|
newItems.push(item);
|
|
}
|
|
});
|
|
|
|
return newItems;
|
|
}
|
|
|
|
/**
|
|
* The `listItems` helper wraps a collection of components in <li> tags,
|
|
* stripping out any unnecessary `Separator` components.
|
|
*
|
|
* @param {*} items
|
|
* @return {Array}
|
|
*/
|
|
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;
|
|
|
|
if (isListItem) {
|
|
item.attrs = item.attrs || {};
|
|
item.attrs.key = item.attrs.key || item.itemName;
|
|
}
|
|
|
|
const space = new String(' ');
|
|
space.attrs = {key: '_space_'+item.itemName};
|
|
|
|
return [
|
|
isListItem
|
|
? item
|
|
: <li className={classList([
|
|
(item.itemName ? 'item-' + item.itemName : ''),
|
|
className,
|
|
(active ? 'active' : '')
|
|
])}
|
|
key={item.itemName}>
|
|
{item}
|
|
</li>,
|
|
space
|
|
];
|
|
});
|
|
}
|