newspack-components 2.0.1 → 2.1.0

package/dist/esm/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/esm/wizard/components/WizardError.js

@@ -0,0 +1,78 @@
+/**
+ * WordPress dependencies.
+ */
+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,
+    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 = 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, {
+      title: __('Unrecoverable error'),
+      onRequestClose: fallbackURL ? () => window.location = fallbackURL : undefined,
+      children: [_jsx(Notice, {
+        noticeText: message,
+        isError: true,
+        rawHTML: true
+      }), fallbackURL && _jsx(Card, {
+        buttonsCard: true,
+        noBorder: true,
+        className: "justify-end",
+        children: _jsx(Button, {
+          isPrimary: true,
+          href: fallbackURL,
+          children: __('Return to Dashboard', 'newspack')
+        })
+      })]
+    });
+  }
+
+  return _jsx(Notice, {
+    isError: true,
+    className: "newspack-wizard__above-header",
+    noticeText: message,
+    rawHTML: true
+  });
+};
+
+export default WizardError;

package/dist/esm/wizard/index.js

@@ -0,0 +1,128 @@
+/**
+ * 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 Router from '../proxied-imports/router';
+import registerStore, { WIZARD_STORE_NAMESPACE } from './store';
+import { useWizardData } from './store/utils';
+import WizardError from './components/WizardError';
+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";
+registerStore();
+const {
+  HashRouter,
+  Redirect,
+  Route,
+  Switch
+} = Router;
+
+const Wizard = _ref => {
+  let {
+    sections = [],
+    apiSlug,
+    headerText,
+    subHeaderText,
+    hasSimpleFooter,
+    className,
+    renderAboveSections,
+    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.
+
+  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 = [{
+      path: '/',
+      render: () => _jsx(PluginInstaller, {
+        plugins: requiredPlugins,
+        onStatus: _ref2 => {
+          let {
+            complete
+          } = _ref2;
+          return setPluginRequirementsSatisfied(complete);
+        }
+      })
+    }];
+  }
+
+  return _jsxs(_Fragment, {
+    children: [_jsx(WizardError, {}), _jsx("div", {
+      className: classnames(isLoading ? 'newspack-wizard__is-loading' : 'newspack-wizard__is-loaded', {
+        'newspack-wizard__is-loading-quiet': isQuietLoading
+      }),
+      children: _jsxs(HashRouter, {
+        hashType: "slash",
+        children: [newspack_aux_data.is_debug_mode && _jsx(Notice, {
+          debugMode: true
+        }), _jsx("div", {
+          className: "bg-white",
+          children: _jsx("div", {
+            className: "newspack-wizard__header__inner",
+            children: _jsxs("div", {
+              className: "newspack-wizard__title",
+              children: [_jsx(Button, {
+                isLink: true,
+                href: newspack_urls.dashboard,
+                label: __('Return to Dashboard', 'newspack'),
+                showTooltip: true,
+                icon: category,
+                iconSize: 36,
+                children: _jsx(NewspackIcon, {
+                  size: 36
+                })
+              }), _jsxs("div", {
+                children: [headerText && _jsx("h2", {
+                  children: headerText
+                }), subHeaderText && _jsx("span", {
+                  children: subHeaderText
+                })]
+              })]
+            })
+          })
+        }), displayedSections.length > 1 && _jsx(TabbedNavigation, {
+          items: displayedSections
+        }), _jsxs(Switch, {
+          children: [displayedSections.map((section, index) => {
+            const SectionComponent = section.render;
+            return _jsx(Route, {
+              path: section.path,
+              children: _jsxs("div", {
+                className: classnames('newspack-wizard newspack-wizard__content', className),
+                children: ['function' === typeof renderAboveSections ? renderAboveSections() : null, _jsx(SectionComponent, {})]
+              })
+            }, index);
+          }), _jsx(Redirect, {
+            to: displayedSections[0].path
+          })]
+        })]
+      })
+    }), !isLoading && _jsx(Footer, {
+      simple: hasSimpleFooter
+    })]
+  });
+};
+
+Wizard.useWizardData = useWizardData;
+Wizard.STORE_NAMESPACE = WIZARD_STORE_NAMESPACE;
+export default Wizard;

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

@@ -0,0 +1,161 @@
+/**
+ * External dependencies.
+ */
+import { set, get, isEmpty } from 'lodash';
+/**
+ * WordPress dependencies.
+ */
+
+import apiFetch from '@wordpress/api-fetch';
+import { createReduxStore, register, dispatch, select } from '@wordpress/data';
+import { createAction } from './utils.js';
+export const WIZARD_STORE_NAMESPACE = 'newspack/wizards';
+const DEFAULT_STATE = {
+  isLoading: true,
+  isQuietLoading: false,
+  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,
+          isQuietLoading: true
+        };
+      }
+
+      return { ...state,
+        isLoading: true
+      };
+
+    case 'FINISH_LOADING_DATA':
+      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,
+        error: payload
+      };
+
+    default:
+      return state;
+  }
+};
+
+const actions = {
+  // Regular actions.
+  startLoadingData: createAction('START_LOADING_DATA'),
+  finishLoadingData: createAction('FINISH_LOADING_DATA'),
+  fetchFromAPI: createAction('FETCH_FROM_API'),
+  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) {
+    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
+      });
+    }
+  },
+
+  *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,
+  isQuietLoading: state => state.isQuietLoading,
+  getWizardAPIData: (state, slug) => state.apiData[slug] || {},
+  getError: state => state.error
+};
+const store = createReduxStore(WIZARD_STORE_NAMESPACE, {
+  reducer,
+  actions,
+  selectors,
+  controls: {
+    FETCH_FROM_API: action => {
+      dispatch(WIZARD_STORE_NAMESPACE).startLoadingData({
+        isQuietLoading: Boolean(action.payload.isQuietFetch)
+      });
+      return apiFetch(action.payload).catch(error => {
+        dispatch(WIZARD_STORE_NAMESPACE).setError(error);
+        return {
+          error
+        };
+      }).finally(result => {
+        dispatch(WIZARD_STORE_NAMESPACE).finishLoadingData();
+        return result;
+      });
+    }
+  },
+  resolvers: {
+    *getWizardAPIData(slug) {
+      if (slug) {
+        const data = yield actions.fetchFromAPI({
+          path: `/newspack/v1/wizard/${slug}`
+        });
+        return actions.setAPIDataForWizard({
+          slug,
+          data
+        });
+      }
+
+      return actions.finishLoadingData();
+    }
+
+  }
+});
+export default (() => register(store));

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

