diff --git a/src/js/common/components/CampaignListRoot/CampaignCardForListBody.jsx b/src/js/common/components/CampaignListRoot/CampaignCardForListBody.jsx index 81c6f21ef..fcbc4f1fe 100644 --- a/src/js/common/components/CampaignListRoot/CampaignCardForListBody.jsx +++ b/src/js/common/components/CampaignListRoot/CampaignCardForListBody.jsx @@ -210,6 +210,8 @@ function CampaignCardForListBody (props) { borderBottom: `1px solid ${DesignTokenColors.neutralUI100}`, borderTop: `1px solid ${DesignTokenColors.neutralUI100}`, } : {}} + loading="eager" + fetchpriority="high" /> ) : ( @@ -261,6 +263,8 @@ function CampaignCardForListBody (props) { } : {}} width={limitCardWidth ? '157px' : '200px'} height={limitCardWidth ? '157px' : '200px'} + loading="eager" + fetchpriority="high" /> ) : ( diff --git a/src/js/common/components/CardForListBody.jsx b/src/js/common/components/CardForListBody.jsx index b872bda37..3078360f7 100644 --- a/src/js/common/components/CardForListBody.jsx +++ b/src/js/common/components/CardForListBody.jsx @@ -334,6 +334,8 @@ function CardForListBody (props) { borderBottom: `1px solid ${DesignTokenColors.neutralUI100}`, borderTop: `1px solid ${DesignTokenColors.neutralUI100}`, } : {}} + loading="eager" + fetchpriority="high" /> {isClaimedProfile && ( @@ -399,6 +401,8 @@ function CardForListBody (props) { } : {}} width={limitCardWidth ? '157px' : '200px'} height={limitCardWidth ? '157px' : '200px'} + loading="eager" + fetchpriority="high" /> ) : ( diff --git a/src/js/pages/Campaigns/CampaignsHome.jsx b/src/js/pages/Campaigns/CampaignsHome.jsx index d221d6fe2..aedabe970 100644 --- a/src/js/pages/Campaigns/CampaignsHome.jsx +++ b/src/js/pages/Campaigns/CampaignsHome.jsx @@ -850,7 +850,6 @@ class CampaignsHome extends Component { /> )} - {(nextReleaseFeaturesEnabled && pigsCanFly) && ( }> @@ -870,41 +869,36 @@ class CampaignsHome extends Component { )} - {(candidateListIsBattleground && candidateListIsBattleground.length > 0) ? ( - 0}> - {/* Was useMinimumBattlegroundHeight */} - }> + 0}> + }> + {(candidateListOther && candidateListOther.length > 0) && ( - - - ) : ( - <> - {displayBattlegroundPlaceholder && } - - )} - {(representativeListShownAsRepresentatives && representativeListShownAsRepresentatives.length > 0) && ( - 0}> - }> - + + {(politicianListToShow && politicianListToShow.length > 0) && ( + 0}> + }> + @@ -926,39 +920,41 @@ class CampaignsHome extends Component { )} - 0}> - }> - - - - {(politicianListToShow && politicianListToShow.length > 0) && ( - 0}> - }> - 0) && ( + 0}> + {/* Was useMinimumBattlegroundHeight */} + }> + + + + )} + {(representativeListShownAsRepresentatives && representativeListShownAsRepresentatives.length > 0) && ( + 0}> + }> + )} - {/* */} {/* */} @@ -1003,6 +999,7 @@ const WhatIsHappeningSection = styled('div', { // background: linear-gradient(0deg, rgba(2,0,36,1) 0%, rgba(46,55,77,0) 52%); // background-color: #f5f5f5; // box-shadow: 0 0 80px 0px rgba(46,55,77,.3); + //min-height: ${useMinimumHeight ? '460px;' : '120px'}; ${useMinimumHeight ? 'height: 460px;' : ''}; ${useMinimumHeight ? 'min-height: 460px;' : ''}; // padding: 0 0 25px 0; diff --git a/src/js/pages/Campaigns/CampaignsHomeLoader.jsx b/src/js/pages/Campaigns/CampaignsHomeLoader.jsx index 7d9769064..831249323 100644 --- a/src/js/pages/Campaigns/CampaignsHomeLoader.jsx +++ b/src/js/pages/Campaigns/CampaignsHomeLoader.jsx @@ -203,10 +203,19 @@ CampaignsHomeLoader.propTypes = { const CampaignsHomeContainer = styled('div')` `; -const WhatIsHappeningSectionLoading = styled('div')` +const WhatIsHappeningSectionLoading = styled('div', { + shouldForwardProp: (prop) => !['useMinimumHeight'].includes(prop), +})(({ useMinimumHeight }) => (` + // background: linear-gradient(180deg, rgba(2,0,36,1) 0%, rgba(46,55,77,0) 52%); + // background: linear-gradient(0deg, rgba(2,0,36,1) 0%, rgba(46,55,77,0) 52%); + // background-color: #f5f5f5; + // box-shadow: 0 0 80px 0px rgba(46,55,77,.3); + //min-height: ${useMinimumHeight ? '460px;' : '120px'}; + // padding: 0 0 25px 0; height: 460px; - min-height: 460px; -`; + min-height: 460px +`)); + export default CampaignsHomeLoader;