newspack-components 2.0.3 → 2.1.0

package/src/button-card/style.scss

@@ -2,17 +2,18 @@
  * Button Card
  */
 
-@import '../../../shared/scss/colors';
 @import '~@wordpress/base-styles/colors';
 
 .newspack-button-card {
-	border-radius: 3px;
+	background: white;
+	border-radius: 2px;
 	border: 1px solid $gray-300;
-	box-shadow: inset 0 0 0 2px transparent;
+	box-shadow: inset 0 0 0 var( --wp-admin-border-width-focus ) transparent;
 	cursor: pointer;
 	display: block;
 	margin: 32px 0;
 	padding: 32px;
+	position: relative;
 	text-decoration: none;
 	transition: background-color 125ms ease-in-out, border-color 125ms ease-in-out,
 		box-shadow 125ms ease-in-out;
@@ -20,43 +21,41 @@
 	&:focus,
 	&.is-pressed {
 		background: white;
-		border-color: $primary-500;
-		box-shadow: inset 0 0 0 2px $primary-500 !important;
+		border-color: var( --wp-admin-theme-color );
+		box-shadow: inset 0 0 0 1px var( --wp-admin-theme-color ) !important;
 		outline: none !important;
-		position: relative;
+		z-index: 1;
 	}
 
 	&.is-pressed:focus-visible {
-		box-shadow: inset 0 0 0 2px $primary-500, 0 0 0 1px white, 0 0 0 2px $primary-500 !important;
+		box-shadow: inset 0 0 0 1px var( --wp-admin-theme-color ), 0 0 0 1px white,
+			0 0 0 var( --wp-admin-border-width-focus ) var( --wp-admin-theme-color ) !important;
 	}
 
 	&:active,
 	&:hover {
-		background-color: $gray-100;
-		color: $primary-600;
+		border-color: var( --wp-admin-theme-color );
+		color: var( --wp-admin-theme-color );
 		text-decoration: none;
+		z-index: 1;
 
-		.title,
-		.desc {
+		.newspack-grid h3,
+		p {
 			color: inherit;
 		}
 	}
 
-	.title,
-	.desc {
-		line-height: 24px;
+	.newspack-grid h3,
+	p {
 		transition: color 125ms ease-in-out;
 	}
 
-	.title {
+	.newspack-grid h3 {
 		color: $gray-900;
-		font-size: 17px;
-		font-weight: bold;
 	}
 
-	.desc {
+	p {
 		color: $gray-700;
-		font-size: 14px;
 	}
 
 	// Grouped
@@ -69,13 +68,13 @@
 		}
 
 		&.br--bottom {
-			border-bottom-left-radius: 3px;
-			border-bottom-right-radius: 3px;
+			border-bottom-left-radius: 2px;
+			border-bottom-right-radius: 2px;
 		}
 
 		&.br--top {
-			border-top-left-radius: 3px;
-			border-top-right-radius: 3px;
+			border-top-left-radius: 2px;
+			border-top-right-radius: 2px;
 		}
 	}
 
@@ -96,7 +95,7 @@
 		}
 
 		svg {
-			fill: $primary-500;
+			fill: var( --wp-admin-theme-color );
 			transition: fill 125ms ease-in-out;
 		}
 	}
@@ -116,8 +115,6 @@
 
 		&.has-chevron,
 		&.has-icon {
-			grid-gap: 8px;
-
 			svg {
 				height: 24px;
 				width: 24px;
@@ -132,13 +129,46 @@
 			}
 		}
 
-		.title {
-			font-size: 14px;
+		h3 {
+			font-size: 1em;
+			line-height: 1.5;
 		}
 
-		.desc {
+		p {
 			font-size: 12px;
-			line-height: 16px;
+			line-height: 1.4;
+		}
+	}
+
+	// Is Destructive
+
+	&.is-destructive {
+		.title {
+			color: $alert-red;
+		}
+
+		&.has-chevron,
+		&.has-icon {
+			svg {
+				fill: $alert-red;
+			}
+		}
+
+		&:focus,
+		&.is-pressed {
+			border-color: $alert-red;
+			box-shadow: inset 0 0 0 1px $alert-red !important;
+		}
+
+		&.is-pressed:focus-visible {
+			box-shadow: inset 0 0 0 1px $alert-red, 0 0 0 1px white,
+				0 0 0 var( --wp-admin-border-width-focus ) $alert-red !important;
+		}
+
+		&:active,
+		&:hover {
+			background-color: $gray-100;
+			border-color: $alert-red;
 		}
 	}
 }

package/src/card/index.js

@@ -26,8 +26,10 @@ class Card extends Component {
 			buttonsCard,
 			className,
 			headerActions,
+			isNarrow,
 			isMedium,
 			isSmall,
+			isWhite,
 			noBorder,
 			...otherProps
 		} = this.props;
@@ -37,7 +39,9 @@ class Card extends Component {
 			buttonsCard && 'newspack-card__buttons-card',
 			headerActions && 'newspack-card__header-actions',
 			isMedium && 'newspack-card__is-medium',
+			isNarrow && 'newspack-card__is-narrow',
 			isSmall && 'newspack-card__is-small',
+			isWhite && 'newspack-card__is-white',
 			noBorder && 'newspack-card__no-border'
 		);
 		return <div className={ classes } { ...otherProps } />;

package/src/card/style.scss

@@ -2,13 +2,12 @@
  * Card
  */
 
-@import '../../../shared/scss/colors';
 @import '~@wordpress/base-styles/colors';
 
 .newspack-card {
-	border-radius: 3px;
+	border-radius: 2px;
 	border: 1px solid $gray-300;
-	color: $gray-700;
+	color: $gray-900;
 	margin: 32px 0;
 	padding: 16px 48px;
 
@@ -21,11 +20,8 @@
 	&__buttons-card {
 		display: flex;
 		flex-wrap: wrap;
-		margin: 32px -8px 16px;
-
-		.newspack-button {
-			margin: 0 8px 16px;
-		}
+		gap: 16px;
+		margin: 32px 0;
 	}
 
 	// Header Actions Card
@@ -43,6 +39,17 @@
 		}
 	}
 
