Browse Source
binding interface now only updates when the dropdown is closed
pull/556/head
kevmodrome
6 years ago
No known key found for this signature in database
GPG Key ID: E8F9CD141E63BF38
3 changed files with
38 additions and
19 deletions
-
packages/builder/package.json
-
packages/builder/src/components/userInterface/PropertyControl.svelte
-
packages/builder/yarn.lock
|
|
|
@ -17,7 +17,7 @@ |
|
|
|
"cy:test": "start-server-and-test cy:setup http://localhost:4001/_builder cy:run", |
|
|
|
"cy:ci": "start-server-and-test cy:setup http://localhost:4001/_builder cy:run:ci" |
|
|
|
}, |
|
|
|
"jest": { |
|
|
|
"jest": { |
|
|
|
"globals": { |
|
|
|
"GLOBALS": { |
|
|
|
"client": "web" |
|
|
|
@ -57,7 +57,7 @@ |
|
|
|
] |
|
|
|
}, |
|
|
|
"dependencies": { |
|
|
|
"@budibase/bbui": "^1.23.1", |
|
|
|
"@budibase/bbui": "^1.27.0", |
|
|
|
"@budibase/client": "^0.1.17", |
|
|
|
"@budibase/colorpicker": "^1.0.1", |
|
|
|
"@nx-js/compiler-util": "^2.0.0", |
|
|
|
@ -121,4 +121,4 @@ |
|
|
|
"svelte-jester": "^1.0.6" |
|
|
|
}, |
|
|
|
"gitHead": "115189f72a850bfb52b65ec61d932531bf327072" |
|
|
|
} |
|
|
|
} |
|
|
|
@ -1,4 +1,6 @@ |
|
|
|
<script> |
|
|
|
import { Icon } from "@budibase/bbui" |
|
|
|
import Input from "components/common/Input.svelte" |
|
|
|
import { store, backendUiStore } from "builderStore" |
|
|
|
import fetchBindableProperties from "builderStore/fetchBindableProperties" |
|
|
|
import { DropdownMenu } from "@budibase/bbui" |
|
|
|
@ -12,13 +14,17 @@ |
|
|
|
export let props = {} |
|
|
|
export let onChange = () => {} |
|
|
|
|
|
|
|
let temporaryBindableValue = value |
|
|
|
|
|
|
|
function handleClose() { |
|
|
|
handleChange(key, temporaryBindableValue) |
|
|
|
} |
|
|
|
|
|
|
|
let bindableProperties |
|
|
|
|
|
|
|
let anchor |
|
|
|
let dropdown |
|
|
|
|
|
|
|
$: console.log() |
|
|
|
|
|
|
|
async function getBindableProperties() { |
|
|
|
// Get all bindableProperties |
|
|
|
bindableProperties = fetchBindableProperties({ |
|
|
|
@ -98,14 +104,24 @@ |
|
|
|
{...props} |
|
|
|
name={key} /> |
|
|
|
</div> |
|
|
|
<button on:click={dropdown.show}>O</button> |
|
|
|
{#if control == Input} |
|
|
|
<button on:click={dropdown.show}> |
|
|
|
<Icon name="edit" /> |
|
|
|
</button> |
|
|
|
{/if} |
|
|
|
</div> |
|
|
|
<DropdownMenu bind:this={dropdown} {anchor} align="right"> |
|
|
|
<BindingDropdown |
|
|
|
{...handlevalueKey(value)} |
|
|
|
on:update={e => handleChange(key, e.detail)} |
|
|
|
{bindableProperties} /> |
|
|
|
</DropdownMenu> |
|
|
|
{#if control == Input} |
|
|
|
<DropdownMenu |
|
|
|
on:close={handleClose} |
|
|
|
bind:this={dropdown} |
|
|
|
{anchor} |
|
|
|
align="right"> |
|
|
|
<BindingDropdown |
|
|
|
{...handlevalueKey(value)} |
|
|
|
on:update={e => (temporaryBindableValue = e.detail)} |
|
|
|
{bindableProperties} /> |
|
|
|
</DropdownMenu> |
|
|
|
{/if} |
|
|
|
|
|
|
|
<style> |
|
|
|
.property-control { |
|
|
|
@ -139,8 +155,11 @@ |
|
|
|
position: absolute; |
|
|
|
background: none; |
|
|
|
border: none; |
|
|
|
right: 0px; |
|
|
|
top: 0; |
|
|
|
bottom: 0; |
|
|
|
border-radius: 50%; |
|
|
|
height: 24px; |
|
|
|
width: 24px; |
|
|
|
background: rgb(224, 224, 224); |
|
|
|
right: 5px; |
|
|
|
--spacing-s: 0; |
|
|
|
} |
|
|
|
</style> |
|
|
|
|
|
|
|
@ -987,10 +987,10 @@ |
|
|
|
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" |
|
|
|
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== |
|
|
|
|
|
|
|
"@budibase/bbui@^1.23.1": |
|
|
|
version "1.23.1" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.23.1.tgz#232b0d31379ef64afe5e76f477d5489e67defc22" |
|
|
|
integrity sha512-L5KbkBPbTaPUGUEM33hxV2G8R6e+ckBZmph6LnjLsI6a5Bs0hWPv6pYHukeiOMXLPyGlF+ShIfYgoFHi+GRRGA== |
|
|
|
"@budibase/bbui@^1.27.0": |
|
|
|
version "1.27.0" |
|
|
|
resolved "https://registry.yarnpkg.com/@budibase/bbui/-/bbui-1.27.0.tgz#948102a29c203c503745c69c2cdea4440e257a74" |
|
|
|
integrity sha512-7YPWD9gASfUiAmPsvYdGvBtVOdVoOKFRV+q3on8mZ9v/NlupZ2gVJy4m6NsRuoCJBhRF1Uq6bR716KFFxqZXVg== |
|
|
|
dependencies: |
|
|
|
sirv-cli "^0.4.6" |
|
|
|
|
|
|
|
|