newspack-components 2.0.3 → 2.2.0

package/dist/esm/notice/style.scss

@@ -2,65 +2,106 @@
  * Notice
  */
 
-@import '~@wordpress/base-styles/colors';
-@import '../../../shared/scss/colors';
+@use 'sass:color';
+@use '~@wordpress/base-styles/colors' as wp-colors;
+@use '../../../shared/scss/colors';
 
 .newspack-notice {
-	align-items: flex-start;
-	background: $gray-100;
-	border-radius: 3px;
-	color: $gray-900;
+	align-items: center;
+	background: wp-colors.$gray-100;
+	color: wp-colors.$gray-900;
 	display: flex;
-	font-size: 14px;
 	justify-content: flex-start;
-	line-height: 24px;
 	margin: 32px 0;
 	padding: 6px 8px;
 
 	> svg {
 		display: block;
-		fill: $gray-900;
+		fill: wp-colors.$gray-900;
 		flex: 0 0 24px;
 		margin-right: 4px;
 	}
 
+	&__is-debug {
+		background: colors.$primary-700;
+		border-radius: 2px;
+		bottom: 16px;
+		box-shadow: 0 0 8px 4px rgba( black, 0.08 );
+		color: white;
+		font-weight: bold;
+		margin: 0 16px;
+		position: fixed;
+		text-transform: uppercase;
+		z-index: 9997;
+
+		> svg {
+			fill: white;
+		}
+	}
+
 	&__is-error {
-		background: lighten( $alert-red, 54% );
+		background: color.adjust( wp-colors.$alert-red, $lightness: 51% );
 
 		> svg {
-			fill: $alert-red;
+			fill: wp-colors.$alert-red;
 			transform: rotate( 180deg );
 		}
 	}
 
+	&__is-handoff {
+		background: color.adjust( wp-colors.$alert-yellow, $lightness: 30% );
+		margin-top: 0;
+		position: sticky;
+		top: 46px;
+		z-index: 100;
+
+		@media ( min-width: 782px ) {
+			top: 32px;
+		}
+	}
+
 	&__is-help {
-		background: $primary-000;
+		background: colors.$primary-050;
 
 		> svg {
-			fill: $primary-500;
+			fill: colors.$primary-500;
 		}
 	}
 
 	&__is-success {
-		background: lighten( $alert-green, 47% );
+		background: color.adjust( wp-colors.$alert-green, $lightness: 42% );
 
 		> svg {
-			fill: $alert-green;
+			fill: wp-colors.$alert-green;
 		}
 	}
 
 	&__is-warning {
-		background: lighten( $alert-yellow, 36% );
+		background: color.adjust( wp-colors.$alert-yellow, $lightness: 30% );
 
 		> svg {
-			fill: $alert-yellow;
+			fill: wp-colors.$alert-yellow;
 			transform: rotate( 180deg );
 		}
 	}
 
-	&__content {
+	& &__content {
 		> div > * {
-			margin: 0;
+			margin: 0 !important;
+		}
+
+		a {
+			color: inherit;
+
+			&:active,
+			&:focus,
+			&:hover {
+				color: inherit;
+			}
+
+			&:focus {
+				box-shadow: 0 0 0 var( --wp-admin-border-width-focus ) currentcolor;
+			}
 		}
 	}
 

package/dist/esm/patrons-logo/index.js

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 /**
  * WordPress.com and Google News Initiative Logos.
  */
@@ -13,11 +12,12 @@ import { __ as alias__ } from '@wordpress/i18n';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 const __ = alias__;
-
 class PatronsLogo extends Component {
   constructor() {
     super(...arguments);
-
+    /**
+     * Render.
+     */
     _defineProperty(this, "render", () => {
       return _jsxs(SVG, {
         xmlns: "http://www.w3.org/2000/svg",
@@ -72,7 +72,5 @@ class PatronsLogo extends Component {
       });
     });
   }
-
 }
-
 export default PatronsLogo;

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

@@ -1,5 +1,4 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-
 /**
  * Plugin Installer
  */
@@ -12,35 +11,33 @@ import { Component } from '@wordpress/element';
 import { __ as alias__ } from '@wordpress/i18n';
 const __ = alias__;
 import { Icon, check } from '@wordpress/icons';
+
 /**
  * Internal dependencies.
  */
-
 import { ActionCard, Button, Waiting } from '../';
 import './style.scss';
 const PLUGIN_STATE_NONE = 0;
 const PLUGIN_STATE_ACTIVE = 1;
 const PLUGIN_STATE_INSTALLING = 2;
 const PLUGIN_STATE_ERROR = 3;
+
 /**
  * External dependencies.
  */
-
 import classnames from 'classnames';
+
 /**
  * Plugin installer.
  */
-
 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";
 class PluginInstaller extends Component {
   constructor() {
     var _this;
-
     super(...arguments);
     _this = this;
-
     _defineProperty(this, "componentDidMount", () => {
       const {
         plugins
@@ -51,7 +48,6 @@ class PluginInstaller extends Component {
         }
       });
     });
-
     _defineProperty(this, "componentDidUpdate", prevProps => {
       const {
         autoInstall,
@@ -60,16 +56,13 @@ class PluginInstaller extends Component {
       const {
         installationInitialized
       } = this.state;
-
       if (plugins !== prevProps.plugins) {
         this.retrievePluginInfo(plugins);
       }
-
       if (autoInstall && !installationInitialized) {
         this.installAllPlugins();
       }
     });
-
     _defineProperty(this, "retrievePluginInfo", plugins => {
       return new Promise(resolve => {
         apiFetch({
@@ -79,8 +72,8 @@ class PluginInstaller extends Component {
             if (plugins.indexOf(slug) === -1) {
               return result;
             }
-
-            result[slug] = { ...response[slug],
+            result[slug] = {
+              ...response[slug],
               installationStatus: response[slug].Status === 'active' ? PLUGIN_STATE_ACTIVE : PLUGIN_STATE_NONE
             };
             return result;
@@ -89,7 +82,6 @@ class PluginInstaller extends Component {
         });
       });
     });
-
     _defineProperty(this, "installAllPlugins", () => {
       const {
         pluginInfo
@@ -100,7 +92,6 @@ class PluginInstaller extends Component {
       const promises = Object.keys(pluginInfo).filter(slug => 'active' !== pluginInfo[slug].Status).map(slug => () => this.installPlugin(slug));
       promises.reduce((promise, action) => promise.then(result => action().then(Array.prototype.concat.bind(result))), Promise.resolve([]));
     });
-
     _defineProperty(this, "installPlugin", slug => {
       this.setInstallationStatus(slug, PLUGIN_STATE_INSTALLING);
       const params = {
@@ -112,8 +103,10 @@ class PluginInstaller extends Component {
           pluginInfo
         } = this.state;
         this.props.onInstalled(slug);
-        this.updatePluginInfo({ ...pluginInfo,
-          [slug]: { ...response,
+        this.updatePluginInfo({
+          ...pluginInfo,
+          [slug]: {
+            ...response,
             installationStatus: PLUGIN_STATE_ACTIVE
           }
         });
@@ -121,32 +114,32 @@ class PluginInstaller extends Component {
         this.setInstallationStatus(slug, PLUGIN_STATE_ERROR, error.message);
       });
     });
-
     _defineProperty(this, "setChecked", (slug, checked) => {
       const {
         pluginInfo
       } = this.state;
-      this.updatePluginInfo({ ...pluginInfo,
-        [slug]: { ...pluginInfo[slug],
+      this.updatePluginInfo({
+        ...pluginInfo,
+        [slug]: {
+          ...pluginInfo[slug],
           checked
         }
       });
     });
-
     _defineProperty(this, "setInstallationStatus", function (slug, installationStatus) {
       let notification = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
       const {
         pluginInfo
       } = _this.state;
-
-      _this.updatePluginInfo({ ...pluginInfo,
-        [slug]: { ...pluginInfo[slug],
+      _this.updatePluginInfo({
+        ...pluginInfo,
+        [slug]: {
+          ...pluginInfo[slug],
           installationStatus,
           notification
         }
       });
     });
-
     _defineProperty(this, "updatePluginInfo", pluginInfo => {
       return new Promise(resolve => {
         const {
@@ -166,29 +159,23 @@ class PluginInstaller extends Component {
         });
       });
     });
-
     _defineProperty(this, "classForInstallationStatus", status => {
       switch (status) {
         case PLUGIN_STATE_ACTIVE:
           return 'newspack-plugin-installer__status-active';
-
         case PLUGIN_STATE_INSTALLING:
           return 'newspack-plugin-installer__status-installing';
-
         case PLUGIN_STATE_ERROR:
           return 'newspack-plugin-installer__status-error';
-
         default:
           return 'newspack-plugin-installer__status-none';
       }
     });
-
     this.state = {
       pluginInfo: {},
       installationInitialized: false
     };
   }
-
   /**
    * Render.
    */
@@ -201,22 +188,26 @@ class PluginInstaller extends Component {
     const {
       pluginInfo
     } = this.state;
-    const slugs = Object.keys(pluginInfo); // Store all plugin status info for installer button text value based on current status.
+    const {
+      is_atomic: isAtomic
+    } = window;
+    const slugs = Object.keys(pluginInfo);
 
+    // Store all plugin status info for installer button text value based on current status.
     const currentPluginStatuses = [];
     slugs.forEach(slug => {
       const plugin = pluginInfo[slug];
       currentPluginStatuses.push(plugin.Status);
-    }); // Make sure plugin status falls in either one of these, to handle button text.
+    });
 
+    // Make sure plugin status falls in either one of these, to handle button text.
     const pluginInstalled = currentStatus => currentStatus === 'active' || currentStatus === 'inactive';
-
     const buttonText = currentPluginStatuses.every(pluginInstalled) ? __('Activate', 'newspack') : __('Install', 'newspack');
     const needsInstall = slugs.some(slug => {
       const plugin = pluginInfo[slug];
       return plugin.Status !== 'active' && plugin.installationStatus === PLUGIN_STATE_NONE;
     });
-    return _jsxs("div", {
+    return _jsxs(_Fragment, {
       children: [(!pluginInfo || !Object.keys(pluginInfo).length) && _jsxs("div", {
         className: "newspack-plugin-installer_is-waiting",
         children: [_jsx(Waiting, {
@@ -227,16 +218,24 @@ class PluginInstaller extends Component {
         const {
           Name,
           Description,
+          Download,
           Status,
           installationStatus,
           notification
         } = plugin;
         const isWaiting = installationStatus === PLUGIN_STATE_INSTALLING;
         const isButton = !isWaiting && Status !== 'active';
+        const installable = Download || pluginInstalled(Status);
         let actionText;
-
         if (installationStatus === PLUGIN_STATE_INSTALLING) {
-          actionText = __('Installing…');
+          actionText = 'inactive' === Status ? __('Activating…') : __('Installing…');
+        } else if (!installable) {
+          actionText = _jsxs("span", {
+            className: "newspack-plugin-installer__status",
+            children: [isAtomic ? __('Contact Newspack support to install', 'newspack') : __('Plugin must be installed manually', 'newspack'), _jsx("span", {
+              className: "newspack-checkbox-icon"
+            })]
+          });
         } else if (Status === 'uninstalled') {
           actionText = _jsxs("span", {
             className: "newspack-plugin-installer__status",
@@ -262,12 +261,12 @@ class PluginInstaller extends Component {
             })]
           });
         }
-
         const classes = classnames('newspack-action-card__plugin-installer', this.classForInstallationStatus(installationStatus));
         const onClick = isButton ? () => this.installPlugin(slug) : null;
         return _jsx(ActionCard, {
           title: Name,
           description: Description,
+          disabled: !installable,
           actionText: actionText,
           isSmall: isSmall,
           isWaiting: isWaiting,
@@ -288,9 +287,7 @@ class PluginInstaller extends Component {
       })]
     });
   }
-
 }
-
 PluginInstaller.defaultProps = {
   onStatus: () => {},
   onInstalled: () => {}

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,32 +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
  */
-
-const __ = alias__;
-import { ActionCard, Grid, Button, TextControl, CheckboxControl, SelectControl } from '../';
+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 (Array.isArray(setting.options) && setting.options.length) {
+  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':
@@ -38,18 +40,23 @@ 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 = _ref => {
-  let {
+const SettingsSection = props => {
+  const [saveDisabled, setSaveDisabled] = useState(true);
+  const {
+    error,
+    sectionKey,
     active,
     title,
     description,
@@ -57,65 +64,73 @@ const SettingsSection = _ref => {
     disabled,
     onChange,
     onUpdate
-  } = _ref;
-
-  const getControlProps = setting => {
-    var _setting$options;
-
-    return {
-      disabled,
-      name: `${setting.section}_${setting.key}`,
-      type: getControlType(setting),
-      label: setting.description,
-      help: setting.help || null,
-      options: ((_setting$options = setting.options) === null || _setting$options === void 0 ? void 0 : _setting$options.map(option => ({
-        value: option.value,
-        label: option.name
-      }))) || null,
-      value: setting.value,
-      checked: setting.type === 'boolean' ? !!setting.value : null,
-      onChange: value => {
-        onChange(setting.key, value);
-      }
-    };
+  } = props;
+  const getControlProps = setting => ({
+    disabled,
+    name: `${setting.section}_${setting.key}`,
+    type: getControlType(setting),
+    label: setting.description,
+    help: setting.help || null,
+    options: setting.options?.map(option => ({
+      value: option.value,
+      label: option.name || option.label
+    })) || null,
+    value: setting.value,
+    multiple: isSelectControl(setting) && setting.multiple ? true : null,
+    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,
     title: title,
     description: description,
     toggleChecked: active,
-    hasGreyHeader: true,
+    hasGreyHeader: active || null === active,
     toggleOnChange: active !== null ? value => onUpdate({
       active: value
     }) : null,
+    actionContent: (active || null === active) && createFilter('buttons', _jsx(Button, {
+      variant: "primary",
+      disabled: disabled || saveDisabled,
+      onClick: () => {
+        onUpdate();
+        setSaveDisabled(true);
+      },
+      children: __('Save Settings', 'newspack')
+    })),
     children: (active || active === null) && _jsxs(Fragment, {
-      children: [_jsx(Grid, {
-        columns: fields.length % 3 === 0 ? 3 : 2,
+      children: [error?.message && _jsx(Notice, {
+        noticeText: error.message,
+        isError: true
+      }), createFilter('beforeControls'), _jsx(Grid, {
+        columns: columns,
         gutter: 32,
         children: fields.map(setting => {
           const Control = getControlComponent(setting); // eslint-disable-line @wordpress/no-unused-vars-before-return, no-unused-vars
-
-          return _jsx(Control, { ...getControlProps(setting)
-          }, setting.key);
-        })
-      }), _jsx("div", {
-        className: "newspack-buttons-card",
-        style: {
-          margin: '32px 0 0'
-        },
-        children: _jsx(Button, {
-          isPrimary: true,
-          disabled: disabled,
-          onClick: () => {
-            onUpdate();
-          },
-          children: __('Save settings', 'newspack')
+          return applyFilters(`newspack.settingsSection.${sectionKey}.control`, _jsx(Control, {
+            ...getControlProps(setting)
+          }, setting.key), {
+            sectionKey,
+            setting,
+            onChange
+          });
         })
       })]
     })
   });
 };
-
 export default SettingsSection;