newspack-components 2.0.3 → 2.2.0

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

@@ -1,44 +1,35 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = withWizard;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _element = require("@wordpress/element");
-
 var _i18n = require("@wordpress/i18n");
-
 var _apiFetch = _interopRequireDefault(require("@wordpress/api-fetch"));
-
 var _icons = require("@wordpress/icons");
-
 var _ = require("../");
-
 var _router = _interopRequireDefault(require("../proxied-imports/router"));
-
 var _footer = _interopRequireDefault(require("../footer"));
-
 require("./style.scss");
-
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
-
 /**
  * WordPress dependencies.
  */
 const __ = _i18n.__;
+/**
+ * Internal dependencies.
+ */
 const {
   Redirect,
   Route
 } = _router.default;
+
 /**
  * Higher-Order Component to provide plugin management and error handling to Newspack Wizards.
  */
-
 function withWizard(WrappedComponent, requiredPlugins) {
   return class WrappedWithWizard extends _element.Component {
     constructor(props) {
@@ -46,11 +37,16 @@ function withWizard(WrappedComponent, requiredPlugins) {
       (0, _defineProperty2.default)(this, "componentDidMount", () => {
         // If there are no requiredPlugins, fire onWizardReady as soon as component mounts.
         if (!requiredPlugins) {
-          const instance = this.wrappedComponentRef.current; // eslint-disable-next-line no-unused-expressions
-
+          const instance = this.wrappedComponentRef.current;
+          // eslint-disable-next-line no-unused-expressions
           instance && instance.onWizardReady && instance.onWizardReady();
         }
       });
+      /**
+       * Set the error. Called by Wizards when an error occurs.
+       *
+       * @return {Promise} Resolved after state update
+       */
       (0, _defineProperty2.default)(this, "setError", error => {
         return new Promise(resolve => {
           this.setState({
@@ -58,26 +54,33 @@ function withWizard(WrappedComponent, requiredPlugins) {
           }, () => resolve());
         });
       });
+      /**
+       * Render any errors that need rendering.
+       *
+       * @return {Component} Error UI
+       */
       (0, _defineProperty2.default)(this, "getError", () => {
         const {
           error
         } = this.state;
-
         if (!error) {
           return null;
         }
-
         const parsedError = this.parseError(error);
         const {
           level
         } = parsedError;
-
         if ('fatal' === level) {
           return this.getFatalError(parsedError);
         }
-
         return this.getErrorNotice(parsedError);
       });
+      /**
+       * Get a notice-level error.
+       *
+       * @param {Error} error object already parsed by parseError
+       * @return {Component} Error notice
+       */
       (0, _defineProperty2.default)(this, "getErrorNotice", error => {
         const {
           message
@@ -89,13 +92,17 @@ function withWizard(WrappedComponent, requiredPlugins) {
           rawHTML: true
         });
       });
+      /**
+       * Get a fatal-level error.
+       *
+       * @param {Error} error object already parsed by parseError
+       * @return {Component} React object
+       */
       (0, _defineProperty2.default)(this, "getFatalError", error => {
         const fallbackURL = this.getFallbackURL();
-
         if (!fallbackURL) {
           return null;
         }
-
         const {
           message
         } = error;
@@ -118,6 +125,12 @@ function withWizard(WrappedComponent, requiredPlugins) {
           })]
         });
       });
+      /**
+       * Get all the relevant info out of a raw API error response.
+       *
+       * @param {Object} error error object
+       * @return {Object} Error object with relevant fields and defaults
+       */
       (0, _defineProperty2.default)(this, "parseError", error => {
         const {
           data,
@@ -125,27 +138,26 @@ function withWizard(WrappedComponent, requiredPlugins) {
           code
         } = error;
         let level = 'fatal';
-
         if (!!data && 'level' in data) {
           level = data.level;
         } else if ('rest_invalid_param' === code) {
           level = 'notice';
         }
-
         return {
           message,
           level
         };
       });
+      /**
+       * Called when plugin installation is complete. Updates state and calls onWizardReady on the wrapped component.
+       */
       (0, _defineProperty2.default)(this, "pluginInstallationStatus", _ref => {
         let {
           complete
         } = _ref;
-
         if (this.state.loading) {
           this.doneLoading();
         }
-
         const instance = this.wrappedComponentRef.current;
         this.setState({
           complete
@@ -154,6 +166,9 @@ function withWizard(WrappedComponent, requiredPlugins) {
           complete && instance && instance.onWizardReady && instance.onWizardReady();
         });
       });
+      /**
+       * Begin loading.
+       */
       (0, _defineProperty2.default)(this, "startLoading", quiet => {
         if (quiet) {
           this.setState(state => ({
@@ -165,6 +180,9 @@ function withWizard(WrappedComponent, requiredPlugins) {
           }));
         }
       });
+      /**
+       * End loading.
+       */
       (0, _defineProperty2.default)(this, "doneLoading", quiet => {
         if (quiet) {
           this.setState(state => ({
@@ -176,6 +194,9 @@ function withWizard(WrappedComponent, requiredPlugins) {
           }));
         }
       });
+      /**
+       * Replacement for core apiFetch that automatically manages wizard loading UI.
+       */
       (0, _defineProperty2.default)(this, "wizardApiFetch", args => {
         const {
           quiet
@@ -191,19 +212,22 @@ function withWizard(WrappedComponent, requiredPlugins) {
           });
         });
       });
+      /**
+       * Render a Route that checks for plugin installation requirements, and redirects to '/' when all are done.
+       *
+       * @return {void}
+       */
       (0, _defineProperty2.default)(this, "pluginRequirements", () => {
         const {
           complete
         } = this.state;
         /* After all plugins are loaded, redirect to / (this could be configurable) */
-
         if (complete) {
           return (0, _jsxRuntime.jsx)(Redirect, {
             from: "/plugin-requirements",
             to: "/"
           });
         }
-
         return (0, _jsxRuntime.jsx)(Route, {
           path: "/",
           render: () => (0, _jsxRuntime.jsxs)(_element.Fragment, {
@@ -223,8 +247,10 @@ function withWizard(WrappedComponent, requiredPlugins) {
                     children: (0, _jsxRuntime.jsx)(_.NewspackIcon, {
                       size: 36
                     })
-                  }), (0, _jsxRuntime.jsx)("h1", {
-                    children: requiredPlugins.length > 1 ? __('Required plugins', 'newspack') : __('Required plugin', 'newspack')
+                  }), (0, _jsxRuntime.jsx)("div", {
+                    children: (0, _jsxRuntime.jsx)("h2", {
+                      children: requiredPlugins.length > 1 ? __('Required plugins', 'newspack') : __('Required plugin', 'newspack')
+                    })
                   })]
                 })
               })
@@ -251,7 +277,6 @@ function withWizard(WrappedComponent, requiredPlugins) {
       };
       this.wrappedComponentRef = (0, _element.createRef)();
     }
-
     /**
      * Render.
      */
@@ -265,11 +290,9 @@ function withWizard(WrappedComponent, requiredPlugins) {
         error
       } = this.state;
       const loadingClasses = [loading ? 'newspack-wizard__is-loading' : 'newspack-wizard__is-loaded'];
-
       if (quietLoading) {
         loadingClasses.push('newspack-wizard__is-loading-quiet');
       }
-
       return (0, _jsxRuntime.jsxs)(_element.Fragment, {
         children: [this.getError(), (0, _jsxRuntime.jsx)("div", {
           className: loadingClasses.join(' '),
@@ -291,6 +314,5 @@ function withWizard(WrappedComponent, requiredPlugins) {
         })]
       });
     }
-
   };
 }

package/dist/cjs/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;
 	}