+	// Is Narrow
+
+	&__is-narrow {
+		margin-left: auto;
+		margin-right: auto;
+
+		@media screen and ( min-width: 608px ) {
+			max-width: 576px;
+		}
+	}
+
 	// Is Small
 
 	&__is-small {
@@ -79,6 +86,13 @@
 		}
 	}
 
+	// Is White
+
+	&__is-white {
+		background: white;
+		border: 0;
+	}
+
 	// No Border
 
 	&__no-border {
@@ -89,49 +103,15 @@
 
 	// Typography
 
-	h2,
-	h3,
-	p {
-		line-height: 24px;
-		margin: 32px 0;
-		padding: 0;
-	}
-
-	h2 {
-		color: $gray-900;
-		font-size: 17px;
-		font-weight: bold;
-	}
-
-	h3 {
-		color: $gray-900;
-		font-size: 14px;
-		font-weight: bold;
-	}
-
-	p {
-		font-size: 14px;
-
-		&.is-dark {
-			color: $gray-900;
-		}
-	}
-
-	strong {
-		font-weight: bold;
-	}
-
 	small {
 		font-size: 12px;
-		line-height: 16px;
+		line-height: 1.4;
 	}
 
 	code {
 		background: $gray-100;
-		color: $gray-700;
-		font-size: 12px;
-		line-height: 16px;
-		padding: 4px 8px;
+		color: $gray-900;
+		padding: 0 0.5em;
 	}
 
 	// Thematic Break
@@ -158,27 +138,14 @@
 
 		&__inline {
 			display: inline-block;
-			line-height: 24px;
+			line-height: 1.5;
 			vertical-align: middle;
 		}
 	}
 
-	// Links
+	// Error
 
-	a {
-		color: $primary-500;
-
-		&:active,
-		&:focus,
-		&:hover {
-			color: $primary-600;
-			text-decoration: none;
-		}
-
-		&:focus {
-			box-shadow: none;
-			outline: 2px solid $primary-500;
-			outline-offset: 2px;
-		}
+	.newspack-error {
+		color: $alert-red;
 	}
 }

package/src/category-autocomplete/index.js

@@ -6,6 +6,7 @@
  * WordPress dependencies.
  */
 import apiFetch from '@wordpress/api-fetch';
+import { Spinner } from '@wordpress/components';
 import { Component } from '@wordpress/element';
 import { addQueryArgs } from '@wordpress/url';
 
@@ -18,7 +19,7 @@ import './style.scss';
 /**
  * External dependencies
  */
