newspack-components 2.1.0 → 2.2.1

package/src/steps-list-item/index.js

@@ -0,0 +1,40 @@
+/**
+ * Steps List Item
+ */
+
+/**
+ * WordPress dependencies.
+ */
+import { Component } from '@wordpress/element';
+
+/**
+ * Internal dependencies.
+ */
+import './style.scss';
+
+/**
+ * External dependencies.
+ */
+import classnames from 'classnames';
+
+class StepsListItem extends Component {
+	/**
+	 * Render
+	 */
+	render() {
+		const { className, listItemCount, listItemText, style = {} } = this.props;
+		const classes = classnames( 'steps-list-item', className );
+
+		return (
+			<div className={ classes } style={ style }>
+				<div className="steps-list-item__number">{ listItemCount }</div>
+				<div
+					className="steps-list-item__content"
+					dangerouslySetInnerHTML={ { __html: listItemText } }
+				/>
+			</div>
+		);
+	}
+}
+
+export default StepsListItem;

package/src/steps-list-item/style.scss

@@ -0,0 +1,47 @@
+@use '../../../shared/scss/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
+
+.steps-list-item {
+	align-items: center;
+	display: grid;
+	grid-template-columns: 28px auto;
+	gap: 24px;
+	position: relative;
+
+	&::before {
+		border: 1px solid #F0F0F0;
+		bottom: -16px;
+		content: '';
+		display: block;
+		left: 14px;
+		position: absolute;
+		top: -16px;
+	}
+
+	&:first-child::before {
+		top: 50%;
+	}
+
+	&:last-child::before {
+		bottom: 50%;
+	}
+
+	+ .steps-list-item {
+		margin-top: 32px;
+	}
+
+	&__number {
+		align-items: center;
+		background: #fff;
+		border: 1px solid currentcolor;
+		border-radius: 100%;
+		color: colors.$primary-500;
+		display: flex;
+		height: 28px;
+		justify-content: center;
+		outline: 8px solid #fff;
+		position: relative;
+		width: 28px;
+		z-index: 2;
+	}
+}

package/src/style-card/index.js

