Skip to content
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

fix(cta): feature image duplication issue #11264

Merged
merged 9 commits into from
Jan 10, 2024
Merged

fix(cta): feature image duplication issue #11264

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
22ceeab
fix(CTA): image duplication issue fix
sangeethababu9223 Dec 21, 2023
91e5a34
Merge remote-tracking branch 'upstream/main' into fix/cta-feature-ima…
sangeethababu9223 Dec 21, 2023
74e1d65
Merge branch 'main' into fix/cta-feature-image-duplication-issue
sangeethababu9223 Jan 1, 2024
493a112
Merge branch 'main' into fix/cta-feature-image-duplication-issue
sangeethababu9223 Jan 4, 2024
5cf6a99
fix(cta): remove log statement
sangeethababu9223 Jan 5, 2024
653fc18
Merge branch 'main' into fix/cta-feature-image-duplication-issue
sangeethababu9223 Jan 5, 2024
d5f9ba6
Merge branch 'main' into fix/cta-feature-image-duplication-issue
sangeethababu9223 Jan 9, 2024
eeb542c
Merge remote-tracking branch 'upstream/main' into fix/cta-feature-ima…
sangeethababu9223 Jan 10, 2024
c651c14
fix(CTA): format cta.stories
sangeethababu9223 Jan 10, 2024
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
45 changes: 36 additions & 9 deletions packages/web-components/src/components/cta/__stories__/cta.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,27 @@ export const Default = (args) => {
: ((childCta as HTMLElement).innerText = customVideoTitle);
}
}
if (ctaType !== 'video') {
const childCta = document.querySelector('c4d-cta')?.shadowRoot!.children[0];
const headingComponent =
childCta?.shadowRoot?.querySelector('c4d-card-heading') ||
childCta?.querySelector('c4d-card-heading');
headingComponent && !duration
? (duration = headingComponent!.textContent!.match(/\((.*)\)/)?.pop())
: null;
if (headingComponent?.textContent) {
duration
? (headingComponent!.textContent = `${heading} (${duration})`)
: (headingComponent!.textContent = heading);
}
}

const childCta = document.querySelector('c4d-cta')?.shadowRoot!.children[0];
childCta?.setAttribute('href', href);

const childCtaRoot = document.querySelector('c4d-cta')?.shadowRoot;
const ctaFeatured = childCtaRoot?.querySelector('c4d-feature-cta');
const c4dImage = ctaFeatured?.querySelectorAll('c4d-image') || [];
const c4dHeading = ctaFeatured?.querySelectorAll('c4d-card-heading') || [];
return html`
${ctaStyle === 'button'
? html`
Expand Down Expand Up @@ -153,16 +170,26 @@ export const Default = (args) => {
: ''}
${ctaStyle === 'feature'
? html`
${ctaType !== 'video'
? html` <c4d-card-heading>${heading}</c4d-card-heading> `
${c4dHeading?.length < 1
? html`
${ctaType !== 'video'
? html`
<c4d-card-heading>${heading}</c4d-card-heading>
`
: ''}
`
: ''}
${ctaType !== CTA_TYPE.VIDEO || customThumbnail
${c4dImage?.length < 1
? html`
<c4d-image
slot="image"
alt="Image alt text"
default-src="${imgLg1x1}">
</c4d-image>
${ctaType !== CTA_TYPE.VIDEO || customThumbnail
? html`
<c4d-image
slot="image"
alt="Image alt text"
default-src="${imgLg1x1}">
</c4d-image>
`
: ''}
`
: ''}
<c4d-feature-cta-footer
Expand Down
Loading