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

Preview limited Global Styles by default #76661

Merged
merged 22 commits into from
May 18, 2023
Merged

Preview limited Global Styles by default #76661

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b39d86e
Preview limited Global Styles by default
mmtr May 8, 2023
6882e09
Merge remote-tracking branch 'origin/trunk' into update/preview-globa…
mmtr May 11, 2023
af9fcc7
Show global notice
mmtr May 11, 2023
bfd4882
Use booleans
mmtr May 11, 2023
d411f40
Open links in new tab and track all clicks
mmtr May 12, 2023
1e0d81a
Merge remote-tracking branch 'origin/trunk' into update/preview-globa…
mmtr May 12, 2023
ace3829
Remove E2E test
mmtr May 12, 2023
74facb0
Merge remote-tracking branch 'origin/trunk' into update/preview-globa…
mmtr May 15, 2023
18acc7d
Better wording
mmtr May 15, 2023
8911cbc
Show action as button
mmtr May 15, 2023
f42369a
Show toggle
mmtr May 15, 2023
071b2a6
Move toggle switch to separate PR
mmtr May 16, 2023
018862e
Merge remote-tracking branch 'origin/trunk' into update/preview-globa…
mmtr May 16, 2023
7006ed9
Show notice in view canvas
mmtr May 16, 2023
c39776f
Add back E2E test
mmtr May 16, 2023
f199e38
Ensure the notice of the edit mode is not tracked when on the view mode
mmtr May 16, 2023
4ed4661
Add missing isSiteEditor argument
mmtr May 16, 2023
33ad7c2
Merge remote-tracking branch 'origin/trunk' into update/preview-globa…
mmtr May 17, 2023
473a599
Remove preview action
mmtr May 17, 2023
154fad0
Merge remote-tracking branch 'origin/trunk' into update/preview-globa…
mmtr May 17, 2023
24a432e
Merge remote-tracking branch 'origin/trunk' into update/preview-globa…
mmtr May 18, 2023
d627869
Make notice dismissible
mmtr May 18, 2023
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
6 changes: 3 additions & 3 deletions apps/editing-toolkit/editing-toolkit-plugin/wpcom-global-styles/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,10 @@ function wpcom_display_global_styles_launch_bar( $bar_controls ) {

if ( wpcom_is_previewing_global_styles() ) {
$preview_text = __( 'Turn off preview', 'full-site-editing' );
dsas marked this conversation as resolved.
Show resolved Hide resolved
$preview_location = remove_query_arg( 'preview-global-styles' );
$preview_location = add_query_arg( 'hide-global-styles', '' );
} else {
$preview_text = __( 'Turn on preview', 'full-site-editing' );
$preview_location = add_query_arg( 'preview-global-styles', '' );
$preview_location = remove_query_arg( 'hide-global-styles' );
}

ob_start(); ?>
Expand Down Expand Up @@ -534,5 +534,5 @@ function wpcom_is_previewing_global_styles( ?int $user_id = null ) {
}

// phpcs:ignore WordPress.Security.NonceVerification.Recommended
return isset( $_GET['preview-global-styles'] ) && user_can( $user_id, 'administrator' );
return ! isset( $_GET['hide-global-styles'] ) && user_can( $user_id, 'administrator' );
}
3 changes: 0 additions & 3 deletions .../stepper/declarative-flow/internals/steps-repository/launchpad/launchpad-site-preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import WebPreview from 'calypso/components/web-preview/component';
import { useSite } from 'calypso/landing/stepper/hooks/use-site';
import { useSitePreviewShareCode } from 'calypso/landing/stepper/hooks/use-site-preview-share-code';
import { isVideoPressFlow } from 'calypso/signup/utils';
import { usePremiumGlobalStyles } from 'calypso/state/sites/hooks/use-premium-global-styles';
import PreviewToolbar from '../design-setup/preview-toolbar';
import type { Device } from '@automattic/components';

Expand Down Expand Up @@ -45,7 +44,6 @@ const LaunchpadSitePreview = ( {
} ) => {
const translate = useTranslate();
const site = useSite();
const { globalStylesInUse } = usePremiumGlobalStyles( site?.ID );
const isInVideoPressFlow = isVideoPressFlow( flow );
const enableEditOverlay = getEnableEditOverlay( flow );

Expand Down Expand Up @@ -93,7 +91,6 @@ const LaunchpadSitePreview = ( {
// hide cookies popup
preview: true,
do_preview_no_interactions: ! isInVideoPressFlow,
...( globalStylesInUse && { 'preview-global-styles': true } ),
} );
}

Expand Down
2 changes: 1 addition & 1 deletion client/landing/stepper/hooks/use-accent-color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const useAccentColor = () => {
if ( ID ) {
wpcom.req
.get( {
path: `/sites/${ ID }/global-styles-variation/site-accent-color?preview-global-styles=true`,
path: `/sites/${ ID }/global-styles-variation/site-accent-color`,
apiNamespace: 'wpcom/v2',
} )
.then( ( color: string ) => {
Expand Down