formatting and lint update

This commit is contained in:
Joe 2020-06-11 13:15:19 +01:00
parent a552772ccc
commit 9068bbc89c
4 changed files with 59 additions and 33 deletions

View File

@ -19,9 +19,10 @@
onChange(_value) onChange(_value)
} }
$: displayValues = value && suffix $: displayValues =
? value.map(v => v.replace(new RegExp(`${suffix}$`), "")) value && suffix
: value || [] ? value.map(v => v.replace(new RegExp(`${suffix}$`), ""))
: value || []
</script> </script>
<div class="input-container"> <div class="input-container">

View File

@ -21,7 +21,7 @@
return componentName || "element" return componentName || "element"
} }
const screenPlaceholder = { const screenPlaceholder = {
name: "Screen Placeholder", name: "Screen Placeholder",
route: "*", route: "*",
props: { props: {
@ -60,9 +60,8 @@
}, },
} }
$: hasComponent = !!$store.currentPreviewItem $: hasComponent = !!$store.currentPreviewItem
$: { $: {
styles = "" styles = ""
// Apply the CSS from the currently selected page and its screens // Apply the CSS from the currently selected page and its screens
@ -88,9 +87,9 @@
libraries: $store.libraries, libraries: $store.libraries,
page: $store.pages[$store.currentPageName], page: $store.pages[$store.currentPageName],
screens: [ screens: [
$store.currentFrontEndType === "page" $store.currentFrontEndType === "page"
? screenPlaceholder ? screenPlaceholder
: $store.currentPreviewItem, : $store.currentPreviewItem,
], ],
appRootPath: "", appRootPath: "",
} }
@ -102,20 +101,25 @@
: "" : ""
const refreshContent = () => { const refreshContent = () => {
iframe.contentWindow.postMessage(JSON.stringify({ iframe.contentWindow.postMessage(
styles, JSON.stringify({
stylesheetLinks, styles,
selectedComponentType, stylesheetLinks,
selectedComponentId, selectedComponentType,
frontendDefinition, selectedComponentId,
})) frontendDefinition,
})
)
} }
$: if(iframe) iframe.contentWindow.addEventListener("bb-ready", refreshContent, { once: true }) $: if (iframe)
iframe.contentWindow.addEventListener("bb-ready", refreshContent, {
once: true,
})
$: if(iframe && frontendDefinition) { $: if (iframe && frontendDefinition) {
refreshContent() refreshContent()
} }
</script> </script>
<div class="component-container"> <div class="component-container">

View File

@ -37,27 +37,32 @@
//use for getting controls for each component property //use for getting controls for each component property
c => c._component === componentInstance._component c => c._component === componentInstance._component
) || {} ) || {}
let panelDefinition = {} let panelDefinition = {}
$: { $: {
if(componentPropDefinition.properties) { if (componentPropDefinition.properties) {
if(selectedCategory.value === "design") { if (selectedCategory.value === "design") {
panelDefinition = componentPropDefinition.properties["design"] panelDefinition = componentPropDefinition.properties["design"]
}else{ } else {
let panelDef = componentPropDefinition.properties["settings"] let panelDef = componentPropDefinition.properties["settings"]
if($store.currentFrontEndType === "page" && $store.currentView !== "component") { if (
panelDefinition = [...page,...panelDef] $store.currentFrontEndType === "page" &&
}else if($store.currentFrontEndType === "screen" && $store.currentView !== "component") { $store.currentView !== "component"
) {
panelDefinition = [...page, ...panelDef]
} else if (
$store.currentFrontEndType === "screen" &&
$store.currentView !== "component"
) {
panelDefinition = [...screen, ...panelDef] panelDefinition = [...screen, ...panelDef]
}else { } else {
panelDefinition = panelDef panelDefinition = panelDef
} }
} }
} }
} }
const onStyleChanged = store.setComponentStyle const onStyleChanged = store.setComponentStyle
const onPropChanged = store.setComponentProp const onPropChanged = store.setComponentProp

View File

@ -403,10 +403,26 @@ export const effects = [
options: [ options: [
{ label: "None", value: "none" }, { label: "None", value: "none" },
{ label: "Extra small", value: "0 1px 2px 0 rgba(0, 0, 0, 0.05)" }, { label: "Extra small", value: "0 1px 2px 0 rgba(0, 0, 0, 0.05)" },
{ label: "Small", value: "0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06)" }, {
{ label: "Medium", value: "0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)" }, label: "Small",
{ label: "Large", value: "0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)" }, value:
{ label: "Extra large", value: "0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)" }, "0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06)",
},
{
label: "Medium",
value:
"0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06)",
},
{
label: "Large",
value:
"0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)",
},
{
label: "Extra large",
value:
"0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04)",
},
], ],
}, },
] ]