fix: remove ghost article flags view (#1916)

newsuk · May 7, 2019 · a10cea3 · a10cea3
1 parent c74a09c
commit a10cea3
Show file tree

Hide file tree

Showing 19 changed files with 1,663 additions and 2,718 deletions.
diff --git a/...article-flag/__tests__/android/__snapshots__/article-flag-with-style.android.test.js.snap b/...article-flag/__tests__/android/__snapshots__/article-flag-with-style.android.test.js.snap
@@ -45,6 +45,7 @@ exports[`2. multiple article flags 1`] = `
     Object {
       "flexDirection": "row",
       "flexWrap": "wrap",
+      "marginBottom": 10,
     }
   }
 >

diff --git a/packages/article-flag/__tests__/ios/__snapshots__/article-flag-with-style.ios.test.js.snap b/packages/article-flag/__tests__/ios/__snapshots__/article-flag-with-style.ios.test.js.snap
@@ -45,6 +45,7 @@ exports[`2. multiple article flags 1`] = `
     Object {
       "flexDirection": "row",
       "flexWrap": "wrap",
+      "marginBottom": 10,
     }
   }
 >

diff --git a/packages/article-flag/__tests__/web/__snapshots__/article-flag-with-style.web.test.js.snap b/packages/article-flag/__tests__/web/__snapshots__/article-flag-with-style.web.test.js.snap
@@ -108,7 +108,6 @@ exports[`2. multiple article flags 1`] = `
   -webkit-box-align: stretch;
   align-items: stretch;
   margin-right: 0px;
-  margin-bottom: 0px;
 }
 
 .IS1 {
@@ -262,6 +261,7 @@ exports[`2. multiple article flags 1`] = `
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
+  margin-bottom: 10px;
   -webkit-box-orient: horizontal;
   -webkit-box-direction: normal;
   -webkit-box-lines: multiple;

