newspack-components 2.0.3 → 2.1.0

package/dist/cjs/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,82 @@ 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;
+		}
 	}
 }
 

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

@@ -45,8 +45,8 @@ function withWizardScreen(WrappedComponent) {
       tabbedNavigation,
       secondaryButtonText,
       secondaryButtonAction,
-      routes,
-      renderAboveContent
+      renderAboveContent,
+      disableUpcomingInTabbedNavigation
     } = props;
     const retrievedButtonProps = (0, _js.buttonProps)(buttonAction);
     const retrievedSecondaryButtonProps = (0, _js.buttonProps)(secondaryButtonAction);
@@ -75,14 +75,12 @@ function withWizardScreen(WrappedComponent) {
 
     return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [newspack_aux_data.is_debug_mode && (0, _jsxRuntime.jsx)(_.Notice, {
-        isWarning: true,
-        className: "newspack-wizard__above-header",
-        noticeText: __('Newspack is in debug mode.', 'newspack')
-      }), (0, _jsxRuntime.jsxs)("div", {
+        debugMode: true
+      }), (0, _jsxRuntime.jsx)("div", {
         className: "newspack-wizard__header",
-        children: [(0, _jsxRuntime.jsxs)("div", {
+        children: (0, _jsxRuntime.jsx)("div", {
           className: "newspack-wizard__header__inner",
-          children: [(0, _jsxRuntime.jsxs)("div", {
+          children: (0, _jsxRuntime.jsxs)("div", {
             className: "newspack-wizard__title",
             children: [(0, _jsxRuntime.jsx)(_.Button, {
               isLink: true,
@@ -94,20 +92,18 @@ function withWizardScreen(WrappedComponent) {
               children: (0, _jsxRuntime.jsx)(_.NewspackIcon, {
                 size: 36
               })
-            }), headerText && (0, _jsxRuntime.jsx)("h1", {
-              children: headerText
-            }), subHeaderText && (0, _jsxRuntime.jsx)("p", {
-              className: "screen-reader-text",
-              children: subHeaderText
+            }), (0, _jsxRuntime.jsxs)("div", {
+              children: [headerText && (0, _jsxRuntime.jsx)("h2", {
+                children: headerText
+              }), subHeaderText && (0, _jsxRuntime.jsx)("span", {
+                children: subHeaderText
+              })]
             })]
-          }), tabbedNavigation && (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-            children: (0, _jsxRuntime.jsx)(_.TabbedNavigation, {
-              items: tabbedNavigation
-            })
-          })]
-        }), routes && (0, _jsxRuntime.jsx)(_.WizardPagination, {
-          routes: routes
-        })]
+          })
+        })
+      }), tabbedNavigation && (0, _jsxRuntime.jsx)(_.TabbedNavigation, {
+        disableUpcoming: disableUpcomingInTabbedNavigation,
+        items: tabbedNavigation.filter(item => !item.isHiddenInNav)
       }), (0, _jsxRuntime.jsxs)("div", {
         className: (0, _classnames.default)('newspack-wizard newspack-wizard__content', className),
         children: [typeof renderAboveContent === 'function' ? renderAboveContent() : null, (0, _jsxRuntime.jsx)(WrappedComponent, { ...props,

package/dist/cjs/with-wizard-screen/style.scss

@@ -6,6 +6,43 @@
 @import '../../../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};
+
+	color: $gray-900;
+
+	// Headings
+	h1,
+	h2,
+	h3 {
+		color: inherit;
+	}
+
+	h1 {
+		line-height: 1.4;
+	}
+
+	// Links
+	a {
+		color: var( --wp-admin-theme-color );
+
+		&:active,
+		&:focus,
+		&:hover {
+			color: var( --wp-admin-theme-color-darker-10 );
+		}
+
+		&:focus {
+			box-shadow: 0 0 0 var( --wp-admin-border-width-focus ) var( --wp-admin-theme-color );
+			outline: 3px solid transparent;
+		}
+	}
+
 	&__header {
 		background: white;
 	}
@@ -15,12 +52,25 @@
 		border-bottom: 1px solid $gray-300;
 		display: flex;
 
-		h1 {
-			color: $gray-900;
-			font-size: 21px;
-			line-height: 30px;
+		h2 {
 			margin: 0;
+			padding: 0;
+		}
+
+		> div {
+			align-items: baseline;
+			display: flex;
 			padding: 0 24px;
+
+			span {
+				color: $gray-700;
+				display: none;
+				margin-left: 8px;
+
+				@media screen and ( min-width: 744px ) {
+					display: block;
+				}
+			}
 		}
 
 		svg {
@@ -35,15 +85,17 @@
 			&:not( .newspack-icon ) {
 				background: $primary-500;
 				left: 50%;
-				margin: -18px 0 0 -18px !important;
+				margin: -28px 0 0 -28px !important;
 				opacity: 0;
+				padding: 10px;
 				position: absolute;
 				top: 50%;
 				transition: opacity 125ms ease-in-out;
 			}
 		}
 
-		a {
+		.components-button.has-icon {
+			padding: 0;
 			position: relative;
 
 			&:hover {
@@ -51,29 +103,26 @@
 					opacity: 1;
 				}
 			}
-		}
-
-		a:focus-visible {
-			outline: none !important;
 
-			&::before {
-				border: 2px solid white;
-				border-radius: 3px;
-				bottom: 5px;
-				content: '';
-				display: block;
-				left: 6px;
-				position: absolute;
-				right: 6px;
-				top: 6px;
+			&:focus-visible {
+				outline: none !important;
+
+				&::before {
+					border: 2px solid white;
+					border-radius: 2px;
+					bottom: 5px;
+					content: '';
+					display: block;
+					left: 6px;
+					position: absolute;
+					right: 6px;
+					top: 6px;
+				}
 			}
 		}
 	}
 
 	&__content {
-		color: $gray-700;
-		font-size: 14px;
-		line-height: 24px;
 		margin: 0 auto;
 		max-width: 1208px;
 		padding: 0 16px;
@@ -84,49 +133,13 @@
 
 		// Typography
 
-		h1,
-		h2,
-		h3,
-		p {
-			line-height: 24px;
-			margin: 32px 0;
-			padding: 0;
-		}
-
-		h1 {
-			color: $gray-900;
-			font-size: 21px;
-			font-weight: bold;
-			line-height: 32px;
-		}
-
-		h2 {
-			color: $gray-900;
-			font-size: 17px;
-			font-weight: bold;
-		}
-
-		h3 {
-			color: $gray-900;
-			font-size: 14px;
-			font-weight: bold;
-		}
-
-		p {
-			font-size: 14px;
-
-			&.is-dark {
-				color: $gray-900;
-			}
-		}
-
 		strong {
 			font-weight: bold;
 		}
 
 		small {
 			font-size: 12px;
-			line-height: 16px;
+			line-height: 1.4;
 		}
 
 		// Thematic Break
@@ -141,70 +154,10 @@
 				margin: 64px 0;
 			}
 		}
-
-		// Links
-
-		a {
-			color: $primary-500;
-
-			&:active,
-			&:focus,
-			&:hover {
-				color: $primary-600;
-				text-decoration: none;
-			}
-
-			&:focus {
-				box-shadow: none;
-				outline: 2px solid $primary-500;
-				outline-offset: 2px;
-			}
-		}
 	}
 
 	&__above-header {
+		border-radius: 0;
 		margin: 0;
 	}
 }
-
-// Buttons Card
-
-.newspack-buttons-card {
-	display: flex;
-	flex-direction: row-reverse;
-	justify-content: flex-start;
-	align-items: center;
-	margin: 64px 0 32px;
-
-	&:empty {
-		display: none;
-	}
-
-	.newspack-button {
-		margin-left: 16px;
-	}
-}
-
-// Checkbox Icon
-
-.newspack-checkbox-icon {
-	background: white;
-	border-radius: 50%;
-	box-shadow: inset 0 0 0 1px $gray-300;
-	display: block;
-	height: 24px;
-	width: 24px;
-
-	svg {
-		fill: $gray-700;
-	}
-
-	&--checked {
-		background: $alert-green;
-		box-shadow: none;
-
-		svg {
-			fill: white;
-		}
-	}
-}

package/dist/cjs/wizard/components/WizardError.js

@@ -0,0 +1,86 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _i18n = require("@wordpress/i18n");
+
+var _data = require("@wordpress/data");
+
+var _ = require("../..");
+
+var _store = require("../store");
+
+var _jsxRuntime = require("@emotion/react/jsx-runtime");
+
+/**
+ * WordPress dependencies.
+ */
+const __ = _i18n.__;
+
+const parseError = _ref => {
+  let {
+    data,
+    message,
+    code
+  } = _ref;
+  let level = 'fatal';
+
+  if (!!data && 'level' in data) {
+    level = data.level;
+  } else if ('rest_invalid_param' === code) {
+    level = 'notice';
+  }
+
+  return {
+    message,
+    level
+  };
+};
+
+const WizardError = () => {
+  const error = (0, _data.useSelect)(select => select(_store.WIZARD_STORE_NAMESPACE).getError());
+
+  if (!error) {
+    return null;
+  }
+
+  const {
+    level,
+    message
+  } = parseError(error);
+
+  if ('fatal' === level) {
+    const fallbackURL = typeof newspack_urls !== 'undefined' && newspack_urls.dashboard;
+    return (0, _jsxRuntime.jsxs)(_.Modal, {
+      title: __('Unrecoverable error'),
+      onRequestClose: fallbackURL ? () => window.location = fallbackURL : undefined,
+      children: [(0, _jsxRuntime.jsx)(_.Notice, {
+        noticeText: message,
+        isError: true,
+        rawHTML: true
+      }), fallbackURL && (0, _jsxRuntime.jsx)(_.Card, {
+        buttonsCard: true,
+        noBorder: true,
+        className: "justify-end",
+        children: (0, _jsxRuntime.jsx)(_.Button, {
+          isPrimary: true,
+          href: fallbackURL,
+          children: __('Return to Dashboard', 'newspack')
+        })
+      })]
+    });
+  }
+
+  return (0, _jsxRuntime.jsx)(_.Notice, {
+    isError: true,
+    className: "newspack-wizard__above-header",
+    noticeText: message,
+    rawHTML: true
+  });
+};
+
+var _default = WizardError;
+exports.default = _default;