-import { debounce, find } from 'lodash';
+import { debounce, find, filter } from 'lodash';
 import classnames from 'classnames';
 
 /**
@@ -28,6 +29,7 @@ class CategoryAutocomplete extends Component {
 	state = {
 		suggestions: {},
 		allCategories: {},
+		isLoading: false,
 	};
 
 	/**
@@ -39,12 +41,15 @@ class CategoryAutocomplete extends Component {
 	}
 
 	componentDidMount() {
+		this.setState( { isLoading: true } );
 		apiFetch( {
 			path: addQueryArgs( `/wp/v2/${ this.props.taxonomy }`, {
 				per_page: -1,
 				_fields: 'id,name',
 			} ),
-		} ).then( categories => this.setState( { allCategories: categories } ) );
+		} )
+			.then( categories => this.setState( { allCategories: categories } ) )
+			.finally( () => this.setState( { isLoading: false } ) );
 	}
 
 	/**
@@ -60,6 +65,7 @@ class CategoryAutocomplete extends Component {
 	 * @param {string} search The typed text to search for.
 	 */
 	updateSuggestions( search ) {
+		this.setState( { isLoading: true } );
 		apiFetch( {
 			path: addQueryArgs( `/wp/v2/${ this.props.taxonomy }`, {
 				search,
@@ -68,14 +74,16 @@ class CategoryAutocomplete extends Component {
 				orderby: 'count',
 				order: 'desc',
 			} ),
-		} ).then( categories => {
-			this.setState( {
-				suggestions: categories.reduce(
-					( accumulator, category ) => ( { ...accumulator, [ category.name ]: category } ),
-					{}
-				),
-			} );
-		} );
+		} )
+			.then( categories => {
+				this.setState( {
+					suggestions: categories.reduce(
+						( accumulator, category ) => ( { ...accumulator, [ category.name ]: category } ),
+						{}
+					),
+				} );
+			} )
+			.finally( () => this.setState( { isLoading: false } ) );
 	}
 
 	/**
@@ -88,12 +96,29 @@ class CategoryAutocomplete extends Component {
 		const { suggestions } = this.state;
 		// Categories that are already will be objects, while new additions will be strings (the name).
 		// allValues nomalizes the array so that they are all objects.
-		const allValues = tokens.map( token =>
-			typeof token === 'string' ? suggestions[ token ] : token
-		);
+		const allValues = tokens
+			.filter( token => 'undefined' !== typeof token ) // Ensure each token is a valid value.
+			.map( token => ( 'string' === typeof token ? suggestions[ token ] : token ) )
+			.filter( Boolean );
 		onChange( allValues );
 	};
 
+	getAvailableSuggestions = () => {
+		const { value } = this.props;
+		const { suggestions } = this.state;
+		const selectedIds = value.reduce( ( acc, item ) => {
+			if ( item?.id ) {
+				acc.push( item.id );
+			}
+			return acc;
+		}, [] );
+		const availableSuggestions = filter(
+			suggestions,
+			( { id } ) => selectedIds.indexOf( id ) === -1
+		);
+		return availableSuggestions.map( v => v.name );
+	};
+
 	/**
 	 * Render the component.
 	 */
@@ -107,21 +132,24 @@ class CategoryAutocomplete extends Component {
 			label,
 			value,
 		} = this.props;