diff --git a/packages/article-flag/src/style/shared.js b/packages/article-flag/src/style/shared.js
@@ -12,7 +12,8 @@ const styles = {
   },
   flags: {
     flexDirection: "row",
-    flexWrap: "wrap"
+    flexWrap: "wrap",
+    marginBottom: spacing(2)
   },
   title: {
     ...fontFactory({

diff --git a/...e-summary/__tests__/android/__snapshots__/article-summary-with-style.android.test.js.snap b/...e-summary/__tests__/android/__snapshots__/article-summary-with-style.android.test.js.snap
@@ -48,28 +48,20 @@ exports[`1. article summary component with a single paragraph 1`] = `
       ...
     </Text>
   </Text>
-  <View
-    style={
-      Object {
-        "marginBottom": 10,
-      }
+  <ArticleFlags
+    flags={
+      Array [
+        Object {
+          "expiryTime": "2020-03-13T12:00:00.000Z",
+          "type": "UPDATED",
+        },
+        Object {
+          "expiryTime": "2019-03-14T12:00:00.000Z",
+          "type": "EXCLUSIVE",
+        },
+      ]
     }
-  >
-    <ArticleFlags
-      flags={
-        Array [
-          Object {
-            "expiryTime": "2020-03-13T12:00:00.000Z",
-            "type": "UPDATED",
-          },
-          Object {
-            "expiryTime": "2019-03-14T12:00:00.000Z",
-            "type": "EXCLUSIVE",
-          },
-        ]
-      }
-    />
-  </View>
+  />
   <Text
     style={
       Object {

diff --git a/...ages/article-summary/__tests__/android/__snapshots__/article-summary.android.test.js.snap b/...ages/article-summary/__tests__/android/__snapshots__/article-summary.android.test.js.snap
@@ -21,22 +21,20 @@ exports[`1. article summary component with a single paragraph 1`] = `
       ...
     </Text>
   </Text>
-  <View>
-    <ArticleFlags
-      flags={
-        Array [
-          Object {
-            "expiryTime": "2020-03-13T12:00:00.000Z",
-            "type": "UPDATED",
-          },
-          Object {
-            "expiryTime": "2019-03-14T12:00:00.000Z",
-            "type": "EXCLUSIVE",
-          },
-        ]
-      }
-    />
-  </View>
+  <ArticleFlags
+    flags={
+      Array [
+        Object {
+          "expiryTime": "2020-03-13T12:00:00.000Z",
+          "type": "UPDATED",
+        },
+        Object {
+          "expiryTime": "2019-03-14T12:00:00.000Z",
+          "type": "EXCLUSIVE",
+        },
+      ]
+    }
+  />
   <Text>
     <DatePublication
       date="2017-11-17T00:01:00.000Z"
@@ -586,22 +584,20 @@ exports[`13. article summary component with a strapline 1`] = `
       ...
     </Text>
   </Text>
-  <View>
-    <ArticleFlags
-      flags={
-        Array [
-          Object {
-            "expiryTime": "2020-03-13T12:00:00.000Z",
-            "type": "UPDATED",
-          },
-          Object {
-            "expiryTime": "2019-03-14T12:00:00.000Z",
-            "type": "EXCLUSIVE",
-          },
-        ]
-      }
-    />
-  </View>
+  <ArticleFlags
+    flags={
+      Array [
+        Object {
+          "expiryTime": "2020-03-13T12:00:00.000Z",
+          "type": "UPDATED",
+        },
+        Object {
+          "expiryTime": "2019-03-14T12:00:00.000Z",
+          "type": "EXCLUSIVE",
+        },
+      ]
+    }
+  />
   <Text>
     <DatePublication
       date="2017-11-17T00:01:00.000Z"

diff --git a/...s/article-summary/__tests__/ios/__snapshots__/article-summary-with-style.ios.test.js.snap b/...s/article-summary/__tests__/ios/__snapshots__/article-summary-with-style.ios.test.js.snap
@@ -48,28 +48,20 @@ exports[`1. article summary component with a single paragraph 1`] = `
       ...
     </Text>
   </Text>
-  <View
-    style={
-      Object {
-        "marginBottom": 10,
-      }
+  <ArticleFlags
+    flags={
+      Array [
+        Object {
+          "expiryTime": "2020-03-13T12:00:00.000Z",
+          "type": "UPDATED",
+        },
+        Object {
+          "expiryTime": "2019-03-14T12:00:00.000Z",
+          "type": "EXCLUSIVE",
+        },
+      ]
     }
-  >
-    <ArticleFlags
-      flags={
-        Array [
-          Object {
-            "expiryTime": "2020-03-13T12:00:00.000Z",
-            "type": "UPDATED",
-          },
-          Object {
-            "expiryTime": "2019-03-14T12:00:00.000Z",
-            "type": "EXCLUSIVE",
-          },
-        ]
-      }
-    />
-  </View>
+  />
   <Text
     style={
       Object {

diff --git a/packages/article-summary/__tests__/ios/__snapshots__/article-summary.ios.test.js.snap b/packages/article-summary/__tests__/ios/__snapshots__/article-summary.ios.test.js.snap
@@ -21,22 +21,20 @@ exports[`1. article summary component with a single paragraph 1`] = `
       ...
     </Text>
   </Text>
-  <View>
-    <ArticleFlags
-      flags={
-        Array [
-          Object {
-            "expiryTime": "2020-03-13T12:00:00.000Z",
-            "type": "UPDATED",
-          },
-          Object {
-            "expiryTime": "2019-03-14T12:00:00.000Z",
-            "type": "EXCLUSIVE",
-          },
-        ]
-      }
-    />
-  </View>
+  <ArticleFlags
+    flags={
+      Array [
+        Object {
+          "expiryTime": "2020-03-13T12:00:00.000Z",
+          "type": "UPDATED",
+        },
+        Object {
+          "expiryTime": "2019-03-14T12:00:00.000Z",
+          "type": "EXCLUSIVE",
+        },
+      ]
+    }
+  />
   <Text>
     <DatePublication
       date="2017-11-17T00:01:00.000Z"
@@ -586,22 +584,20 @@ exports[`13. article summary component with a strapline 1`] = `
       ...
     </Text>
   </Text>
-  <View>
-    <ArticleFlags
-      flags={
-        Array [
-          Object {
-            "expiryTime": "2020-03-13T12:00:00.000Z",
-            "type": "UPDATED",
-          },
-          Object {
-            "expiryTime": "2019-03-14T12:00:00.000Z",
-            "type": "EXCLUSIVE",
-          },
-        ]
-      }
-    />
-  </View>
+  <ArticleFlags
+    flags={
+      Array [
+        Object {
+          "expiryTime": "2020-03-13T12:00:00.000Z",
+          "type": "UPDATED",
+        },
+        Object {
+          "expiryTime": "2019-03-14T12:00:00.000Z",
+          "type": "EXCLUSIVE",
+        },
+      ]
+    }
+  />
   <Text>
     <DatePublication
       date="2017-11-17T00:01:00.000Z"

diff --git a/...s/article-summary/__tests__/web/__snapshots__/article-summary-with-style.web.test.js.snap b/...s/article-summary/__tests__/web/__snapshots__/article-summary-with-style.web.test.js.snap
@@ -38,10 +38,6 @@ exports[`1. article summary component with a single paragraph 1`] = `
 }
 
 .S5 {
-  margin-bottom: 10px;
-}
-
-.S6 {
   color: rgba(105,105,105,1.00);
   font-family: GillSansMTStd-Medium;
   font-size: 13px;
@@ -50,7 +46,7 @@ exports[`1. article summary component with a single paragraph 1`] = `
   margin-bottom: 5px;
 }
 
-.S7 {
+.S6 {
   color: inherit;
   font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Ubuntu, "Helvetica Neue", sans-serif;
   font-size: 14px;
@@ -89,26 +85,22 @@ exports[`1. article summary component with a single paragraph 1`] = `
       ...
     </span>
   </div>
+  <ArticleFlags
+    flags={
+      Array [
+        Object {
+          "expiryTime": "2020-03-13T12:00:00.000Z",
+          "type": "UPDATED",
+        },
+        Object {
+          "expiryTime": "2019-03-14T12:00:00.000Z",
+          "type": "EXCLUSIVE",
+        },
+      ]
+    }
+  />
   <div
     className="S5"
-  >
-    <ArticleFlags
-      flags={
-        Array [
-          Object {
-            "expiryTime": "2020-03-13T12:00:00.000Z",
-            "type": "UPDATED",
-          },
-          Object {
-            "expiryTime": "2019-03-14T12:00:00.000Z",
-            "type": "EXCLUSIVE",
-          },
-        ]
-      }
-    />
-  </div>
-  <div
-    className="S6"
     data-testid="datePublication"
   >
     <DatePublication
@@ -117,7 +109,7 @@ exports[`1. article summary component with a single paragraph 1`] = `
     />
   </div>
   <div
-    className="S7"
+    className="S6"
   >
     <ArticleByline
       ast={