newspack-components 2.0.1 → 2.1.0

package/dist/esm/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/dist/esm/web-preview/index.js

@@ -7,11 +7,12 @@ import { Component, createRef, Fragment, createPortal } from '@wordpress/element
 import { __ as alias__ } from '@wordpress/i18n';
 const __ = alias__;
 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';
 /**
  * External dependencies.
@@ -51,7 +52,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(_jsx("div", {
         className: classes,
@@ -66,26 +67,23 @@ class WebPreview extends Component {
                   onClick: () => this.setState({
                     device: 'desktop'
                   }),
-                  isSmall: true,
-                  className: classnames('is-desktop', 'desktop' === device && 'is-selected'),
+                  variant: 'desktop' === device && 'primary',
                   icon: desktop,
-                  label: __('Preview desktop size', 'newspack')
+                  label: __('Preview Desktop Size', 'newspack')
                 }), _jsx(Button, {
                   onClick: () => this.setState({
                     device: 'tablet'
                   }),
-                  isSmall: true,
-                  className: classnames('is-tablet', 'tablet' === device && 'is-selected'),
+                  variant: 'tablet' === device && 'primary',
                   icon: tablet,
-                  label: __('Preview tablet size', 'newspack')
+                  label: __('Preview Tablet Size', 'newspack')
                 }), _jsx(Button, {
                   onClick: () => this.setState({
                     device: 'phone'
                   }),
-                  isSmall: true,
-                  className: classnames('is-phone', 'phone' === device && 'is-selected'),
+                  variant: 'phone' === device && 'primary',
                   icon: mobile,
-                  label: __('Preview phone size', 'newspack')
+                  label: __('Preview Phone Size', 'newspack')
                 })]
               })
             }), _jsx("div", {
@@ -98,9 +96,8 @@ class WebPreview extends Component {
                     loaded: false
                   });
                 },
-                isSmall: true,
                 icon: closeSmall,
-                label: __('Close preview', 'newspack')
+                label: __('Close Preview', 'newspack')
               })
             })]
           }), _jsxs("div", {
@@ -172,12 +169,7 @@ class WebPreview extends Component {
   render() {
     const {
       label,
-      isPrimary,
-      isSecondary,
-      isTertiary,
-      isQuaternary,
-      isLink,
-      isSmall,
+      variant,
 
       /**
        * Inversion of control - let the caller render
@@ -189,12 +181,7 @@ class WebPreview extends Component {
       children: [renderButton ? renderButton({
         showPreview: this.showPreview
       }) : _jsx(Button, {
-        isPrimary: isPrimary,
-        isSecondary: isSecondary,
-        isTertiary: isTertiary,
-        isQuaternary: isQuaternary,
-        isLink: isLink,
-        isSmall: isSmall,
+        variant: variant,
         onClick: this.showPreview,
         tabIndex: "0",
         children: label

package/dist/esm/web-preview/style.scss

@@ -6,41 +6,47 @@
 @import '~@wordpress/base-styles/colors';
 
 .newspack-web-preview {
-	&--open {
-		overflow: hidden;
+	// 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};
+
+	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%;
@@ -48,7 +54,7 @@
 
 	&__content {
 		background: $gray-100;
-		height: calc( 100% - 37px );
+		height: calc( 100% - 49px );
 		-webkit-overflow-scrolling: touch;
 		overflow-x: hidden;
 		width: 100%;
@@ -81,6 +87,7 @@
 	&__toolbar {
 		border-bottom: 1px solid $gray-300;
 		display: flex;
+		padding: 6px;
 
 		&-left {
 			flex: 0 0 auto;

package/dist/esm/with-wizard/index.js

@@ -221,8 +221,10 @@ export default function withWizard(WrappedComponent, requiredPlugins) {
                     children: _jsx(NewspackIcon, {
                       size: 36
                     })
-                  }), _jsx("h1", {
-                    children: requiredPlugins.length > 1 ? __('Required plugins', 'newspack') : __('Required plugin', 'newspack')
+                  }), _jsx("div", {
+                    children: _jsx("h2", {
+                      children: requiredPlugins.length > 1 ? __('Required plugins', 'newspack') : __('Required plugin', 'newspack')
+                    })
                   })]
                 })
               })

package/dist/esm/with-wizard/style.scss

@@ -40,60 +40,13 @@ svg {
 	}
 }
 
-// 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;
-	}
-
 	.newspack-footer {
 		background: $primary-500;
 		border-color: $primary-500;
@@ -165,80 +118,115 @@ svg {
 		}
 
 		@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,
+			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;
 			width: calc( 100% - ( 64px * 2 ) );
 		}
 	}
 
-	// Welcome Screen
-	.newspack_page_newspack-setup-wizard__welcome & {
+	// Blue Screen
+	.newspack-wizard__blue & {
 		background: $primary-500;
 
-		&::before,
-		&::after {
-			left: 50%;
-			position: absolute;
-			transform: translate( -50% );
-		}
-
 		&::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: $primary-500;
+			height: 8px;
+			right: 100%;
+			z-index: 9999;
+		}
+
+		&::after {
+			background: rgba( white, 0.7 );
+			bottom: 0;
+			right: 0;
+			z-index: 9998;
+		}
+	}
+}
+
+.newspack-wizard-section__is-loading {
+	background: white;
+	cursor: wait;
+	min-height: 150px;
+
+	> * {
+		display: none !important;
+	}
+
+	&::after {
+		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;
+		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;
+		}
+
+		@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;
+		}
 	}
 }
 

package/dist/esm/with-wizard-screen/index.js

@@ -8,7 +8,7 @@ import { category } from '@wordpress/icons';
  * Internal dependencies
  */
 
