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

feat(mwpw-167662): add ability to have alt cta work with overlays #251

Merged
merged 3 commits into from
Feb 25, 2025
Merged

feat(mwpw-167662): add ability to have alt cta work with overlays #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29cb09f
feat(mwpw-167662): add ability to have alt cta work with overlays
Feb 24, 2025
c5763ea
fix(mwpw-167662): merging
Feb 25, 2025
85f3f0b
fix(mwpw-167662): rebuilding
Feb 25, 2025
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
2 changes: 1 addition & 1 deletion dist/app.css
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 28 additions & 5 deletions dist/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Chimera UI Libraries - Build 0.30.2 (2/24/2025, 09:27:47)
* Chimera UI Libraries - Build 0.30.3 (2/25/2025, 12:39:16)
*
*/
/******/ (function(modules) { // webpackBootstrap
Expand Down Expand Up @@ -47042,7 +47042,7 @@ var Card = function Card(props) {
var registrationUrl = getConfig('collection', 'banner.register.url');
var hideDateInterval = getConfig('collection', 'hideDateInterval');
var showCardBadges = getConfig('collection', 'showCardBadges');
var altCta = getConfig('collection', 'dynamicCTAForLiveEvents');
var altCtaUsed = getConfig('collection', 'dynamicCTAForLiveEvents');
var ctaAction = getConfig('collection', 'ctaAction');

/**
Expand Down Expand Up @@ -47129,6 +47129,26 @@ var Card = function Card(props) {
});
}

/**
* Extends footer data and extracts an alt CTA if it exists
* this is important for when overlay links are being used for live events
* @param {Array} footerData
* @return {String}
*/
function getAltCtaLink(footerData) {
if (!footerData) return '';
if (footerData.length === 1) {
var _footerData$0$altCta = footerData[0].altCta,
altCta = _footerData$0$altCta === undefined ? [] : _footerData$0$altCta;

if (altCta.length === 1) {
return altCta[0].href;
}
}
// default value is an unauthored alt cta
return '';
}

// Card styles
var isOneHalf = cardStyle === 'one-half';
var isThreeFourths = cardStyle === 'three-fourths';
Expand All @@ -47150,7 +47170,7 @@ var Card = function Card(props) {
var showText = !isHalfHeight && !isFull && !isNews;
var showFooter = isOneHalf || isProduct || isText || isNews;
var showFooterLeft = !isProduct;
var showFooterCenter = !isProduct && !altCta;
var showFooterCenter = !isProduct && !altCtaUsed;
var hideBanner = false;
var eventBanner = '';
var hideOnDemandDates = hideDateInterval && (0, _general.isDateAfterInterval)((0, _general.getCurrentDate)(), endDate);
Expand Down Expand Up @@ -47195,7 +47215,10 @@ var Card = function Card(props) {

var linkBlockerTarget = (0, _general.getLinkTarget)(overlayLink, ctaAction);
var addParams = new URLSearchParams(additionalParams);
var overlay = additionalParams && addParams.keys().next().value ? overlayLink + '?' + addParams.toString() : overlayLink;
var overlayParams = additionalParams && addParams.keys().next().value ? overlayLink + '?' + addParams.toString() : overlayLink;
var isLive = (0, _general.isDateWithinInterval)((0, _general.getCurrentDate)(), startDate, endDate);
var altCtaLink = getAltCtaLink(footer);
var overlay = altCtaUsed && isLive && altCtaLink !== '' ? altCtaLink : overlayParams;
var getsFocus = isHalfHeight || isThreeFourths || isFull || isDoubleWide || isIcon || hideCTA;

return _react2.default.createElement(
Expand Down Expand Up @@ -47329,7 +47352,7 @@ var Card = function Card(props) {
left: showFooterLeft && !hideOnDemandDates ? extendFooterData(footerItem.left) : [],
center: showFooterCenter ? extendFooterData(footerItem.center) : [],
right: extendFooterData(footerItem.right),
altRight: altCta ? extendFooterData(footerItem.altCta) : [],
altRight: altCtaUsed ? extendFooterData(footerItem.altCta) : [],
startDate: startDate,
endDate: endDate,
cardStyle: cardStyle,
Expand Down
4 changes: 2 additions & 2 deletions dist/main.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/main.source.js
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 28 additions & 5 deletions react/src/js/components/Consonant/Cards/Card.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import CardFooter from './CardFooter/CardFooter';
import prettyFormatDate from '../Helpers/prettyFormat';
import { INFOBIT_TYPE } from '../Helpers/constants';
import { hasTag } from '../Helpers/Helpers';
import { getEventBanner, getLinkTarget, isDateBeforeInterval, isDateAfterInterval, getCurrentDate, getSearchParam } from '../Helpers/general';
import { getEventBanner, getLinkTarget, isDateBeforeInterval, isDateWithinInterval, isDateAfterInterval, getCurrentDate, getSearchParam } from '../Helpers/general';
import { useConfig, useRegistered } from '../Helpers/hooks';
import {
stylesType,
Expand Down Expand Up @@ -177,7 +177,7 @@ const Card = (props) => {
const registrationUrl = getConfig('collection', 'banner.register.url');
const hideDateInterval = getConfig('collection', 'hideDateInterval');
const showCardBadges = getConfig('collection', 'showCardBadges');
const altCta = getConfig('collection', 'dynamicCTAForLiveEvents');
const altCtaUsed = getConfig('collection', 'dynamicCTAForLiveEvents');
const ctaAction = getConfig('collection', 'ctaAction');

/**
Expand Down Expand Up @@ -273,6 +273,26 @@ const Card = (props) => {
});
}

/**
* Extends footer data and extracts an alt CTA if it exists
* this is important for when overlay links are being used for live events
* @param {Array} footerData
* @return {String}
*/
function getAltCtaLink(footerData) {
if (!footerData) return '';
if (footerData.length === 1) {
const {
altCta = [],
} = footerData[0];
if (altCta.length === 1) {
return altCta[0].href;
}
}
// default value is an unauthored alt cta
return '';
}

// Card styles
const isOneHalf = cardStyle === 'one-half';
const isThreeFourths = cardStyle === 'three-fourths';
Expand All @@ -294,7 +314,7 @@ const Card = (props) => {
const showText = !isHalfHeight && !isFull && !isNews;
const showFooter = isOneHalf || isProduct || isText || isNews;
const showFooterLeft = !isProduct;
const showFooterCenter = !isProduct && !altCta;
const showFooterCenter = !isProduct && !altCtaUsed;
let hideBanner = false;
let eventBanner = '';
const hideOnDemandDates = hideDateInterval && isDateAfterInterval(getCurrentDate(), endDate);
Expand Down Expand Up @@ -345,7 +365,10 @@ const Card = (props) => {

const linkBlockerTarget = getLinkTarget(overlayLink, ctaAction);
const addParams = new URLSearchParams(additionalParams);
const overlay = (additionalParams && addParams.keys().next().value) ? `${overlayLink}?${addParams.toString()}` : overlayLink;
const overlayParams = (additionalParams && addParams.keys().next().value) ? `${overlayLink}?${addParams.toString()}` : overlayLink;
const isLive = isDateWithinInterval(getCurrentDate(), startDate, endDate);
const altCtaLink = getAltCtaLink(footer);
const overlay = (altCtaUsed && isLive && altCtaLink !== '') ? altCtaLink : overlayParams;
const getsFocus = isHalfHeight
|| isThreeFourths
|| isFull
Expand Down Expand Up @@ -494,7 +517,7 @@ const Card = (props) => {
extendFooterData(footerItem.left) : []}
center={showFooterCenter ? extendFooterData(footerItem.center) : []}
right={extendFooterData(footerItem.right)}
altRight={altCta ? extendFooterData(footerItem.altCta) : []}
altRight={altCtaUsed ? extendFooterData(footerItem.altCta) : []}
startDate={startDate}
endDate={endDate}
cardStyle={cardStyle}
Expand Down
Loading