-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12508 from guardian/revert-12499-revert-12153-cc/…
…ticker-update Revert "Revert "Ticker Update""
- Loading branch information
Showing
12 changed files
with
89 additions
and
467 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,198 +0,0 @@ | ||
| /** | ||
| * @file | ||
| * This file was migrated from: | ||
| * https://github.com/guardian/support-dotcom-components/blob/0a2439b701586a7a2cc60dce10b4d96cf7a828db/packages/modules/src/modules/banners/designableBanner/components/DesignableBannerTicker.tsx | ||
| */ | ||
| import type { SerializedStyles } from '@emotion/react'; | ||
| import { css } from '@emotion/react'; | ||
| import { from, space, textSansBold15 } from '@guardian/source/foundations'; | ||
| import { TickerCountType } from '@guardian/support-dotcom-components'; | ||
| import type { TickerSettings } from '@guardian/support-dotcom-components/dist/shared/src/types'; | ||
| import { useEffect, useState } from 'react'; | ||
| import { useIsInView } from '../../../../../lib/useIsInView'; | ||
| import { useTicker } from '../../../hooks/useTicker'; | ||
| import type { ReactComponent } from '../../../lib/ReactComponent'; | ||
| import type { TickerStylingSettings } from '../settings'; | ||
| import { templateSpacing } from '../styles/templateStyles'; | ||
|
|
||
| const progressBarHeight = 12; | ||
| const tickerFillOffset = 15; | ||
| const overFilledTickerOffset = 10; | ||
|
|
||
| const styles = { | ||
| containerStyles: css` | ||
| position: relative; | ||
| ${templateSpacing.bannerTicker} | ||
| `, | ||
| tickerLabelsContainer: css` | ||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: end; | ||
| margin-bottom: ${space[1]}px; | ||
| `, | ||
| countLabelStyles: (colour: string) => css` | ||
| ${textSansBold15}; | ||
| font-size: 13px; | ||
| color: ${colour}; | ||
| line-height: 1.3; | ||
| ${from.desktop} { | ||
| font-size: 17px; | ||
| } | ||
| `, | ||
| progressBarContainerStyles: css` | ||
| position: relative; | ||
| `, | ||
| progressBarStyles: (backgroundColour: string) => css` | ||
| position: relative; | ||
| overflow: hidden; | ||
| width: 100%; | ||
| height: ${progressBarHeight}px; | ||
| background: ${backgroundColour}; | ||
| `, | ||
| progressBarTransform: ( | ||
| end: number, | ||
| runningTotal: number, | ||
| total: number, | ||
| ): string => { | ||
| const haveStartedAnimating = runningTotal > 0; | ||
|
|
||
| if (!haveStartedAnimating) { | ||
| return 'translateX(-100%)'; | ||
| } | ||
|
|
||
| const percentage = (total / end) * 100 - 100; | ||
|
|
||
| return `translate3d(${percentage >= 0 ? 0 : percentage}%, 0, 0)`; | ||
| }, | ||
| filledProgressStyles: ( | ||
| end: number, | ||
| runningTotal: number, | ||
| total: number, | ||
| colour: string, | ||
| isGoalReached: boolean, | ||
| ): SerializedStyles => css` | ||
| height: ${progressBarHeight}px; | ||
| width: calc( | ||
| 100% - ${isGoalReached ? overFilledTickerOffset : tickerFillOffset}% | ||
| ); | ||
| transform: ${styles.progressBarTransform(end, runningTotal, total)}; | ||
| transition: transform 3s cubic-bezier(0.25, 0.55, 0.2, 0.85); | ||
| background-color: ${colour}; | ||
| `, | ||
| soFarContainerStyles: css` | ||
| padding-right: ${space[5]}px; | ||
| `, | ||
| goalContainerStyles: css` | ||
| text-align: end; | ||
| margin-right: ${tickerFillOffset}%; | ||
| transform: translateX(50%); | ||
| `, | ||
| goalMarkerStyles: (colour: string): SerializedStyles => css` | ||
| border-right: 2px solid ${colour}; | ||
| height: calc(100% + 6px); | ||
| position: absolute; | ||
| top: -3px; | ||
| right: ${tickerFillOffset}%; | ||
| `, | ||
| }; | ||
|
|
||
| type DesignableBannerTickerProps = { | ||
| tickerSettings: TickerSettings; | ||
| stylingSettings: TickerStylingSettings; | ||
| }; | ||
|
|
||
| const DesignableBannerTicker: ReactComponent<DesignableBannerTickerProps> = ({ | ||
| tickerSettings, | ||
| stylingSettings, | ||
| }: DesignableBannerTickerProps) => { | ||
| const [readyToAnimate, setReadyToAnimate] = useState(false); | ||
|
|
||
| const [hasBeenSeen, setNode] = useIsInView({ | ||
| debounce: true, | ||
| threshold: 0, | ||
| }); | ||
|
|
||
| useEffect(() => { | ||
| if (hasBeenSeen) { | ||
| setTimeout(() => setReadyToAnimate(true), 500); | ||
| } | ||
| }, [hasBeenSeen]); | ||
|
|
||
| const total = tickerSettings.tickerData?.total ?? 1; | ||
| const goal = tickerSettings.tickerData?.goal ?? 1; | ||
| const isGoalReached = total >= goal; | ||
| const runningTotal = useTicker(total, readyToAnimate); | ||
|
|
||
| const currencySymbol = | ||
| tickerSettings.countType === TickerCountType.money | ||
| ? tickerSettings.currencySymbol | ||
| : ''; | ||
|
|
||
| return ( | ||
| <div ref={setNode} css={styles.containerStyles}> | ||
| <div css={styles.tickerLabelsContainer}> | ||
| <div css={styles.soFarContainerStyles}> | ||
| <div | ||
| css={styles.countLabelStyles( | ||
| stylingSettings.textColour, | ||
| )} | ||
| > | ||
| {!isGoalReached && currencySymbol} | ||
| {isGoalReached | ||
| ? tickerSettings.copy.goalReachedPrimary | ||
| : runningTotal.toLocaleString()}{' '} | ||
| <span> | ||
| {isGoalReached | ||
| ? tickerSettings.copy.goalReachedSecondary | ||
| : tickerSettings.copy.countLabel} | ||
| </span> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div css={styles.goalContainerStyles}> | ||
| <div | ||
| css={styles.countLabelStyles( | ||
| stylingSettings.textColour, | ||
| )} | ||
| > | ||
| {currencySymbol} | ||
| {isGoalReached | ||
| ? runningTotal.toLocaleString() | ||
| : goal.toLocaleString()}{' '} | ||
| <span> | ||
| {isGoalReached | ||
| ? tickerSettings.copy.countLabel | ||
| : 'goal'} | ||
| </span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div css={styles.progressBarContainerStyles}> | ||
| <div | ||
| css={styles.progressBarStyles( | ||
| stylingSettings.progressBarBackgroundColour, | ||
| )} | ||
| > | ||
| <div | ||
| css={styles.filledProgressStyles( | ||
| goal, | ||
| runningTotal, | ||
| total, | ||
| stylingSettings.filledProgressColour, | ||
| isGoalReached, | ||
| )} | ||
| /> | ||
| </div> | ||
| <div | ||
| css={styles.goalMarkerStyles( | ||
| stylingSettings.goalMarkerColour, | ||
| )} | ||
| /> | ||
| </div> | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export { DesignableBannerTicker }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.