From 13468013adea88c01a2ec7c31e284df3e6874e25 Mon Sep 17 00:00:00 2001
From: Jeremy Herve <jeremy@jeremy.hu>
Date: Fri, 4 Mar 2022 11:20:24 +0100
Subject: [PATCH] Replace all isPrimary references

We use variant instead, since https://github.com/WordPress/gutenberg/pull/31713/
---
 projects/plugins/jetpack/extensions/blocks/amazon/edit.js  | 2 +-
 .../plugins/jetpack/extensions/blocks/anchor-fm/editor.js  | 2 +-
 .../jetpack/extensions/blocks/button/button-width-panel.js | 2 +-
 .../blocks/contact-form/components/jetpack-field-width.js  | 2 +-
 .../plugins/jetpack/extensions/blocks/conversation/edit.js | 2 +-
 .../jetpack/extensions/blocks/instagram-gallery/edit.js    | 2 +-
 .../jetpack/extensions/blocks/podcast-player/edit.js       | 2 +-
 .../jetpack/extensions/blocks/recurring-payments/edit.jsx  | 4 ++--
 .../jetpack/extensions/blocks/social-previews/upgrade.js   | 2 +-
 .../extensions/blocks/videopress/resumable-upload/index.js | 2 +-
 .../shared/external-media/media-browser/index.js           | 7 ++++++-
 .../sources/google-photos/google-photos-auth.js            | 2 +-
 .../extensions/shared/external-media/sources/pexels.js     | 2 +-
 13 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/projects/plugins/jetpack/extensions/blocks/amazon/edit.js b/projects/plugins/jetpack/extensions/blocks/amazon/edit.js
