newspack-components 2.0.1 → 2.1.0

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

@@ -9,6 +9,8 @@ exports.default = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _apiFetch = _interopRequireDefault(require("@wordpress/api-fetch"));
 
 var _element = require("@wordpress/element");
@@ -21,6 +23,10 @@ var _SettingsSection = _interopRequireDefault(require("./SettingsSection"));
 
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 
+/**
+ * External dependencies
+ */
+
 /**
  * WordPress dependencies.
  */
@@ -31,18 +37,24 @@ class PluginSettings extends _element.Component {
     super(...arguments);
     (0, _defineProperty2.default)(this, "fetchSettings", () => {
       const {
-        pluginSlug
+        afterFetch,
+        pluginSlug,
+        isWizard
       } = this.props;
       this.setState({
         inFlight: true
       });
       (0, _apiFetch.default)({
-        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
@@ -54,12 +66,10 @@ class PluginSettings extends _element.Component {
       });
     });
     (0, _defineProperty2.default)(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;
-      }, {})) || {};
+      }, {}) || {};
     });
     (0, _defineProperty2.default)(this, "handleSettingChange", sectionKey => (key, value) => {
       const sectionSettings = [...this.state.settings[sectionKey]];
@@ -76,13 +86,15 @@ class PluginSettings extends _element.Component {
     });
     (0, _defineProperty2.default)(this, "handleSectionUpdate", sectionKey => data => {
       const {
-        pluginSlug
+        afterUpdate,
+        pluginSlug,
+        isWizard
       } = this.props;
       this.setState({
         inFlight: true
       });
       (0, _apiFetch.default)({
-        path: `/${pluginSlug}/v1/settings`,
+        path: isWizard ? `/newspack/v1/wizard/${pluginSlug}/settings` : `/${pluginSlug}/v1/settings`,
         method: 'POST',
         data: {
           section: sectionKey,
@@ -93,6 +105,10 @@ class PluginSettings extends _element.Component {
           settings,
           error: null
         });
+
+        if ('function' === typeof afterUpdate) {
+          afterUpdate(settings);
+        }
       }).catch(error => {
         this.setState({
           error
@@ -104,27 +120,19 @@ class PluginSettings extends _element.Component {
       });
     });
     (0, _defineProperty2.default)(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');
     });
     (0, _defineProperty2.default)(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;
     });
     (0, _defineProperty2.default)(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;
     });
     (0, _defineProperty2.default)(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;
@@ -133,9 +141,7 @@ class PluginSettings extends _element.Component {
       return activation.value;
     });
     (0, _defineProperty2.default)(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,
@@ -154,7 +160,9 @@ class PluginSettings extends _element.Component {
   render() {
     const {
       title,
-      description
+      description,
+      hasGreyHeader,
+      children
     } = this.props;
     const {
       settings,
@@ -162,21 +170,28 @@ class PluginSettings extends _element.Component {
       error
     } = this.state;
     return (0, _jsxRuntime.jsxs)(_element.Fragment, {
-      children: [(0, _jsxRuntime.jsx)(_.SectionHeader, {
+      children: [title && (0, _jsxRuntime.jsx)(_.SectionHeader, {
         title: title,
         description: description
       }), error && (0, _jsxRuntime.jsx)(_.Notice, {
         isError: true,
         noticeText: error.message
-      }), Object.keys(settings).map(sectionKey => (0, _jsxRuntime.jsx)(_SettingsSection.default, {
-        disabled: inFlight,
-        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))]
+      }), (0, _jsxRuntime.jsxs)("div", {
+        className: (0, _classnames.default)('newspack-plugin-settings', {
+          'newspack-wizard-section__is-loading': inFlight && !Object.keys(settings).length
+        }),
+        children: [Object.keys(settings).map(sectionKey => (0, _jsxRuntime.jsx)(_SettingsSection.default, {
+          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),
+          hasGreyHeader: hasGreyHeader
+        }, sectionKey)), children]
+      })]
     });
   }
 

package/dist/cjs/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/cjs/plugin-toggle/index.js

@@ -80,6 +80,14 @@ class PluginToggle extends _element.Component {
               }
             };
           }, () => shouldRefreshAfterUpdate && location.reload());
+        }).catch(e => {
+          this.setState({
+            pluginInfo: { ...pluginInfo,
+              [plugin]: { ...pluginInfo[plugin],
+                error: e.message || __('There was an error managing this plugin.', 'newspack')
+              }
+            }
+          });
         });
       });
     });
@@ -142,6 +150,15 @@ class PluginToggle extends _element.Component {
         return actionText ? actionText : __('Configure', 'newspack');
       }
     });
