newspack-components 2.1.0 → 2.2.0

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

@@ -2,7 +2,7 @@
 * Styles for AutocompleteWithSuggestions component.
 */
 
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-autocomplete-with-suggestions {
 	width: 100%;
@@ -27,19 +27,19 @@
 	}
 
 	.components-input-control__backdrop {
-		border-color: $gray-700 !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-700;
+		background: wp-colors.$gray-100;
+		border: 1px solid wp-colors.$gray-700;
 		border-radius: 2px;
 		cursor: progress;
 		margin: 16px 0;
@@ -56,15 +56,16 @@
 
 	.newspack-autocomplete-tokenfield__help {
 		font-size: inherit;
+		margin-bottom: 8px !important;
 	}
 
 	.components-form-token-field {
 		&__input-container {
-			border-color: $gray-700;
+			border-color: wp-colors.$gray-700;
 		}
 
 		&__suggestions-list {
-			border-top-color: $gray-700;
+			border-top-color: wp-colors.$gray-700;
 			margin: 4px -4px -2px;
 		}
 
@@ -79,7 +80,7 @@
 	}
 
 	&__selected-items {
-		border-bottom: 1px solid $gray-700;
+		border-bottom: 1px solid wp-colors.$gray-700;
 		display: flex;
 		flex-wrap: wrap;
 		gap: 8px;
@@ -93,9 +94,9 @@
 	}
 
 	&__selected-item-button.components-button.is-tertiary {
-		background-color: $gray-300;
+		background-color: wp-colors.$gray-300;
 		border-radius: 2px;
-		color: $gray-900;
+		color: wp-colors.$gray-900;
 		font-size: 13px;
 		height: auto;
 		margin: 0;
@@ -116,7 +117,7 @@
 	&__search-suggestions,
 	&__search-suggestions-multiselect {
 		border-radius: 2px;
-		border: 1px solid $gray-700;
+		border: 1px solid wp-colors.$gray-700;
 		max-height: 178px;
 		overflow-x: visible;
 		overflow-y: auto;
@@ -128,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;
 				}
@@ -150,7 +151,7 @@
 
 	&__search-suggestions {
 		border-radius: 2px;
-		border: 1px solid $gray-700;
+		border: 1px solid wp-colors.$gray-700;
 		padding: 0;
 
 		.components-button {
@@ -158,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-card/style.scss

@@ -2,12 +2,12 @@
  * Button Card
  */
 
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-button-card {
 	background: white;
 	border-radius: 2px;
-	border: 1px solid $gray-300;
+	border: 1px solid wp-colors.$gray-300;
 	box-shadow: inset 0 0 0 var( --wp-admin-border-width-focus ) transparent;
 	cursor: pointer;
 	display: block;
@@ -51,11 +51,11 @@
 	}
 
 	.newspack-grid h3 {
-		color: $gray-900;
+		color: wp-colors.$gray-900;
 	}
 
 	p {
-		color: $gray-700;
+		color: wp-colors.$gray-700;
 	}
 
 	// Grouped
@@ -90,7 +90,7 @@
 		&:active,
 		&:hover {
 			svg {
-				fill: currentColor;
+				fill: currentcolor;
 			}
 		}
 
@@ -144,31 +144,31 @@
 
 	&.is-destructive {
 		.title {
-			color: $alert-red;
+			color: wp-colors.$alert-red;
 		}
 
 		&.has-chevron,
 		&.has-icon {
 			svg {
-				fill: $alert-red;
+				fill: wp-colors.$alert-red;
 			}
 		}
 
 		&:focus,
 		&.is-pressed {
-			border-color: $alert-red;
-			box-shadow: inset 0 0 0 1px $alert-red !important;
+			border-color: wp-colors.$alert-red;
+			box-shadow: inset 0 0 0 1px wp-colors.$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;
+			box-shadow: inset 0 0 0 1px wp-colors.$alert-red, 0 0 0 1px white,
+				0 0 0 var( --wp-admin-border-width-focus ) wp-colors.$alert-red !important;
 		}
 
 		&:active,
 		&:hover {
-			background-color: $gray-100;
-			border-color: $alert-red;
+			background-color: wp-colors.$gray-100;
+			border-color: wp-colors.$alert-red;
 		}
 	}
 }

package/src/card/style.scss

@@ -2,12 +2,12 @@
  * Card
  */
 
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-card {
 	border-radius: 2px;
-	border: 1px solid $gray-300;
-	color: $gray-900;
+	border: 1px solid wp-colors.$gray-300;
+	color: wp-colors.$gray-900;
 	margin: 32px 0;
 	padding: 16px 48px;
 
@@ -30,6 +30,7 @@
 		align-items: center;
 		display: flex;
 		flex-wrap: wrap;
+		gap: 8px;
 		justify-content: space-between;
 		margin-bottom: -16px;
 
@@ -37,6 +38,12 @@
 			margin-bottom: 0 !important;
 			margin-top: 0 !important;
 		}
+
+		.newspack-select-control {
+			.components-base-control__field {
+				margin-bottom: 0;
+			}
+		}
 	}
 
 	// Is Narrow
@@ -101,6 +108,16 @@
 		padding: 0;
 	}
 
+	// Margin
+
+	&.mt64 {
+		margin-top: 64px;
+	}
+
+	&.mt16 {
+		margin-top: 16px;
+	}
+
 	// Typography
 
 	small {
@@ -109,15 +126,15 @@
 	}
 
 	code {
-		background: $gray-100;
-		color: $gray-900;
+		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;
@@ -130,7 +147,7 @@
 	// Separator
 
 	.sep {
-		background: $gray-300;
+		background: wp-colors.$gray-300;
 		height: 1px;
 		margin-left: 8px;
 		margin-right: 8px;
@@ -146,6 +163,6 @@
 	// Error
 
 	.newspack-error {
-		color: $alert-red;
+		color: wp-colors.$alert-red;
 	}
 }

package/src/category-autocomplete/index.js

@@ -19,7 +19,9 @@ import './style.scss';
 /**
  * External dependencies
  */
-import { debounce, find, filter } from 'lodash';
+import debounce from 'lodash/debounce';
+import find from 'lodash/find';
+import filter from 'lodash/filter';
 import classnames from 'classnames';
 
 /**

package/src/category-autocomplete/style.scss

@@ -2,8 +2,6 @@
  * Category Autocomplete
  */
 
-@import '../../../shared/scss/colors';
-
 .newspack-category-autocomplete {
 	position: relative;
 

package/src/color-picker/style.scss

@@ -2,9 +2,6 @@
  * Color Picker
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
-
 .newspack-color-picker {
 	position: relative;
 

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';

package/src/custom-select-control/style.scss

@@ -2,8 +2,7 @@
  * Custom Select Control
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-custom-select-control {
 	label {
@@ -12,9 +11,9 @@
 	}
 
 	.components-custom-select-control__button {
-		border-color: $gray-700;
+		border-color: wp-colors.$gray-700;
 		border-radius: 2px;
-		color: $gray-900;
+		color: wp-colors.$gray-900;
 		font-size: inherit;
 		min-height: 30px;
 		min-width: 100%;
@@ -24,7 +23,7 @@
 		&:focus,
 		&:hover,
 		&[aria-expanded='true'] {
-			color: $gray-900;
+			color: wp-colors.$gray-900;
 		}
 
 		&:focus {
@@ -43,7 +42,7 @@
 	}
 
 	.components-custom-select-control__menu {
-		border-color: $gray-700;
+		border-color: wp-colors.$gray-700;
 		border-radius: 2px;
 		box-shadow: 0 4px 8px rgba( black, 0.08 );
 		margin: 8px 0 0;
@@ -64,7 +63,7 @@
 		}
 
 		&.is-header {
-			background: $gray-100;
+			background: wp-colors.$gray-100;
 			cursor: default;
 			font-weight: bold;
 			margin-left: 0;

package/src/date-range-picker/style.scss

@@ -1,5 +1,5 @@
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '../../../shared/scss/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .DateRangePicker {
 	margin: 32px 0;
@@ -47,7 +47,7 @@
 	}
 
 	&__MonthHeader {
-		color: $gray-900;
+		color: wp-colors.$gray-900;
 		font-size: 17px;
 		height: auto;
 		line-height: 24px;
@@ -62,8 +62,8 @@
 	}
 
 	&__WeekdayHeading {
-		border-bottom-color: $gray-300;
-		color: $gray-900;
+		border-bottom-color: wp-colors.$gray-300;
+		color: wp-colors.$gray-900;
 
 		abbr[title] {
 			color: inherit;
@@ -76,20 +76,20 @@
 	}
 
 	&__Date {
-		border-color: $gray-300;
+		border-color: wp-colors.$gray-300;
 		border-bottom-width: 1px;
 
 		&--weekend {
-			background-color: $gray-100;
+			background-color: wp-colors.$gray-100;
 		}
 
 		&--otherMonth {
-			color: $gray-200;
+			color: wp-colors.$gray-200;
 			opacity: 1;
 		}
 
 		&--is-disabled {
-			color: $gray-100;
+			color: wp-colors.$gray-100;
 			cursor: not-allowed;
 		}
 
@@ -100,7 +100,7 @@
 
 	&__CalendarSelection,
 	&__CalendarHighlight {
-		border-color: $primary-500;
+		border-color: colors.$primary-500;
 		bottom: 4px;
 		top: 4px;
 
@@ -129,11 +129,11 @@
 	}
 
 	&__CalendarSelection {
-		background-color: $primary-500;
+		background-color: colors.$primary-500;
 	}
 
 	&__CalendarHighlight {
-		background: $primary-500;
+		background: colors.$primary-500;
 		border: none;
 		bottom: 0;
 		top: 0;

package/src/footer/index.js

@@ -28,12 +28,12 @@ const Footer = ( { simple } ) => {
 	const footerElements = [
 		{
 			label: pluginVersion.label,
-			url: 'https://newspack.pub/category/release-notes/',
+			url: 'https://newspack.com/category/release-notes/',
 			external: true,
 		},
 		{
 			label: __( 'About', 'newspack' ),
-			url: 'https://newspack.pub/',
+			url: 'https://newspack.com/',
 			external: true,
 		},
 		{

package/src/footer/style.scss

@@ -2,15 +2,15 @@
  * Footer
  */
 
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-footer {
 	align-items: stretch;
 	background: white;
-	border: 0 solid $gray-300;
+	border: 0 solid wp-colors.$gray-300;
 	border-width: 1px 0;
 	bottom: 0;
-	color: $gray-700;
+	color: wp-colors.$gray-700;
 	display: flex;
 	flex-wrap: wrap;
 	font-size: 12px;
@@ -53,14 +53,14 @@
 			&:active,
 			&:focus,
 			&:hover {
-				color: $gray-900;
+				color: wp-colors.$gray-900;
 			}
 		}
 	}
 
 	&__logo {
 		align-items: center;
-		background: $gray-900;
+		background: wp-colors.$gray-900;
 		display: flex;
 		margin: 0 0 -1px;
 		padding: 16px;

package/src/form-token-field/index.js

@@ -23,13 +23,8 @@ class FormTokenField extends Component {
 	 * Render.
 	 */
 	render() {
-		const {
-			className,
-			description,
-			hideHelpFromVision,
-			hideLabelFromVision,
-			...otherProps
-		} = this.props;
+		const { className, description, hideHelpFromVision, hideLabelFromVision, ...otherProps } =
+			this.props;
 		const classes = classnames( 'newspack-form-token-field__input-container', className );
 		return (
 			<div

package/src/form-token-field/style.scss

@@ -2,8 +2,7 @@
  * Form Token Field
  */
 
-@import '../../../shared/scss/colors';
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-form-token-field {
 	width: 100%;
@@ -16,7 +15,7 @@
 	// Help
 
 	&__help {
-		color: $gray-700;
+		color: wp-colors.$gray-700;
 		font-size: 12px;
 		margin: 8px 0 0 !important;
 	}

package/src/grid/style.scss

@@ -2,7 +2,7 @@
  * Grid
  */
 
-@import '~@wordpress/base-styles/colors';
+@use '~@wordpress/base-styles/colors' as wp-colors;
 
 .newspack-grid {
 	display: grid;
@@ -145,9 +145,9 @@
 	// Table-like
 	&__thead {
 		background: rgba( black, 0.025 );
-		border-bottom: 1px solid $gray-300;
-		border-top: 1px solid $gray-300;
-		color: $gray-900;
+		border-bottom: 1px solid wp-colors.$gray-300;
+		border-top: 1px solid wp-colors.$gray-300;
+		color: wp-colors.$gray-900;
 
 		> *:not( .screen-reader-text ) {
 			padding: 8px;
@@ -155,7 +155,7 @@
 	}
 
 	&__tbody {
-		border-bottom: 1px solid $gray-300;
+		border-bottom: 1px solid wp-colors.$gray-300;
 		padding: 8px 0;
 	}
 

package/src/handoff/index.js

@@ -17,7 +17,7 @@ import { Button, Card, Modal, Waiting } from '../';
 /**
  * External dependencies.
  */
-import { assign } from 'lodash';
+import assign from 'lodash/assign';
 import classnames from 'classnames';
 
 class Handoff extends Component {
@@ -95,13 +95,8 @@ class Handoff extends Component {
 			...otherProps
 		} = this.props;
 		const { pluginInfo, showModal } = this.state;
-		const {
-			modalBody,
-			modalTitle,
-			primaryButton,
-			primaryModalButton,
-			dismissModalButton,
-		} = this.textForPlugin( pluginInfo );
+		const { modalBody, modalTitle, primaryButton, primaryModalButton, dismissModalButton } =
+			this.textForPlugin( pluginInfo );
 		const { Configured, Name, Slug, Status } = pluginInfo;
 		const classes = classnames( Configured && 'is-configured', className );
 		return (

package/src/handoff-message/index.js

@@ -0,0 +1,39 @@
+/**
+ * WordPress dependencies.
+ */
+import { useEffect, useState } from '@wordpress/element';
+
+/**
+ * Internal dependencies.
+ */
+import { HANDOFF_KEY } from '../consts';
+import { Notice } from '../';
+
+/**
+ * Handoff Message Component.
+ */
+export default function HandoffMessage() {
+	const [ handoffMessage, setHandoffMessage ] = useState( false );
+	useEffect( () => {
+		// Slight delay to allow for localStorage to be updated by RAS component.
+		setTimeout( () => {
+			const handoff = JSON.parse( localStorage.getItem( HANDOFF_KEY ) );
+			if ( handoff?.message ) {
+				setHandoffMessage( handoff.message );
+			} else {
+				setHandoffMessage( false );
+			}
+
+			// Clean up the notification if navigating away from the relevant page.
+			if ( handoff?.url && -1 === window.location.href.indexOf( handoff.url ) ) {
+				window.localStorage.removeItem( HANDOFF_KEY );
+				setHandoffMessage( false );
+			}
+		}, 100 );
+
+		// Clean up the notification when unmounting.
+		return () => window.localStorage.removeItem( HANDOFF_KEY );
+	}, [] );
+	if ( ! handoffMessage ) return null;
+	return <Notice isHandoff isDismissible={ false } rawHTML noticeText={ handoffMessage } />;
+}

package/src/hooks/useObjectState.js

@@ -3,7 +3,8 @@
  */
 import { useState } from '@wordpress/element';
 
-import { mergeWith, isArray } from 'lodash';
+import isArray from 'lodash/isArray';
+import mergeWith from 'lodash/mergeWith';
 
 const mergeCustomizer = ( objValue, srcValue ) => {
 	if ( isArray( objValue ) ) {

package/src/image-upload/index.js

@@ -75,6 +75,7 @@ class ImageUpload extends Component {
 		const {
 			buttonLabel,
 			className,
+			disabled,
 			help,
 			image,
 			info,
@@ -104,17 +105,22 @@ class ImageUpload extends Component {
 								alt={ __( 'Image preview', 'newspack' ) }
 							/>
 							<div className="newspack-image-upload__controls">
-								<Button onClick={ this.openModal } isLink>
+								<Button disabled={ disabled } onClick={ this.openModal } isLink>
 									{ __( 'Replace', 'newspack' ) }
 								</Button>
 								<span className="sep" />
-								<Button onClick={ () => onChange( null ) } isLink isDestructive>
+								<Button
+									disabled={ disabled }
+									onClick={ () => onChange( null ) }
+									isLink
+									isDestructive
+								>
 									{ __( 'Remove', 'newspack' ) }
 								</Button>
 							</div>
 						</>
 					) : (
-						<Button onClick={ this.openModal } isLink>
+						<Button disabled={ disabled } onClick={ this.openModal } isLink>
 							{ buttonLabel ? buttonLabel : __( 'Upload', 'newspack' ) }
 						</Button>
 					) }