diff --git a/assets/js/src/form_editor/store/defaults.ts b/assets/js/src/form_editor/store/defaults.ts index f446d21d69..11313da392 100644 --- a/assets/js/src/form_editor/store/defaults.ts +++ b/assets/js/src/form_editor/store/defaults.ts @@ -51,3 +51,11 @@ export const slideInForm = { position: 'right', formDelay: 15, }; + +export const formStyles = { + formPadding: 20, + inputPadding: 5, + borderSize: 0, + borderRadius: 0, + alignment: 'left', +}; diff --git a/assets/js/src/form_editor/store/map_form_data_after_loading.jsx b/assets/js/src/form_editor/store/map_form_data_after_loading.jsx index 8bc3c58e76..6f6bd9c32f 100644 --- a/assets/js/src/form_editor/store/map_form_data_after_loading.jsx +++ b/assets/js/src/form_editor/store/map_form_data_after_loading.jsx @@ -24,10 +24,19 @@ export default function mapFormDataAfterLoading(data) { ? asNum(data.settings.slide_in_form_delay) : defaults.slideInForm.formDelay, slideInFormPosition: data.settings.slide_in_form_position ?? defaults.slideInForm.position, - borderRadius: asNum(data.settings.border_radius), - borderSize: asNum(data.settings.border_size), - formPadding: data.settings.form_padding ? asNum(data.settings.form_padding) : 20, - inputPadding: data.settings.input_padding ? asNum(data.settings.input_padding) : 5, + alignment: data.settings.alignment ?? defaults.formStyles.alignment, + borderRadius: data.settings.border_radius !== undefined + ? asNum(data.settings.border_radius) + : defaults.formStyles.borderRadius, + borderSize: data.settings.border_size !== undefined + ? asNum(data.settings.border_size) + : defaults.formStyles.borderSize, + formPadding: data.settings.form_padding !== undefined + ? asNum(data.settings.form_padding) + : defaults.formStyles.formPadding, + inputPadding: data.settings.input_padding !== undefined + ? asNum(data.settings.input_padding) + : defaults.formStyles.inputPadding, borderColor: data.settings.border_color, fontFamily: data.settings.font_family, successValidationColor: data.settings.success_validation_color, diff --git a/tests/javascript/form_editor/store/map_form_data_after_loading.spec.js b/tests/javascript/form_editor/store/map_form_data_after_loading.spec.js index 3f9175cfb3..35f089268f 100644 --- a/tests/javascript/form_editor/store/map_form_data_after_loading.spec.js +++ b/tests/javascript/form_editor/store/map_form_data_after_loading.spec.js @@ -59,9 +59,12 @@ describe('Form Data Load Mapper', () => { expect(map(data).settings).to.have.property('placeFormBellowAllPosts', false); }); - it('Sets default paddings', () => { + it('Sets default form styles', () => { expect(map(data).settings).to.have.property('formPadding', 20); expect(map(data).settings).to.have.property('inputPadding', 5); + expect(map(data).settings).to.have.property('alignment', 'left'); + expect(map(data).settings).to.have.property('borderRadius', 0); + expect(map(data).settings).to.have.property('borderSize', 0); }); it('Maps form and input padding', () => {