newspack-components 2.0.1 → 2.1.0

package/dist/cjs/modal/style.scss

@@ -3,166 +3,54 @@
  */
 
 @import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
 
 .newspack-modal {
-	background: white;
-	border: 0;
-	color: $gray-700;
-	font-size: 14px;
-	line-height: 24px;
-	margin: auto;
-	max-height: 100%;
-	width: 100%;
-
-	@media screen and ( min-width: 600px ) {
-		border-radius: 3px;
-		max-width: 80%;
-		max-width: calc( 100% - 64px );
-	}
+	// 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};
 
 	@media screen and ( min-width: 744px ) {
 		max-width: 680px;
+		width: 680px;
 
 		&--wide {
 			max-width: 1168px;
+			width: 1168px;
 		}
 	}
 
 	&--narrow {
 		max-width: 360px;
+		width: 360px;
 	}
 
-	// Header
-
-	.components-modal__header {
-		align-items: flex-start;
-		background: white;
-		border: 0;
-		height: auto;
-		justify-content: flex-end;
-		margin: 0 -32px 0;
-		padding: 32px 32px 0;
-		position: relative;
-
-		.components-modal__header-heading-container {
-			display: block;
-			margin-right: 16px;
-		}
-
-		.components-button.has-icon {
-			flex: 0 0 36px;
-			left: 0;
-			margin: -2px 0;
-
-			&:hover,
-			&[aria-expended='true'] {
-				color: $primary-500;
-			}
-
-			&:focus:not( :disabled ) {
-				box-shadow: 0 0 0 2px $primary-500;
-			}
-
-			svg {
-				width: 24px;
-				height: 24px;
-
-				+ span {
-					display: none;
-				}
-			}
-		}
-
-		.components-modal__header-heading {
-			color: $gray-900;
-			font-size: 21px;
-			font-weight: bold;
-			line-height: 32px;
-		}
-	}
-
-	// Content
-
-	.components-modal__content {
-		padding: 0 32px;
-		margin: 0;
-
-		&::before {
-			display: none;
-		}
-	}
-
-	// Typography
-
-	h2,
-	p {
-		line-height: 24px;
-		margin: 32px 0;
-		padding: 0;
-	}
-
-	h2 {
-		color: $gray-900;
-		font-size: 17px;
-		font-weight: bold;
-	}
-
-	p {
-		font-size: 14px;
-
-		&.is-dark {
-			color: $gray-900;
-		}
-	}
-
-	// Thematic Break
-
-	hr {
-		background: $gray-300;
-		border: 0;
-		height: 1px;
-		margin: 48px -48px;
-
-		@media screen and ( min-width: 744px ) {
-			margin: 64px -64px;
-		}
+	@media screen and ( min-width: 960px ) {
+		max-height: calc( 100% - 128px );
 	}
 
 	// Links
-
 	a {
-		color: $primary-500;
+		color: var( --wp-admin-theme-color );
 
 		&:active,
 		&:focus,
 		&:hover {
-			color: $primary-600;
-			text-decoration: none;
+			color: var( --wp-admin-theme-color-darker-10 );
 		}
 
 		&:focus {
-			box-shadow: none;
-			outline: 2px solid $primary-500;
-			outline-offset: 2px;
+			box-shadow: 0 0 0 var( --wp-admin-border-width-focus ) var( --wp-admin-theme-color );
+			outline: 3px solid transparent;
 		}
 	}
-}
-
-// Overlay
 
-.newspack-modal__overlay {
-	background: rgba( black, 0.7 );
-}
-
-// Small Screens
-
-@media ( max-width: 599px ) {
-	.newspack-modal {
-		top: auto;
-
-		.components-modal__content {
-			height: auto;
+	.components-modal__content {
+		> *:last-child {
+			margin-bottom: 8px;
 		}
 	}
 }

package/dist/cjs/newspack-icon/index.js

@@ -39,9 +39,11 @@ class NewspackIcon extends _element.Component {
   render() {
     const {
       className,
-      size
+      simple,
+      size,
+      white
     } = this.props;
-    const classes = (0, _classnames.default)('newspack-icon', className);
+    const classes = (0, _classnames.default)('newspack-icon', simple && 'newspack-icon--simple', white && 'newspack-icon--white', className);
     return (0, _jsxRuntime.jsx)(_components.SVG, {
       xmlns: "http://www.w3.org/2000/svg",
       height: size,

package/dist/cjs/newspack-icon/style.scss

@@ -8,4 +8,19 @@
 	background: $primary-500;
 	fill: white;
 	padding: 12px;
+
+	&--white {
+		background: white;
+		fill: $primary-500;
+	}
+
+	&--simple {
+		background: none;
+		fill: $primary-500;
+		padding: 0;
+	}
+
+	&#{&}--simple#{&}--white {
+		fill: white;
+	}
 }

package/dist/cjs/notice/index.js

@@ -11,6 +11,8 @@ var _element = require("@wordpress/element");
 
 var _icons = require("@wordpress/icons");
 
+var _i18n = require("@wordpress/i18n");
+
 require("./style.scss");
 
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -24,14 +26,8 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
 /**
  * WordPress dependencies.
  */
+const __ = _i18n.__;
 
-/**
- * Internal dependencies.
- */
-
-/**
- * External dependencies.
- */
 class Notice extends _element.Component {
   /**
    * Render
@@ -39,6 +35,7 @@ class Notice extends _element.Component {
   render() {
     const {
       className,
+      debugMode,
       isError,
       isHelp,
       isSuccess,
@@ -48,13 +45,15 @@ class Notice extends _element.Component {
       style = {},
       children = null
     } = this.props;
-    const classes = (0, _classnames.default)('newspack-notice', className, isError && 'newspack-notice__is-error', isHelp && 'newspack-notice__is-help', isSuccess && 'newspack-notice__is-success', isWarning && 'newspack-notice__is-warning');
+    const classes = (0, _classnames.default)('newspack-notice', className, debugMode && 'newspack-notice__is-debug', isError && 'newspack-notice__is-error', isHelp && 'newspack-notice__is-help', isSuccess && 'newspack-notice__is-success', isWarning && 'newspack-notice__is-warning');
     let noticeIcon;
 
     if (isHelp) {
       noticeIcon = _icons.help;
     } else if (isSuccess) {
       noticeIcon = _icons.check;
+    } else if (debugMode) {
+      noticeIcon = _icons.bug;
     } else {
       noticeIcon = _icons.info;
     }
@@ -68,7 +67,7 @@ class Notice extends _element.Component {
         className: "newspack-notice__content",
         children: [rawHTML ? (0, _jsxRuntime.jsx)(_element.RawHTML, {
           children: noticeText
-        }) : noticeText, children || null]
+        }) : noticeText, debugMode && __('Debug Mode', 'newspack'), children || null]
       })]
     });
   }

package/dist/cjs/notice/style.scss

@@ -6,14 +6,11 @@
 @import '../../../shared/scss/colors';
 
 .newspack-notice {
-	align-items: flex-start;
+	align-items: center;
 	background: $gray-100;
-	border-radius: 3px;
 	color: $gray-900;
 	display: flex;
-	font-size: 14px;
 	justify-content: flex-start;
-	line-height: 24px;
 	margin: 32px 0;
 	padding: 6px 8px;
 
@@ -24,8 +21,25 @@
 		margin-right: 4px;
 	}
 
+	&__is-debug {
+		background: $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: lighten( $alert-red, 51% );
 
 		> svg {
 			fill: $alert-red;
@@ -34,7 +48,7 @@
 	}
 
 	&__is-help {
-		background: $primary-000;
+		background: $primary-050;
 
 		> svg {
 			fill: $primary-500;
@@ -42,7 +56,7 @@
 	}
 
 	&__is-success {
-		background: lighten( $alert-green, 47% );
+		background: lighten( $alert-green, 42% );
 
 		> svg {
 			fill: $alert-green;
@@ -50,7 +64,7 @@
 	}
 
 	&__is-warning {
-		background: lighten( $alert-yellow, 36% );
+		background: lighten( $alert-yellow, 30% );
 
 		> svg {
 			fill: $alert-yellow;
@@ -58,9 +72,23 @@
 		}
 	}
 
-	&__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/cjs/plugin-installer/index.js

@@ -116,6 +116,7 @@ class PluginInstaller extends _element.Component {
         const {
           pluginInfo
         } = this.state;
+        this.props.onInstalled(slug);
         this.updatePluginInfo({ ...pluginInfo,
           [slug]: { ...response,
             installationStatus: PLUGIN_STATE_ACTIVE
@@ -215,7 +216,7 @@ class PluginInstaller extends _element.Component {
       const plugin = pluginInfo[slug];
       return plugin.Status !== 'active' && plugin.installationStatus === PLUGIN_STATE_NONE;
     });
-    return (0, _jsxRuntime.jsxs)("div", {
+    return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [(!pluginInfo || !Object.keys(pluginInfo).length) && (0, _jsxRuntime.jsxs)("div", {
         className: "newspack-plugin-installer_is-waiting",
         children: [(0, _jsxRuntime.jsx)(_.Waiting, {
@@ -291,7 +292,8 @@ class PluginInstaller extends _element.Component {
 }
 
 PluginInstaller.defaultProps = {
-  onStatus: () => {}
+  onStatus: () => {},
+  onInstalled: () => {}
 };
 var _default = PluginInstaller;
 exports.default = _default;

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

@@ -7,10 +7,16 @@ exports.default = void 0;
 
 var _element = require("@wordpress/element");
 
+var _hooks = require("@wordpress/hooks");
+
 var _i18n = require("@wordpress/i18n");
 
+var _components = require("@wordpress/components");
+
 var _ = require("../");
 
+require("./style.scss");
+
 var _jsxRuntime = require("@emotion/react/jsx-runtime");
 
 /**
@@ -22,15 +28,19 @@ var _jsxRuntime = require("@emotion/react/jsx-runtime");
  */
 const __ = _i18n.__;
 
+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;
+      return _components.CheckboxControl;
 
     default:
       return _.TextControl;
@@ -49,13 +59,22 @@ const getControlType = setting => {
     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 {
+    error,
+    sectionKey,
     active,
     title,
     description,
@@ -63,61 +82,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);
+    }
+  });
+
+  const createFilter = function (name) {
+    let defaultComponent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    return (0, _hooks.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 (0, _jsxRuntime.jsx)(_.ActionCard, {
     isMedium: true,
     disabled: disabled,
     title: title,
     description: description,
     toggleChecked: active,
-    hasGreyHeader: active !== null,
-    toggleOnChange: value => onUpdate({
+    hasGreyHeader: active || null === active,
+    toggleOnChange: active !== null ? value => onUpdate({
       active: value
-    }),
+    }) : null,
+    actionContent: (active || null === active) && createFilter('buttons', (0, _jsxRuntime.jsx)(_.Button, {
+      variant: "primary",
+      disabled: disabled,
+      onClick: () => {
+        onUpdate();
+      },
+      children: __('Save Settings', 'newspack')
+    })),
     children: (active || active === null) && (0, _jsxRuntime.jsxs)(_element.Fragment, {
-      children: [(0, _jsxRuntime.jsx)(_.Grid, {
-        columns: fields.length % 3 === 0 ? 3 : 2,
+      children: [error?.message && (0, _jsxRuntime.jsx)(_.Notice, {
+        noticeText: error.message,
+        isError: true
+      }), createFilter('beforeControls'), (0, _jsxRuntime.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 (0, _jsxRuntime.jsx)(Control, { ...getControlProps(setting)
-          }, setting.key);
-        })
-      }), (0, _jsxRuntime.jsx)("div", {
-        className: "newspack-buttons-card",
-        style: {
-          margin: '32px 0 0'
-        },
-        children: (0, _jsxRuntime.jsx)(_.Button, {
-          isPrimary: true,
-          disabled: disabled,
-          onClick: () => {
-            onUpdate();
-          },
-          children: __('Save settings', 'newspack')
+          return (0, _hooks.applyFilters)(`newspack.settingsSection.${sectionKey}.control`, (0, _jsxRuntime.jsx)(Control, { ...getControlProps(setting)
+          }, setting.key), {
+            sectionKey,
+            setting,
+            onChange
+          });
         })
       })]
     })