MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #347 from Budibase/property-panel/remove-suffix-dependency 

User can now specify suffix in the Input
This commit is contained in:
Conor_Mack 2020-06-09 11:46:07 +01:00 committed by GitHub
parent 7cd53d06ab d029dc6a4d
commit ce51796e30
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/builder/src/components/common/Inputs/InputGroup.svelte
View File

@ -10,18 +10,18 @@
export let onChange = () => {} export let onChange = () => {}
function handleChange(val, idx) { function handleChange(val, idx) {
value.splice(idx, 1, val !== "auto" ? val + suffix : val) value.splice(idx, 1, val !== "auto" && suffix ? val + suffix : val)
value = value value = value
let _value = value.map(v => let _value = value.map(v =>
!v.endsWith(suffix) && v !== "auto" ? v + suffix : v suffix && !v.endsWith(suffix) && v !== "auto" ? v + suffix : v
) )
onChange(_value) onChange(_value)
} }
$: displayValues = value $: displayValues = value && suffix
? value.map(v => v.replace(new RegExp(`${suffix}$`), "")) ? value.map(v => v.replace(new RegExp(`${suffix}$`), ""))
: [] : value || []
</script> </script>
<div class="input-container"> <div class="input-container">

8
packages/builder/src/components/userInterface/propertyCategories.js
View File

@ -84,7 +84,6 @@ export const spacing = [
key: "margin", key: "margin",
control: InputGroup, control: InputGroup,
meta: spacingMeta, meta: spacingMeta,
suffix: "px",
defaultValue: ["0", "0", "0", "0"], defaultValue: ["0", "0", "0", "0"],
}, },
{ {
@ -92,7 +91,6 @@ export const spacing = [
key: "padding", key: "padding",
control: InputGroup, control: InputGroup,
meta: spacingMeta, meta: spacingMeta,
suffix: "px",
defaultValue: ["0", "0", "0", "0"], defaultValue: ["0", "0", "0", "0"],
}, },
] ]
@ -103,7 +101,6 @@ export const size = [
key: "width", key: "width",
control: Input, control: Input,
placeholder: "px", placeholder: "px",
suffix: "px",
width: "48px", width: "48px",
textAlign: "center", textAlign: "center",
}, },
@ -112,7 +109,6 @@ export const size = [
key: "height", key: "height",
control: Input, control: Input,
placeholder: "px", placeholder: "px",
suffix: "px",
width: "48px", width: "48px",
textAlign: "center", textAlign: "center",
}, },
@ -121,7 +117,6 @@ export const size = [
key: "min-width", key: "min-width",
control: Input, control: Input,
placeholder: "px", placeholder: "px",
suffix: "px",
width: "48px", width: "48px",
textAlign: "center", textAlign: "center",
}, },
@ -129,7 +124,6 @@ export const size = [
label: "Min H", label: "Min H",
key: "min-height", key: "min-height",
control: Input, control: Input,
suffix: "px",
placeholder: "px", placeholder: "px",
width: "48px", width: "48px",
textAlign: "center", textAlign: "center",
@ -139,7 +133,6 @@ export const size = [
key: "max-width", key: "max-width",
control: Input, control: Input,
placeholder: "px", placeholder: "px",
suffix: "px",
width: "48px", width: "48px",
textAlign: "center", textAlign: "center",
}, },
@ -148,7 +141,6 @@ export const size = [
key: "max-height", key: "max-height",
control: Input, control: Input,
placeholder: "px", placeholder: "px",
suffix: "px",
width: "48px", width: "48px",
textAlign: "center", textAlign: "center",
}, },