-import { Button, Handoff, NewspackIcon, Notice, TabbedNavigation, WizardPagination } from '../';
+import { Button, Handoff, NewspackIcon, Notice, TabbedNavigation } from '../';
 import { buttonProps } from '../../../shared/js/';
 import './style.scss';
 /**
@@ -39,8 +39,8 @@ export default function withWizardScreen(WrappedComponent) {
       tabbedNavigation,
       secondaryButtonText,
       secondaryButtonAction,
-      routes,
-      renderAboveContent
+      renderAboveContent,
+      disableUpcomingInTabbedNavigation
     } = props;
     const retrievedButtonProps = buttonProps(buttonAction);
     const retrievedSecondaryButtonProps = buttonProps(secondaryButtonAction);
@@ -69,14 +69,12 @@ export default function withWizardScreen(WrappedComponent) {
 
     return _jsxs(_Fragment, {
       children: [newspack_aux_data.is_debug_mode && _jsx(Notice, {
-        isWarning: true,
-        className: "newspack-wizard__above-header",
-        noticeText: __('Newspack is in debug mode.', 'newspack')
-      }), _jsxs("div", {
+        debugMode: true
+      }), _jsx("div", {
         className: "newspack-wizard__header",
-        children: [_jsxs("div", {
+        children: _jsx("div", {
           className: "newspack-wizard__header__inner",
-          children: [_jsxs("div", {
+          children: _jsxs("div", {
             className: "newspack-wizard__title",
             children: [_jsx(Button, {
               isLink: true,
@@ -88,20 +86,18 @@ export default function withWizardScreen(WrappedComponent) {
               children: _jsx(NewspackIcon, {
                 size: 36
               })
-            }), headerText && _jsx("h1", {
-              children: headerText
-            }), subHeaderText && _jsx("p", {
-              className: "screen-reader-text",
-              children: subHeaderText
+            }), _jsxs("div", {
+              children: [headerText && _jsx("h2", {
+                children: headerText
+              }), subHeaderText && _jsx("span", {
+                children: subHeaderText
+              })]
             })]
-          }), tabbedNavigation && _jsx(_Fragment, {
-            children: _jsx(TabbedNavigation, {
-              items: tabbedNavigation
-            })
-          })]
-        }), routes && _jsx(WizardPagination, {
-          routes: routes
-        })]
+          })
+        })
+      }), tabbedNavigation && _jsx(TabbedNavigation, {
+        disableUpcoming: disableUpcomingInTabbedNavigation,
+        items: tabbedNavigation.filter(item => !item.isHiddenInNav)
       }), _jsxs("div", {
         className: classnames('newspack-wizard newspack-wizard__content', className),
         children: [typeof renderAboveContent === 'function' ? renderAboveContent() : null, _jsx(WrappedComponent, { ...props,