Address feedback

Automattic · Nov 18, 2020 · 02997af · 02997af
1 parent dd18974
commit 02997af
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 53 deletions.
diff --git a/packages/launch/src/focused-launch/go-back-button/index.tsx b/packages/launch/src/focused-launch/go-back-button/index.tsx
diff --git a/packages/launch/src/focused-launch/go-back-button/style.scss b/packages/launch/src/focused-launch/go-back-button/style.scss
diff --git a/packages/launch/src/focused-launch/plan-details/index.tsx b/packages/launch/src/focused-launch/plan-details/index.tsx
@@ -10,12 +10,12 @@ import { Plans } from '@automattic/data-stores';
 import PlansGrid from '@automattic/plans-grid';
 import { Title, SubTitle } from '@automattic/onboarding';
 import { useHistory } from 'react-router-dom';
+import { BackButton } from '@automattic/onboarding';
 
 /**
  * Internal dependencies
  */
 import { LAUNCH_STORE } from '../../stores';
-import GoBackButton from '../go-back-button';
 
 import './style.scss';
 
@@ -33,13 +33,13 @@ const PlanDetails: React.FunctionComponent = () => {
 		history.goBack();
 	};
 
-	const handlePickDomain = () => {
+	const goBackToSummary = () => {
 		history.goBack();
 	};
 
 	return (
 		<div>
-			<GoBackButton />
+			<BackButton onClick={ goBackToSummary }>{ __( 'Go back', __i18n_text_domain__ ) }</BackButton>
 			<div className="focused-launch-plan-details__header">
 				<div>
 					<Title>{ __( 'Select a plan', __i18n_text_domain__ ) }</Title>
@@ -56,7 +56,7 @@ const PlanDetails: React.FunctionComponent = () => {
 					currentDomain={ domain }
 					onPlanSelect={ handleSelect }
 					currentPlan={ selectedPlan }
-					onPickDomainClick={ handlePickDomain }
+					onPickDomainClick={ goBackToSummary }
 					customTagLines={ {
 						free_plan: __( 'Best for getting started', __i18n_text_domain__ ),
 						'business-bundle': __( 'Best for small businesses', __i18n_text_domain__ ),

diff --git a/packages/plans-grid/src/plans-grid/index.tsx b/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
@@ -35,9 +37,9 @@ export interface Props {
 	isAccordion?: boolean;
 	locale: string;
 	showPlanTaglines?: boolean;
-	CTAVariation?: 'FULL_WIDTH' | 'NORMAL';
-	popularBadgeVariation?: 'ON_TOP' | 'NEXT_TO_NAME';
-	customTagLines?: Record< string, string >;
+	CTAVariation?: CTAVariation;
+	popularBadgeVariation?: PopularBadgeVariation;
+	customTagLines?: CustomTagLinesMap;
 }
 
 const PlansGrid: React.FunctionComponent< Props > = ( {

diff --git a/packages/plans-grid/src/plans-table/index.tsx b/packages/plans-grid/src/plans-table/index.tsx
@@ -10,6 +10,7 @@ import type { DomainSuggestions } from '@automattic/data-stores';
  */
 import PlanItem from './plan-item';
 import { PLANS_STORE } from '../constants';
+import type { CTAVariation, PopularBadgeVariation, CustomTagLinesMap } from './types';
 
 /**
  * Style dependencies
@@ -24,9 +25,9 @@ export interface Props {
 	disabledPlans?: { [ planSlug: string ]: string };
 	locale: string;
 	showTaglines?: boolean;
-	CTAVariation?: 'FULL_WIDTH' | 'NORMAL';
-	popularBadgeVariation: 'ON_TOP' | 'NEXT_TO_NAME';
-	customTagLines?: Record< string, string >;
+	CTAVariation?: CTAVariation;
+	popularBadgeVariation: PopularBadgeVariation;
+	customTagLines?: CustomTagLinesMap;
 }
 
 const PlansTable: React.FunctionComponent< Props > = ( {

diff --git a/packages/plans-grid/src/plans-table/plan-item.tsx b/packages/plans-grid/src/plans-table/plan-item.tsx
@@ -7,6 +7,7 @@ import { Button } from '@wordpress/components';
 import { useViewportMatch } from '@wordpress/compose';
 import { __, sprintf } from '@wordpress/i18n';
 import type { DomainSuggestions } from '@automattic/data-stores';
+import type { CTAVariation, PopularBadgeVariation } from './types';
 
 /**
  * Internal dependencies
@@ -49,8 +50,8 @@ export interface Props {
 	onToggleExpandAll?: () => void;
 	allPlansExpanded: boolean;
 	disabledLabel?: string;
-	CTAVariation: 'FULL_WIDTH' | 'NORMAL';
-	popularBadgeVariation: 'ON_TOP' | 'NEXT_TO_NAME';
+	CTAVariation?: CTAVariation;
+	popularBadgeVariation?: PopularBadgeVariation;
 }
 
 // NOTE: this component is used by PlansAccordion and contains some duplicated code from plans-table/plans-item.tsx

diff --git a/packages/plans-grid/src/plans-table/types.ts b/packages/plans-grid/src/plans-table/types.ts
@@ -0,0 +1,8 @@
+/**
+ * External dependencies
+ */
+import type { Plans } from '@automattic/data-stores';
+
+export type CTAVariation = 'FULL_WIDTH' | 'NORMAL';
+export type PopularBadgeVariation = 'ON_TOP' | 'NEXT_TO_NAME';
+export type CustomTagLinesMap = Record< Plans.PlanSlug, string >;