diff --git a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx
index b3d965530dd2..461d54899f1d 100644
--- a/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx
+++ b/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx
@@ -468,57 +468,34 @@ export class _DSCard extends React.PureComponent {
dispatch={this.props.dispatch}
spocMessageVariant={this.props.spocMessageVariant}
/>
- {saveToPocketCard && (
-
-
- {!this.props.flightId && stpButton()}
-
-
+
+
+
+ {saveToPocketCard && <>{!this.props.flightId && stpButton()}>}
+
+
- )}
- {!saveToPocketCard && (
-
- )}
+
);
}
diff --git a/browser/components/newtab/data/content/activity-stream.bundle.js b/browser/components/newtab/data/content/activity-stream.bundle.js
index 60cdd77eea90..0f7f58ec9a58 100644
--- a/browser/components/newtab/data/content/activity-stream.bundle.js
+++ b/browser/components/newtab/data/content/activity-stream.bundle.js
@@ -2967,11 +2967,11 @@ class _DSCard extends (external_React_default()).PureComponent {
ctaButtonVariant: ctaButtonVariant,
dispatch: this.props.dispatch,
spocMessageVariant: this.props.spocMessageVariant
- }), saveToPocketCard && /*#__PURE__*/external_React_default().createElement("div", {
+ }), /*#__PURE__*/external_React_default().createElement("div", {
className: "card-stp-button-hover-background"
}, /*#__PURE__*/external_React_default().createElement("div", {
className: "card-stp-button-position-wrapper"
- }, !this.props.flightId && stpButton(), /*#__PURE__*/external_React_default().createElement(DSLinkMenu, {
+ }, saveToPocketCard && /*#__PURE__*/external_React_default().createElement((external_React_default()).Fragment, null, !this.props.flightId && stpButton()), /*#__PURE__*/external_React_default().createElement(DSLinkMenu, {
id: this.props.id,
index: this.props.pos,
dispatch: this.props.dispatch,
@@ -2989,25 +2989,7 @@ class _DSCard extends (external_React_default()).PureComponent {
saveToPocketCard: saveToPocketCard,
pocket_button_enabled: pocketButtonEnabled,
isRecentSave: isRecentSave
- }))), !saveToPocketCard && /*#__PURE__*/external_React_default().createElement(DSLinkMenu, {
- id: this.props.id,
- index: this.props.pos,
- dispatch: this.props.dispatch,
- url: this.props.url,
- title: this.props.title,
- source: source,
- type: this.props.type,
- pocket_id: this.props.pocket_id,
- shim: this.props.shim,
- bookmarkGuid: this.props.bookmarkGuid,
- flightId: !this.props.is_collection ? this.props.flightId : undefined,
- showPrivacyInfo: !!this.props.flightId,
- hostRef: this.contextMenuButtonHostRef,
- onMenuUpdate: this.onMenuUpdate,
- onMenuShow: this.onMenuShow,
- pocket_button_enabled: pocketButtonEnabled,
- isRecentSave: isRecentSave
- }));
+ }))));
}
}
_DSCard.defaultProps = {
diff --git a/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx b/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx
index afb6d6dcd218..796f805444b8 100644
--- a/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx
+++ b/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx
@@ -70,7 +70,9 @@ describe("
", () => {
});
it("should render DSLinkMenu", () => {
- assert.equal(wrapper.children().at(3).type(), DSLinkMenu);
+ // Note: component moved from a direct child element of `.ds-card`. See Bug 1893936
+ const default_link_menu = wrapper.find(DSLinkMenu);
+ assert.ok(default_link_menu.exists());
});
it("should start with no .active class", () => {