Focused Launch: PlanDetails View

packages/data-stores/src/launch/reducer.ts

@@ -57,6 +57,20 @@ const plan: Reducer< Plans.Plan | undefined, LaunchAction > = ( state, action )
 	return state;
 };
 
+/**
+ * To keep track of the last paid plan the user has picked
+ * This is useful information as this paid plan can be suggested later
+ *
+ * @param state the state
+ * @param action the action
+ */
+const paidPlan: Reducer< Plans.Plan | undefined, LaunchAction > = ( state, action ) => {
+	if ( action.type === 'SET_PLAN' && ! action.plan?.isFree ) {
+		return action.plan;
+	}
+	return state;
+};
+
 const isFocusedLaunchOpen: Reducer< boolean, LaunchAction > = ( state = false, action ) => {
 	if ( action.type === 'OPEN_FOCUSED_LAUNCH' ) {
 		return true;
@@ -135,6 +149,7 @@ const reducer = combineReducers( {
 	confirmedDomainSelection,
 	domainSearch,
 	plan,
+	paidPlan,
 	isSidebarOpen,
 	isSidebarFullscreen,
 	isExperimental,

packages/data-stores/src/launch/selectors.ts

@@ -26,6 +26,15 @@ export const getSelectedDomain = ( state: State ): DomainSuggestions.DomainSugge
 	state.domain;
 export const getSelectedPlan = ( state: State ): Plans.Plan | undefined => state.plan;
 
+/**
+ * Returns the last paid plan the user has picked.
+ * If they revert to a free plan,
+ * this is useful if you want to recommend their once-picked paid plan
+ *
+ * @param state State
+ */
+export const getPaidPlan = ( state: State ): Plans.Plan | undefined => state.paidPlan;
+
 // Completion status of steps is derived from the state of the launch flow
 export const isStepCompleted = ( state: State, step: LaunchStepType ): boolean => {
 	if ( step === LaunchStep.Plan ) {

packages/launch/package.json

@@ -34,6 +34,7 @@
 		"@automattic/data-stores": "^1.0.0-alpha.1",
 		"@automattic/domain-picker": "^1.0.0-alpha.0",
 		"@automattic/onboarding": "^1.0.0",
+		"@automattic/plans-grid": "^1.0.0-alpha.0",
 		"@wordpress/components": "^10.0.5",
 		"@wordpress/icons": "^2.4.0",
 		"@wordpress/url": "^2.17.0",

packages/launch/src/focused-launch/go-back-button/index.tsx

@@ -0,0 +1,23 @@
+/**
+ * External dependencies
+ */
+import React from 'react';
+import { __ } from '@wordpress/i18n';
+import { Icon, chevronLeft } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import { BackButton } from '@automattic/onboarding';
+import './style.scss';
+
+declare const __i18n_text_domain__: string;
+
+export default function GoBackButton( props ) {
+	return (
+		<BackButton { ...props }>
+			<Icon icon={ chevronLeft } />
+			{ __( 'Go back', __i18n_text_domain__ ) }
+		</BackButton>
+	);
+}

packages/launch/src/focused-launch/go-back-button/style.scss

@@ -0,0 +1,22 @@
+.go-back-button__focused-launch {
+	text-decoration: underline;
+	background: transparent;
+	border: none;
+	padding: 0;
+	margin: 0;
+	margin-bottom: 24px;
+	cursor: pointer;
+
+	& > * {
+		vertical-align: middle;
+	}
+
+	svg {
+		// the svg has 5 empty pixels on the left
+		margin-left: -5px;
+	}
+}
+
+.go-back-button__focused-launch:hover {
+	opacity: 0.7;
+}

packages/launch/src/focused-launch/plan-details/index.tsx

@@ -3,22 +3,82 @@
 /**
  * External dependencies
  */
-import React from 'react';
-import { Link } from 'react-router-dom';
+import * as React from 'react';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
+import { Plans } from '@automattic/data-stores';
+import PlansGrid from '@automattic/plans-grid';
+import { Title, SubTitle } from '@automattic/onboarding';
+import { useHistory } from 'react-router-dom';
 
 /**
  * Internal dependencies
  */
-import { Route } from '../route';
+import { LAUNCH_STORE } from '../../stores';
+import GoBackButton from '../go-back-button';
 
 import './style.scss';
 
 const PlanDetails: React.FunctionComponent = () => {
+	const domain = useSelect( ( select ) => select( LAUNCH_STORE ).getSelectedDomain() );
+	const selectedPlan = useSelect( ( select ) => select( LAUNCH_STORE ).getSelectedPlan() );
+	const history = useHistory();
+
+	const { updatePlan } = useDispatch( LAUNCH_STORE );
+
+	const hasPaidDomain = domain && ! domain.is_free;
+
+	const handleSelect = ( planSlug: Plans.PlanSlug ) => {
+		updatePlan( planSlug );
+		history.goBack();
+	};
+
+	const goBackToSummary = () => {
+		history.goBack();
+	};
+
 	return (
 		<div>
-			<Link to={ Route.Summary }>{ __( 'Go back', __i18n_text_domain__ ) }</Link>
-			<p>{ __( 'Select a plan', __i18n_text_domain__ ) }</p>
+			<div className="focused-launch-plan-details__back-button-wrapper">
+				<GoBackButton onClick={ goBackToSummary } />
+			</div>
+			<div className="focused-launch-plan-details__header">
+				<div>
+					<Title>{ __( 'Select a plan', __i18n_text_domain__ ) }</Title>
+					<SubTitle>
+						{ __(
+							"There's no risk, you can cancel for a full refund within 30 days.",
+							__i18n_text_domain__
+						) }
+					</SubTitle>
+				</div>
+			</div>
+			<div className="focused-launch-plan-details__body">
+				<PlansGrid
+					currentDomain={ domain }
+					onPlanSelect={ handleSelect }
+					currentPlan={ selectedPlan }
+					onPickDomainClick={ goBackToSummary }
+					customTagLines={ {
+						free_plan: __( 'Best for getting started', __i18n_text_domain__ ),
+						'business-bundle': __( 'Best for small businesses', __i18n_text_domain__ ),
+					} }
+					showPlanTaglines
+					popularBadgeVariation="NEXT_TO_NAME"
+					disabledPlans={
+						hasPaidDomain
+							? {
+									[ Plans.PLAN_FREE ]: __(
+										'Not available with custom domain',
+										__i18n_text_domain__
+									),
+							  }
+							: undefined
+					}
+					CTAVariation="FULL_WIDTH"
+					locale="user"
+				/>
+			</div>
 		</div>
 	);
 };

packages/launch/src/focused-launch/plan-details/style.scss

@@ -0,0 +1,3 @@
+.focused-launch-plan-details__back-button-wrapper {
+	margin-bottom: 24px;
+}

packages/launch/src/focused-launch/summary/index.tsx

@@ -21,7 +21,7 @@ import FocusedLaunchSummaryItem, {
  */
 import { Route } from '../route';
 import { useTitle, useDomainSearch, useSiteDomains, useSite, usePlans } from '../../hooks';
-import { LAUNCH_STORE, Plan, SiteDetailsPlan } from '../../stores';
+import { LAUNCH_STORE } from '../../stores';
 import LaunchContext from '../../context';
 import { isDefaultSiteTitle } from '../../utils';
 
@@ -245,39 +245,35 @@ type PlanStepProps = CommonStepProps & {
 	hasPaidPlan?: boolean;
 	hasPaidDomain?: boolean;
 	selectedPaidDomain?: boolean;
-	defaultPaidPlan: Plan | undefined;
-	defaultFreePlan: Plan | undefined;
-	planPrices: Record< string, string >;
-	selectedPlan: Plan | undefined;
-	onSetPlan: ( plan: Plan ) => void;
-	onUnsetPlan: () => void;
-	sitePlan: SiteDetailsPlan | undefined;
 };
 
 const PlanStep: React.FunctionComponent< PlanStepProps > = ( {
 	stepIndex,
 	hasPaidPlan = false,
 	hasPaidDomain = false,
 	selectedPaidDomain = false,
-	defaultPaidPlan,
-	defaultFreePlan,
-	planPrices,
-	selectedPlan,
-	onSetPlan,
-	onUnsetPlan,
-	sitePlan,
 } ) => {
+	const { setPlan, unsetPlan } = useDispatch( LAUNCH_STORE );
+
+	const selectedPlan = useSelect( ( select ) => select( LAUNCH_STORE ).getSelectedPlan() );
+
+	const onceSelectedPaidPlan = useSelect( ( select ) => select( LAUNCH_STORE ).getPaidPlan() );
+
+	const { defaultPaidPlan, defaultFreePlan, planPrices } = usePlans();
+
+	const sitePlan = useSite().sitePlan;
+
 	useEffect( () => {
 		// To keep the launch store state valid,
 		// unselect the free plan if the user selected a paid domain.
 		// free plans don't support paid domains.
 		if ( selectedPaidDomain && selectedPlan && selectedPlan.isFree ) {
-			onUnsetPlan();
+			unsetPlan();
 		}
-	}, [ selectedPaidDomain, selectedPlan, onUnsetPlan ] );
+	}, [ selectedPaidDomain, selectedPlan, unsetPlan ] );
 
-	// if the user picks up a paid plan from the detailed plan page, show it, otherwise show premium plan
-	const paidPlan = selectedPlan && ! selectedPlan.isFree ? selectedPlan : defaultPaidPlan;
+	// if the user picks (or ever picked) up a paid plan from the detailed plan page, show it, otherwise show premium plan
+	const paidPlan = onceSelectedPaidPlan || defaultPaidPlan;
 
 	return (
 		<SummaryStep
@@ -339,7 +335,7 @@ const PlanStep: React.FunctionComponent< PlanStepProps > = ( {
 							<FocusedLaunchSummaryItem
 								isLoading={ ! defaultFreePlan || ! defaultPaidPlan }
 								readOnly={ hasPaidDomain || selectedPaidDomain }
-								onClick={ () => defaultFreePlan && onSetPlan( defaultFreePlan ) }
+								onClick={ () => defaultFreePlan && setPlan( defaultFreePlan ) }
 								isSelected={ ! ( hasPaidDomain || selectedPaidDomain ) && selectedPlan?.isFree }
 							>
 								<LeadingContentSide
@@ -358,7 +354,7 @@ const PlanStep: React.FunctionComponent< PlanStepProps > = ( {
 							</FocusedLaunchSummaryItem>
 							<FocusedLaunchSummaryItem
 								isLoading={ ! defaultFreePlan || ! defaultPaidPlan }
-								onClick={ () => paidPlan && onSetPlan( paidPlan ) }
+								onClick={ () => paidPlan && setPlan( paidPlan ) }
 								isSelected={ selectedPlan?.storeSlug === paidPlan?.storeSlug }
 							>
 								<LeadingContentSide
@@ -439,11 +435,9 @@ const Summary: React.FunctionComponent = () => {
 	const { title, updateTitle, saveTitle, isSiteTitleStepVisible, showSiteTitleStep } = useTitle();
 
 	const { sitePrimaryDomain, siteSubdomain, hasPaidDomain } = useSiteDomains();
-	const selectedPlan = useSelect( ( select ) => select( LAUNCH_STORE ).getSelectedPlan() );
 	const selectedDomain = useSelect( ( select ) => select( LAUNCH_STORE ).getSelectedDomain() );
-	const { setDomain, unsetDomain, setPlan, unsetPlan } = useDispatch( LAUNCH_STORE );
+	const { setDomain, unsetDomain } = useDispatch( LAUNCH_STORE );
 	const domainSearch = useDomainSearch();
-	const { defaultPaidPlan, defaultFreePlan, planPrices } = usePlans();
 
 	const site = useSite();
 
@@ -466,7 +460,6 @@ const Summary: React.FunctionComponent = () => {
 		}
 	}, [ title, showSiteTitleStep, isSiteTitleStepVisible ] );
 
-	const sitePlan = site.sitePlan;
 	const hasPaidPlan = site.isPaidPlan;
 
 	// Prepare Steps
@@ -506,13 +499,6 @@ const Summary: React.FunctionComponent = () => {
 			hasPaidDomain={ hasPaidDomain }
 			stepIndex={ forwardStepIndex ? stepIndex : undefined }
 			key={ stepIndex }
-			defaultPaidPlan={ defaultPaidPlan }
-			defaultFreePlan={ defaultFreePlan }
-			selectedPlan={ selectedPlan }
-			onSetPlan={ setPlan }
-			onUnsetPlan={ unsetPlan }
-			planPrices={ planPrices }
-			sitePlan={ sitePlan }
 		/>
 	);
 

packages/launch/tsconfig.json

@@ -37,6 +37,7 @@
 		{ "path": "../data-stores" },
 		{ "path": "../components" },
 		{ "path": "../onboarding" },
-		{ "path": "../domain-picker" }
+		{ "path": "../domain-picker" },
+		{ "path": "../plans-grid" }
 	]
 }

packages/plans-grid/src/plans-grid/index.tsx

@@ -13,6 +13,8 @@ import debugFactory from 'debug';
 import PlansTable from '../plans-table';
 import PlansAccordion from '../plans-accordion';
 import PlansDetails from '../plans-details';
+import type { CTAVariation, CustomTagLinesMap, PopularBadgeVariation } from '../plans-table/types';
+export type { CTAVariation, CustomTagLinesMap, PopularBadgeVariation } from '../plans-table/types';
 
 /**
  * Style dependencies
@@ -34,6 +36,10 @@ export interface Props {
 	disabledPlans?: { [ planSlug: string ]: string };
 	isAccordion?: boolean;
 	locale: string;
+	showPlanTaglines?: boolean;
+	CTAVariation?: CTAVariation;
+	popularBadgeVariation?: PopularBadgeVariation;
+	customTagLines?: CustomTagLinesMap;
 }
 
 const PlansGrid: React.FunctionComponent< Props > = ( {
@@ -46,6 +52,10 @@ const PlansGrid: React.FunctionComponent< Props > = ( {
 	disabledPlans,
 	isAccordion,
 	locale,
+	showPlanTaglines = false,
+	CTAVariation = 'NORMAL',
+	popularBadgeVariation = 'ON_TOP',
+	customTagLines,
 } ) => {
 	isAccordion && debug( 'PlansGrid accordion version is active' );
 
@@ -67,12 +77,16 @@ const PlansGrid: React.FunctionComponent< Props > = ( {
 						></PlansAccordion>
 					) : (
 						<PlansTable
+							popularBadgeVariation={ popularBadgeVariation }
+							CTAVariation={ CTAVariation }
 							selectedPlanSlug={ currentPlan?.storeSlug ?? '' }
 							onPlanSelect={ onPlanSelect }
+							customTagLines={ customTagLines }
 							currentDomain={ currentDomain }
 							onPickDomainClick={ onPickDomainClick }
 							disabledPlans={ disabledPlans }
 							locale={ locale }
+							showTaglines={ showPlanTaglines }
 						></PlansTable>
 					) }
 				</div>