newspack-components 2.0.3 → 2.2.0

package/src/action-card/style.scss

@@ -2,12 +2,12 @@
  * Action Card
  */
 
-@import '~@wordpress/base-styles/colors';
-@import '../../../shared/scss/colors';
+@use 'sass:color';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-card.newspack-action-card {
 	padding: 0;
-	border-color: $gray-300;
+	border-color: wp-colors.$gray-300;
 
 	// Clickable
 
@@ -26,7 +26,7 @@
 	&.newspack-card__is-secondary,
 	&.newspack-card__is-supported,
 	&.newspack-card__is-unsupported {
-		box-shadow: inset 4px 0 0 $gray-100;
+		box-shadow: inset 4px 0 0 wp-colors.$gray-100;
 
 		.newspack-action-card__region-top {
 			padding-left: 28px;
@@ -34,19 +34,19 @@
 	}
 
 	&.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 {
-		box-shadow: inset 4px 0 0 $alert-yellow;
+		box-shadow: inset 4px 0 0 wp-colors.$alert-yellow;
 	}
 
 	&.newspack-card__is-supported {
-		box-shadow: inset 4px 0 0 $alert-green;
+		box-shadow: inset 4px 0 0 wp-colors.$alert-green;
 	}
 
 	&.newspack-card__is-unsupported {
-		box-shadow: inset 4px 0 0 $alert-red;
+		box-shadow: inset 4px 0 0 wp-colors.$alert-red;
 	}
 
 	// Small
@@ -84,18 +84,18 @@
 		}
 
 		&.mv0 {
-			border-left-color: $gray-300;
+			border-left-color: wp-colors.$gray-300;
 			border-radius: 0;
-			border-right-color: $gray-300;
+			border-right-color: wp-colors.$gray-300;
 
 			&:first-of-type {
-				border-top-color: $gray-300;
+				border-top-color: wp-colors.$gray-300;
 				border-top-left-radius: 3px;
 				border-top-right-radius: 3px;
 			}
 
 			&:last-of-type {
-				border-bottom-color: $gray-300;
+				border-bottom-color: wp-colors.$gray-300;
 				border-bottom-left-radius: 3px;
 				border-bottom-right-radius: 3px;
 			}
@@ -142,7 +142,25 @@
 		}
 
 		.newspack-action-card__region-children {
-			padding: 0 32px 32px 32px;
+			padding: 0 32px 32px;
+		}
+	}
+
+	// Nested children
+
+	&.newspack-card--has-children {
+		.newspack-action-card {
+			&:first-child {
+				margin-top: 32px;
+			}
+
+			+ .newspack-action-card {
+				margin-top: 16px !important;
+			}
+
+			&:last-child {
+				margin-bottom: 0;
+			}
 		}
 	}
 
@@ -150,20 +168,58 @@
 
 	&.newspack-card--has-grey-header {
 		overflow: hidden;
+
 		&.newspack-card--has-children {
 			.newspack-action-card__region-top {
-				border-bottom: 1px solid $gray-300;
+				border-bottom: 1px solid wp-colors.$gray-300;
+			}
+
+			.is-small > .newspack-action-card__region-top {
+				padding-bottom: 8px;
+				padding-top: 8px;
 			}
 		}
+
 		.newspack-action-card__region-top {
-			background-color: $gray-100;
+			background-color: rgba( black, 0.025 );
+		}
+
+		.newspack-action-card__region-center {
+			p {
+				color: color.adjust( wp-colors.$gray-700, $lightness: -0.75% );
+			}
+		}
+	}
+
+	&.newspack-card--has-white-header {
+		.newspack-action-card__region-top {
+			background-color: transparent;
+			border: none !important;
+		}
+	}
+
+	// Indent
+
+	&.newspack-card--indent {
+		margin-left: 56px;
+		position: relative;
+
+		&::before {
+			border: 0 solid wp-colors.$gray-300;
+			border-left-width: 1px;
+			border-bottom-width: 1px;
+			border-radius: 0 0 0 2px;
+			content: '';
+			display: block;
+			position: absolute;
+			inset: -17px 100% 50% -28px;
 		}
 	}
 
 	// Typography
 
 	h2,
-	p {
+	p:not( [class*='components-base-control'] ) {
 		margin: 0;
 		max-width: 100%;
 		width: 100%;
@@ -186,7 +242,7 @@
 			&:active,
 			&:focus,
 			&:hover {
-				color: $primary-500;
+				color: var( --wp-admin-theme-color );
 			}
 		}
 	}
