From 406686994f24e539e31e13ca126076ec30e80575 Mon Sep 17 00:00:00 2001
From: Gervwyk <gervwyk@gmail.com>
Date: Sat, 18 Sep 2021 20:07:46 +0200
Subject: [PATCH] fix(blocksAntd): Fix margin in Alert when message is none.

---
 .../blocksAntd/src/blocks/Alert/Alert.js      |  7 ++--
 .../__snapshots__/Alert.mock.test.js.snap     | 26 ++++++++++++---
 .../tests/__snapshots__/Alert.test.js.snap    | 32 ++++++++++++++++---
 3 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/packages/blocks/blocksAntd/src/blocks/Alert/Alert.js b/packages/blocks/blocksAntd/src/blocks/Alert/Alert.js
index 5d9f4a3ec..7c63e0924 100644
--- a/packages/blocks/blocksAntd/src/blocks/Alert/Alert.js
+++ b/packages/blocks/blocksAntd/src/blocks/Alert/Alert.js
@@ -37,8 +37,11 @@ const AlertBlock = ({ blockId, events, methods, properties }) => {
       description={renderHtml({ html: properties.description, methods })}
       id={blockId}
       message={
-        renderHtml({ html: properties.message, methods }) ||
-        (type.isNone(properties.description) && <div style={{ height: '1.5175em' }}></div>)
+        type.isNone(properties.message) ? (
+          <div style={{ marginBottom: -4 }}></div>
+        ) : (
+          renderHtml({ html: properties.message, methods })
+        )
       }
       onClose={() => methods.triggerEvent({ name: 'onClose' })}
       showIcon={properties.showIcon === false ? false : true}
diff --git a/packages/blocks/blocksAntd/tests/__snapshots__/Alert.mock.test.js.snap b/packages/blocks/blocksAntd/tests/__snapshots__/Alert.mock.test.js.snap
index bffe8bda7..40cc6a483 100644
--- a/packages/blocks/blocksAntd/tests/__snapshots__/Alert.mock.test.js.snap
+++ b/packages/blocks/blocksAntd/tests/__snapshots__/Alert.mock.test.js.snap
@@ -13,7 +13,7 @@ Array [
       "message": <div
         style={
           Object {
-            "height": "1.5175em",
+            "marginBottom": -4,
           }
         }
       />,
@@ -614,7 +614,13 @@ Array [
         }
       />,
       "id": "with description only",
-      "message": false,
+      "message": <div
+        style={
+          Object {
+            "marginBottom": -4,
+          }
+        }
+      />,
       "onClose": [Function],
       "showIcon": true,
       "type": undefined,
@@ -644,7 +650,13 @@ Array [
         }
       />,
       "id": "with description only and icon false",
-      "message": false,
+      "message": <div
+        style={
+          Object {
+            "marginBottom": -4,
+          }
+        }
+      />,
       "onClose": [Function],
       "showIcon": false,
       "type": undefined,
@@ -1414,7 +1426,13 @@ Array [
         }
       />,
       "id": "with description uses html",
-      "message": false,
+      "message": <div
+        style={
+          Object {
+            "marginBottom": -4,
+          }
+        }
+      />,
       "onClose": [Function],
       "showIcon": true,
       "type": undefined,
diff --git a/packages/blocks/blocksAntd/tests/__snapshots__/Alert.test.js.snap b/packages/blocks/blocksAntd/tests/__snapshots__/Alert.test.js.snap
index dcdc31e97..b6f3da0d2 100644
--- a/packages/blocks/blocksAntd/tests/__snapshots__/Alert.test.js.snap
+++ b/packages/blocks/blocksAntd/tests/__snapshots__/Alert.test.js.snap
@@ -35,7 +35,7 @@ exports[`Render default - value[0] 1`] = `
       <div
         style={
           Object {
-            "height": "1.5175em",
+            "marginBottom": -4,
           }
         }
       />
@@ -780,7 +780,15 @@ exports[`Render with description only - value[0] 1`] = `
   >
     <div
       className="ant-alert-message"
-    />
+    >
+      <div
+        style={
+          Object {
+            "marginBottom": -4,
+          }
+        }
+      />
+    </div>
     <div
       className="ant-alert-description"
     >
@@ -804,7 +812,15 @@ exports[`Render with description only and icon false - value[0] 1`] = `
   >
     <div
       className="ant-alert-message"
-    />
+    >
+      <div
+        style={
+          Object {
+            "marginBottom": -4,
+          }
+        }
+      />
+    </div>
     <div
       className="ant-alert-description"
     >
@@ -1650,7 +1666,15 @@ exports[`Render with description uses html - value[0] 1`] = `
   >
     <div
       className="ant-alert-message"
-    />
+    >
+      <div
+        style={
+          Object {
+            "marginBottom": -4,
+          }
+        }
+      />
+    </div>
     <div
       className="ant-alert-description"
     >