index 0a8f1ac9f67f2..2e77b988e9c1e 100644
--- a/projects/plugins/jetpack/extensions/blocks/amazon/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/amazon/edit.js
@@ -222,7 +222,7 @@ function AmazonEdit( {
 					<Button
 						href={ detailPageUrl }
 						icon={ icon }
-						isPrimary
+						variant="primary"
 						className={ `${ defaultClassName }-button` }
 						style={ {
 							color: buttonTextColor,
diff --git a/projects/plugins/jetpack/extensions/blocks/anchor-fm/editor.js b/projects/plugins/jetpack/extensions/blocks/anchor-fm/editor.js
index 54f5ab5b046d5..d55e45240cd7d 100644
--- a/projects/plugins/jetpack/extensions/blocks/anchor-fm/editor.js
+++ b/projects/plugins/jetpack/extensions/blocks/anchor-fm/editor.js
@@ -83,7 +83,7 @@ const ConvertToAudio = () => {
 				onClick={ handleClick }
 				onKeyDown={ handleClick }
 			>
-				<Button isPrimary href="https://anchor.fm/wordpressdotcom" target="_top">
+				<Button variant="primary" href="https://anchor.fm/wordpressdotcom" target="_top">
 					{ __( 'Create a podcast episode', 'jetpack' ) }{ ' ' }
 					<Icon icon={ external } className="anchor-post-publish-outbound-link__external_icon" />
 				</Button>
diff --git a/projects/plugins/jetpack/extensions/blocks/button/button-width-panel.js b/projects/plugins/jetpack/extensions/blocks/button/button-width-panel.js
index 7fbb96dd5dc9e..f5638dff0a66c 100644
--- a/projects/plugins/jetpack/extensions/blocks/button/button-width-panel.js
+++ b/projects/plugins/jetpack/extensions/blocks/button/button-width-panel.js
@@ -75,7 +75,7 @@ export function ButtonWidthControl( { align, width, onChange } ) {
 								<Button
 									key={ widthValue }
 									isSmall
-									isPrimary={ widthValue === width }
+									variant={ widthValue === width ? 'primary' : undefined }
 									onClick={ () => handleChange( widthValue ) }
 								>
 									{ widthValue }
diff --git a/projects/plugins/jetpack/extensions/blocks/contact-form/components/jetpack-field-width.js b/projects/plugins/jetpack/extensions/blocks/contact-form/components/jetpack-field-width.js
index 1fb594f434c5f..69e13e8b5ea9a 100644
--- a/projects/plugins/jetpack/extensions/blocks/contact-form/components/jetpack-field-width.js
+++ b/projects/plugins/jetpack/extensions/blocks/contact-form/components/jetpack-field-width.js
@@ -20,7 +20,7 @@ export default function JetpackFieldWidth( { setAttributes, width } ) {
 						<Button
 							key={ widthValue }
 							isSmall
-							isPrimary={ widthValue === width }
+							variant={ widthValue === width ? 'primary' : undefined }
 							onClick={ () => setAttributes( { width: widthValue } ) }
 						>
 							{ widthValue }%
diff --git a/projects/plugins/jetpack/extensions/blocks/conversation/edit.js b/projects/plugins/jetpack/extensions/blocks/conversation/edit.js
index 92df202fe4791..d7faa3464556d 100644
--- a/projects/plugins/jetpack/extensions/blocks/conversation/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/conversation/edit.js
@@ -208,7 +208,7 @@ function ConversationEdit( {
 						className="wp-block-jetpack-slideshow__add-item-button"
 						onChange={ uploadTranscriptFile }
 						accept={ ACCEPTED_FILE_EXTENSIONS }
-						isPrimary
+						variant="primary"
 						title={ `${ __( 'Accepted file formats:', 'jetpack' ) } ${ ACCEPTED_FILE_EXTENSIONS }` }
 						disabled={ isProcessingFile }
 					>
diff --git a/projects/plugins/jetpack/extensions/blocks/instagram-gallery/edit.js b/projects/plugins/jetpack/extensions/blocks/instagram-gallery/edit.js
index c214e89dc30a6..3a057618c6897 100644
--- a/projects/plugins/jetpack/extensions/blocks/instagram-gallery/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/instagram-gallery/edit.js
@@ -158,7 +158,7 @@ const InstagramGalleryEdit = props => {
 						) }
 					</p>
 				) }
-				<Button disabled={ isButtonDisabled } isPrimary onClick={ connectBlockToInstagram }>
+				<Button disabled={ isButtonDisabled } variant="primary" onClick={ connectBlockToInstagram }>
 					{ isConnecting && __( 'Connecting…', 'jetpack' ) }
 					{ isRequestingUserConnections && __( 'Loading your connections…', 'jetpack' ) }
 					{ ! isConnecting &&
diff --git a/projects/plugins/jetpack/extensions/blocks/podcast-player/edit.js b/projects/plugins/jetpack/extensions/blocks/podcast-player/edit.js
index 5612c0d920e49..c911884d2781f 100644
--- a/projects/plugins/jetpack/extensions/blocks/podcast-player/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/podcast-player/edit.js
@@ -284,7 +284,7 @@ const PodcastPlayerEdit = ( {
 						className={ 'components-placeholder__input' }
 						onChange={ editedUrl => dispatch( { type: actions.EDIT_URL, payload: editedUrl } ) }
 					/>
-					<Button isPrimary type="submit">
+					<Button variant="primary" type="submit">
 						{ __( 'Embed', 'jetpack' ) }
 					</Button>
 				</form>
diff --git a/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx b/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
index eb8080c2c3f8a..2bddde23769ed 100644
--- a/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
+++ b/projects/plugins/jetpack/extensions/blocks/recurring-payments/edit.jsx
@@ -212,7 +212,7 @@ export class MembershipsButtonEdit extends Component {
 		if ( this.state.addingMembershipAmount === PRODUCT_NOT_ADDING && ! forceShowForm ) {
 			return (
 				<Button
-					isPrimary
+					variant="primary"
 					onClick={ () => this.setState( { addingMembershipAmount: PRODUCT_FORM } ) }
 				>
 					{ __( 'Add a payment plan', 'jetpack' ) }
@@ -290,7 +290,7 @@ export class MembershipsButtonEdit extends Component {
 				/>
 				<div>
 					<Button
-						isPrimary
+						variant="primary"
 						className="membership-button__field-button membership-button__add-amount"
 						onClick={ this.saveProduct }
 					>
diff --git a/projects/plugins/jetpack/extensions/blocks/social-previews/upgrade.js b/projects/plugins/jetpack/extensions/blocks/social-previews/upgrade.js
index 12a4862920f29..d8c6af04f943f 100644
--- a/projects/plugins/jetpack/extensions/blocks/social-previews/upgrade.js
+++ b/projects/plugins/jetpack/extensions/blocks/social-previews/upgrade.js
@@ -59,7 +59,7 @@ export default function SocialPreviewsUpgrade() {
 				</ul>
 				<Button
 					href={ href } // Only for server-side rendering, since onClick doesn't work there.
-					isPrimary
+					variant="primary"
 					label={ __( 'Purchase a Business plan to access social previews', 'jetpack' ) }
 					onClick={ autosaveAndRedirect }
 					target="_top"
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/resumable-upload/index.js b/projects/plugins/jetpack/extensions/blocks/videopress/resumable-upload/index.js
index 518c02f8c93d1..f268e02e37475 100644
--- a/projects/plugins/jetpack/extensions/blocks/videopress/resumable-upload/index.js
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/resumable-upload/index.js
@@ -131,7 +131,7 @@ export default function ResumableUpload( { file } ) {
 							'jetpack'
 						) }
 					</div>
-					<Button isPrimary onClick={ () => restartUpload() }>
+					<Button variant="primary" onClick={ () => restartUpload() }>
 						{ __( 'Try again', 'jetpack' ) }
 					</Button>
 					<Button
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/media-browser/index.js b/projects/plugins/jetpack/extensions/shared/external-media/media-browser/index.js
index 02e8a547d015f..5cf64a25f5c67 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/media-browser/index.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/media-browser/index.js
@@ -180,7 +180,12 @@ function MediaBrowser( props ) {
 
 		return (
 			<div className="jetpack-external-media-browser__media__toolbar">
-				<Button isPrimary isBusy={ isCopying } disabled={ disabled } onClick={ onCopyAndInsert }>
+				<Button
+					variant="primary"
+					isBusy={ isCopying }
+					disabled={ disabled }
+					onClick={ onCopyAndInsert }
+				>
 					{ label }
 				</Button>
 			</div>
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/google-photos-auth.js b/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/google-photos-auth.js
index 4b5f57a9542f2..73d982a2cf09c 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/google-photos-auth.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/sources/google-photos/google-photos-auth.js
@@ -51,7 +51,7 @@ function GooglePhotosAuth( props ) {
 		<div className="jetpack-external-media-auth">
 			{ isAuthing ? <AuthProgress /> : <AuthInstructions /> }
 
-			<Button isPrimary disabled={ isAuthing } onClick={ onAuthorize }>
+			<Button variant="primary" disabled={ isAuthing } onClick={ onAuthorize }>
 				{ __( 'Connect to Google Photos', 'jetpack' ) }
 			</Button>
 		</div>
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/sources/pexels.js b/projects/plugins/jetpack/extensions/shared/external-media/sources/pexels.js
index 068fad604caca..4678bf8cf4849 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/sources/pexels.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/sources/pexels.js
@@ -91,7 +91,7 @@ function PexelsMedia( props ) {
 					disabled={ !! isCopying }
 				/>
 				<Button
-					isPrimary
+					variant="primary"
 					onClick={ onSearch }
 					type="submit"
 					disabled={