@@ -230,7 +286,7 @@
 	}
 
 	.newspack-action-card__region-children {
-		padding: 0 24px 24px 24px;
+		padding: 0 24px 24px;
 
 		&__inner {
 			padding-top: 32px;
@@ -270,6 +326,14 @@
 		align-items: flex-start;
 		flex: 1 1 auto;
 		flex-wrap: wrap;
+
+		.newspack-grid {
+			width: 100%;
+		}
+
+		p {
+			color: wp-colors.$gray-700;
+		}
 	}
 
 	.newspack-action-card__region-right {
@@ -289,6 +353,10 @@
 		> * {
 			text-align: inherit;
 		}
+
+		.newspack-action-card__secondary_button {
+			margin-top: 8px;
+		}
 	}
 
 	// Waiting
@@ -307,6 +375,12 @@
 				margin-top: 0;
 			}
 		}
+
+		&.newspack-action-card__region-children {
+			.newspack-notice {
+				margin-top: 32px;
+			}
+		}
 	}
 
 	// Image
@@ -326,34 +400,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: wp-colors.$gray-100;
+		border-radius: 2px;
+		color: wp-colors.$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 {
@@ -367,6 +426,49 @@
 		font-style: italic;
 	}
 
+	// Expandable card children
+
+	&.is-expandable {
+		.newspack-action-card__title .components-button.is-link {
+			color: inherit;
+			font-size: inherit;
+			font-weight: inherit;
+			text-decoration: inherit;
+		}
+
+		.newspack-action-card__region-children {
+			border-top: 1px solid wp-colors.$gray-100;
+			padding-top: 24px;
+		}
+
+		&.is-medium .newspack-action-card__region-children {
+			padding-top: 32px;
+		}
+
+		&.has-checkbox {
+			.newspack-action-card__region-children {
+				padding-left: 72px;
+			}
+
+			&.is-small .newspack-action-card__region-children {
+				padding-left: 64px;
+			}
+
+			&.is-medium .newspack-action-card__region-children {
+				padding-left: 56px;
+			}
+		}
+	}
+
+	// Action content with multiple buttons
+	&.has-action-content .newspack-action-card__region-right {
+		flex-direction: row;
+
+		.components-button + .components-button {
+			margin-left: 8px;
+		}
+	}
+
 	// Multiple Cards
 
 	& + & {
@@ -376,6 +478,6 @@
 
 .newspack-card {
 	.newspack-card.newspack-action-card {
-		border: 1px solid $gray-200;
+		border: 1px solid wp-colors.$gray-200;
 	}
 }

package/src/autocomplete-tokenfield/index.js

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { debounce } from 'lodash';
+import debounce from 'lodash/debounce';
 
 /**
  * WordPress dependencies

package/src/autocomplete-tokenfield/style.scss

@@ -2,16 +2,16 @@
  * Autocomplete Token Field
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-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. */
@@ -27,7 +27,7 @@
 	}
 
 	.newspack-autocomplete-tokenfield__help {
-		color: $gray-700;
+		color: wp-colors.$gray-700;
 		font-size: inherit;
 		margin-top: 0;
 	}
@@ -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/src/autocomplete-with-suggestions/index.js

