newspack-components 2.0.3 → 2.2.0

package/dist/esm/plugin-settings/index.js

@@ -1,44 +1,46 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 /**
  * External dependencies
  */
 import classnames from 'classnames';
+
 /**
  * WordPress dependencies.
  */
-
 import apiFetch from '@wordpress/api-fetch';
 import { Component, Fragment } from '@wordpress/element';
 import { __ as alias__ } from '@wordpress/i18n';
+
 /**
  * Internal dependencies.
  */
-
 const __ = alias__;
 import { SectionHeader, Notice } from '../';
 import SettingsSection from './SettingsSection';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-
 class PluginSettings extends Component {
   constructor() {
     super(...arguments);
-
     _defineProperty(this, "fetchSettings", () => {
       const {
-        pluginSlug
+        afterFetch,
+        pluginSlug,
+        isWizard
       } = this.props;
       this.setState({
         inFlight: true
       });
       apiFetch({
-        path: `/${pluginSlug}/v1/settings`
+        path: isWizard ? `/newspack/v1/wizard/${pluginSlug}/settings` : `/${pluginSlug}/v1/settings`
       }).then(settings => {
         this.setState({
           settings,
           error: null
         });
+        if ('function' === typeof afterFetch) {
+          afterFetch(settings);
+        }
       }).catch(error => {
         this.setState({
           error
@@ -49,16 +51,12 @@ class PluginSettings extends Component {
         });
       });
     });
-
     _defineProperty(this, "getSettingsValues", sectionKey => {
-      var _this$state$settings$;
-
-      return ((_this$state$settings$ = this.state.settings[sectionKey]) === null || _this$state$settings$ === void 0 ? void 0 : _this$state$settings$.reduce((map, setting) => {
+      return this.state.settings[sectionKey]?.reduce((map, setting) => {
         map[setting.key] = setting.value;
         return map;
-      }, {})) || {};
+      }, {}) || {};
     });
-
     _defineProperty(this, "handleSettingChange", sectionKey => (key, value) => {
       const sectionSettings = [...this.state.settings[sectionKey]];
       sectionSettings.forEach(setting => {
@@ -67,21 +65,23 @@ class PluginSettings extends Component {
         }
       });
       this.setState({
-        settings: { ...this.state.settings,
+        settings: {
+          ...this.state.settings,
           [sectionKey]: sectionSettings
         }
       });
     });
-
     _defineProperty(this, "handleSectionUpdate", sectionKey => data => {
       const {
-        pluginSlug
+        afterUpdate,
+        pluginSlug,
+        isWizard
       } = this.props;
       this.setState({
         inFlight: true
       });
       apiFetch({
-        path: `/${pluginSlug}/v1/settings`,
+        path: isWizard ? `/newspack/v1/wizard/${pluginSlug}/settings` : `/${pluginSlug}/v1/settings`,
         method: 'POST',
         data: {
           section: sectionKey,
@@ -89,9 +89,15 @@ class PluginSettings extends Component {
         }
       }).then(settings => {
         this.setState({
-          settings,
+          settings: {
+            ...this.state.settings,
+            [sectionKey]: settings[sectionKey]
+          },
           error: null
         });
+        if ('function' === typeof afterUpdate) {
+          afterUpdate(settings);
+        }
       }).catch(error => {
         this.setState({
           error
@@ -102,64 +108,76 @@ class PluginSettings extends Component {
         });
       });
     });
-
+    /**
+     * Get the section setting containing section information.
+     *
+     * @param {string} sectionKey The section name.
+     * @return {Object} The section setting.
+     */
     _defineProperty(this, "getSectionInfo", sectionKey => {
-      var _this$state$settings$2;
-
-      return (_this$state$settings$2 = this.state.settings[sectionKey]) === null || _this$state$settings$2 === void 0 ? void 0 : _this$state$settings$2.find(setting => !setting.key || setting.key === 'active');
+      return this.state.settings[sectionKey]?.find(setting => !setting.key || setting.key === 'active');
     });
-
+    /**
+     * Get the section title.
+     *
+     * @param {string} sectionKey The section name.
+     * @return {string} The section title.
+     */
     _defineProperty(this, "getSectionTitle", sectionKey => {
-      var _this$getSectionInfo;
-
-      return (_this$getSectionInfo = this.getSectionInfo(sectionKey)) === null || _this$getSectionInfo === void 0 ? void 0 : _this$getSectionInfo.description;
+      return this.getSectionInfo(sectionKey)?.description;
     });
-
+    /**
+     * Get the section description.
+     *
+     * @param {string} sectionKey The section name.
+     * @return {string} The section description.
+     */
     _defineProperty(this, "getSectionDescription", sectionKey => {
-      var _this$getSectionInfo2;
-
-      return (_this$getSectionInfo2 = this.getSectionInfo(sectionKey)) === null || _this$getSectionInfo2 === void 0 ? void 0 : _this$getSectionInfo2.help;
+      return this.getSectionInfo(sectionKey)?.help;
     });
-
+    /**
+     * Get whether a section is active.
+     *
+     * @param {string} sectionKey The section name.
+     * @return {?boolean} Whether the section is active or not. Null if the section is not found or does not support activation.
+     */
     _defineProperty(this, "isSectionActive", sectionKey => {
-      var _settings$sectionKey;
-
       const {
         settings
       } = this.state;
-      const activation = (_settings$sectionKey = settings[sectionKey]) === null || _settings$sectionKey === void 0 ? void 0 : _settings$sectionKey.find(setting => setting.key === 'active');
-
+      const activation = settings[sectionKey]?.find(setting => setting.key === 'active');
       if (!activation) {
         return null;
       }
-
       return activation.value;
     });
-
+    /**
+     * Get list of section field settings.
+     *
+     * @param {string} sectionKey The section name.
+     * @return {?Array} List of section fields.
+     */
     _defineProperty(this, "getSectionFields", sectionKey => {
-      var _this$state$settings$3;
-
-      return (_this$state$settings$3 = this.state.settings[sectionKey]) === null || _this$state$settings$3 === void 0 ? void 0 : _this$state$settings$3.filter(setting => setting.key && setting.key !== 'active');
+      return this.state.settings[sectionKey]?.filter(setting => setting.key && setting.key !== 'active');
     });
-
     this.state = {
       inFlight: false,
       settings: {},
       error: null
     };
   }
-
   componentDidMount() {
     this.fetchSettings();
   }
-
   /**
    * Render.
    */
   render() {
     const {
       title,
-      description
+      description,
+      hasGreyHeader,
+      children
     } = this.props;
     const {
       settings,
@@ -167,31 +185,31 @@ class PluginSettings extends Component {
       error
     } = this.state;
     return _jsxs(Fragment, {
-      children: [_jsx(SectionHeader, {
+      children: [title && _jsx(SectionHeader, {
         title: title,
         description: description
       }), error && _jsx(Notice, {
         isError: true,
         noticeText: error.message
-      }), _jsx("div", {
-        className: classnames({
+      }), _jsxs("div", {
+        className: classnames('newspack-plugin-settings', {
           'newspack-wizard-section__is-loading': inFlight && !Object.keys(settings).length
         }),
-        children: Object.keys(settings).map(sectionKey => _jsx(SettingsSection, {
+        children: [Object.keys(settings).map(sectionKey => _jsx(SettingsSection, {
           disabled: inFlight,
+          sectionKey: sectionKey,
           title: this.getSectionTitle(sectionKey),
           description: this.getSectionDescription(sectionKey),
           active: this.isSectionActive(sectionKey),
           fields: this.getSectionFields(sectionKey),
           onChange: this.handleSettingChange(sectionKey),
-          onUpdate: this.handleSectionUpdate(sectionKey)
-        }, sectionKey))
+          onUpdate: this.handleSectionUpdate(sectionKey),
+          hasGreyHeader: hasGreyHeader
+        }, sectionKey)), children]
       })]
     });
   }
-
 }
-
 PluginSettings.defaultProps = {
   title: __('General Settings', 'newspack')
 };

package/dist/esm/plugin-settings/style.scss

@@ -0,0 +1,7 @@
+.newspack-card:not( .newspack-settings__no-border ) {
+	.newspack-action-card__region-children {
+		> .newspack-grid {
+			margin: 32px 0 0 !important;
+		}
+	}
+}

package/dist/esm/plugin-toggle/index.js

@@ -1,37 +1,35 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 /**
  * WordPress dependencies.
  */
 import apiFetch from '@wordpress/api-fetch';
 import { Component, Fragment } from '@wordpress/element';
 import { __ as alias__ } from '@wordpress/i18n';
+
 /**
  * Internal dependencies.
  */
-
 const __ = alias__;
 import { ActionCard, Waiting } from '../';
 import './style.scss';
+
 /**
  * Plugin toggle group component.
  */
-
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-
 class PluginToggle extends Component {
   constructor() {
     super(...arguments);
-
     _defineProperty(this, "state", {
       pluginInfo: {}
     });
-
     _defineProperty(this, "componentDidMount", () => {
       this.retrievePluginInfo();
     });
-
+    /**
+     * Retrieve complete data about Newspack plugins.
+     */
     _defineProperty(this, "retrievePluginInfo", () => {
       return new Promise(() => {
         apiFetch({
@@ -41,7 +39,9 @@ class PluginToggle extends Component {
         }));
       });
     });
-
+    /**
+     * Install/activate or remove a plugin.
+     */
     _defineProperty(this, "managePlugin", (plugin, value) => {
       const {
         plugins
@@ -55,8 +55,10 @@ class PluginToggle extends Component {
         method: 'post'
       };
       this.setState({
-        pluginInfo: { ...pluginInfo,
-          [plugin]: { ...pluginInfo[plugin],
+        pluginInfo: {
+          ...pluginInfo,
+          [plugin]: {
+            ...pluginInfo[plugin],
             inFlight: action
           }
         }
@@ -70,34 +72,50 @@ class PluginToggle extends Component {
               pluginInfo: currentPluginInfo
             } = _ref;
             return {
-              pluginInfo: { ...currentPluginInfo,
+              pluginInfo: {
+                ...currentPluginInfo,
                 [plugin]: response
               }
             };
           }, () => shouldRefreshAfterUpdate && location.reload());
+        }).catch(e => {
+          this.setState({
+            pluginInfo: {
+              ...pluginInfo,
+              [plugin]: {
+                ...pluginInfo[plugin],
+                error: e.message || __('There was an error managing this plugin.', 'newspack')
+              }
+            }
+          });
         });
       });
     });
-
-    _defineProperty(this, "prepareDataForRender", (pluginsFromProps, pluginsFromAPI) => Object.keys(pluginsFromProps).map(pluginSlug => pluginsFromAPI[pluginSlug] ? Object.keys(pluginsFromAPI[pluginSlug]).reduce((accumulator, key) => ({ ...accumulator,
+    /**
+     * Prepare plugins data for render. Change all keys to camelCase, merge API-fetched data with prop.
+     */
+    _defineProperty(this, "prepareDataForRender", (pluginsFromProps, pluginsFromAPI) => Object.keys(pluginsFromProps).map(pluginSlug => pluginsFromAPI[pluginSlug] ? Object.keys(pluginsFromAPI[pluginSlug]).reduce((accumulator, key) => ({
+      ...accumulator,
       [key.charAt(0).toLowerCase() + key.slice(1)]: pluginsFromAPI[pluginSlug][key]
     }), {}) : {}).map(plugin => Object.assign(plugin, pluginsFromProps[plugin.slug])));
-
+    /**
+     * Generate a classname for the ActionCard based on plugin state. Applies 'in-flight' class if an API is underway and 'loading' if the plugin data is not yet available.
+     */
     _defineProperty(this, "classNameForPlugin", plugin => {
       const {
         status,
         inFlight
       } = plugin;
-
       if (inFlight) {
         return 'in-flight';
       }
-
       if (!status) {
         return 'loading';
       }
     });
-
+    /**
+     * Generate the ActionCard action text for a plugin.
+     */
     _defineProperty(this, "actionTextForPlugin", plugin => {
       const {
         actionText,
@@ -105,8 +123,8 @@ class PluginToggle extends Component {
         href,
         inFlight,
         name
-      } = plugin; // Show spinner when plugin data is unavailable, or when an API call is in flight.
-
+      } = plugin;
+      // Show spinner when plugin data is unavailable, or when an API call is in flight.
       if ('configure' === inFlight) {
         return _jsxs(Fragment, {
           children: [__('Installing…', 'newspack'), " ", _jsx(Waiting, {
@@ -114,7 +132,6 @@ class PluginToggle extends Component {
           })]
         });
       }
-
       if ('deactivate' === inFlight) {
         return _jsxs(Fragment, {
           children: [__('Deactivating…', 'newspack'), " ", _jsx(Waiting, {
@@ -122,25 +139,36 @@ class PluginToggle extends Component {
           })]
         });
       }
-
       if (!name) {
         return _jsxs(Fragment, {
           children: [__('Loading…', 'newspack'), " ", _jsx(Waiting, {
             isRight: true
           })]
         });
-      } // No action button at all if the plugin isn't installed and active.
-
-
+      }
+      // No action button at all if the plugin isn't installed and active.
       if (!this.isPluginInstalledAndActive(plugin)) {
         return null;
       }
-
       if (href || editPath) {
         return actionText ? actionText : __('Configure', 'newspack');
       }
     });
-
+    /**
+     * Get error message for this plugin.
+     */
+    _defineProperty(this, "errorForPlugin", plugin => {
+      const {
+        slug
+      } = plugin;
+      const {
+        pluginInfo
+      } = this.state;
+      return pluginInfo[slug]?.error || null;
+    });
+    /**
+     * Get installation/activation status for a plugin.
+     */
     _defineProperty(this, "isPluginInstalledAndActive", plugin => {
       const {
         status
@@ -148,7 +176,6 @@ class PluginToggle extends Component {
       return status === 'active';
     });
   }
-
   /**
    * Render.
    */
@@ -169,6 +196,7 @@ class PluginToggle extends Component {
       } = plugin;
       const pluginStatus = this.isPluginInstalledAndActive(plugin);
       const handoff = !href && pluginStatus && editPath ? slug : null;
+      const error = this.errorForPlugin(plugin);
       return _jsx(ActionCard, {
         className: this.classNameForPlugin(plugin),
         title: name,
@@ -178,15 +206,12 @@ class PluginToggle extends Component {
         href: href,
         toggle: true,
         toggleChecked: this.isPluginInstalledAndActive(plugin),
-        toggleOnChange: value => this.managePlugin(slug, value)
+        toggleOnChange: value => this.managePlugin(slug, value),
+        notification: error,
+        notificationHTML: error,
+        notificationLevel: "error"
       }, index);
     });
   }
-  /**
-   * Prepare plugins data for render. Change all keys to camelCase, merge API-fetched data with prop.
-   */
-
-
 }
-
 export default PluginToggle;

package/dist/esm/plugin-toggle/style.scss

@@ -2,7 +2,7 @@
  * Plugin Toggle
  */
 
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-action-card {
 	&.in-flight,
@@ -11,7 +11,7 @@
 
 		.newspack-action-card__region-right {
 			.newspack-button {
-				color: $gray-700;
+				color: wp-colors.$gray-700;
 				pointer-events: none;
 				text-decoration: none;
 			}

package/dist/esm/popover/index.js

@@ -3,22 +3,21 @@
  */
 import { Popover as BaseComponent } from '@wordpress/components';
 import { Component } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
-
 import './style.scss';
+
 /**
  * External dependencies
  */
-
 import classnames from 'classnames';
+
 /**
  * Popover
  */
-
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
-
 class Popover extends Component {
   /**
    * Render
@@ -35,9 +34,7 @@ class Popover extends Component {
       ...otherProps
     });
   }
-
 }
-
 Popover.defaultProps = {
   padding: false
 };

package/dist/esm/popover/style.scss

@@ -2,48 +2,47 @@
  * Popover
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '../../../shared/scss/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-popover {
 	.components-popover__content {
-		border: 1px solid $gray-300;
-		border-radius: 3px;
-		box-shadow: 0 4px 8px rgba( black, 0.08 );
 		min-width: 238px;
 
 		.newspack-button {
-			color: $gray-700;
+			color: wp-colors.$gray-700;
 			display: flex;
 			font-weight: normal;
 			padding: 6px 8px;
 
 			&:hover {
+				color: colors.$primary-500;
+
 				.components-menu-items__item-icon {
-					fill: currentColor;
+					fill: currentcolor;
 				}
 			}
 
 			&:focus:not( :disabled ) {
-				box-shadow: inset 0 0 0 2px $primary-500;
+				box-shadow: inset 0 0 0 2px colors.$primary-500;
 				position: relative;
 				z-index: 1;
 			}
 
 			&.is-link {
-				border-radius: 3px;
+				border-radius: 2px;
 				padding: 6px 8px;
 				text-decoration: none;
 
 				&:not( .is-destructive ) {
-					color: $gray-700;
+					color: wp-colors.$gray-700;
 
 					&:active,
 					&:active:enabled,
 					&:focus,
 					&:focus:enabled &:hover,
-					&:not( :disabled ):not( [aria-disabled='true'] ):not( .is-default ):hover {
-						color: $primary-500;
+					&:not( :disabled, [aria-disabled='true'], .is-default ):hover {
+						color: colors.$primary-500;
 					}
 				}
 
@@ -53,8 +52,12 @@
 				}
 			}
 
+			&.is-destructive:not( :focus ) {
+				box-shadow: none !important;
+			}
+
 			.components-menu-items__item-icon {
-				fill: $gray-900;
+				fill: wp-colors.$gray-900;
 			}
 
 			.components-menu-item__item {
@@ -64,7 +67,7 @@
 		}
 
 		.components-menu-group__label {
-			color: $gray-900;
+			color: wp-colors.$gray-900;
 			font-size: 12px;
 			font-weight: bold;
 			line-height: 16px;
@@ -86,8 +89,8 @@
 					min-height: 36px;
 
 					&:focus ~ div.components-input-control__backdrop {
-						border-color: $primary-500;
-						box-shadow: inset 0 0 0 1px $primary-500;
+						border-color: colors.$primary-500;
+						box-shadow: inset 0 0 0 1px colors.$primary-500;
 					}
 				}
 
@@ -129,7 +132,7 @@
 	}
 
 	&:not( .is-without-arrow )::before {
-		border-color: $gray-300;
+		border-color: wp-colors.$gray-300;
 	}
 
 	&.is-from-bottom {