Skip to content

Payment blocks: Fix upgrade nudge in the site editor #27909

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
BogdanUngureanu merged 3 commits into from
Dec 22, 2022
Merged

Payment blocks: Fix upgrade nudge in the site editor #27909

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00544ea
Payment blocks: Fix upgrade nudge in the site editor.
BogdanUngureanu Dec 13, 2022
e00178a
Pass only "ref" from blockProps
BogdanUngureanu Dec 21, 2022
1d82ae0
Merge branch 'trunk' into fix/payment-blocks-nudge
BogdanUngureanu Dec 22, 2022
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
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/fix-payment-blocks-nudge
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: bugfix

Payment blocks: Fixed the upgrade nudge for Payment blocks
57 changes: 18 additions & 39 deletions projects/plugins/jetpack/extensions/extended-blocks/paid-blocks/with-upgrade-banner.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import {
getRequiredPlan,
getUsableBlockProps,
} from '@automattic/jetpack-shared-extension-utils';
import { useBlockProps } from '@wordpress/block-editor';
import { createHigherOrderComponent } from '@wordpress/compose';
import { useSelect } from '@wordpress/data';
import { render, useState, useEffect, useMemo, useContext } from '@wordpress/element';
import { useState, useEffect, useMemo, useContext } from '@wordpress/element';
import { PaidBlockContext, PaidBlockProvider } from './components';
import UpgradePlanBanner from './upgrade-plan-banner';
import { trackUpgradeBannerImpression, trackUpgradeClickEvent } from './utils';
Expand Down Expand Up @@ -70,50 +71,28 @@ export default createHigherOrderComponent(
setAttributes( { shouldDisplayFrontendBanner: ! hasParentBanner } );
}, [ setAttributes, hasParentBanner ] );

useEffect( () => {
const block = document.querySelector( `.wp-block[data-block="${ clientId }"]` );
if ( ! block ) {
return;
}

let upgradeBannerContainer = document.querySelector(
`.wp-block[data-block="${ clientId }"] > .jetpack-block-upgrade-banner-container`
);
if ( ! upgradeBannerContainer ) {
upgradeBannerContainer = document.createElement( 'div' );
upgradeBannerContainer.classList.add( 'jetpack-block-upgrade-banner-container' );
block.prepend( upgradeBannerContainer );
}

render(
<UpgradePlanBanner
className={ `is-${ name.replace( /\//, '-' ) }-paid-block` }
title={ null }
align={ attributes?.align }
visible={ isBannerVisible }
description={ usableBlocksProps?.description }
requiredPlan={ requiredPlan }
context={ bannerContext }
onRedirect={ () => trackUpgradeClickEvent( trackEventData ) }
/>,
upgradeBannerContainer
);
}, [
attributes?.align,
clientId,
isBannerVisible,
name,
requiredPlan,
trackEventData,
usableBlocksProps?.description,
] );
const blockProps = useBlockProps();

return (
<PaidBlockProvider
onBannerVisibilityChange={ setIsVisible }
hasParentBanner={ isBannerVisible }
>
<BlockEdit { ...props } />
<div { ...blockProps }>
Comment thread
mmtr marked this conversation as resolved.
Resolved
<div className="jetpack-block-upgrade-banner-container">
Comment thread
mmtr marked this conversation as resolved.
Resolved
<UpgradePlanBanner
className={ `is-${ name.replace( /\//, '-' ) }-paid-block` }
title={ null }
align={ attributes?.align }
visible={ isBannerVisible }
description={ usableBlocksProps?.description }
requiredPlan={ requiredPlan }
context={ bannerContext }
onRedirect={ () => trackUpgradeClickEvent( trackEventData ) }
/>
</div>
<BlockEdit { ...props } />
</div>
</PaidBlockProvider>
);
},
Expand Down