Skip to content

🐛 [amp story shopping] Do not render shopping CTA if no shopping tags are on the page #37503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
processprocess merged 10 commits into from
Feb 2, 2022
Merged

🐛 [amp story shopping] Do not render shopping CTA if no shopping tags are on the page #37503

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2031460
Rename. Do not render CTA.
processprocess Jan 27, 2022
5ff5acf
Update comment
processprocess Jan 27, 2022
fb2c3d5
Update test.
processprocess Jan 27, 2022
9ec5aa3
Remove unused
processprocess Jan 27, 2022
7c9cab9
revert
processprocess Jan 28, 2022
7e8b2fc
revert
processprocess Jan 28, 2022
2d256a3
install in shopping attachment
processprocess Jan 28, 2022
3e81b72
check in layoutCallback
processprocess Jan 28, 2022
f9f9ba2
Move selectors to buildCallback.
processprocess Jan 31, 2022
03a5412
Refert install
processprocess Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rename. Do not render CTA.
  • Loading branch information
@processprocess
processprocess committed Jan 28, 2022
commit 2031460dedab1f17b5a557ff2b3da55b639b01ff
22 changes: 8 additions & 14 deletions extensions/amp-story-shopping/0.1/amp-story-shopping-attachment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as Preact from '#core/dom/jsx';
import {Layout_Enum} from '#core/dom/layout';
import {closest} from '#core/dom/query';

import {Services} from '#service';
import {LocalizedStringId_Enum} from '#service/localization/strings';
Expand Down Expand Up @@ -33,27 +34,20 @@ export class AmpStoryShoppingAttachment extends AMP.BaseElement {
/** @private {?Element} */
this.attachmentEl_ = null;

/** @private {!Element} */
this.pageEl_ = this.element.closest('amp-story-page');

/** @private {!Array<!Element>} */
this.shoppingTags_ = Array.from(
this.pageEl_.querySelectorAll('amp-story-shopping-tag')
closest(
element,
(el) => el.tagName === 'AMP-STORY-PAGE'
).querySelectorAll('amp-story-shopping-tag')
);

/** @private @const {!Element} */
this.plpContainer_ = <div></div>;

/** @private {?../../amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
this.storeService_ = null;

/** @private {?../../../src/service/localization.LocalizationService} */
this.localizationService_ = null;
}

/** @override */
buildCallback() {
loadFonts(this.win, FONTS_TO_LOAD);
if (this.shoppingTags_.length === 0) {
Comment thread
processprocess marked this conversation as resolved.
return;
}
this.attachmentEl_ = (
<amp-story-page-attachment
layout="nodisplay"
Expand Down
13 changes: 4 additions & 9 deletions extensions/amp-story/1.0/amp-story-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ export class AmpStoryPage extends AMP.BaseElement {

this.muteAllMedia();

this.renderOpenAttachmentUI_();
this.installPageAttachmentExtension_();

return Promise.all([
this.waitForMediaLayout_().then(() => this.markPageAsLoaded_()),
Expand Down Expand Up @@ -1523,21 +1523,16 @@ export class AmpStoryPage extends AMP.BaseElement {
}

/**
* Renders the open attachment UI affordance.
* Installs the page attachment extension.
* @private
*/
renderOpenAttachmentUI_() {
installPageAttachmentExtension_() {
// AttachmentEl can be any component that extends draggable drawer.
const attachmentEl = this.element.querySelector(
'amp-story-page-attachment, amp-story-page-outlink, amp-story-shopping-attachment'
);

if (
!attachmentEl ||
(attachmentEl.tagName === 'AMP-STORY-SHOPPING-ATTACHMENT' &&
this.element.getElementsByTagName('amp-story-shopping-tag').length ===
0)
) {
if (!attachmentEl) {
return;
}

Expand Down