newspack-components 2.1.0 → 2.2.0

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

@@ -2,7 +2,7 @@
  * Plugin Installer
  */
 
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-card {
 	.newspack-plugin-installer__status {
@@ -35,10 +35,10 @@
 	}
 
 	&.newspack-plugin-installer__status-active {
-		box-shadow: inset 4px 0 0 $alert-green;
+		box-shadow: inset 4px 0 0 wp-colors.$alert-green;
 
 		.newspack-plugin-installer__checkbox {
-			background: $alert-green;
+			background: wp-colors.$alert-green;
 			box-shadow: none;
 		}
 
@@ -48,12 +48,12 @@
 	}
 
 	&.newspack-plugin-installer__status-error {
-		box-shadow: inset 4px 0 0 $alert-red;
+		box-shadow: inset 4px 0 0 wp-colors.$alert-red;
 	}
 
 	&.newspack-plugin-installer__status-installing,
 	&.newspack-plugin-installer__status-none {
-		box-shadow: inset 4px 0 0 $gray-100;
+		box-shadow: inset 4px 0 0 wp-colors.$gray-100;
 	}
 
 	// Is Small

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

@@ -5,39 +5,34 @@
 /**
  * WordPress dependencies
  */
-import { Fragment } from '@wordpress/element';
+import { Fragment, useState } from '@wordpress/element';
 import { applyFilters } from '@wordpress/hooks';
 import { __ as alias__ } from '@wordpress/i18n';
 const __ = alias__;
 import { CheckboxControl } from '@wordpress/components';
+
 /**
  * Internal dependencies
  */
-
 import { ActionCard, Button, Grid, Notice, SelectControl, TextControl } from '../';
 import './style.scss';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
-
 const isSelectControl = setting => {
   return Array.isArray(setting.options) && setting.options.length;
 };
-
 const getControlComponent = setting => {
   if (isSelectControl(setting)) {
     return SelectControl;
   }
-
   switch (setting.type) {
     case 'checkbox':
     case 'boolean':
       return CheckboxControl;
-
     default:
       return TextControl;
   }
 };
-
 const getControlType = setting => {
   switch (setting.type) {
     case 'int':
@@ -45,24 +40,20 @@ const getControlType = setting => {
     case 'float':
     case 'number':
       return 'number';
-
     case 'string':
     case 'text':
       return 'text';
-
     case 'password':
       return 'password';
-
     case 'boolean':
     case 'checkbox':
       return 'checkbox';
-
     default:
       return null;
   }
 };
-
 const SettingsSection = props => {
+  const [saveDisabled, setSaveDisabled] = useState(true);
   const {
     error,
     sectionKey,
@@ -74,7 +65,6 @@ const SettingsSection = props => {
     onChange,
     onUpdate
   } = props;
-
   const getControlProps = setting => ({
     disabled,
     name: `${setting.section}_${setting.key}`,
@@ -90,22 +80,19 @@ const SettingsSection = props => {
     checked: setting.type === 'boolean' ? !!setting.value : null,
     onChange: value => {
       onChange(setting.key, value);
+      setSaveDisabled(false);
     }
   });
-
   const createFilter = function (name) {
     let defaultComponent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     return applyFilters(`newspack.settingSection.${sectionKey}.${name}`, defaultComponent, props);
   };
-
   let columns = 2;
-
   if (fields.length % 3 === 0) {
     columns = 3;
   } else if (fields.length === 1) {
     columns = 1;
   }
-
   return _jsx(ActionCard, {
     isMedium: true,
     disabled: disabled,
@@ -118,9 +105,10 @@ const SettingsSection = props => {
     }) : null,
     actionContent: (active || null === active) && createFilter('buttons', _jsx(Button, {
       variant: "primary",
-      disabled: disabled,
+      disabled: disabled || saveDisabled,
       onClick: () => {
         onUpdate();
+        setSaveDisabled(true);
       },
       children: __('Save Settings', 'newspack')
     })),
@@ -133,8 +121,8 @@ const SettingsSection = props => {
         gutter: 32,
         children: fields.map(setting => {
           const Control = getControlComponent(setting); // eslint-disable-line @wordpress/no-unused-vars-before-return, no-unused-vars
-
-          return applyFilters(`newspack.settingsSection.${sectionKey}.control`, _jsx(Control, { ...getControlProps(setting)
+          return applyFilters(`newspack.settingsSection.${sectionKey}.control`, _jsx(Control, {
+            ...getControlProps(setting)
           }, setting.key), {
             sectionKey,
             setting,
@@ -145,5 +133,4 @@ const SettingsSection = props => {
     })
   });
 };
-
 export default SettingsSection;

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

@@ -1,30 +1,27 @@
 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 {
         afterFetch,
@@ -41,7 +38,6 @@ class PluginSettings extends Component {
           settings,
           error: null
         });
-
         if ('function' === typeof afterFetch) {
           afterFetch(settings);
         }
@@ -55,14 +51,12 @@ class PluginSettings extends Component {
         });
       });
     });
-
     _defineProperty(this, "getSettingsValues", sectionKey => {
       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 => {
@@ -71,12 +65,12 @@ class PluginSettings extends Component {
         }
       });
       this.setState({
-        settings: { ...this.state.settings,
+        settings: {
+          ...this.state.settings,
           [sectionKey]: sectionSettings
         }
       });
     });
-
     _defineProperty(this, "handleSectionUpdate", sectionKey => data => {
       const {
         afterUpdate,
@@ -95,10 +89,12 @@ class PluginSettings extends Component {
         }
       }).then(settings => {
         this.setState({
-          settings,
+          settings: {
+            ...this.state.settings,
+            [sectionKey]: settings[sectionKey]
+          },
           error: null
         });
-
         if ('function' === typeof afterUpdate) {
           afterUpdate(settings);
         }
@@ -112,47 +108,67 @@ 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 => {
       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 => {
       return this.getSectionInfo(sectionKey)?.description;
     });
-
+    /**
+     * Get the section description.
+     *
+     * @param {string} sectionKey The section name.
+     * @return {string} The section description.
+     */
     _defineProperty(this, "getSectionDescription", sectionKey => {
       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 => {
       const {
         settings
       } = this.state;
       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 => {
       return this.state.settings[sectionKey]?.filter(setting => setting.key && setting.key !== 'active');
     });
-
     this.state = {
       inFlight: false,
       settings: {},
       error: null
     };
   }
-
   componentDidMount() {
     this.fetchSettings();
   }
-
   /**
    * Render.
    */
@@ -193,9 +209,7 @@ class PluginSettings extends Component {
       })]
     });
   }
-
 }
-
 PluginSettings.defaultProps = {
   title: __('General Settings', 'newspack')
 };

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,15 +72,18 @@ 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],
+            pluginInfo: {
+              ...pluginInfo,
+              [plugin]: {
+                ...pluginInfo[plugin],
                 error: e.message || __('There was an error managing this plugin.', 'newspack')
               }
             }
@@ -86,26 +91,31 @@ class PluginToggle extends Component {
         });
       });
     });
-
-    _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,
@@ -113,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, {
@@ -122,7 +132,6 @@ class PluginToggle extends Component {
           })]
         });
       }
-
       if ('deactivate' === inFlight) {
         return _jsxs(Fragment, {
           children: [__('Deactivating…', 'newspack'), " ", _jsx(Waiting, {
@@ -130,25 +139,24 @@ 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
@@ -158,7 +166,9 @@ class PluginToggle extends Component {
       } = this.state;
       return pluginInfo[slug]?.error || null;
     });
-
+    /**
+     * Get installation/activation status for a plugin.
+     */
     _defineProperty(this, "isPluginInstalledAndActive", plugin => {
       const {
         status
@@ -166,7 +176,6 @@ class PluginToggle extends Component {
       return status === 'active';
     });
   }
-
   /**
    * Render.
    */
@@ -204,11 +213,5 @@ class PluginToggle extends Component {
       }, 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,30 +2,29 @@
  * 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: 2px;
-		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;
 			}
@@ -36,14 +35,14 @@
 				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 {