newspack-components 2.0.3 → 2.2.0

package/src/card/style.scss

@@ -2,13 +2,12 @@
  * Card
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-card {
-	border-radius: 3px;
-	border: 1px solid $gray-300;
-	color: $gray-700;
+	border-radius: 2px;
+	border: 1px solid wp-colors.$gray-300;
+	color: wp-colors.$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
@@ -34,6 +30,7 @@
 		align-items: center;
 		display: flex;
 		flex-wrap: wrap;
+		gap: 8px;
 		justify-content: space-between;
 		margin-bottom: -16px;
 
@@ -41,6 +38,23 @@
 			margin-bottom: 0 !important;
 			margin-top: 0 !important;
 		}
+
+		.newspack-select-control {
+			.components-base-control__field {
+				margin-bottom: 0;
+			}
+		}
+	}
+
+	// Is Narrow
+
+	&__is-narrow {
+		margin-left: auto;
+		margin-right: auto;
+
+		@media screen and ( min-width: 608px ) {
+			max-width: 576px;
+		}
 	}
 
 	// Is Small
@@ -79,65 +93,48 @@
 		}
 	}
 
-	// No Border
+	// Is White
 
-	&__no-border {
-		border-radius: 0;
+	&__is-white {
+		background: white;
 		border: 0;
-		padding: 0;
 	}
 
-	// Typography
+	// No Border
 
-	h2,
-	h3,
-	p {
-		line-height: 24px;
-		margin: 32px 0;
+	&__no-border {
+		border-radius: 0;
+		border: 0;
 		padding: 0;
 	}
 
-	h2 {
-		color: $gray-900;
-		font-size: 17px;
-		font-weight: bold;
-	}
+	// Margin
 
-	h3 {
-		color: $gray-900;
-		font-size: 14px;
-		font-weight: bold;
+	&.mt64 {
+		margin-top: 64px;
 	}
 
-	p {
-		font-size: 14px;
-
-		&.is-dark {
-			color: $gray-900;
-		}
+	&.mt16 {
+		margin-top: 16px;
 	}
 
-	strong {
-		font-weight: bold;
-	}
+	// Typography
 
 	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;
+		background: wp-colors.$gray-100;
+		color: wp-colors.$gray-900;
+		padding: 0 0.5em;
 	}
 
 	// Thematic Break
 
 	hr {
-		background: $gray-300;
+		background: wp-colors.$gray-300;
 		border: 0;
 		height: 1px;
 		margin: 48px 0;
@@ -150,7 +147,7 @@
 	// Separator
 
 	.sep {
-		background: $gray-300;
+		background: wp-colors.$gray-300;
 		height: 1px;
 		margin-left: 8px;
 		margin-right: 8px;
@@ -158,27 +155,14 @@
 
 		&__inline {
 			display: inline-block;
-			line-height: 24px;
+			line-height: 1.5;
 			vertical-align: middle;
 		}
 	}
 
-	// Links
-
-	a {
-		color: $primary-500;
+	// Error
 
-		&:active,
-		&:focus,
-		&:hover {
-			color: $primary-600;
-			text-decoration: none;
-		}
-
-		&:focus {
-			box-shadow: none;
-			outline: 2px solid $primary-500;
-			outline-offset: 2px;
-		}
+	.newspack-error {
+		color: wp-colors.$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,9 @@ import './style.scss';
 /**
  * External dependencies
  */
-import { debounce, find } from 'lodash';
+import debounce from 'lodash/debounce';
+import find from 'lodash/find';
+import filter from 'lodash/filter';
 import classnames from 'classnames';
 
 /**
@@ -28,6 +31,7 @@ class CategoryAutocomplete extends Component {
 	state = {
 		suggestions: {},
 		allCategories: {},
+		isLoading: false,
 	};
 
 	/**
@@ -39,12 +43,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 +67,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 +76,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 +98,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 +134,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 +159,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

@@ -2,37 +2,33 @@
  * Category Autocomplete
  */
 
-@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 }
 					/>

package/src/color-picker/style.scss

@@ -2,179 +2,36 @@
  * Color Picker
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
-
 .newspack-color-picker {
 	position: relative;
-	margin: 32px 0;
-
-	&__main {
-		height: 48px;
-	}
-	&__expander {
-		padding: 11px 3px;
-		justify-content: space-between;
-		&,
-		> div {
-			display: flex;
-			align-items: center;
-		}
-		> div {
-			margin: 0 4px;
-		}
-		div + div {
-			margin-left: 8px;
-		}
-		&:focus {
-			border-color: $primary-500;
-			box-shadow: inset 0 0 0 2px $primary-500;
-		}
-		&--expanded:focus {
-			border-bottom-color: white;
-			box-shadow: inset 2px 2px 0 0 $primary-500, inset -2px 2px 0 0 $primary-500;
-
-			+ .components-color-picker {
-				position: relative;
-				border-bottom-color: $primary-500;
-				border-left-color: $primary-500;
-				border-right-color: $primary-500;
-				box-shadow: inset 2px -2px 0 0 $primary-500, inset -2px -2px 0 0 $primary-500;
 
-				&::before,
-				&::after {
-					background: $primary-500;
-					display: block;
-					content: '';
-					height: 1px;
-					left: -1px;
-					position: absolute;
-					top: -1px;
-					width: 3px;
-				}
-
-				&::after {
-					left: auto;
-					right: -1px;
-				}
-			}
-		}
-	}
-	&__indicator {
-		border: 1px solid rgba( black, 0.125 );
-		border-radius: 50%;
-		height: 24px;
-		overflow: hidden;
-		width: 24px;
-	}
 	&__label {
-		align-items: center;
-		color: $gray-900;
-		display: flex;
-		font-weight: bold;
-	}
-
-	&__expander,
-	.components-color-picker {
-		background-color: white;
-		border: 1px solid $gray-300;
-		border-radius: 3px;
-		&--expanded {
-			border-bottom-color: white;
-			border-bottom-left-radius: 0;
-			border-bottom-right-radius: 0;
-		}
-	}
-	.components-color-picker {
-		padding: 8px;
-		position: relative;
-		z-index: 1;
-		padding-top: 0;
-		border-top: none;
-		border-top-left-radius: 0;
-		border-top-right-radius: 0;
-	}
-
-	// Overrides of @wordpress/components component
-
-	// Inputs
-
-	.components-color-picker__body {
-		padding: 16px 0 0;
-	}
-
-	.components-color-picker__inputs-wrapper {
-		margin: 0;
-	}
-
-	.components-color-picker__inputs-fields {
-		margin-right: 8px;
+		margin-bottom: 8px;
 	}
 
-	.components-color-picker__inputs-field {
-		color: $gray-700;
-		font-size: 14px;
-		line-height: 24px;
-		margin: 0;
-
-		+ .components-color-picker__inputs-field {
-			margin-left: 8px;
-		}
-
-		label {
-			color: $gray-900;
-			font-size: inherit;
-			font-weight: bold;
-			line-height: inherit;
-			margin: 0;
-		}
-
-		input[type='number'],
-		input[type='text'] {
-			background: white;
-			border: 1px solid $gray-300;
-			border-radius: 3px;
-			box-shadow: none;
-			color: inherit;
-			font-size: 16px;
-			line-height: inherit;
-			margin: 0;
-			min-height: 48px;
-			padding: 11px 8px;
-			transition: border-color 125ms ease-in-out, box-shadow 125ms ease-in-out;
-			width: 100%;
-
-			@media screen and ( min-width: 768px ) {
-				font-size: inherit;
-			}
-
-			&:focus {
-				border-color: $primary-500;
-				box-shadow: 0 0 0 2px $primary-500;
-			}
-		}
-
-		// Reset
+	&__expander {
+		box-shadow: inset 0 0 0 1px rgb( 0 0 0 / 20% );
+		border-radius: 2px;
+		height: 64px;
+		padding: 12px;
+		text-align: right;
+		text-transform: uppercase;
 
-		.components-base-control__field,
-		.components-base-control__label {
-			display: block;
-			margin: 0;
+		&:focus-visible {
+			box-shadow: 0 0 0 var( --wp-admin-border-width-focus ) var( --wp-admin-theme-color );
+			border-color: white;
 		}
 	}
 
-	.components-color-picker__inputs-toggle {
-		height: 36px;
-		margin-bottom: 6px;
-
-		&:active,
-		&:focus:not( :disabled ),
-		&:hover {
-			color: $primary-500;
-		}
-
-		&:focus:not( :disabled ) {
-			box-shadow: 0 0 0 3px $primary-500;
+	&__main {
+		background: white;
+		box-shadow: 0 0 8px 4px rgba( black, 0.08 );
+		margin: 12px 0;
+		position: absolute;
+		z-index: 2;
+
+		&:empty {
+			display: none;
 		}
 	}
 }

package/src/consts.js

@@ -1,2 +1,3 @@
-export const NEWSPACK_SITE_URL = 'https://newspack.pub';
+export const NEWSPACK_SITE_URL = 'https://newspack.com';
 export const NEWSPACK_SUPPORT_URL = `${ NEWSPACK_SITE_URL }/support`;
+export const HANDOFF_KEY = 'newspack_wizard_handoff_message';