dodgy merge
This commit is contained in:
parent
42b3893c21
commit
1bb0a9a14b
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue