Skip to content

My Jetpack: migrate link-variant Buttons to @wordpress/ui Link #49109

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

Merged
CGastrell merged 2 commits into from
May 25, 2026
+19 −26
Merged

My Jetpack: migrate link-variant Buttons to @wordpress/ui Link #49109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acf65ad
My Jetpack: migrate link-variant Buttons to @wordpress/ui Link
CGastrell May 22, 2026
07d39f8
My Jetpack: center-align primary-footer items after Link migration
CGastrell May 25, 2026
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
32 changes: 10 additions & 22 deletions projects/packages/my-jetpack/_inc/components/plans-section/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// TODO: migrate Button usages to @wordpress/ui Link (handled in a separate PR — all Buttons here use variant="link" + href + isExternalLink + weight="regular", which @wordpress/ui Button does not support).
import { Button } from '@automattic/jetpack-components';
import { getUserConnectionUrl } from '@automattic/jetpack-connection';
import { getMyJetpackUrl } from '@automattic/jetpack-script-data';
import { dateI18n, getDate } from '@wordpress/date';
Expand Down Expand Up @@ -110,16 +108,16 @@ const PlanExpiry: FC< PlanSectionProps > = ( { purchase } ) => {

if ( isExpiringSoon ) {
return (
<Button href={ renewUrl } isExternalLink={ true } variant="link" weight="regular">
<Link href={ renewUrl } openInNewTab>
{ __( 'Renew subscription', 'jetpack-my-jetpack' ) }
</Button>
</Link>
);
}

return (
<Button href={ managePurchaseUrl } isExternalLink={ true } variant="link" weight="regular">
<Link href={ managePurchaseUrl } openInNewTab>
{ __( 'Resume subscription', 'jetpack-my-jetpack' ) }
</Button>
</Link>
);
}, [ isExpiringPurchase, isExpiringSoon, managePurchaseUrl, renewUrl ] );

Expand Down Expand Up @@ -243,39 +241,29 @@ const PlanSectionFooter: FC< PlanSectionHeaderAndFooterProps > = ( { numberOfPur
) }
{ numberOfPurchases > 0 && (
<li className={ styles[ 'actions-list-item' ] }>
<Button
<Link
onClick={ viewIncludedFeaturesClickHandler }
href={ getMyJetpackUrl( '#/products?filter=included' ) }
variant="link"
weight="regular"
>
{ __( 'View included features', 'jetpack-my-jetpack' ) }
</Button>
</Link>
</li>
) }
{ ! hasComplete && (
<li className={ styles[ 'actions-list-item' ] }>
<Button
onClick={ planPurchaseClickHandler }
href={ getPurchasePlanUrl() }
weight="regular"
variant="link"
isExternalLink={ true }
>
<Link onClick={ planPurchaseClickHandler } href={ getPurchasePlanUrl() } openInNewTab>
{ planPurchaseDescription }
</Button>
</Link>
</li>
) }
{ ! hasComplete && loadAddLicenseScreen && (
<li className={ styles[ 'actions-list-item' ] }>
<Button
<Link
onClick={ activateLicenseClickHandler }
href={ isUserConnected ? getMyJetpackUrl( '#/add-license' ) : getUserConnectionUrl() }
variant="link"
weight="regular"
>
{ activateLicenceDescription }
</Button>
</Link>
</li>
) }
</ul>
Expand Down
8 changes: 4 additions & 4 deletions ...ages/my-jetpack/_inc/components/product-interstitial-modal/product-interstitial-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Text, Button, ThemeProvider, Col, Container } from '@automattic/jetpack-components';
import { Modal } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { Link } from '@wordpress/ui';
import clsx from 'clsx';
import { useCallback, useState, cloneElement } from 'react';
import LoadingBlock from '../loading-block';
Expand Down Expand Up @@ -234,13 +235,12 @@ const ProductInterstitialModal: FC< ProductInterstitialModalProps > = props => {
</div>
<div className={ styles[ 'primary-footer' ] }>
{ PrimaryButton }
<Button
variant="link"
isExternalLink={ secondaryButtonHasExternalLink }
<Link
openInNewTab={ secondaryButtonHasExternalLink }
href={ secondaryButtonHref }
>
{ __( 'Learn more', 'jetpack-my-jetpack' ) }
</Button>
</Link>
</div>
</Col>
{
Expand Down
1 change: 1 addition & 0 deletions projects/packages/my-jetpack/_inc/components/product-interstitial-modal/style.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ $interstitial-modal-padding: 40px;
.primary-footer {
display: flex;
flex-direction: row;
align-items: center;
gap: 8px 24px;
}

Expand Down
4 changes: 4 additions & 0 deletions projects/packages/my-jetpack/changelog/update-link-variant-buttons-to-wp-ui-link
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: changed

My Jetpack: migrate link-variant Buttons in Plans section and product interstitial modal to @wordpress/ui Link.
Loading