From d31745fb02846d0ef3ea300716add5424867b20d Mon Sep 17 00:00:00 2001 From: pngwn Date: Mon, 20 Jan 2020 12:28:05 +0000 Subject: [PATCH] Ensure only props are passed to propControl --- .../builder/src/userInterface/PropsView.svelte | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/builder/src/userInterface/PropsView.svelte b/packages/builder/src/userInterface/PropsView.svelte index 89d03e71e4..80e742e220 100644 --- a/packages/builder/src/userInterface/PropsView.svelte +++ b/packages/builder/src/userInterface/PropsView.svelte @@ -30,11 +30,11 @@ $: { if(componentInfo) { isInstance = !!instanceProps; - props = isInstance + props = isInstance ? getInstanceProps(componentInfo, instanceProps) : cloneDeep(componentInfo.fullProps); - propsDefinitions = pipe(componentInfo.propsDefinition, [ + propsDefinitions = pipe(componentInfo.propsDefinition.props, [ keys, map(k => ({...componentInfo.propsDefinition[k], ____name:k})), sortBy("____name") @@ -64,16 +64,16 @@ let setProp = (name, value) => { props = newProps; if(validate(finalProps)) onPropsChanged(finalProps); - + } - + const validate = (finalProps) => { errors = validateProps(componentInfo.rootComponent, finalProps, [], false); onValidate(errors); return errors.length === 0; } -const fieldHasError = (propName) => +const fieldHasError = (propName) => some(e => e.propName === propName)(errors); @@ -82,7 +82,7 @@ const fieldHasError = (propName) =>
{#each propsDefinitions as propDef, index} - +
disabled={false} />
- + {/each}
- + @@ -121,4 +121,4 @@ const fieldHasError = (propName) => min-width: 250px; } - \ No newline at end of file +