-		const { suggestions, allCategories } = this.state;
+		const { allCategories, isLoading } = this.state;
 		const classes = classnames( 'newspack-category-autocomplete', className );
 		return (
 			<div className={ classes }>
 				<FormTokenField
 					onInputChange={ input => this.debouncedUpdateSuggestions( input ) }
 					value={ value.reduce( ( acc, item ) => {
-						const category =
+						const categoryOrItem =
 							typeof item === 'number' ? find( allCategories, [ 'id', item ] ) : item;
-						if ( category ) {
-							acc.push( { id: category.term_id || category.id, value: category.name } );
+						if ( categoryOrItem ) {
+							acc.push( {
+								id: categoryOrItem.term_id || categoryOrItem.id,
+								value: categoryOrItem.value || categoryOrItem.name,
+							} );
 						}
 						return acc;
 					}, [] ) }
-					suggestions={ Object.keys( suggestions ) }
+					suggestions={ this.getAvailableSuggestions() }
 					onChange={ this.handleOnChange }
 					label={ label }
 					disabled={ disabled }
@@ -129,6 +157,11 @@ class CategoryAutocomplete extends Component {
 					hideHelpFromVision={ hideHelpFromVision }
 					hideLabelFromVision={ hideLabelFromVision }
 				/>
+				{ isLoading ? (
+					<span className="newspack-category-autocomplete__suggestions-spinner">
+						<Spinner />
+					</span>
+				) : null }
 			</div>
 		);
 	}

package/src/category-autocomplete/style.scss

@@ -5,34 +5,32 @@
 @import '../../../shared/scss/colors';
 
 .newspack-category-autocomplete {
+	position: relative;
+
 	.components-form-token-field__help {
 		display: none;
 	}
 
-	.components-button:focus:not( :disabled ) {
-		box-shadow: inset 0 0 0 2px $primary-500;
-	}
-
-	// Multiple Select Controls
-
-	& + & {
-		margin-bottom: 32px;
-		margin-top: -16px;
-	}
-
-	// Multiple Controls
-
-	+ .newspack-select-control,
-	+ .newspack-text-control,
-	+ .newspack-textarea-control,
-	+ .newspack-toggle-control {
-		margin-bottom: 32px;
-		margin-top: -16px;
-	}
-
 	// Within a Grid
 
-	.newspack-grid & .newspack-form-token-field {
+	.newspack-grid & .newspack-form-token-field__input-container {
 		margin: 0;
 	}
+
+	// Loading state spinner
+	&__suggestions-spinner {
+		position: absolute;
+		right: 1px;
+		top: calc( 1.4em + 8px );
+		z-index: 2;
+
+		[class*='--label-hidden'] + & {
+			top: 0;
+		}
+
+		.components-spinner {
+			display: block;
+			margin: 7px;
+		}
+	}
 }

package/src/color-picker/index.js

@@ -3,12 +3,13 @@
  */
 import { ColorPicker as ColorPickerComponent } from '@wordpress/components';
 import { useState, useRef } from '@wordpress/element';
-import { Icon, chevronDown } from '@wordpress/icons';
 
 /**
  * External dependencies.
  */
 import classnames from 'classnames';
+import { colord, extend } from 'colord';
+import a11yPlugin from 'colord/plugins/a11y';
 
 /**
  * Internal dependencies.
@@ -17,40 +18,33 @@ import hooks from '../hooks';
 import utils from '../utils';
 import './style.scss';
 
+extend( [ a11yPlugin ] );
 const { InteractiveDiv } = utils;
 
 const ColorPicker = ( { label, color = '#fff', onChange, className } ) => {
 	const [ isExpanded, setIsExpanded ] = useState( false );
 	const ref = useRef();
+	const colordColor = colord( color );
 	hooks.useOnClickOutside( ref, () => setIsExpanded( false ) );
 	return (
 		<div className={ classnames( 'newspack-color-picker', className ) }>
 			<div className="newspack-color-picker__label">{ label }</div>
+
+			<InteractiveDiv
+				className={ 'newspack-color-picker__expander' }
+				onClick={ () => setIsExpanded( ! isExpanded ) }
+				style={ {
+					backgroundColor: color,
+					color: colordColor.contrast() > colordColor.contrast( '#000' ) ? '#fff' : '#000',
+				} }
+			>
+				{ color }
+			</InteractiveDiv>
+
 			<div className="newspack-color-picker__main" ref={ ref }>
-				<InteractiveDiv
-					className={ classnames( 'newspack-color-picker__expander', {
-						'newspack-color-picker__expander--expanded': isExpanded,
-					} ) }
-					onClick={ () => setIsExpanded( ! isExpanded ) }
-				>
-					<div>
-						<div
-							className="newspack-color-picker__indicator"
-							style={ { backgroundColor: color } }
-						/>
-						<div>{ color }</div>
-					</div>
-					<Icon
-						icon={ chevronDown }
-						size={ 18 }
-						style={ isExpanded ? { transform: 'rotate(180deg)' } : {} }
-					/>
-				</InteractiveDiv>
 				{ isExpanded && (
 					<ColorPickerComponent
 						color={ color }
-						onChangeComplete={ ( { hex } ) => onChange( hex ) } // Prop will be deprecated in favor of onChange, which expects a string hex value.
-						disableAlpha // Prop will be deprecated in favor of enableAlpha, which behaves in the opposite manner.
 						onChange={ hex => onChange( hex ) }
 						enableAlpha={ false }
 					/>