dodgy merge

This commit is contained in:
Michael Shanks 2020-02-20 17:27:48 +00:00
parent f2e6ac0145
commit 7940d12c62
2 changed files with 6 additions and 3 deletions

View File

@ -116,7 +116,6 @@
</ul> </ul>
{#if componentLibrary} {#if componentLibrary}
{#each $store.builtins.concat(componentLibrary.components) as component}
{#each generate_components_list(componentLibrary.components) as component} {#each generate_components_list(componentLibrary.components) as component}
<div class="component-container"> <div class="component-container">
<div <div

View File

@ -25,8 +25,12 @@
] ]
) )
const lastPartOfName = c => const lastPartOfName = c => {
c && last(c.name ? c.name.split("/") : c._component.split("/")) if (!c) return ""
const name = c.name ? c.name : c._component ? c._component : c
return last(name.split("/"))
}
const isComponentSelected = (current, comp) => current === comp const isComponentSelected = (current, comp) => current === comp