Skip to content
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

Subscriptions: add a floating subscribe button #37722

Merged
merged 12 commits into from
Oct 21, 2024
Merged

Subscriptions: add a floating subscribe button #37722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b26504a
Subscriptions: add floating subscribe button variation
simison Jun 5, 2024
99b0888
changelog
simison Jun 5, 2024
fa00018
Cleanup
simison Jun 5, 2024
a4317bd
cleanup
simison Jun 5, 2024
8495acb
Add removal lock to the block
simison Jun 5, 2024
ae600d1
Move spacing into the button so that customers can modify it
simison Jun 5, 2024
fe49ab1
Fix z-index with overlay
simison Jun 5, 2024
e7b4164
Update projects/plugins/jetpack/modules/subscriptions/subscribe-float…
simison Jun 16, 2024
07ba5ac
Disables WP.com action bar as the features collide/overlap
simison Oct 17, 2024
aa2cf6f
Add APIs and sync setup
simison Oct 17, 2024
93004a5
Add toggle to settings
simison Oct 17, 2024
d702b69
Simplify description
simison Oct 17, 2024
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
39 changes: 39 additions & 0 deletions projects/plugins/jetpack/_inc/client/newsletter/subscriptions-settings.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ function SubscriptionsSettings( props ) {
isStcEnabled,
isSmEnabled,
isSubscribeOverlayEnabled,
isSubscribeFloatingEnabled,
isSubscribePostEndEnabled,
isLoginNavigationEnabled,
isSubscribeNavigationEnabled,
Expand Down Expand Up @@ -69,6 +70,15 @@ function SubscriptionsSettings( props ) {
} )
: null;

const subscribeFloatingEditorUrl =
siteAdminUrl && themeStylesheet
? addQueryArgs( `${ siteAdminUrl }site-editor.php`, {
postType: 'wp_template_part',
postId: `${ themeStylesheet }//jetpack-subscribe-floating-button`,
canvas: 'edit',
} )
: null;

const singlePostTemplateEditorUrl = siteAdminUrl
? addQueryArgs( `${ siteAdminUrl }site-editor.php`, {
postType: 'wp_template',
Expand Down Expand Up @@ -99,6 +109,13 @@ function SubscriptionsSettings( props ) {
updateFormStateModuleOption( SUBSCRIPTIONS_MODULE_NAME, 'jetpack_subscribe_overlay_enabled' );
}, [ updateFormStateModuleOption ] );

const handleSubscribeFloatingToggleChange = useCallback( () => {
updateFormStateModuleOption(
SUBSCRIPTIONS_MODULE_NAME,
'jetpack_subscribe_floating_button_enabled'
);
}, [ updateFormStateModuleOption ] );

const handleSubscribePostEndToggleChange = useCallback( () => {
updateFormStateModuleOption(
SUBSCRIPTIONS_MODULE_NAME,
Expand Down Expand Up @@ -202,6 +219,25 @@ function SubscriptionsSettings( props ) {
</span>
}
/>
<ToggleControl
checked={ isSubscriptionsActive && isSubscribeFloatingEnabled }
disabled={ isDisabled }
toggling={ isSavingAnyOption( [ 'jetpack_subscribe_floating_button_enabled' ] ) }
onChange={ handleSubscribeFloatingToggleChange }
label={
<span className="jp-form-toggle-explanation">
{ __( "Floating subscribe button on site's bottom corner", 'jetpack' ) }
{ isBlockTheme && subscribeFloatingEditorUrl && (
<>
{ '. ' }
<ExternalLink href={ subscribeFloatingEditorUrl }>
{ __( 'Preview and edit', 'jetpack' ) }
</ExternalLink>
</>
) }
</span>
}
/>
</FormFieldset>
{ isSubscriptionSiteEditSupported && (
<FormFieldset>
Expand Down Expand Up @@ -293,6 +329,9 @@ export default withModuleSettingsFormHelpers(
isStcEnabled: ownProps.getOptionValue( 'stc_enabled' ),
isSmEnabled: ownProps.getOptionValue( 'sm_enabled' ),
isSubscribeOverlayEnabled: ownProps.getOptionValue( 'jetpack_subscribe_overlay_enabled' ),
isSubscribeFloatingEnabled: ownProps.getOptionValue(
'jetpack_subscribe_floating_button_enabled'
),
isSubscribePostEndEnabled: ownProps.getOptionValue(
'jetpack_subscriptions_subscribe_post_end_enabled'
),
Expand Down
Loading
Loading