Stats-30 - Ensure correct logo and titles are displayed in the new header #102833
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -12,30 +12,35 @@ interface BackLinkProps { | |
|
|
||
| interface HeaderProps extends React.HTMLAttributes< HTMLElement > { | ||
| title?: string; | ||
| titleLogo?: ReactNode; | ||
| backLinkProps?: BackLinkProps; | ||
| titleElement?: ReactNode; | ||
| headElement?: ReactNode; | ||
| rightSection?: ReactNode; | ||
| hasScreenOptionsTab?: boolean; | ||
| titleProps?: { | ||
| title?: string; | ||
| titleLogo?: ReactNode; | ||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * Header component that can be used in various contexts | ||
| * @param props - Component props | ||
| * @param props.className - Additional CSS class name for the component | ||
| * @param props.titleProps - Header title props | ||
| * @param props.backLinkProps - Object containing back link properties (backLink URL, backLinkText, and onBackClick handler) | ||
| * @param props.titleElement - Custom element to override default title rendering | ||
| * @param props.headElement - Custom element to override default head section rendering | ||
| * @param props.rightSection - Child elements to render in the right section | ||
| * @param props.hasScreenOptionsTab - Indicates whether the screen options tab should be added | ||
| * @returns The rendered NavigationHeader component | ||
| */ | ||
| const NavigationHeader: React.FC< HeaderProps > = ( { | ||
| className, | ||
| titleProps, | ||
| backLinkProps, | ||
| titleElement, | ||
| headElement = backLinkProps?.url && ( | ||
| <a | ||
| className="calypso-navigation-header__back-link" | ||
|
|
@@ -50,10 +55,27 @@ const NavigationHeader: React.FC< HeaderProps > = ( { | |
| ← { backLinkProps?.text ?? translate( 'Back' ) } | ||
| </a> | ||
| ), | ||
| rightSection, | ||
| hasScreenOptionsTab, | ||
| ...rest | ||
| } ) => { | ||
| const defaultTitleElement = ( | ||
| <h1 className="calypso-navigation-header__title"> | ||
| { titleProps?.titleLogo && ( | ||
| <span className="calypso-navigation-header__title-logo" aria-hidden="true"> | ||
| { titleProps.titleLogo } | ||
| </span> | ||
| ) } | ||
| { titleProps?.title && titleProps?.titleLogo ? ( | ||
| <span className="calypso-navigation-header__title-text">{ titleProps?.title }</span> | ||
| ) : ( | ||
| titleProps?.title | ||
| ) } | ||
| </h1> | ||
| ); | ||
|
|
||
| const finalTitleElement = titleElement ?? defaultTitleElement; | ||
|
|
||
| return ( | ||
| <header | ||
| className={ clsx( 'calypso-navigation-header', className, { | ||
|
|
@@ -63,8 +85,10 @@ const NavigationHeader: React.FC< HeaderProps > = ( { | |
| > | ||
| <div className="calypso-navigation-header__head">{ headElement }</div> | ||
| <div className="calypso-navigation-header__body"> | ||
| <div className="calypso-navigation-header__left-section">{ finalTitleElement }</div> | ||
| { rightSection && ( | ||
|
Contributor
Member
Author
There was a problem hiding this comment. The
Contributor
There was a problem hiding this comment. Per the original component design, I feel like the
Contributor
There was a problem hiding this comment.
|
||
| <div className="calypso-navigation-header__right-section">{ rightSection }</div> | ||
| ) } | ||
| </div> | ||
| </header> | ||
| ); | ||
|
|
||
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import config from '@automattic/calypso-config'; | ||
| import JetpackLogo from 'calypso/components/jetpack-logo'; | ||
| import NavigationHeaderImpr from 'calypso/components/navigation-header/navigation-header'; | ||
| import { STATS_PRODUCT_NAME, STATS_PRODUCT_NAME_IMPR } from '../../constants'; | ||
|
|
||
| function PageHeader() { | ||
| const isOdysseyStats = config.isEnabled( 'is_running_in_jetpack_site' ); | ||
|
|
||
| if ( isOdysseyStats ) { | ||
| return ( | ||
| <NavigationHeaderImpr | ||
| className="stats__section-header modernized-header" | ||
| titleProps={ { | ||
| title: STATS_PRODUCT_NAME, | ||
| titleLogo: <JetpackLogo size={ 24 } monochrome={ false } />, | ||
| } } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <NavigationHeaderImpr | ||
| className="stats__section-header modernized-header" | ||
| titleProps={ { | ||
| title: STATS_PRODUCT_NAME_IMPR, | ||
| } } | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| export default PageHeader; |
This file contains hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.