+    (0, _defineProperty2.default)(this, "errorForPlugin", plugin => {
+      const {
+        slug
+      } = plugin;
+      const {
+        pluginInfo
+      } = this.state;
+      return pluginInfo[slug]?.error || null;
+    });
     (0, _defineProperty2.default)(this, "isPluginInstalledAndActive", plugin => {
       const {
         status
@@ -170,6 +187,7 @@ class PluginToggle extends _element.Component {
       } = plugin;
       const pluginStatus = this.isPluginInstalledAndActive(plugin);
       const handoff = !href && pluginStatus && editPath ? slug : null;
+      const error = this.errorForPlugin(plugin);
       return (0, _jsxRuntime.jsx)(_.ActionCard, {
         className: this.classNameForPlugin(plugin),
         title: name,
@@ -179,7 +197,10 @@ class PluginToggle extends _element.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);
     });
   }

package/dist/cjs/popover/style.scss

@@ -8,7 +8,7 @@
 .newspack-popover {
 	.components-popover__content {
 		border: 1px solid $gray-300;
-		border-radius: 3px;
+		border-radius: 2px;
 		box-shadow: 0 4px 8px rgba( black, 0.08 );
 		min-width: 238px;
 
@@ -31,7 +31,7 @@
 			}
 
 			&.is-link {
-				border-radius: 3px;
+				border-radius: 2px;
 				padding: 6px 8px;
 				text-decoration: none;
 

package/dist/cjs/radio-control/style.scss

@@ -76,8 +76,7 @@
 	// Multiple Controls
 
 	+ .newspack-select-control,
-	+ .newspack-text-control,
-	+ .newspack-textarea-control {
+	+ .newspack-text-control {
 		margin-bottom: 32px;
 		margin-top: -16px;
 	}

package/dist/cjs/section-header/index.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _ = require("..");
+
 require("./style.scss");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -26,23 +28,34 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 const SectionHeader = _ref => {
   let {
+    centered,
     className,
     description,
+    heading,
+    isWhite,
     noMargin,
     title
   } = _ref;
-  const classes = (0, _classnames.default)('newspack-section-header', noMargin && 'newspack-section-header--no-margin', className);
-  return (0, _jsxRuntime.jsxs)("div", {
+  const classes = (0, _classnames.default)('newspack-section-header', centered && 'newspack-section-header--is-centered', isWhite && 'newspack-section-header--is-white', noMargin && 'newspack-section-header--no-margin', className);
+  const HeadingTag = `h${heading}`;
+  return (0, _jsxRuntime.jsxs)(_.Grid, {
+    columns: 1,
+    gutter: 8,
     className: classes,
-    children: [(0, _jsxRuntime.jsx)("h2", {
+    children: [typeof title === 'string' && (0, _jsxRuntime.jsx)(HeadingTag, {
       children: title
-    }), typeof description === 'string' && (0, _jsxRuntime.jsx)("span", {
+    }), typeof title === 'function' && (0, _jsxRuntime.jsx)(HeadingTag, {
+      children: title()
+    }), typeof description === 'string' && (0, _jsxRuntime.jsx)("p", {
       children: description
-    }), typeof description === 'function' && (0, _jsxRuntime.jsx)("span", {
+    }), typeof description === 'function' && (0, _jsxRuntime.jsx)("p", {
       children: description()
     })]
   });
 };
 
+SectionHeader.defaultProps = {
+  heading: 2
+};
 var _default = SectionHeader;
 exports.default = _default;

package/dist/cjs/section-header/style.scss

@@ -2,14 +2,39 @@
  * Section Header
  */
 
+@import '~@wordpress/base-styles/colors';
+
 .newspack-section-header {
 	margin: 64px 0 32px;
 
 	&--no-margin,
-	h2 {
+	h1,
+	h2,
+	h3,
+	h4,
+	h5,
+	h6 {
 		margin: 0 !important;
 	}
 
+	&--is-centered {
+		text-align: center;
+	}
+
+	&:not( #{&}--no-margin ) + *:not( #{&} ) {
+		margin-top: -16px !important;
+	}
+
+	&#{&}--is-white {
+		> * {
+			color: white;
+		}
+	}
+
+	p {
+		color: $gray-700;
+	}
+
 	.newspack-wizard__content &:first-child {
 		margin-top: 32px;
 	}

package/dist/cjs/select-control/ButtonGroupControl.js

@@ -31,20 +31,21 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
 const ButtonGroupControl = _ref => {
   let {
     buttonOptions,
-    onChange,
-    value,
+    className,
+    hideLabelFromVision,
     label,
-    className
+    onChange,
+    value
   } = _ref;
 
   const id = _.hooks.useUniqueId('button-group');
 
   return (0, _jsxRuntime.jsx)(_components.BaseControl, {
     label: label,
+    hideLabelFromVision: hideLabelFromVision,
     id: id.current,
     className: (0, _classnames.default)(className, 'components-select-control'),
-    children: (0, _jsxRuntime.jsx)(_.ButtonGroup, {
-      noMargin: true,
+    children: (0, _jsxRuntime.jsx)(_components.ButtonGroup, {
       children: buttonOptions.map(option => {
         const isSelected = value === option.value;
 
@@ -57,9 +58,8 @@ const ButtonGroupControl = _ref => {
           });
         }
 
-        return (0, _jsxRuntime.jsx)(_.Button, {
-          isSecondary: !isSelected,
-          isPressed: isSelected,
+        return (0, _jsxRuntime.jsx)(_components.Button, {
+          variant: isSelected ? 'primary' : null,
           onClick: () => onChange(option.value),
           children: (0, _jsxRuntime.jsx)(Label, {})
         }, option.value);

package/dist/cjs/select-control/GroupedSelectControl.js

@@ -50,41 +50,44 @@ function GroupedSelectControl(_ref) {
 
   const id = _.hooks.useUniqueId('group-select');
 
-  return (0, _jsxRuntime.jsxs)(_components.BaseControl, {
+  return (0, _jsxRuntime.jsx)(_components.BaseControl, {
     label: label,
     hideLabelFromVision: hideLabelFromVision,
     id: id,
     help: help,
     className: (0, _classnames.default)(className, 'components-select-control'),
-    children: [(0, _jsxRuntime.jsxs)("select", {
-      id: id,
-      className: "components-select-control__input",
-      onChange: onChangeValue,
-      "aria-describedby": !!help ? `${id}__help` : undefined,
-      ...props,
-      children: [(0, _jsxRuntime.jsx)("option", {
-        value: "",
-        children: __('-- Select --', 'newspack')
-      }), optgroups.map((_ref2, optgroupIndex) => {
-        let {
-          label: optgroupLabel,
-          options
-        } = _ref2;
-        return (0, _jsxRuntime.jsx)("optgroup", {
-          label: optgroupLabel,
-          children: options.map((option, optionIndex) => (0, _jsxRuntime.jsx)("option", {
-            value: option.value,
-            disabled: option.disabled,
-            children: option.label
-          }, `${option.label}-${option.value}-${optionIndex}`))
-        }, optgroupIndex);
+    children: (0, _jsxRuntime.jsxs)("div", {
+      className: "relative",
+      children: [(0, _jsxRuntime.jsxs)("select", {
+        id: id,
+        className: "components-select-control__input",
+        onChange: onChangeValue,
+        "aria-describedby": !!help ? `${id}__help` : undefined,
+        ...props,
+        children: [(0, _jsxRuntime.jsx)("option", {
+          value: "",
+          children: __('-- Select --', 'newspack')
+        }), optgroups.map((_ref2, optgroupIndex) => {
+          let {
+            label: optgroupLabel,
+            options
+          } = _ref2;
+          return (0, _jsxRuntime.jsx)("optgroup", {
+            label: optgroupLabel,
+            children: options.map((option, optionIndex) => (0, _jsxRuntime.jsx)("option", {
+              value: option.value,
+              disabled: option.disabled,
+              children: option.label
+            }, `${option.label}-${option.value}-${optionIndex}`))
+          }, optgroupIndex);
+        })]
+      }), (0, _jsxRuntime.jsx)("div", {
+        className: "components-select-control__arrow-wrapper",
+        children: (0, _jsxRuntime.jsx)(_icons.Icon, {
+          icon: _icons.chevronDown,
+          size: 18
+        })
       })]
-    }), (0, _jsxRuntime.jsx)("div", {
-      className: "components-select-control__arrow-wrapper",
-      children: (0, _jsxRuntime.jsx)(_icons.Icon, {
-        icon: _icons.chevronDown,
-        size: 18
-      })
-    })]
+    })
   });
 }

package/dist/cjs/select-control/index.js

@@ -45,10 +45,9 @@ class SelectControl extends _element.Component {
       className,
       optgroups,
       buttonOptions,
-      isSmall,
       ...otherProps
     } = this.props;
-    const classes = (0, _classnames.default)('newspack-select-control', optgroups && 'newspack-grouped-select-control', buttonOptions && 'newspack-buttons-select-control', isSmall && 'newspack-select-control--small', className);
+    const classes = (0, _classnames.default)('newspack-select-control', optgroups && 'newspack-grouped-select-control', buttonOptions && 'newspack-buttons-select-control', className);
     return (0, _jsxRuntime.jsx)("div", {
       className: classes,
       children: optgroups ? (0, _jsxRuntime.jsx)(_GroupedSelectControl.default, {

package/dist/cjs/select-control/style.scss

@@ -2,92 +2,39 @@
  * Select Control
  */
 
-@import '../../../shared/scss/colors';
 @import '~@wordpress/base-styles/colors';
 
-.newspack-select-control {
-	color: $gray-700;
-	font-size: 14px;
-	line-height: 24px;
-	margin: 32px 0;
+.components-select-control {
+	&__input {
+		max-width: 100% !important;
 
-	.components-base-control__field {
-		margin: 0;
-	}
-	.components-input-control__label,
-	.components-base-control__label {
-		color: $gray-900 !important;
-		display: flex;
-		font-size: 14px;
-		font-weight: bold;
-		line-height: 24px;
-		padding-bottom: 0 !important;
-		margin-bottom: 0;
-	}
-
-	.components-select-control {
-		border-radius: 3px;
-		font-size: 14px;
-		line-height: 24px;
-
-		div.components-input-control__backdrop {
-			border-color: $gray-300;
-		}
-
-		select.components-select-control__input {
-			color: $gray-700;
-			border-color: $gray-300;
-			font-size: 16px;
-			height: 48px;
-			line-height: 24px;
-			max-width: 100%;
-			min-height: 48px;
+		&[multiple] {
+			height: auto !important;
+			min-height: 70px !important;
+			padding: 0 !important;
 
-			@media screen and ( min-width: 600px ) {
-				font-size: 16px;
+			+ .components-input-control__suffix {
+				display: none;
 			}
 
-			@media screen and ( min-width: 768px ) {
-				font-size: 14px;
-			}
+			option {
+				min-height: 1.4em;
+				padding: 8px;
 
-			&:focus ~ div.components-input-control__backdrop {
-				border-color: $primary-500;
-				box-shadow: inset 0 0 0 2px $primary-500;
+				&:checked {
+					background: var( --wp-admin-theme-color );
+					color: white;
+				}
 			}
 		}
 	}
 
-	// Help
-
-	.components-base-control__help {
-		margin-top: 0;
-		font-style: italic;
-	}
-
-	// Small
-
-	&--small {
-		.components-select-control select.components-select-control__input {
-			height: 36px;
-			min-height: 36px;
-		}
-	}
-
-	// Multiple Select Controls
-
-	& + & {
-		margin-bottom: 32px;
-		margin-top: -16px;
+	.components-base-control__field {
+		width: 100%;
 	}
 
-	// Multiple Controls
-
-	+ .newspack-category-autocomplete,
-	+ .newspack-text-control,
-	+ .newspack-textarea-control {
-		margin-bottom: 32px;
-		margin-top: -16px;
+	.components-input-control__label {
+		line-height: inherit;
 	}
 }
 
@@ -100,29 +47,38 @@
 		&__input {
 			appearance: none;
 			background: transparent;
-			border-radius: 3px;
+			border: 1px solid $gray-700;
+			border-radius: 2px;
 			box-shadow: none !important;
 			box-sizing: border-box;
 			display: block;
+			font-size: inherit;
 			margin: 0;
+			max-width: 100%;
 			outline: none;
 			padding: 0 24px 0 7px;
 			width: 100%;
 
+			&:hover {
+				color: inherit;
+			}
+
 			&:focus {
-				border-color: $primary-500 !important;
-				box-shadow: inset 0 0 0 2px $primary-500 !important;
+				border-color: var( --wp-admin-theme-color-darker-10 ) !important;
+				box-shadow: inset 0 0 0 1px var( --wp-admin-theme-color-darker-10 ) !important;
+				color: inherit;
 			}
 		}
 
 		&__arrow-wrapper {
 			align-items: center;
-			bottom: 0;
 			display: flex;
-			height: 48px;
+			height: 24px;
 			justify-content: center;
+			margin-top: -12px;
 			position: absolute;
 			right: 1px;
+			top: 50%;
 			width: 24px;
 		}
 	}
@@ -131,19 +87,22 @@
 // Buttons
 
 .newspack-buttons-select-control {
-	&.icon-only {
-		.newspack-button-group {
-			display: flex;
-		}
+	.components-base-control__label {
+		display: inline-flex;
+		margin-bottom: 8px;
+	}
 
-		.newspack-button {
+	.components-button-group {
+		display: flex;
+	}
+
+	&.icon-only {
+		.components-button {
 			align-items: center;
-			display: flex;
-			font-size: 17px;
-			height: 48px;
+			height: 36px;
 			justify-content: center;
 			padding: 0 !important;
-			width: 48px;
+			width: 36px;
 		}
 	}
 }