newspack-components 2.0.3 → 2.2.0

package/src/waiting/index.js

@@ -6,8 +6,7 @@
  * WordPress dependencies.
  */
 import { Component } from '@wordpress/element';
-import { Path, SVG } from '@wordpress/components';
-import { Icon } from '@wordpress/icons';
+import { Spinner } from '@wordpress/components';
 
 /**
  * Internal dependencies.
@@ -19,28 +18,18 @@ import './style.scss';
  */
 import classnames from 'classnames';
 
-export const icon = (
-	<SVG xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-		<Path
-			clipRule="evenodd"
-			d="M12 4h-.033a7.975 7.975 0 00-5.636 2.322L5.138 5.129l-.353 3.889 3.889-.354-1.282-1.281A6.48 6.48 0 0112 5.5a6.48 6.48 0 014.63 1.904 6.469 6.469 0 011.848 3.747l1.487-.195a7.969 7.969 0 00-2.275-4.613A7.975 7.975 0 0012.033 4H12zm-6.478 8.85l-1.487.194a7.969 7.969 0 002.275 4.613A7.975 7.975 0 0012 20a7.975 7.975 0 005.669-2.322l1.193 1.193.353-3.889-3.889.354 1.282 1.281A6.48 6.48 0 0112 18.5a6.48 6.48 0 01-4.63-1.904 6.469 6.469 0 01-1.848-3.747z"
-			fillRule="evenodd"
-		/>
-	</SVG>
-);
-
 class Waiting extends Component {
 	/**
 	 * Render
 	 */
 	render() {
-		const { className, isRight, isLeft, isCenter, size } = this.props;
-		const classes = classnames( 'newspack-is-waiting', className, {
-			'newspack-is-waiting__is-right': isRight,
-			'newspack-is-waiting__is-left': isLeft,
-			'newspack-is-waiting__is-center': isCenter,
+		const { className, isRight, isLeft, isCenter, ...otherProps } = this.props;
+		const classes = classnames( 'newspack-waiting', className, {
+			'is-right': isRight,
+			'is-left': isLeft,
+			'is-center': isCenter,
 		} );
-		return <Icon icon={ icon } size={ size } className={ classes } />;
+		return <Spinner className={ classes } { ...otherProps } />;
 	}
 }
 

package/src/waiting/style.scss

@@ -2,37 +2,26 @@
  * Waiting
  */
 
-.newspack-is-waiting {
-	animation: newspack-is-waiting__animation 1s infinite linear;
-	display: block;
-	fill: currentColor;
-	flex: 0 0 24px;
+.newspack-waiting.components-spinner {
+	flex: 0 0 auto;
+	margin: 0;
 
-	&.newspack-is-waiting__is-left {
-		margin-right: 4px;
+	&.is-left {
+		margin-right: 8px;
 	}
 
-	&.newspack-is-waiting__is-right {
-		margin-right: 4px;
+	&.is-right {
+		margin-right: 8px;
 		order: -1;
 
 		@media screen and ( min-width: 744px ) {
-			margin-left: 4px;
+			margin-left: 8px;
 			margin-right: 0;
 			order: 1;
 		}
 	}
 
-	&.newspack-is-waiting__is-center {
+	&.is-center {
 		margin: auto;
 	}
 }
-
-@keyframes newspack-is-waiting__animation {
-	from {
-		transform: rotate( 360deg );
-	}
-	to {
-		transform: rotate( 0deg );
-	}
-}

package/src/web-preview/index.js

@@ -4,11 +4,12 @@
 import { Component, createRef, Fragment, createPortal } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { closeSmall, desktop, mobile, tablet } from '@wordpress/icons';
+import { Button, ButtonGroup } from '@wordpress/components';
 
 /**
  * Internal dependencies.
  */
-import { Button, ButtonGroup, Waiting } from '../';
+import { Waiting } from '../';
 import './style.scss';
 
 /**
@@ -68,11 +69,7 @@ class WebPreview extends Component {
 			return null;
 		}
 
-		const classes = classnames(
-			'newspack-web-preview__container',
-			device,
-			loaded && 'newspack-web-preview__is-loaded'
-		);
+		const classes = classnames( 'newspack-web-preview', device, loaded && 'is-loaded' );
 		beforeLoad();
 		return createPortal(
 			<div className={ classes }>
@@ -82,24 +79,21 @@ class WebPreview extends Component {
 							<ButtonGroup>
 								<Button
 									onClick={ () => this.setState( { device: 'desktop' } ) }
-									isSmall
-									className={ classnames( 'is-desktop', 'desktop' === device && 'is-selected' ) }
+									variant={ 'desktop' === device && 'primary' }
 									icon={ desktop }
-									label={ __( 'Preview desktop size', 'newspack' ) }
+									label={ __( 'Preview Desktop Size', 'newspack' ) }
 								/>
 								<Button
 									onClick={ () => this.setState( { device: 'tablet' } ) }
-									isSmall
-									className={ classnames( 'is-tablet', 'tablet' === device && 'is-selected' ) }
+									variant={ 'tablet' === device && 'primary' }
 									icon={ tablet }
-									label={ __( 'Preview tablet size', 'newspack' ) }
+									label={ __( 'Preview Tablet Size', 'newspack' ) }
 								/>
 								<Button
 									onClick={ () => this.setState( { device: 'phone' } ) }
-									isSmall
-									className={ classnames( 'is-phone', 'phone' === device && 'is-selected' ) }
+									variant={ 'phone' === device && 'primary' }
 									icon={ mobile }
-									label={ __( 'Preview phone size', 'newspack' ) }
+									label={ __( 'Preview Phone Size', 'newspack' ) }
 								/>
 							</ButtonGroup>
 						</div>
@@ -109,9 +103,8 @@ class WebPreview extends Component {
 									onClose();
 									this.setState( { isPreviewVisible: false, loaded: false } );
 								} }
-								isSmall
 								icon={ closeSmall }
-								label={ __( 'Close preview', 'newspack' ) }
+								label={ __( 'Close Preview', 'newspack' ) }
 							/>
 						</div>
 					</div>
@@ -148,12 +141,7 @@ class WebPreview extends Component {
 	render() {
 		const {
 			label,
-			isPrimary,
-			isSecondary,
-			isTertiary,
-			isQuaternary,
-			isLink,
-			isSmall,
+			variant,
 			/**
 			 * Inversion of control - let the caller render
 			 * the button that will trigger the modal
@@ -166,16 +154,7 @@ class WebPreview extends Component {
 				{ renderButton ? (
 					renderButton( { showPreview: this.showPreview } )
 				) : (
-					<Button
-						isPrimary={ isPrimary }
-						isSecondary={ isSecondary }
-						isTertiary={ isTertiary }
-						isQuaternary={ isQuaternary }
-						isLink={ isLink }
-						isSmall={ isSmall }
-						onClick={ this.showPreview }
-						tabIndex="0"
-					>
+					<Button variant={ variant } onClick={ this.showPreview } tabIndex="0">
 						{ label }
 					</Button>
 				) }
@@ -186,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,53 +2,59 @@
  * 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 {
-	&--open {
-		overflow: hidden;
+	// Color
+	--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;
+	height: 100%;
+	left: 0;
+	margin: 0;
+	max-width: 100%;
+	padding: 32px;
+	position: fixed;
+	top: 0;
+	width: 100%;
+	z-index: 99999;
+
+	&.phone iframe {
+		max-width: 380px;
 	}
 
-	&__container {
-		background: rgba( black, 0.7 );
-		box-sizing: border-box;
-		height: 100%;
-		left: 0;
-		margin: 0;
-		max-width: 100%;
-		padding: 32px;
-		position: fixed;
-		top: 0;
-		width: 100%;
-		z-index: 99999;
-
-		&.phone iframe {
-			max-width: 380px;
-		}
+	&.tablet iframe {
+		max-width: 768px;
+	}
 
-		&.tablet iframe {
-			max-width: 768px;
-		}
+	&.is-loaded iframe {
+		opacity: 1;
+	}
 
-		&.newspack-web-preview__is-loaded iframe {
-			opacity: 1;
-		}
+	&--open {
+		overflow: hidden;
 	}
 
 	&__interior {
 		animation: appear-animation 125ms ease-in-out;
 		animation-fill-mode: forwards;
 		background: white;
-		border-radius: 3px;
+		border-radius: 2px;
 		overflow: hidden;
 		height: 100%;
 		width: 100%;
 	}
 
 	&__content {
-		background: $gray-100;
-		height: calc( 100% - 37px );
+		background: wp-colors.$gray-100;
+		height: calc( 100% - 49px );
 		-webkit-overflow-scrolling: touch;
 		overflow-x: hidden;
 		width: 100%;
@@ -60,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;
@@ -72,15 +78,16 @@
 		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;
 
 		&-left {
 			flex: 0 0 auto;
@@ -95,7 +102,7 @@
 				padding: 0 !important;
 
 				&.is-selected {
-					background: $primary-500;
+					background: colors.$primary-500;
 					color: white;
 
 					&:active,
@@ -107,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/index.js

@@ -226,11 +226,13 @@ export default function withWizard( WrappedComponent, requiredPlugins ) {
 											>
 												<NewspackIcon size={ 36 } />
 											</Button>
-											<h1>
-												{ requiredPlugins.length > 1
-													? __( 'Required plugins', 'newspack' )
-													: __( 'Required plugin', 'newspack' ) }
-											</h1>
+											<div>
+												<h2>
+													{ requiredPlugins.length > 1
+														? __( 'Required plugins', 'newspack' )
+														: __( 'Required plugin', 'newspack' ) }
+												</h2>
+											</div>
 										</div>
 									</div>
 								</div>

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,71 +32,24 @@ 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;
 	}
 }
 
-// Welcome Screen
+// Blue Screen
 
-.newspack_page_newspack-setup-wizard__welcome {
+.newspack-wizard__blue {
 	#wpwrap {
-		background: $primary-500;
-	}
-
-	.newspack-wizard__header {
-		display: none;
-	}
-
-	.newspack-card {
-		background: white;
-		border: 0;
-		margin: 0 auto 32px;
-
-		@media screen and ( min-width: 584px ) {
-			max-width: 520px;
-		}
-
-		&.loading {
-			cursor: wait;
-		}
-
-		&__footer {
-			align-items: center;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-
-			.newspack-checkbox-control {
-				margin: 12px 16px 12px 0;
-			}
-		}
-
-		h1 {
-			align-items: center;
-			display: flex;
-			flex-wrap: wrap;
-
-			svg {
-				margin-right: 8px;
-			}
-		}
-	}
-
-	.newspack-logo__wrapper {
-		margin-bottom: 32px;
-	}
-
-	.newspack-buttons-card {
-		margin: 0;
+		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 {
@@ -123,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;
@@ -142,103 +92,106 @@ 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, 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, 512px 96px 0 0 white,
+				0 96px 0 0 wp-colors.$gray-700;
 			width: calc( 100% - ( 64px * 2 ) );
 		}
 	}
 
-	// Welcome Screen
-	.newspack_page_newspack-setup-wizard__welcome & {
-		background: $primary-500;
-
-		&::before,
-		&::after {
-			left: 50%;
-			position: absolute;
-			transform: translate( -50% );
-		}
+	// Blue Screen
+	.newspack-wizard__blue & {
+		background: colors.$primary-500;
 
 		&::before {
-			border-radius: 4px;
+			animation: loading-quiet 1.25s ease-in-out infinite;
 			background: white;
-			height: 192px;
-			max-width: 584px;
-			top: 120px;
-			width: calc( 100% - ( 32px * 2 ) );
-
-			@media screen and ( min-width: 744px ) {
-				width: calc( 100% - ( 64px * 2 ) );
-			}
+			border-radius: 0;
+			box-shadow: 0;
+			height: 8px;
+			left: 0;
+			margin: 0;
+			position: absolute;
+			right: 100%;
+			top: 0;
+			width: auto;
 		}
 
 		&::after {
-			box-shadow: inset -130px 0 0 0 white, 0 64px 0 0 $gray-700, 0 96px 0 0 $gray-700;
-			margin: 0;
-			max-width: 520px;
-			top: 156px;
-			width: calc( 100% - ( 64px * 2 ) );
-
-			@media screen and ( min-width: 600px ) {
-				box-shadow: inset -260px 0 0 0 white, 0 64px 0 0 $gray-700, 0 96px 0 0 $gray-700;
-			}
+			display: none;
 		}
 	}
 
 	// Quiet
 	&-quiet {
-		cursor: wait;
 		position: relative;
 
-		> * {
-			opacity: 0.5;
-		}
-
-		&::before {
-			animation: loading-quiet 1.25s ease-in-out infinite;
-			background: $primary-500;
+		&::before,
+		&::after {
 			content: '';
+			cursor: wait;
 			display: block;
-			height: 8px;
 			left: 0;
 			position: fixed;
-			right: 100%;
 			top: 46px;
-			z-index: 1;
 
 			@media screen and ( min-width: 783px ) {
 				top: 32px;
 				margin-left: 160px;
 
-				body.auto-fold &,
+				body.auto-fold & {
+					margin-left: 36px;
+				}
+			}
+
+			@media screen and ( min-width: 961px ) {
+				body.auto-fold & {
+					margin-left: 160px;
+				}
+
 				body.folded & {
 					margin-left: 36px;
 				}
 			}
 		}
+
+		&::before {
+			animation: loading-quiet 1.25s ease-in-out infinite;
+			background: colors.$primary-500;
+			height: 8px;
+			right: 100%;
+			z-index: 9999;
+		}
+
+		&::after {
+			background: rgba( white, 0.7 );
+			bottom: 0;
+			right: 0;
+			z-index: 9998;
+		}
 	}
 }
 
@@ -255,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%;
 	}
@@ -300,7 +253,7 @@ svg {
 		right: 0;
 	}
 
-	to {
+	100% {
 		left: 100%;
 		right: 0;
 	}