@@ -25,17 +25,8 @@ class StyleCard extends Component {
 	 * Render.
 	 */
 	render() {
-		const {
-			ariaLabel,
-			className,
-			cardTitle,
-			url,
-			image,
-			imageType,
-			isActive,
-			onClick,
-			id,
-		} = this.props;
+		const { ariaLabel, className, cardTitle, url, image, imageType, isActive, onClick, id } =
+			this.props;
 		const classes = classnames(
 			'newspack-style-card',
 			isActive && 'newspack-style-card__is-active',

package/src/style-card/style.scss

@@ -2,8 +2,8 @@
  * Style Card
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '../../../shared/scss/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-style-card {
 	margin: 32px 0;
@@ -15,13 +15,13 @@
 		text-align: center;
 
 		.newspack-style-card__is-active & {
-			color: $primary-500;
+			color: colors.$primary-500;
 		}
 	}
 
 	// Image
 	&__image {
-		border: 1px solid $gray-300;
+		border: 1px solid wp-colors.$gray-300;
 		border-radius: 2px;
 		overflow: hidden;
 		position: relative;
@@ -43,13 +43,13 @@
 		}
 
 		svg {
-			fill: $gray-600;
+			fill: wp-colors.$gray-600;
 			margin: 8px;
 		}
 
 		.newspack-style-card__is-active & {
-			border-color: $primary-500;
-			box-shadow: inset 0 0 0 1px $primary-500;
+			border-color: colors.$primary-500;
+			box-shadow: inset 0 0 0 1px colors.$primary-500;
 
 			img {
 				position: relative;
@@ -62,16 +62,13 @@
 	&__actions {
 		align-items: center;
 		background: rgba( white, 0.9 );
-		bottom: 0;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
-		left: 0;
+		inset: 0;
 		opacity: 0;
 		padding: 16px;
 		position: absolute;
-		right: 0;
-		top: 0;
 		transition: opacity 125ms ease-in-out;
 
 		&:empty {
@@ -91,7 +88,7 @@
 		}
 
 		.newspack-style-card__is-active & {
-			box-shadow: inset 0 0 0 1px $primary-500;
+			box-shadow: inset 0 0 0 1px colors.$primary-500;
 		}
 	}
 }

package/src/style.scss

@@ -1,5 +1,4 @@
-@import '~@wordpress/base-styles/colors';
-@import '../../shared/scss/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 // Buttons Card
 
@@ -21,17 +20,17 @@
 .newspack-checkbox-icon {
 	background: white;
 	border-radius: 50%;
-	box-shadow: inset 0 0 0 1px $gray-300;
+	box-shadow: inset 0 0 0 1px wp-colors.$gray-300;
 	display: block;
 	height: 24px;
 	width: 24px;
 
 	svg {
-		fill: $gray-700;
+		fill: wp-colors.$gray-700;
 	}
 
 	&--checked {
-		background: $alert-green;
+		background: wp-colors.$alert-green;
 		box-shadow: none;
 
 		svg {
@@ -39,6 +38,6 @@
 		}
 	}
 	&--pending {
-		background: $alert-yellow;
+		background: wp-colors.$alert-yellow;
 	}
 }

package/src/tabbed-navigation/index.js

@@ -2,7 +2,7 @@
  * External dependencies.
  */
 import classnames from 'classnames';
-import { findIndex } from 'lodash';
+import findIndex from 'lodash/findIndex';
 import Router from '../proxied-imports/router';
 
 /**
@@ -12,16 +12,23 @@ import './style.scss';
 
 const { NavLink, useHistory } = Router;
 
-const TabbedNavigation = ( { items, className, disableUpcoming } ) => {
+const TabbedNavigation = ( { items, className, disableUpcoming, children = null } ) => {
+	const displayedItems = items.filter( item => ! item.isHiddenInTabbedNavigation );
 	const { location } = useHistory();
-	const currentIndex = findIndex( items, [ 'path', location.pathname ] );
+	const currentIndex = findIndex( displayedItems, [ 'path', location.pathname ] );
 	return (
 		<div className={ classnames( 'newspack-tabbed-navigation', className ) }>
 			<ul>
-				{ items.map( ( item, index ) => (
+				{ displayedItems.map( ( item, index ) => (
 					<li key={ index }>
 						<NavLink
 							to={ item.path }
+							isActive={ ( match, { pathname } ) => {
+								if ( item.activeTabPaths ) {
+									return item.activeTabPaths.includes( pathname );
+								}
+								return match;
+							} }
 							exact
 							activeClassName={ 'selected' }
 							className={ classnames( {
@@ -33,6 +40,7 @@ const TabbedNavigation = ( { items, className, disableUpcoming } ) => {
 					</li>
 				) ) }
 			</ul>
+			{ children }
 		</div>
 	);
 };

package/src/tabbed-navigation/style.scss

@@ -2,8 +2,7 @@
  * Tabbed Navigation
  */
 
-@import '~@wordpress/base-styles/colors';
-@import '../../../shared/scss/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-tabbed-navigation {
 	background: white;
@@ -20,7 +19,7 @@
 	}
 
 	ul {
-		box-shadow: 0 -1px 0 inset $gray-300;
+		box-shadow: 0 -1px 0 inset wp-colors.$gray-300;
 		display: flex;
 		flex-wrap: wrap;
 		margin: 0;
@@ -36,7 +35,7 @@
 
 		a {
 			align-items: center;
-			color: $gray-900;
+			color: wp-colors.$gray-900;
 			display: flex;
 			font-weight: bold;
 			height: 48px;

package/src/utils/index.js

@@ -13,6 +13,15 @@ const InteractiveDiv = ( { style = {}, ...props } ) => (
 	/>
 );
 
+const confirmAction = message => {
+	// eslint-disable-next-line no-alert
+	if ( confirm( message ) ) {
+		return true;
+	}
+	return false;
+};
+
 export default {
 	InteractiveDiv,
+	confirmAction,
 };

package/src/web-preview/index.js

@@ -165,7 +165,7 @@ class WebPreview extends Component {
 }
 
 WebPreview.defaultProps = {
-	url: '//newspack.pub',
+	url: '//newspack.com',
 	label: __( 'Preview', 'newspack' ),
 	onLoad: () => {},
 };

package/src/web-preview/style.scss

@@ -2,17 +2,17 @@
  * Web Preview
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '../../../shared/scss/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-web-preview {
 	// Color
-	--wp-admin-theme-color: #{$primary-500};
-	--wp-admin-theme-color--rgb: #{$primary-500--rgb};
-	--wp-admin-theme-color-darker-10: #{$primary-600};
-	--wp-admin-theme-color-darker-10--rgb: #{$primary-600--rgb};
-	--wp-admin-theme-color-darker-20: #{$primary-700};
-	--wp-admin-theme-color-darker-20--rgb: #{$primary-700--rgb};
+	--wp-admin-theme-color: #{colors.$primary-500};
+	--wp-admin-theme-color--rgb: #{colors.$primary-500--rgb};
+	--wp-admin-theme-color-darker-10: #{colors.$primary-600};
+	--wp-admin-theme-color-darker-10--rgb: #{colors.$primary-600--rgb};
+	--wp-admin-theme-color-darker-20: #{colors.$primary-700};
+	--wp-admin-theme-color-darker-20--rgb: #{colors.$primary-700--rgb};
 
 	background: rgba( black, 0.7 );
 	box-sizing: border-box;
@@ -53,7 +53,7 @@
 	}
 
 	&__content {
-		background: $gray-100;
+		background: wp-colors.$gray-100;
 		height: calc( 100% - 49px );
 		-webkit-overflow-scrolling: touch;
 		overflow-x: hidden;
@@ -66,7 +66,7 @@
 			margin: 0 auto;
 			max-width: 100%;
 			opacity: 0;
-			outline: 1px solid $gray-300;
+			outline: 1px solid wp-colors.$gray-300;
 			padding: 0;
 			pointer-events: all;
 			transition: max-width 125ms ease-in-out, opacity 250ms ease-in-out;
@@ -78,14 +78,14 @@
 		align-items: center;
 		display: flex;
 		left: 50%;
-		margin: -12px 0 0 0;
+		margin: -12px 0 0;
 		position: absolute;
 		top: 50%;
 		transform: translateX( -50% );
 	}
 
 	&__toolbar {
-		border-bottom: 1px solid $gray-300;
+		border-bottom: 1px solid wp-colors.$gray-300;
 		display: flex;
 		padding: 6px;
 
@@ -102,7 +102,7 @@
 				padding: 0 !important;
 
 				&.is-selected {
-					background: $primary-500;
+					background: colors.$primary-500;
 					color: white;
 
 					&:active,
@@ -114,7 +114,7 @@
 					}
 
 					&:focus {
-						box-shadow: inset 0 0 0 1px $primary-500, inset 0 0 0 3px white !important;
+						box-shadow: inset 0 0 0 1px colors.$primary-500, inset 0 0 0 3px white !important;
 					}
 				}
 

package/src/with-wizard/style.scss

@@ -2,8 +2,8 @@
  * With Wizard
  */
 
-@import '~@wordpress/base-styles/colors';
-@import '../../../shared/scss/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
+@use '../../../shared/scss/colors';
 
 // Reset Padding of the Admin Page
 
@@ -32,11 +32,11 @@ body[class*='admin_page_newspack-'] {
 
 svg {
 	&.newspack--error {
-		fill: $alert-red;
+		fill: wp-colors.$alert-red;
 		transform: rotate( 180deg );
 	}
 	&.newspack--success {
-		fill: $alert-green;
+		fill: wp-colors.$alert-green;
 	}
 }
 
@@ -44,12 +44,12 @@ svg {
 
 .newspack-wizard__blue {
 	#wpwrap {
-		background: $primary-500;
+		background: colors.$primary-500;
 	}
 
 	.newspack-footer {
-		background: $primary-500;
-		border-color: $primary-500;
+		background: colors.$primary-500;
+		border-color: colors.$primary-500;
 		justify-content: center;
 
 		&__logo {
@@ -76,12 +76,9 @@ svg {
 
 .newspack-wizard__is-loading {
 	background: white;
-	bottom: 0;
 	cursor: wait;
-	left: 0;
+	inset: 0;
 	position: absolute;
-	right: 0;
-	top: 0;
 
 	> * {
 		display: none !important;
@@ -95,38 +92,39 @@ svg {
 	}
 
 	&::before {
-		background: $primary-500;
-		box-shadow: 24px 0 0 white, 69px 0 0 -15px $gray-900, 99px 0 0 -15px $gray-900,
-			129px 0 0 -15px $gray-900, 159px 0 0 -15px $gray-900, 189px 0 0 -15px $gray-900;
+		background: colors.$primary-500;
+		box-shadow: 24px 0 0 white, 69px 0 0 -15px wp-colors.$gray-900,
+			99px 0 0 -15px wp-colors.$gray-900, 129px 0 0 -15px wp-colors.$gray-900,
+			159px 0 0 -15px wp-colors.$gray-900, 189px 0 0 -15px wp-colors.$gray-900;
 		height: 60px;
 		width: 60px;
 	}
 
 	&::after {
-		background: $gray-900;
-		box-shadow: inset -40vw 0 0 0 white, 0 64px 0 0 $gray-700, 40vw 96px 0 0 white,
-			0 96px 0 0 $gray-700;
+		background: wp-colors.$gray-900;
+		box-shadow: inset -40vw 0 0 0 white, 0 64px 0 0 wp-colors.$gray-700, 40vw 96px 0 0 white,
+			0 96px 0 0 wp-colors.$gray-700;
 		height: 24px;
 		margin: 68px auto 0;
 		max-width: 1040px;
 		width: calc( 100% - ( 32px * 2 ) );
 
 		@media screen and ( min-width: 744px ) {
-			box-shadow: inset -400px 0 0 0 white, 0 64px 0 0 $gray-700, 200px 96px 0 0 white,
-				0 96px 0 0 $gray-700;
+			box-shadow: inset -400px 0 0 0 white, 0 64px 0 0 wp-colors.$gray-700, 200px 96px 0 0 white,
+				0 96px 0 0 wp-colors.$gray-700;
 			width: calc( 100% - ( 64px * 2 ) );
 		}
 
 		@media screen and ( min-width: 1224px ) {
-			box-shadow: inset -600px 0 0 0 white, 0 64px 0 0 $gray-700, 512px 96px 0 0 white,
-				0 96px 0 0 $gray-700;
+			box-shadow: inset -600px 0 0 0 white, 0 64px 0 0 wp-colors.$gray-700, 512px 96px 0 0 white,
+				0 96px 0 0 wp-colors.$gray-700;
 			width: calc( 100% - ( 64px * 2 ) );
 		}
 	}
 
 	// Blue Screen
 	.newspack-wizard__blue & {
-		background: $primary-500;
+		background: colors.$primary-500;
 
 		&::before {
 			animation: loading-quiet 1.25s ease-in-out infinite;
@@ -182,7 +180,7 @@ svg {
 
 		&::before {
 			animation: loading-quiet 1.25s ease-in-out infinite;
-			background: $primary-500;
+			background: colors.$primary-500;
 			height: 8px;
 			right: 100%;
 			z-index: 9999;
@@ -210,42 +208,42 @@ svg {
 		animation: loading 2s ease-in-out infinite;
 		content: '';
 		display: block;
-		background: $gray-900;
-		box-shadow: inset -40vw 0 0 0 white, 0 64px 0 0 $gray-700, 40vw 96px 0 0 white,
-			0 96px 0 0 $gray-700;
+		background: wp-colors.$gray-900;
+		box-shadow: inset -40vw 0 0 0 white, 0 64px 0 0 wp-colors.$gray-700, 40vw 96px 0 0 white,
+			0 96px 0 0 wp-colors.$gray-700;
 		height: 24px;
 		margin: 0 auto;
 		max-width: 1040px;
 		width: 100%;
 
 		@media screen and ( min-width: 744px ) {
-			box-shadow: inset -400px 0 0 0 white, 0 64px 0 0 $gray-700, 200px 96px 0 0 white,
-				0 96px 0 0 $gray-700;
+			box-shadow: inset -400px 0 0 0 white, 0 64px 0 0 wp-colors.$gray-700, 200px 96px 0 0 white,
+				0 96px 0 0 wp-colors.$gray-700;
 		}
 
 		@media screen and ( min-width: 1224px ) {
-			box-shadow: inset -600px 0 0 0 white, 0 64px 0 0 $gray-700, 520px 96px 0 0 white,
-				0 96px 0 0 $gray-700;
+			box-shadow: inset -600px 0 0 0 white, 0 64px 0 0 wp-colors.$gray-700, 520px 96px 0 0 white,
+				0 96px 0 0 wp-colors.$gray-700;
 		}
 	}
 }
 
 @keyframes loading {
-	from {
-		opacity: 100%;
+	0% {
+		opacity: 1;
 	}
 
 	50% {
-		opacity: 10%;
+		opacity: 0.1;
 	}
 
-	to {
-		opacity: 100%;
+	100% {
+		opacity: 1;
 	}
 }
 
 @keyframes loading-quiet {
-	from {
+	0% {
 		left: 0;
 		right: 100%;
 	}
@@ -255,7 +253,7 @@ svg {
 		right: 0;
 	}
 
-	to {
+	100% {
 		left: 100%;
 		right: 0;
 	}

package/src/with-wizard-screen/index.js

@@ -7,7 +7,7 @@ import { category } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { Button, Handoff, NewspackIcon, Notice, TabbedNavigation } from '../';
+import { Button, Handoff, NewspackIcon, Notice, HandoffMessage, TabbedNavigation } from '../';
 import { buttonProps } from '../../../shared/js/';
 import './style.scss';
 
@@ -34,6 +34,7 @@ export default function withWizardScreen( WrappedComponent, { hidePrimaryButton
 			renderAboveContent,
 			disableUpcomingInTabbedNavigation,
 		} = props;
+
 		const retrievedButtonProps = buttonProps( buttonAction );
 		const retrievedSecondaryButtonProps = buttonProps( secondaryButtonAction );
 		const SecondaryCTAComponent = retrievedSecondaryButtonProps.plugin ? Handoff : Button;
@@ -87,6 +88,8 @@ export default function withWizardScreen( WrappedComponent, { hidePrimaryButton
 					/>
 				) }
 
+				<HandoffMessage />
+
 				<div className={ classnames( 'newspack-wizard newspack-wizard__content', className ) }>
 					{ typeof renderAboveContent === 'function' ? renderAboveContent() : null }
 					{ <WrappedComponent { ...props } renderPrimaryButton={ renderPrimaryButton } /> }

package/src/with-wizard-screen/style.scss

@@ -2,19 +2,19 @@
  * With Wizard Screen
  */
 
-@import '~@wordpress/base-styles/colors';
-@import '../../../shared/scss/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
+@use '../../../shared/scss/colors';
 
 .newspack-wizard {
 	// Color
-	--wp-admin-theme-color: #{$primary-500};
-	--wp-admin-theme-color--rgb: #{$primary-500--rgb};
-	--wp-admin-theme-color-darker-10: #{$primary-600};
-	--wp-admin-theme-color-darker-10--rgb: #{$primary-600--rgb};
-	--wp-admin-theme-color-darker-20: #{$primary-700};
-	--wp-admin-theme-color-darker-20--rgb: #{$primary-700--rgb};
+	--wp-admin-theme-color: #{colors.$primary-500};
+	--wp-admin-theme-color--rgb: #{colors.$primary-500--rgb};
+	--wp-admin-theme-color-darker-10: #{colors.$primary-600};
+	--wp-admin-theme-color-darker-10--rgb: #{colors.$primary-600--rgb};
+	--wp-admin-theme-color-darker-20: #{colors.$primary-700};
+	--wp-admin-theme-color-darker-20--rgb: #{colors.$primary-700--rgb};
 
-	color: $gray-900;
+	color: wp-colors.$gray-900;
 
 	// Headings
 	h1,
@@ -49,7 +49,7 @@
 
 	&__title {
 		align-items: center;
-		border-bottom: 1px solid $gray-300;
+		border-bottom: 1px solid wp-colors.$gray-300;
 		display: flex;
 
 		h2 {
@@ -63,7 +63,7 @@
 			padding: 0 24px;
 
 			span {
-				color: $gray-700;
+				color: wp-colors.$gray-700;
 				display: none;
 				margin-left: 8px;
 
@@ -83,7 +83,7 @@
 			}
 
 			&:not( .newspack-icon ) {
-				background: $primary-500;
+				background: colors.$primary-500;
 				left: 50%;
 				margin: -28px 0 0 -28px !important;
 				opacity: 0;
@@ -110,13 +110,10 @@
 				&::before {
 					border: 2px solid white;
 					border-radius: 2px;
-					bottom: 5px;
 					content: '';
 					display: block;
-					left: 6px;
+					inset: 6px 6px 5px;
 					position: absolute;
-					right: 6px;
-					top: 6px;
 				}
 			}
 		}
@@ -145,7 +142,7 @@
 		// Thematic Break
 
 		hr {
-			background: $gray-300;
+			background: wp-colors.$gray-300;
 			border: 0;
 			height: 1px;
 			margin: 48px 0;