@@ -190,7 +190,7 @@ const AutocompleteWithSuggestions = ( {
 					{ selectedMessage }
 					{ 1 < selections.length && _x( ' – ', 'separator character', 'newspack' ) }
 					{ 1 < selections.length && (
-						<Button onClick={ () => onChange( [] ) } isLink>
+						<Button onClick={ () => onChange( [] ) } isLink isDestructive>
 							{ __( 'Clear all', 'newspack' ) }
 						</Button>
 					) }
@@ -241,7 +241,9 @@ const AutocompleteWithSuggestions = ( {
 		if ( multiSelect ) {
 			const selections = selectedPost ? [ ...selectedItems, selectedPost ] : [ ...selectedItems ];
 			const isSelected = !! selections.find(
-				_selection => parseInt( _selection.value ) === parseInt( suggestion.value )
+				_selection =>
+					parseInt( _selection.value ) === parseInt( suggestion.value ) &&
+					_selection.label === suggestion.label
 			);
 			return (
 				<CheckboxControl

package/src/autocomplete-with-suggestions/style.scss

@@ -2,8 +2,7 @@
 * Styles for AutocompleteWithSuggestions component.
 */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-autocomplete-with-suggestions {
 	width: 100%;
@@ -18,8 +17,9 @@
 	}
 
 	.components-spinner {
+		margin: 8px;
 		right: 0;
-		top: 2em;
+		top: calc( 1.4em + 8px );
 	}
 
 	.components-select-control__input {
@@ -27,19 +27,19 @@
 	}
 
 	.components-input-control__backdrop {
-		border-color: $gray-900 !important;
+		border-color: wp-colors.$gray-700 !important;
 	}
 
 	.newspack-autocomplete-with-suggestions__label,
 	.components-form-token-field__label,
 	.components-input-control__label,
 	.components-checkbox-control__label {
-		color: $gray-900 !important;
+		color: wp-colors.$gray-900 !important;
 	}
 
 	&__suggestions-spinner {
-		background: $gray-100;
-		border: 1px solid $gray-900;
+		background: wp-colors.$gray-100;
+		border: 1px solid wp-colors.$gray-700;
 		border-radius: 2px;
 		cursor: progress;
 		margin: 16px 0;
@@ -49,21 +49,23 @@
 			display: block;
 			margin: 0 auto;
 			position: relative;
+			right: auto;
 			top: 0;
 		}
 	}
 
 	.newspack-autocomplete-tokenfield__help {
 		font-size: inherit;
+		margin-bottom: 8px !important;
 	}
 
 	.components-form-token-field {
 		&__input-container {
-			border-color: $gray-900;
+			border-color: wp-colors.$gray-700;
 		}
 
 		&__suggestions-list {
-			border-top-color: $gray-900;
+			border-top-color: wp-colors.$gray-700;
 			margin: 4px -4px -2px;
 		}
 
@@ -74,32 +76,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 wp-colors.$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;
+		background-color: wp-colors.$gray-300;
 		border-radius: 2px;
-		color: #1e1e1e;
+		color: wp-colors.$gray-900;
 		font-size: 13px;
 		height: auto;
-		margin-bottom: 4px;
-		margin-right: 4px;
+		margin: 0;
 		padding-left: 8px;
 		padding-right: 8px;
 
@@ -117,7 +117,7 @@
 	&__search-suggestions,
 	&__search-suggestions-multiselect {
 		border-radius: 2px;
-		border: 1px solid $gray-900;
+		border: 1px solid wp-colors.$gray-700;
 		max-height: 178px;
 		overflow-x: visible;
 		overflow-y: auto;
@@ -129,14 +129,14 @@
 			margin: auto;
 
 			&.is-link {
-				color: $gray-900;
+				color: wp-colors.$gray-900;
 				padding: 8px;
 				text-decoration: none;
 				width: 100%;
 
 				&:active:not( :disabled ),
 				&:hover:not( :disabled ) {
-					background: $gray-900;
+					background: wp-colors.$gray-900;
 					background: var( --wp-admin-theme-color );
 					color: white;
 				}
@@ -151,7 +151,7 @@
 
 	&__search-suggestions {
 		border-radius: 2px;
-		border: 1px solid $gray-900;
+		border: 1px solid wp-colors.$gray-700;
 		padding: 0;
 
 		.components-button {
@@ -159,7 +159,7 @@
 
 			&:focus:not( :disabled ) {
 				border-radius: 0;
-				box-shadow: inset 0 0 0 1.5px $gray-900;
+				box-shadow: inset 0 0 0 1.5px wp-colors.$gray-900;
 				box-shadow: inset 0 0 0 var( --wp-admin-border-width-focus ) var( --wp-admin-theme-color );
 			}
 

package/src/button/index.js

@@ -14,19 +14,12 @@ import { useState } from '@wordpress/element';
 import Router from '../proxied-imports/router';
 import './style.scss';
 
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 const { useHistory } = Router;
 
-const Button = ( { className, isQuaternary, href, onClick, ...otherProps } ) => {
+const Button = ( { href, onClick, ...otherProps } ) => {
 	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.
 	if ( href && onClick ) {
 		otherProps.onClick = async () => {
@@ -42,7 +35,7 @@ const Button = ( { className, isQuaternary, href, onClick, ...otherProps } ) =>
 	if ( isAwaitingOnClick ) {
 		otherProps.disabled = true;
 	}
-	return <BaseComponent className={ classes } { ...otherProps } />;
+	return <BaseComponent { ...otherProps } />;
 };
 
 export default Button;