From c99e04ad4911a9cd8db183fc2a2ebf6a8aed9492 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta@mailpoet.com>
Date: Tue, 19 May 2020 13:41:26 +0200
Subject: [PATCH] Fix form input padding mapping

[MAILPOET-2930]
---
 .../store/map_form_data_after_loading.jsx           |  2 +-
 .../store/map_form_data_after_loading.spec.js       | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

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 f8e0c4289a..492cc0a413 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
@@ -21,7 +21,7 @@ export default function mapFormDataAfterLoading(data) {
       borderRadius: asNum(data.settings.border_radius),
       borderSize: asNum(data.settings.border_size),
       formPadding: data.settings.form_padding ? asNum(data.settings.form_padding) : 10,
-      inputPadding: data.settings.input_padding ? asNum(data.settings.form_padding) : 5,
+      inputPadding: data.settings.input_padding ? asNum(data.settings.input_padding) : 5,
       borderColor: data.settings.border_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 c584e2c218..3c33697afa 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
@@ -63,5 +63,18 @@ describe('Form Data Load Mapper', () => {
       expect(map(data).settings).to.have.property('formPadding', 10);
       expect(map(data).settings).to.have.property('inputPadding', 5);
     });
+
+    it('Maps form and input padding', () => {
+      const mapData = {
+        ...data,
+        settings: {
+          ...data.settings,
+          form_padding: 50,
+          input_padding: 20,
+        },
+      };
+      expect(map(mapData).settings).to.have.property('formPadding', 50);
+      expect(map(mapData).settings).to.have.property('inputPadding', 20);
+    });
   });
 });