newspack-components 2.0.1 → 2.1.0

package/dist/esm/action-card/index.js

@@ -8,13 +8,13 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
  * WordPress dependencies
  */
 import { Component } from '@wordpress/element';
-import { ExternalLink } from '@wordpress/components';
+import { ExternalLink, ToggleControl } from '@wordpress/components';
 import { Icon, check } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
 
-import { Button, Card, Handoff, Notice, ToggleControl, Waiting } from '../';
+import { Button, Card, Grid, Handoff, Notice, Waiting } from '../';
 import './style.scss';
 /**
  * External dependencies
@@ -53,10 +53,13 @@ class ActionCard extends Component {
       notification,
       notificationLevel,
       notificationHTML,
+      actionContent,
       actionText,
       secondaryActionText,
+      secondaryDestructive,
       image,
       imageLink,
+      indent,
       isSmall,
       isMedium,
       simple,
@@ -66,10 +69,11 @@ class ActionCard extends Component {
       titleLink,
       toggleChecked,
       toggleOnChange,
-      hasGreyHeader
+      hasGreyHeader,
+      isPending
     } = this.props;
     const hasChildren = notification || children;
-    const classes = classnames('newspack-action-card', simple && 'newspack-card--is-clickable', hasGreyHeader && 'newspack-card--has-grey-header', hasChildren && 'newspack-card--has-children', isSmall && 'is-small', isMedium && 'is-medium', className);
+    const classes = classnames('newspack-action-card', simple && 'newspack-card--is-clickable', hasGreyHeader && 'newspack-card--has-grey-header', hasChildren && 'newspack-card--has-children', indent && 'newspack-card--indent', isSmall && 'is-small', isMedium && 'is-medium', className);
     const titleProps = toggleOnChange && !titleLink && !disabled ? {
       onClick: () => toggleOnChange(!toggleChecked),
       tabIndex: '0'
@@ -98,31 +102,36 @@ class ActionCard extends Component {
         }), checkbox && !toggleOnChange && _jsx("div", {
           className: "newspack-action-card__region newspack-action-card__region-left",
           children: _jsx("span", {
-            className: classnames('newspack-checkbox-icon', 'is-primary', 'checked' === checkbox && 'newspack-checkbox-icon--checked'),
+            className: classnames('newspack-checkbox-icon', 'is-primary', 'checked' === checkbox && 'newspack-checkbox-icon--checked', isPending && 'newspack-checkbox-icon--pending'),
             children: 'checked' === checkbox && _jsx(Icon, {
               icon: check
             })
           })
-        }), _jsxs("div", {
+        }), _jsx("div", {
           className: "newspack-action-card__region newspack-action-card__region-center",
-          children: [_jsxs("h2", {
-            children: [_jsx("span", {
-              className: "newspack-action-card__title",
-              ...titleProps,
-              children: titleLink ? _jsx("a", {
-                href: titleLink,
-                children: title
-              }) : title
-            }), (badges === null || badges === void 0 ? void 0 : badges.length) && badges.map((badgeText, i) => _jsx("span", {
-              className: "newspack-action-card__badge",
-              children: badgeText
-            }, `badge-${i}`))]
-          }), _jsxs("p", {
-            children: [typeof description === 'string' && description, typeof description === 'function' && description()]
-          })]
-        }), (actionText || isDisplayingSecondaryAction) && _jsxs("div", {
+          children: _jsxs(Grid, {
+            columns: 1,
+            gutter: 8,
+            noMargin: true,
+            children: [_jsxs("h2", {
+              children: [_jsx("span", {
+                className: "newspack-action-card__title",
+                ...titleProps,
+                children: titleLink ? _jsx("a", {
+                  href: titleLink,
+                  children: title
+                }) : title
+              }), badges?.length && badges.map((badgeText, i) => _jsx("span", {
+                className: "newspack-action-card__badge",
+                children: badgeText
+              }, `badge-${i}`))]
+            }), description && _jsxs("p", {
+              children: [typeof description === 'string' && description, typeof description === 'function' && description()]
+            })]
+          })
+        }), (actionText || isDisplayingSecondaryAction || actionContent) && _jsxs("div", {
           className: "newspack-action-card__region newspack-action-card__region-right",
-          children: [actionText && (handoff ? _jsx(Handoff, {
+          children: [actionContent && actionContent, actionText && (handoff ? _jsx(Handoff, {
             plugin: handoff,
             editLink: editLink,
             compact: true,
@@ -147,6 +156,7 @@ class ActionCard extends Component {
             isLink: true,
             onClick: onSecondaryActionClick,
             className: "newspack-action-card__secondary_button",
+            isDestructive: secondaryDestructive,
             children: secondaryActionText
           })]
         })]

package/dist/esm/action-card/style.scss

@@ -3,7 +3,6 @@
  */
 
 @import '~@wordpress/base-styles/colors';
