Bug 1527195 - Height issues fixed for ds card. r=Mardak a=lizzard
authork88hudson <k88hudson@gmail.com>
Sat, 16 Feb 2019 00:49:39 +0200
changeset 515990 7f0cb549e3d3f3f532c93898c8177c3d7921cd45
parent 515989 d5494d3885c75f0bdde1d08932439961f5300e0e
child 515991 86bd7fce23cdf0b425d4abb2e0f439f243291e1f
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMardak, lizzard
bugs1527195
milestone66.0
Bug 1527195 - Height issues fixed for ds card. r=Mardak a=lizzard Reviewers: thecount, Mardak Reviewed By: Mardak Bug #: 1527195 Differential Revision: https://phabricator.services.mozilla.com/D19972
browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx
browser/components/newtab/data/content/activity-stream.bundle.js
--- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx
+++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx
@@ -23,18 +23,18 @@ export class DSCard extends React.PureCo
         click: 0,
         tiles: [{id: this.props.id, pos: this.props.index}],
       }));
     }
   }
 
   render() {
     return (
-      <SpocIntersectionObserver campaignId={this.props.campaignId} dispatch={this.props.dispatch}>
-        <SafeAnchor url={this.props.url} className="ds-card" onLinkClick={this.onLinkClick}>
+      <SafeAnchor url={this.props.url} className="ds-card" onLinkClick={this.onLinkClick}>
+        <SpocIntersectionObserver campaignId={this.props.campaignId} dispatch={this.props.dispatch}>
           <div className="img-wrapper">
             <div className="img" style={{backgroundImage: `url(${this.props.image_src}`}} />
           </div>
           <div className="meta">
             <div className="info-wrap">
               <header className="title">{this.props.title}</header>
               {this.props.excerpt && <p className="excerpt">{this.props.excerpt}</p>}
             </div>
@@ -43,13 +43,13 @@ export class DSCard extends React.PureCo
                 <span>
                   <span className="context">{this.props.context}</span>
                   <br />
                 </span>
               )}
               <span className="source">{this.props.source}</span>
             </p>
           </div>
-        </SafeAnchor>
-      </SpocIntersectionObserver>
+        </SpocIntersectionObserver>
+      </SafeAnchor>
     );
   }
 }
--- a/browser/components/newtab/data/content/activity-stream.bundle.js
+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
@@ -7172,21 +7172,21 @@ class DSCard_DSCard extends external_Rea
         click: 0,
         tiles: [{ id: this.props.id, pos: this.props.index }]
       }));
     }
   }
 
   render() {
     return external_React_default.a.createElement(
-      SpocIntersectionObserver["SpocIntersectionObserver"],
-      { campaignId: this.props.campaignId, dispatch: this.props.dispatch },
+      SafeAnchor_SafeAnchor,
+      { url: this.props.url, className: "ds-card", onLinkClick: this.onLinkClick },
       external_React_default.a.createElement(
-        SafeAnchor_SafeAnchor,
-        { url: this.props.url, className: "ds-card", onLinkClick: this.onLinkClick },
+        SpocIntersectionObserver["SpocIntersectionObserver"],
+        { campaignId: this.props.campaignId, dispatch: this.props.dispatch },
         external_React_default.a.createElement(
           "div",
           { className: "img-wrapper" },
           external_React_default.a.createElement("div", { className: "img", style: { backgroundImage: `url(${this.props.image_src}` } })
         ),
         external_React_default.a.createElement(
           "div",
           { className: "meta" },