newspack-components 2.1.0 → 2.2.0

package/dist/esm/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/dist/esm/with-wizard-screen/index.js

@@ -4,22 +4,22 @@
 import { __ as alias__ } from '@wordpress/i18n';
 const __ = alias__;
 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';
+
 /**
  * External dependencies
  */
-
 import classnames from 'classnames';
+
 /**
  * Higher-Order Component to provide plugin management and error handling to Newspack Wizards.
  */
-
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 import { Fragment as _Fragment } from "@emotion/react/jsx-runtime";
@@ -27,7 +27,6 @@ export default function withWizardScreen(WrappedComponent) {
   let {
     hidePrimaryButton
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
   const WrappedWithWizardScreen = props => {
     const {
       className,
@@ -47,7 +46,6 @@ export default function withWizardScreen(WrappedComponent) {
     const SecondaryCTAComponent = retrievedSecondaryButtonProps.plugin ? Handoff : Button;
     const shouldRenderPrimaryButton = buttonText && buttonAction;
     const shouldRenderSecondaryButton = secondaryButtonText && secondaryButtonAction;
-
     const renderPrimaryButton = function () {
       let overridingProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       return retrievedButtonProps.plugin ? _jsx(Handoff, {
@@ -58,7 +56,8 @@ export default function withWizardScreen(WrappedComponent) {
       }) : _jsx(Button, {
         isPrimary: !buttonDisabled,
         isSecondary: !!buttonDisabled,
-        disabled: buttonDisabled // Allow overridingProps to set children.
+        disabled: buttonDisabled
+        // Allow overridingProps to set children.
         // eslint-disable-next-line react/no-children-prop
         ,
         children: buttonText,
@@ -66,7 +65,6 @@ export default function withWizardScreen(WrappedComponent) {
         ...overridingProps
       });
     };
-
     return _jsxs(_Fragment, {
       children: [newspack_aux_data.is_debug_mode && _jsx(Notice, {
         debugMode: true
@@ -98,9 +96,10 @@ export default function withWizardScreen(WrappedComponent) {
       }), tabbedNavigation && _jsx(TabbedNavigation, {
         disableUpcoming: disableUpcomingInTabbedNavigation,
         items: tabbedNavigation.filter(item => !item.isHiddenInNav)
-      }), _jsxs("div", {
+      }), _jsx(HandoffMessage, {}), _jsxs("div", {
         className: classnames('newspack-wizard newspack-wizard__content', className),
-        children: [typeof renderAboveContent === 'function' ? renderAboveContent() : null, _jsx(WrappedComponent, { ...props,
+        children: [typeof renderAboveContent === 'function' ? renderAboveContent() : null, _jsx(WrappedComponent, {
+          ...props,
           renderPrimaryButton: renderPrimaryButton
         }), (shouldRenderPrimaryButton || shouldRenderSecondaryButton) && _jsxs("div", {
           className: "newspack-buttons-card",
@@ -113,6 +112,5 @@ export default function withWizardScreen(WrappedComponent) {
       })]
     });
   };
-
   return WrappedWithWizardScreen;
 }

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

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

@@ -4,15 +4,14 @@
 import { __ as alias__ } from '@wordpress/i18n';
 const __ = alias__;
 import { useSelect } from '@wordpress/data';
+
 /**
  * Internal dependencies.
  */
-
 import { Button, Card, Modal, Notice } from '../..';
 import { WIZARD_STORE_NAMESPACE } from '../store';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-
 const parseError = _ref => {
   let {
     data,
@@ -20,31 +19,25 @@ const parseError = _ref => {
     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 = useSelect(select => select(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 _jsxs(Modal, {
@@ -66,7 +59,6 @@ const WizardError = () => {
       })]
     });
   }
-
   return _jsx(Notice, {
     isError: true,
     className: "newspack-wizard__above-header",
@@ -74,5 +66,4 @@ const WizardError = () => {
     rawHTML: true
   });
 };
-
 export default WizardError;

package/dist/esm/wizard/index.js

@@ -2,20 +2,20 @@
  * External dependencies.
  */
 import classnames from 'classnames';
+
 /**
  * WordPress dependencies.
  */
-
 import { useSelect } from '@wordpress/data';
 import { useState } from '@wordpress/element';
 import { __ as alias__ } from '@wordpress/i18n';
 const __ = alias__;
 import { category } from '@wordpress/icons';
+
 /**
  * Internal dependencies
  */
-
-import { Footer, Notice, Button, NewspackIcon, TabbedNavigation, PluginInstaller } from '../';
+import { Footer, Notice, Button, NewspackIcon, TabbedNavigation, PluginInstaller, HandoffMessage } from '../';
 import Router from '../proxied-imports/router';
 import registerStore, { WIZARD_STORE_NAMESPACE } from './store';
 import { useWizardData } from './store/utils';
@@ -30,7 +30,6 @@ const {
   Route,
   Switch
 } = Router;
-
 const Wizard = _ref => {
   let {
     sections = [],
@@ -43,13 +42,13 @@ const Wizard = _ref => {
     requiredPlugins = []
   } = _ref;
   const isLoading = useSelect(select => select(WIZARD_STORE_NAMESPACE).isLoading());
-  const isQuietLoading = useSelect(select => select(WIZARD_STORE_NAMESPACE).isQuietLoading()); // Trigger initial data fetch. Some sections might not use the wizard data,
-  // but for consistency, fetching is triggered regardless of the section.
+  const isQuietLoading = useSelect(select => select(WIZARD_STORE_NAMESPACE).isQuietLoading());
 
+  // Trigger initial data fetch. Some sections might not use the wizard data,
+  // but for consistency, fetching is triggered regardless of the section.
   useSelect(select => select(WIZARD_STORE_NAMESPACE).getWizardAPIData(apiSlug));
   let displayedSections = sections.filter(section => !section.isHidden);
   const [pluginRequirementsSatisfied, setPluginRequirementsSatisfied] = useState(requiredPlugins.length === 0);
-
   if (!pluginRequirementsSatisfied) {
     headerText = requiredPlugins.length > 1 ? __('Required plugins', 'newspack') : __('Required plugin', 'newspack');
     displayedSections = [{
@@ -65,9 +64,8 @@ const Wizard = _ref => {
       })
     }];
   }
-
   return _jsxs(_Fragment, {
-    children: [_jsx(WizardError, {}), _jsx("div", {
+    children: [_jsx("div", {
       className: classnames(isLoading ? 'newspack-wizard__is-loading' : 'newspack-wizard__is-loaded', {
         'newspack-wizard__is-loading-quiet': isQuietLoading
       }),
@@ -101,8 +99,9 @@ const Wizard = _ref => {
             })
           })
         }), displayedSections.length > 1 && _jsx(TabbedNavigation, {
-          items: displayedSections
-        }), _jsxs(Switch, {
+          items: displayedSections,
+          children: _jsx(WizardError, {})
+        }), _jsx(HandoffMessage, {}), _jsxs(Switch, {
           children: [displayedSections.map((section, index) => {
             const SectionComponent = section.render;
             return _jsx(Route, {
@@ -122,7 +121,6 @@ const Wizard = _ref => {
     })]
   });
 };
-
 Wizard.useWizardData = useWizardData;
 Wizard.STORE_NAMESPACE = WIZARD_STORE_NAMESPACE;
 export default Wizard;

package/dist/esm/wizard/store/index.js

@@ -1,11 +1,13 @@
 /**
  * External dependencies.
  */
-import { set, get, isEmpty } from 'lodash';
+import set from 'lodash/set';
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+
 /**
  * WordPress dependencies.
  */
-
 import apiFetch from '@wordpress/api-fetch';
 import { createReduxStore, register, dispatch, select } from '@wordpress/data';
 import { createAction } from './utils.js';
@@ -16,55 +18,50 @@ const DEFAULT_STATE = {
   apiData: {},
   error: null
 };
+
 /**
  * wordpress/data does not trigger a component re-render
  * on deep state change (via lodash's set function)
  * unless the state was cloned first.
  */
-
 const clone = objectToClone => JSON.parse(JSON.stringify(objectToClone));
-
 const reducer = function () {
   let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_STATE;
   let {
     type,
     payload = {}
   } = arguments.length > 1 ? arguments[1] : undefined;
-
   switch (type) {
     case 'START_LOADING_DATA':
       if (payload.isQuietLoading) {
-        return { ...state,
+        return {
+          ...state,
           isQuietLoading: true
         };
       }
-
-      return { ...state,
+      return {
+        ...state,
         isLoading: true
       };
-
     case 'FINISH_LOADING_DATA':
-      return { ...state,
+      return {
+        ...state,
         isLoading: false,
         isQuietLoading: false
       };
-
     case 'SET_API_DATA':
       return set(clone(state), ['apiData', payload.slug], payload.data);
-
     case 'UPDATE_WIZARD_SETTINGS':
       return set(clone(state), ['apiData', payload.slug, ...payload.path], payload.value);
-
     case 'SET_ERROR':
-      return { ...state,
+      return {
+        ...state,
         error: payload
       };
-
     default:
       return state;
   }
 };
-
 const actions = {
   // Regular actions.
   startLoadingData: createAction('START_LOADING_DATA'),
@@ -73,47 +70,43 @@ const actions = {
   setAPIDataForWizard: createAction('SET_API_DATA'),
   updateWizardSettings: createAction('UPDATE_WIZARD_SETTINGS'),
   setError: createAction('SET_ERROR'),
-
   // Async actions. These will not show up in Redux devtools.
-  *saveWizardSettings(_ref) {
+  saveWizardSettings(_ref) {
     let {
       slug,
       section = '',
       payloadPath = false,
       updatePayload = null
     } = _ref;
-
-    // Optionally data can be updated before saving - an immediate update case
-    // (without an explicit "save" action).
-    if (updatePayload) {
-      yield actions.updateWizardSettings({
-        slug,
-        ...updatePayload
-      });
-    }
-
-    const wizardState = select(WIZARD_STORE_NAMESPACE).getWizardAPIData(slug);
-    const updatedData = yield actions.fetchFromAPI({
-      path: `/newspack/v1/wizard/${slug}/${section}`,
-      method: 'POST',
-      data: payloadPath ? get(wizardState, payloadPath) : wizardState,
-      isQuietFetch: true
-    });
-
-    if (!isEmpty(updatedData)) {
-      return actions.setAPIDataForWizard({
-        slug,
-        data: updatedData
+    return function* () {
+      // Optionally data can be updated before saving - an immediate update case
+      // (without an explicit "save" action).
+      if (updatePayload) {
+        yield actions.updateWizardSettings({
+          slug,
+          ...updatePayload
+        });
+      }
+      const wizardState = select(WIZARD_STORE_NAMESPACE).getWizardAPIData(slug);
+      const updatedData = yield actions.fetchFromAPI({
+        path: `/newspack/v1/wizard/${slug}/${section}`,
+        method: 'POST',
+        data: payloadPath ? get(wizardState, payloadPath) : wizardState,
+        isQuietFetch: true
       });
-    }
+      if (!isEmpty(updatedData) && !updatedData.error) {
+        return actions.setAPIDataForWizard({
+          slug,
+          data: updatedData
+        });
+      }
+    }();
   },
-
   *wizardApiFetch(fetchConfig) {
     // Just a proxy to fetchFromAPI, but it has to be a generator.
     const result = yield actions.fetchFromAPI(fetchConfig);
     return result;
   }
-
 };
 const selectors = {
   isLoading: state => state.isLoading,
@@ -130,7 +123,10 @@ const store = createReduxStore(WIZARD_STORE_NAMESPACE, {
       dispatch(WIZARD_STORE_NAMESPACE).startLoadingData({
         isQuietLoading: Boolean(action.payload.isQuietFetch)
       });
-      return apiFetch(action.payload).catch(error => {
+      return apiFetch(action.payload).then(data => {
+        dispatch(WIZARD_STORE_NAMESPACE).setError(null);
+        return data;
+      }).catch(error => {
         dispatch(WIZARD_STORE_NAMESPACE).setError(error);
         return {
           error
@@ -152,10 +148,8 @@ const store = createReduxStore(WIZARD_STORE_NAMESPACE, {
           data
         });
       }
-
       return actions.finishLoadingData();
     }
-
   }
 });
 export default (() => register(store));

package/dist/esm/wizard/store/utils.js

@@ -2,10 +2,10 @@
  * WordPress dependencies.
  */
 import { useSelect } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
-
 import { WIZARD_STORE_NAMESPACE } from '.';
 export const createAction = type => payload => ({
   type,