@@ -0,0 +1,17 @@
+/**
+ * WordPress dependencies.
+ */
+import { useSelect } from '@wordpress/data';
+/**
+ * Internal dependencies
+ */
+
+import { WIZARD_STORE_NAMESPACE } from '.';
+export const createAction = type => payload => ({
+  type,
+  payload
+});
+export const useWizardData = function (wizardName) {
+  let defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return useSelect(select => select(WIZARD_STORE_NAMESPACE).getWizardAPIData(`newspack-${wizardName}-wizard`)) || defaultValue;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "newspack-components",
-	"version": "2.0.1",
+	"version": "2.1.0",
 	"description": "Newspack design system components",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
@@ -30,6 +30,7 @@
 		"@wordpress/icons": "^6.1.0",
 		"classnames": "^2.3.1",
 		"lodash": "^4.17.21",
+		"moment-range": "^3.1.1",
 		"qs": "^6.10.1",
 		"react-daterange-picker": "^2.0.1",
 		"react-router-dom": "^5.3.0"

package/shared/scss/_colors.scss

@@ -1,3 +1,4 @@
+// HEX
 $primary-000: #f5fdff;
 $primary-050: #d6f6ff;
 $primary-100: #b4e4ff;
@@ -10,3 +11,17 @@ $primary-700: #1522af;
 $primary-800: #0b0b8d;
 $primary-900: #0d046e;
 $primary-950: #0e0052;
+
+// RGB
+$primary-000--rgb: 245, 253, 255;
+$primary-050--rgb: 214, 246, 255;
+$primary-100--rgb: 180, 228, 255;
+$primary-200--rgb: 147, 204, 253;
+$primary-300--rgb: 114, 175, 251;
+$primary-400--rgb: 82, 141, 252;
+$primary-500--rgb: 51, 102, 255;
+$primary-600--rgb: 34, 64, 213;
+$primary-700--rgb: 21, 34, 175;
+$primary-800--rgb: 11, 11, 141;
+$primary-900--rgb: 13, 4, 110;
+$primary-950--rgb: 14, 0, 82;