Add new linkType to LinkElement: 'standard button' #15151
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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,42 @@ | ||
| import { ProductLinkElementButton } from './ProductLinkElementButton'; | ||
| import { StandardLinkElementButton } from './StandardLinkElementButton'; | ||
|
|
||
| type LinkElementButtonProps = { | ||
| label: string; | ||
| url: string; | ||
| linkType: 'StandardButton' | 'ProductButton'; | ||
| priority?: 'Primary' | 'Tertiary'; | ||
| }; | ||
|
|
||
| const LinkTypePriorityToButtonPriority = { | ||
| Primary: 'primary', | ||
| Tertiary: 'tertiary', | ||
| } as const; | ||
|
|
||
| export const LinkElementButton = ({ | ||
| label, | ||
| url, | ||
| priority = 'Primary', | ||
| linkType, | ||
| }: LinkElementButtonProps) => { | ||
| switch (linkType) { | ||
| case 'StandardButton': { | ||
| return ( | ||
| <StandardLinkElementButton | ||
| label={label} | ||
| url={url} | ||
| priority={LinkTypePriorityToButtonPriority[priority]} | ||
| /> | ||
| ); | ||
| } | ||
| case 'ProductButton': { | ||
| return ( | ||
| <ProductLinkElementButton | ||
| label={label} | ||
| url={url} | ||
| priority={LinkTypePriorityToButtonPriority[priority]} | ||
| /> | ||
| ); | ||
| } | ||
| } | ||
| }; |
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 |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| import type { Meta, StoryFn, StoryObj } from '@storybook/react-webpack5'; | ||
| import { lightDecorator } from '../../../.storybook/decorators/themeDecorator'; | ||
| import { | ||
| ArticleDesign, | ||
| ArticleDisplay, | ||
| ArticleSpecial, | ||
| Pillar, | ||
| } from '../../lib/articleFormat'; | ||
| import type { StandardLinkElementButtonProps } from './StandardLinkElementButton'; | ||
| import { StandardLinkElementButton } from './StandardLinkElementButton'; | ||
|
|
||
| const meta: Meta<typeof StandardLinkElementButton> = { | ||
| title: 'Components/StandardLinkElementButton', | ||
| component: StandardLinkElementButton, | ||
| } satisfies Meta<typeof StandardLinkElementButton>; | ||
|
|
||
| export default meta; | ||
|
|
||
| type Story = StoryObj<typeof meta>; | ||
|
|
||
| const pillars = [ | ||
| Pillar.News, | ||
| Pillar.Sport, | ||
| Pillar.Culture, | ||
| Pillar.Lifestyle, | ||
| Pillar.Opinion, | ||
| ArticleSpecial.SpecialReport, | ||
| ArticleSpecial.Labs, | ||
| ]; | ||
|
|
||
| const allThemeStandardVariations = pillars.map((theme) => ({ | ||
| design: ArticleDesign.Standard, | ||
| display: ArticleDisplay.Standard, | ||
| theme, | ||
| })); | ||
|
|
||
| const urls = ['https://www.theguardian.com/uk', 'https://www.bbc.co.uk']; | ||
|
|
||
| const Template: StoryFn<typeof StandardLinkElementButton> = ( | ||
| args: Omit<StandardLinkElementButtonProps, 'url' | 'priority'>, | ||
| ) => { | ||
| return ( | ||
| <> | ||
| {urls.map((url) => ( | ||
| <StandardLinkElementButton | ||
| key={url} | ||
| {...args} | ||
| label="Click me" | ||
| url={url} | ||
| /> | ||
| ))} | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export const WhenPrimary = { | ||
| args: { | ||
| priority: 'primary', | ||
| }, | ||
| render: Template, | ||
| decorators: [lightDecorator(allThemeStandardVariations)], | ||
| } satisfies Story; | ||
| // ***************************************************************************** | ||
|
|
||
| export const WhenSecondary = { | ||
| args: { | ||
| priority: 'secondary', | ||
| }, | ||
| render: Template, | ||
| decorators: [lightDecorator(allThemeStandardVariations)], | ||
| } satisfies Story; | ||
| // ***************************************************************************** | ||
|
|
||
| export const WhenTertiary = { | ||
| args: { | ||
| priority: 'tertiary', | ||
| }, | ||
| render: Template, | ||
| decorators: [lightDecorator(allThemeStandardVariations)], | ||
| } satisfies Story; | ||
| // ***************************************************************************** | ||
|
|
||
| export const WhenSubdued = { | ||
| args: { | ||
| priority: 'subdued', | ||
| }, | ||
| render: Template, | ||
| decorators: [lightDecorator(allThemeStandardVariations)], | ||
| } satisfies Story; | ||
| // ***************************************************************************** |
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,32 @@ | ||
| import type { ButtonPriority } from '@guardian/source/react-components'; | ||
| import { EditorialLinkButton } from './EditorialLinkButton'; | ||
| import { getPropsForLinkUrl, isExternalLink } from './utils'; | ||
|
|
||
| export type StandardLinkElementButtonProps = { | ||
| label: string; | ||
| url: string; | ||
| priority?: ButtonPriority; | ||
| }; | ||
|
|
||
| export const StandardLinkElementButton = ({ | ||
| label, | ||
| url, | ||
| priority, | ||
| }: StandardLinkElementButtonProps) => { | ||
| const propsForLinkUrl = isExternalLink(url) | ||
| ? getPropsForLinkUrl(label) | ||
| : {}; | ||
|
|
||
| return ( | ||
| <EditorialLinkButton | ||
| iconSide="right" | ||
| priority={priority} | ||
| data-link-name={`standard link button ${priority}`} | ||
| data-spacefinder-role="inline" | ||
| data-ignore="global-link-styling" | ||
| {...propsForLinkUrl} | ||
| > | ||
| {label} | ||
| </EditorialLinkButton> | ||
| ); | ||
| }; | ||
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 |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import { SvgArrowRightStraight } from '@guardian/source/react-components'; | ||
|
|
||
| const platformHostnames = [ | ||
| // CODE | ||
| 'https://code.dev-theguardian.com/', | ||
| 'https://m.code.dev-theguardian.com/', | ||
| // PROD | ||
| 'www.theguardian.com', | ||
| ]; | ||
|
|
||
| export const isExternalLink = (url: string) => | ||
| platformHostnames.includes(new URL(url).hostname); | ||
|
|
||
| export const getPropsForLinkUrl = (label: string) => ({ | ||
| rel: 'noreferrer noopener', | ||
| target: '_blank', | ||
| 'aria-label': `${label} (opens in a new tab)`, | ||
| icon: <SvgArrowRightStraight />, | ||
|
Contributor
There was a problem hiding this comment. While a design question, I'm not sure if the right arrow gives enough affordance that a link is going to open in a new window. The usual icon for this behaviour is a box with a diagonal arrow protruding from it (
Contributor
Author
There was a problem hiding this comment. This will have implications for the product button, too (storybook) — happy to raise, let's chat out of band about the best forum 👍 |
||
| }); | ||
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
Empty file.
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
Empty file.
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe
iconSide="right"can go ingetPropsForLinkUrl()?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in #15186.