-@import '../../../shared/scss/colors';
 
 .newspack-card.newspack-action-card {
 	padding: 0;
@@ -34,7 +33,7 @@
 	}
 
 	&.newspack-card__is-primary {
-		box-shadow: inset 4px 0 0 $primary-500;
+		box-shadow: inset 4px 0 0 var( --wp-admin-theme-color );
 	}
 
 	&.newspack-card__is-secondary {
@@ -150,20 +149,49 @@
 
 	&.newspack-card--has-grey-header {
 		overflow: hidden;
+
 		&.newspack-card--has-children {
 			.newspack-action-card__region-top {
 				border-bottom: 1px solid $gray-300;
 			}
 		}
+
 		.newspack-action-card__region-top {
-			background-color: $gray-100;
+			background-color: rgba( black, 0.025 );
+		}
+
+		.newspack-action-card__region-center {
+			p {
+				color: darken( $gray-700, 0.75% );
+			}
+		}
+	}
+
+	// Indent
+
+	&.newspack-card--indent {
+		margin-left: 56px;
+		position: relative;
+
+		&::before {
+			border: 0 solid $gray-300;
+			border-left-width: 1px;
+			border-bottom-width: 1px;
+			border-radius: 0 0 0 2px;
+			bottom: 50%;
+			content: '';
+			display: block;
+			left: -28px;
+			position: absolute;
+			right: 100%;
+			top: -17px;
 		}
 	}
 
 	// Typography
 
 	h2,
-	p {
+	p:not( [class*='components-base-control'] ) {
 		margin: 0;
 		max-width: 100%;
 		width: 100%;
@@ -186,7 +214,7 @@
 			&:active,
 			&:focus,
 			&:hover {
-				color: $primary-500;
+				color: var( --wp-admin-theme-color );
 			}
 		}
 	}
@@ -270,6 +298,14 @@
 		align-items: flex-start;
 		flex: 1 1 auto;
 		flex-wrap: wrap;
+
+		.newspack-grid {
+			width: 100%;
+		}
+
+		p {
+			color: $gray-700;
+		}
 	}
 
 	.newspack-action-card__region-right {
@@ -289,6 +325,10 @@
 		> * {
 			text-align: inherit;
 		}
+
+		.newspack-action-card__secondary_button {
+			margin-top: 8px;
+		}
 	}
 
 	// Waiting
@@ -326,34 +366,19 @@
 		margin: 0;
 	}
 
