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

Merge pull request #8934 from Budibase/fix-skeleton-jank 

Fix Skeleton Loader Jumping
This commit is contained in:
Andrew Kingston 2022-12-05 18:12:16 +00:00 committed by GitHub
parent 2f162efa7b 0506c66266
commit 93df5aaf33
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/manifest.json
View File

@ -2598,6 +2598,7 @@
] ]
}, },
"passwordfield": { "passwordfield": {
"skeleton": false,
"name": "Password Field", "name": "Password Field",
"icon": "LockClosed", "icon": "LockClosed",
"styles": [ "styles": [
@ -3066,6 +3067,7 @@
] ]
}, },
"longformfield": { "longformfield": {
"skeleton": false,
"name": "Long Form Field", "name": "Long Form Field",
"icon": "TextAlignLeft", "icon": "TextAlignLeft",
"styles": [ "styles": [

43
packages/client/src/components/app/forms/Form.svelte
View File

@ -20,7 +20,6 @@
const context = getContext("context") const context = getContext("context")
const { API, fetchDatasourceSchema } = getContext("sdk") const { API, fetchDatasourceSchema } = getContext("sdk")
let loaded = false
let schema let schema
let table let table
@ -56,32 +55,30 @@
} }
const res = await fetchDatasourceSchema(dataSource) const res = await fetchDatasourceSchema(dataSource)
schema = res || {} schema = res || {}
if (!loaded) {
loaded = true
}
} }
$: initialValues = getInitialValues(actionType, dataSource, $context) $: initialValues = getInitialValues(actionType, dataSource, $context)
$: resetKey = Helpers.hashString( $: resetKey = Helpers.hashString(
JSON.stringify(initialValues) + JSON.stringify(dataSource) + disabled !!schema +
JSON.stringify(initialValues) +
JSON.stringify(dataSource) +
disabled
) )
</script> </script>
{#if loaded} {#key resetKey}
{#key resetKey} <InnerForm
<InnerForm {dataSource}
{dataSource} {theme}
{theme} {size}
{size} {disabled}
{disabled} {actionType}
{actionType} {schema}
{schema} {table}
{table} {initialValues}
{initialValues} {disableValidation}
{disableValidation} {editAutoColumns}
{editAutoColumns} >
> <slot />
<slot /> </InnerForm>
</InnerForm> {/key}
{/key}
{/if}