Skip to content

Beautiful Open-Source Form Builder

Fix sizing issue with captcha

Julien Nahum7888990e8469
diff --git a/client/components/open/forms/OpenForm.vue b/client/components/open/forms/OpenForm.vue
index 4b286c8d4..e20cbe458 100644
--- a/client/components/open/forms/OpenForm.vue
+++ b/client/components/open/forms/OpenForm.vue
@@ -6,6 +6,7 @@
</div>
<form
v-else-if="dataForm"
+ :style="computedStyle"
@submit.prevent=""
>
<template v-if="form.show_progress_bar">
@@ -77,6 +78,8 @@
ref="hcaptcha"
:sitekey="hCaptchaSiteKey"
:theme="darkMode?'dark':'light'"
+ @opened="setMinHeight(500)"
+ @closed="setMinHeight(0)"
/>
<has-error
:form="dataForm"
@@ -179,6 +182,7 @@ export default {
dataForm,
recordsStore,
workingFormStore,
+ isIframe: useIsIframe(),
draggingNewBlock: computed(() => workingFormStore.draggingNewBlock),
pendingSubmission: pendingSubmission(props.form)
}
@@ -191,6 +195,7 @@ export default {
* Used to force refresh components by changing their keys
*/
isAutoSubmit: false,
+ minHeight: 0
}
},
@@ -290,6 +295,11 @@ export default {
}
})
return data
+ },
+ computedStyle() {
+ return {
+ ...this.minHeight ? {minHeight: this.minHeight + 'px'} : {}
+ }
}
},
@@ -452,7 +462,7 @@ export default {
nextPage() {
if (this.adminPreview || this.urlPrefillPreview) {
this.currentFieldGroupIndex += 1
- window.scrollTo({ top: 0, behavior: 'smooth' })
+ window.scrollTo({top: 0, behavior: 'smooth'})
return false
}
const fieldsToValidate = this.currentFields.map(f => f.id)
@@ -463,28 +473,28 @@ export default {
this.dataForm.busy = false
window.scrollTo({top: 0, behavior: 'smooth'})
}).catch(error => {
- console.error(error)
- if (error && error.data && error.data.message) {
- useAlert().error(error.data.message)
- }
- this.dataForm.busy = false
- })
+ console.error(error)
+ if (error && error.data && error.data.message) {
+ useAlert().error(error.data.message)
+ }
+ this.dataForm.busy = false
+ })
return false
},
isFieldHidden(field) {
return (new FormLogicPropertyResolver(field, this.dataFormValue)).isHidden()
},
- getTargetFieldIndex(currentFieldPageIndex){
+ getTargetFieldIndex(currentFieldPageIndex) {
let targetIndex = 0
- if (this.currentFieldGroupIndex > 0) {
- for (let i = 0; i < this.currentFieldGroupIndex; i++) {
- targetIndex += this.fieldGroups[i].length
- }
- targetIndex += currentFieldPageIndex
- } else {
- targetIndex = currentFieldPageIndex
+ if (this.currentFieldGroupIndex > 0) {
+ for (let i = 0; i < this.currentFieldGroupIndex; i++) {
+ targetIndex += this.fieldGroups[i].length
}
- return targetIndex
+ targetIndex += currentFieldPageIndex
+ } else {
+ targetIndex = currentFieldPageIndex
+ }
+ return targetIndex
},
handleDragDropped(data) {
if (data.added) {
@@ -497,6 +507,18 @@ export default {
const newTargetIndex = this.getTargetFieldIndex(data.moved.newIndex)
this.workingFormStore.moveField(oldTargetIndex, newTargetIndex)
}
+ },
+ setMinHeight(minHeight) {
+ if (!this.isIframe) {
+ return
+ }
+ this.minHeight = minHeight
+ // Trigger window iframe resize
+ try {
+ window.parentIFrame.size()
+ } catch (e) {
+ console.error(e)
+ }
}
}
}