-	// Buttons
-
-	.newspack-button {
-		&.newspack-action-card__secondary_button {
-			&.is-link {
-				color: $alert-red;
-
-				&:active,
-				&:focus,
-				&:hover {
-					color: darken( $alert-red, 20% );
-				}
-			}
-		}
-	}
-
 	// Badge
 
 	.newspack-action-card__badge {
-		border: 1px solid $gray-300;
-		border-radius: 12px;
+		background: $gray-100;
+		border-radius: 2px;
+		color: $gray-900;
 		display: block;
 		flex: 0 0 auto;
-		font-size: 12px;
+		font-size: 10px;
 		font-weight: bold;
-		line-height: 16px;
-		margin: 3px 8px 3px 0;
-		padding: 0 8px;
+		line-height: 1.4;
+		margin: 0 8px 0 0;
+		padding: 2px 8px;
 		text-transform: uppercase;
 
 		+ .newspack-action-card__badge {

package/dist/esm/autocomplete-tokenfield/style.scss

@@ -2,16 +2,16 @@
  * Autocomplete Token Field
  */
 
-@import '../../../shared/scss/colors';
 @import '~@wordpress/base-styles/colors';
 
 .newspack-autocomplete-tokenfield {
 	position: relative;
 
 	.components-spinner {
+		margin: 8px;
 		position: absolute;
-		right: 1rem;
-		top: 1rem;
+		right: 0;
+		top: calc( 1.4em + 8px );
 	}
 
 	/* Workaround for hard-coded help text in FormTokenField. */
@@ -38,6 +38,6 @@
 	}
 
 	.components-button:focus:not( :disabled ) {
-		box-shadow: inset 0 0 0 2px $primary-500;
+		box-shadow: inset 0 0 0 var( --wp-admin-border-width-focus ) var( --wp-admin-theme-color );
 	}
 }

package/dist/esm/autocomplete-with-suggestions/index.js

@@ -144,7 +144,7 @@ const AutocompleteWithSuggestions = _ref => {
     return posts.reduce((acc, post) => {
       acc.push({
         value: parseInt(post.id),
-        label: decodeEntities(post === null || post === void 0 ? void 0 : post.title.rendered) || __('(no title)', 'newspack')
+        label: decodeEntities(post?.title.rendered) || __('(no title)', 'newspack')
       });
       return acc;
     }, []);
@@ -197,6 +197,7 @@ const AutocompleteWithSuggestions = _ref => {
         children: [selectedMessage, 1 < selections.length && _x(' – ', 'separator character', 'newspack'), 1 < selections.length && _jsx(Button, {
           onClick: () => onChange([]),
           isLink: true,
+          isDestructive: true,
           children: __('Clear all', 'newspack')
         })]
       }), selections.map(selection => _jsx(Button, {
@@ -234,7 +235,7 @@ const AutocompleteWithSuggestions = _ref => {
   const renderSuggestion = suggestion => {
     if (multiSelect) {
       const selections = selectedPost ? [...selectedItems, selectedPost] : [...selectedItems];
-      const isSelected = !!selections.find(_selection => parseInt(_selection.value) === parseInt(suggestion.value));
+      const isSelected = !!selections.find(_selection => parseInt(_selection.value) === parseInt(suggestion.value) && _selection.label === suggestion.label);
       return _jsx(CheckboxControl, {
         checked: isSelected,
         onChange: () => handleOnChange([suggestion]),

package/dist/esm/autocomplete-with-suggestions/style.scss

@@ -2,7 +2,6 @@
 * Styles for AutocompleteWithSuggestions component.
 */
 
-@import '../../../shared/scss/colors';
 @import '~@wordpress/base-styles/colors';
 
 .newspack-autocomplete-with-suggestions {
@@ -18,8 +17,9 @@
 	}
 
 	.components-spinner {
+		margin: 8px;
 		right: 0;
-		top: 2em;
+		top: calc( 1.4em + 8px );
 	}
 
 	.components-select-control__input {
@@ -27,7 +27,7 @@
 	}
 
 	.components-input-control__backdrop {
-		border-color: $gray-900 !important;
+		border-color: $gray-700 !important;
 	}
 
 	.newspack-autocomplete-with-suggestions__label,
@@ -39,7 +39,7 @@
 
 	&__suggestions-spinner {
 		background: $gray-100;
-		border: 1px solid $gray-900;
+		border: 1px solid $gray-700;
 		border-radius: 2px;
 		cursor: progress;
 		margin: 16px 0;
@@ -49,6 +49,7 @@
 			display: block;
 			margin: 0 auto;
 			position: relative;
+			right: auto;
 			top: 0;
 		}
 	}
@@ -59,11 +60,11 @@
 
 	.components-form-token-field {
 		&__input-container {
-			border-color: $gray-900;
+			border-color: $gray-700;
 		}
 
 		&__suggestions-list {
-			border-top-color: $gray-900;
+			border-top-color: $gray-700;
 			margin: 4px -4px -2px;
 		}
 
@@ -74,32 +75,30 @@
 
 	p.newspack-autocomplete-with-suggestions__label {
 		font-size: inherit;
-		margin-bottom: 4px;
+		margin: 0 0 8px;
 	}
 
 	&__selected-items {
-		border-bottom: 1px solid $gray-300;
+		border-bottom: 1px solid $gray-700;
+		display: flex;
+		flex-wrap: wrap;
+		gap: 8px;
 		margin-bottom: 16px;
 		padding-bottom: 12px;
 
-		.newspack-autocomplete-with-suggestions__label {
-			font-weight: bold;
-
-			.components-button.is-link {
-				color: $alert-red;
-				font-weight: normal;
-			}
+		p.newspack-autocomplete-with-suggestions__label {
+			flex: 0 0 100%;
+			margin: 0;
 		}
 	}
 
 	&__selected-item-button.components-button.is-tertiary {
 		background-color: $gray-300;
 		border-radius: 2px;
-		color: #1e1e1e;
+		color: $gray-900;
 		font-size: 13px;
 		height: auto;
-		margin-bottom: 4px;
-		margin-right: 4px;
+		margin: 0;
 		padding-left: 8px;
 		padding-right: 8px;
 
@@ -117,7 +116,7 @@
 	&__search-suggestions,
 	&__search-suggestions-multiselect {
 		border-radius: 2px;
-		border: 1px solid $gray-900;
+		border: 1px solid $gray-700;
 		max-height: 178px;
 		overflow-x: visible;
 		overflow-y: auto;
@@ -151,7 +150,7 @@
 
 	&__search-suggestions {
 		border-radius: 2px;
-		border: 1px solid $gray-900;
+		border: 1px solid $gray-700;
 		padding: 0;
 
 		.components-button {

package/dist/esm/button/index.js

@@ -13,11 +13,6 @@ import { useState } from '@wordpress/element';
 
 import Router from '../proxied-imports/router';
 import './style.scss';
-/**
- * External dependencies
- */
-
-import classnames from 'classnames';
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 const {
   useHistory
@@ -25,15 +20,12 @@ const {
 
 const Button = _ref => {
   let {
-    className,
-    isQuaternary,
     href,
     onClick,
     ...otherProps
   } = _ref;
   const history = useHistory();
-  const [isAwaitingOnClick, setIsAwaitingOnClick] = useState(false);
-  const classes = classnames('newspack-button', isQuaternary && 'is-quaternary', className); // If both onClick and href are present, await the onClick action an then redirect.
+  const [isAwaitingOnClick, setIsAwaitingOnClick] = useState(false); // If both onClick and href are present, await the onClick action an then redirect.
 
   if (href && onClick) {
     otherProps.onClick = async () => {
@@ -51,9 +43,7 @@ const Button = _ref => {
     otherProps.disabled = true;
   }
 
-  return _jsx(BaseComponent, {
-    className: classes,
-    ...otherProps
+  return _jsx(BaseComponent, { ...otherProps
   });
 };