newspack-components 2.2.1 → 3.0.0-alpha.2

package/src/settings/MinMaxSetting.js

@@ -16,37 +16,39 @@ const MinMaxSetting = ( {
 	onChangeMax,
 	minPlaceholder,
 	maxPlaceholder,
+	...props
 } ) => {
 	return (
-		<>
+		<div { ...props }>
 			<div className="newspack-settings__min-max">
 				<CheckboxControl
 					checked={ min > 0 }
 					onChange={ value => onChangeMin( value ? 1 : 0 ) }
-					label={ __( 'Min', 'newspack' ) }
+					label={ __( 'Min', 'newspack-plugin' ) }
 				/>
 				<TextControl
-					data-testid="min-articles-input"
+					data-testid="min"
 					type="number"
 					value={ min }
 					placeholder={ minPlaceholder }
 					onChange={ value => onChangeMin( value > 0 ? value : 0 ) }
 				/>
 			</div>
-			<div className="newspack-settings__min-max">
+			<div className="newspack-settings__min-max" data-testid="max">
 				<CheckboxControl
 					checked={ max > 0 }
 					onChange={ value => onChangeMax( value ? min || 1 : 0 ) }
-					label={ __( 'Max', 'newspack' ) }
+					label={ __( 'Max', 'newspack-plugin' ) }
 				/>
 				<TextControl
+					data-testid="max"
 					type="number"
 					value={ max }
 					placeholder={ maxPlaceholder }
 					onChange={ value => onChangeMax( value > 0 ? value : 0 ) }
 				/>
 			</div>
-		</>
+		</div>
 	);
 };
 export default MinMaxSetting;

package/src/settings/style.scss

@@ -37,16 +37,29 @@
 				}
 			}
 			&__content {
-				> div {
+				> div,
+				.newspack-settings__min-max {
 					margin: 0;
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
 					flex-wrap: wrap;
-					> *:not( [class*='help'], [class*='label'] ) {
+					> *:not([class*="help"], [class*="label"]) {
 						margin: 0;
 					}
 				}
+				.newspack-autocomplete-tokenfield,
+				.newspack-settings__min-max {
+					width: 100%;
+				}
+				.newspack-autocomplete-tokenfield {
+					display: block;
+					margin: 0;
+
+					label:empty {
+						display: none;
+					}
+				}
 				.newspack-text-control,
 				.newspack-checkbox-control {
 					margin: 0 !important;

package/src/sortable-newsletter-list-control/index.js

@@ -0,0 +1,137 @@
+/**
+ * WordPress dependencies
+ */
+import { Icon, chevronUp, chevronDown, trash } from '@wordpress/icons';
+import { Notice } from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import ActionCard from '../action-card';
+import Button from '../button';
+import './style.scss';
+
+export default function SortableNewsletterListControl( {
+	lists,
+	selected = [],
+	onChange = () => {},
+} ) {
+	if ( ! Array.isArray( lists ) && lists.errors ) {
+		return (
+			<Notice status="error" isDismissible={ false }>
+				{ Object.values( lists.errors ).join( ', ' ) }
+			</Notice>
+		);
+	}
+	const getList = id => lists.find( list => list.id === id );
+	const getAvailableLists = () => {
+		return lists.filter( list => list.active && ! selected.find( ( { id } ) => id === list.id ) );
+	};
+	return (
+		<div className="newspack__newsletter-list-control">
+			<div className="newspack__newsletter-list-control__selected">
+				{ selected.map( selectedList => {
+					const list = getList( selectedList.id );
+					if ( ! list ) {
+						return null;
+					}
+					return (
+						<ActionCard
+							key={ `selected-${ selectedList.id }` }
+							title={ list.name }
+							description={ () => (
+								<>
+									<input
+										type="checkbox"
+										checked={ selectedList.checked }
+										onChange={ () => {
+											const index = selected.findIndex( ( { id } ) => id === selectedList.id );
+											const newSelected = [ ...selected ];
+											newSelected[ index ].checked = ! newSelected[ index ].checked;
+											onChange( newSelected );
+										} }
+									/>
+									{ __( 'Checked by default', 'newspack-plugin' ) }
+								</>
+							) }
+							isSmall
+							actionText={
+								<>
+									<Button
+										onClick={ () =>
+											onChange( selected.filter( ( { id } ) => id !== selectedList.id ) )
+										}
+										label={ __( 'Remove', 'newspack-plugin' ) }
+										icon={ trash }
+									/>
+								</>
+							}
+						>
+							{ selected.length > 1 && (
+								<span className="newspack__newsletter-list-control__sort-handle">
+									<button
+										onClick={ () => {
+											const index = selected.findIndex( ( { id } ) => id === selectedList.id );
+											if ( index === 0 ) {
+												return;
+											}
+											const newSelected = [ ...selected ];
+											newSelected.splice( index, 1 );
+											newSelected.splice( index - 1, 0, selectedList );
+											onChange( newSelected );
+										} }
+										className={
+											selected.findIndex( ( { id } ) => id === selectedList.id ) === 0
+												? 'disabled'
+												: ''
+										}
+									>
+										<Icon icon={ chevronUp } />
+									</button>
+									<button
+										onClick={ () => {
+											const index = selected.findIndex( ( { id } ) => id === selectedList.id );
+											const newSelected = [ ...selected ];
+											newSelected.splice( index, 1 );
+											newSelected.splice( index + 1, 0, selectedList );
+											onChange( newSelected );
+										} }
+										className={
+											selected.findIndex( ( { id } ) => id === selectedList.id ) ===
+											selected.length - 1
+												? 'disabled'
+												: ''
+										}
+									>
+										<Icon icon={ chevronDown } />
+									</button>
+								</span>
+							) }
+						</ActionCard>
+					);
+				} ) }
+			</div>
+			{ getAvailableLists().length > 0 && (
+				<p className="newspack__newsletter-list-control__lists">
+					{ selected.length > 0 ? (
+						<strong>{ __( 'Add more lists:', 'newspack-plugin' ) }</strong>
+					) : (
+						<strong>{ __( 'Select lists:', 'newspack-plugin' ) }</strong>
+					) }{ ' ' }
+					{ getAvailableLists().map( list => {
+						return (
+							<Button
+								key={ list.id }
+								variant="secondary"
+								onClick={ () => onChange( [ ...selected, { id: list.id, checked: true } ] ) }
+							>
+								{ list.name }
+							</Button>
+						);
+					} ) }
+				</p>
+			) }
+		</div>
+	);
+}

package/src/sortable-newsletter-list-control/style.scss

@@ -0,0 +1,45 @@
+.newspack__newsletter-list-control {
+	&__selected {
+		.newspack-card {
+			display: flex;
+			justify-content: center;
+			min-height: 40px;
+			flex-direction: row;
+			.newspack-action-card__region {
+				align-items: center;
+				display: flex;
+				justify-content: space-between;
+				margin: 0;
+			}
+			.newspack-action-card__region-top {
+				flex: 1;
+				order: 2;
+			}
+			.newspack-action-card__region-children {
+				padding: 12px;
+			}
+		}
+	}
+	&__sort-handle {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		button {
+			background: transparent;
+			border: none;
+			margin: 0;
+			padding: 0;
+			height: 20px;
+			&.disabled {
+				cursor: default;
+				opacity: 0.3;
+			}
+		}
+	}
+	&__lists {
+		button {
+			margin-right: 0.5rem;
+		}
+	}
+}

package/src/steps-list/style.scss

@@ -1,5 +1,5 @@
-@use '../../../shared/scss/colors';
-@use '~@wordpress/base-styles/colors' as wp-colors;
+@use "../../../shared/scss/colors";
+@use "~@wordpress/base-styles/colors" as wp-colors;
 
 .steps-list {
 	margin-left: auto;

package/src/steps-list-item/style.scss

@@ -1,5 +1,5 @@
-@use '../../../shared/scss/colors';
-@use '~@wordpress/base-styles/colors' as wp-colors;
+@use "../../../shared/scss/colors";
+@use "~@wordpress/base-styles/colors" as wp-colors;
 
 .steps-list-item {
 	align-items: center;
@@ -9,9 +9,9 @@
 	position: relative;
 
 	&::before {
-		border: 1px solid #F0F0F0;
+		border: 1px solid #f0f0f0;
 		bottom: -16px;
-		content: '';
+		content: "";
 		display: block;
 		left: 14px;
 		position: absolute;
@@ -44,4 +44,4 @@
 		width: 28px;
 		z-index: 2;
 	}
-}
+}

package/src/style-card/index.js

@@ -38,25 +38,31 @@ class StyleCard extends Component {
 					{ imageType === 'html' ? (
 						<div dangerouslySetInnerHTML={ image } />
 					) : (
-						<img src={ image } alt={ cardTitle + ' ' + __( 'Thumbnail', 'newspack' ) } />
+						<img src={ image } alt={ cardTitle + ' ' + __( 'Thumbnail', 'newspack-plugin' ) } />
 					) }
 					<div className="newspack-style-card__actions">
 						{ isActive ? (
 							<span className="newspack-style-card__actions__badge">
-								{ __( 'Selected', 'newspack' ) }
+								{ __( 'Selected', 'newspack-plugin' ) }
 							</span>
 						) : (
 							<Button
 								variant="link"
 								onClick={ onClick }
-								aria-label={ ariaLabel ? ariaLabel : __( 'Select', 'newspack' ) + ' ' + cardTitle }
+								aria-label={
+									ariaLabel ? ariaLabel : __( 'Select', 'newspack-plugin' ) + ' ' + cardTitle
+								}
 								tabIndex="0"
 							>
-								{ __( 'Select', 'newspack' ) }
+								{ __( 'Select', 'newspack-plugin' ) }
 							</Button>
 						) }
 						{ url && (
-							<WebPreview url={ url } label={ __( 'View Demo', 'newspack' ) } variant="link" />
+							<WebPreview
+								url={ url }
+								label={ __( 'View Demo', 'newspack-plugin' ) }
+								variant="link"
+							/>
 						) }
 					</div>
 				</div>

package/src/style-card/style.scss

@@ -2,8 +2,8 @@
  * Style Card
  */
 
-@use '../../../shared/scss/colors';
-@use '~@wordpress/base-styles/colors' as wp-colors;
+@use "../../../shared/scss/colors";
+@use "~@wordpress/base-styles/colors" as wp-colors;
 
 .newspack-style-card {
 	margin: 32px 0;
@@ -61,7 +61,7 @@
 	// Actions
 	&__actions {
 		align-items: center;
-		background: rgba( white, 0.9 );
+		background: rgba(white, 0.9);
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
@@ -83,7 +83,7 @@
 		}
 
 		&__badge {
-			color: var( --wp-admin-theme-color );
+			color: var(--wp-admin-theme-color);
 			font-weight: bold;
 		}
 

package/src/style.scss

@@ -1,4 +1,4 @@
-@use '~@wordpress/base-styles/colors' as wp-colors;
+@use "~@wordpress/base-styles/colors" as wp-colors;
 
 // Buttons Card
 
@@ -15,8 +15,20 @@
 	}
 }
 
-// Checkbox Icon
+// Checkboxes
+.newspack-checkbox-control {
+	margin-top: 0 !important;
+	.components-checkbox-control__label {
+		font-weight: 600;
+	}
+
+	.components-base-control__help {
+		margin-left: 32px;
+		margin-top: 0;
+	}
+}
 
+// Checkbox Icon
 .newspack-checkbox-icon {
 	background: white;
 	border-radius: 50%;

package/src/tabbed-navigation/style.scss

@@ -2,7 +2,7 @@
  * Tabbed Navigation
  */
 
-@use '~@wordpress/base-styles/colors' as wp-colors;
+@use "~@wordpress/base-styles/colors" as wp-colors;
 
 .newspack-tabbed-navigation {
 	background: white;
@@ -50,7 +50,7 @@
 			&:active,
 			&:focus,
 			&:hover {
-				color: var( --wp-admin-theme-color );
+				color: var(--wp-admin-theme-color);
 				outline: none;
 			}
 
@@ -64,10 +64,10 @@
 			}
 
 			&.selected {
-				box-shadow: inset 0 0 0 2px white, inset 0 0 0 4px var( --wp-admin-theme-color );
+				box-shadow: inset 0 0 0 2px white, inset 0 0 0 4px var(--wp-admin-theme-color);
 
 				@media screen and ( min-width: 600px ) {
-					border-color: var( --wp-admin-theme-color );
+					border-color: var(--wp-admin-theme-color);
 					box-shadow: none;
 				}
 			}

package/src/text-control/index.tsx

@@ -0,0 +1,65 @@
+/**
+ * Text Control
+ */
+
+/**
+ * WordPress dependencies
+ */
+import { TextControl as BaseComponent } from '@wordpress/components';
+import { useEffect, useRef } from '@wordpress/element';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import './style.scss';
+
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
+
+type BaseComponentProps = {
+	onChange: ( value: string ) => void;
+	value: string | number;
+};
+
+const TextControl = ( {
+	className = '',
+	required = false,
+	isWide = false,
+	withMargin = true,
+	...otherProps
+} ) => {
+	const wrapperRef = useRef< HTMLDivElement >( null );
+	useEffect( () => {
+		if ( wrapperRef.current === null ) {
+			return;
+		}
+		const labelEl = wrapperRef.current.querySelector( 'label' );
+		if ( labelEl ) {
+			labelEl.setAttribute( 'data-required-text', __( '(required)', 'newspack-plugin' ) );
+		}
+	}, [ wrapperRef.current ] );
+	const classes = classNames(
+		'newspack-text-control',
+		{
+			'newspack-text-control--wide': isWide,
+			'newspack-text-control--with-margin': withMargin,
+		},
+		className
+	);
+	return required ? (
+		<div ref={ wrapperRef } className="newspack-text-control--required">
+			<BaseComponent
+				className={ classes }
+				required={ required }
+				{ ...( otherProps as BaseComponentProps ) }
+			/>
+		</div>
+	) : (
+		<BaseComponent className={ classes } { ...( otherProps as BaseComponentProps ) } />
+	);
+};
+
+export default TextControl;

package/src/web-preview/index.js

@@ -81,19 +81,19 @@ class WebPreview extends Component {
 									onClick={ () => this.setState( { device: 'desktop' } ) }
 									variant={ 'desktop' === device && 'primary' }
 									icon={ desktop }
-									label={ __( 'Preview Desktop Size', 'newspack' ) }
+									label={ __( 'Preview Desktop Size', 'newspack-plugin' ) }
 								/>
 								<Button
 									onClick={ () => this.setState( { device: 'tablet' } ) }
 									variant={ 'tablet' === device && 'primary' }
 									icon={ tablet }
-									label={ __( 'Preview Tablet Size', 'newspack' ) }
+									label={ __( 'Preview Tablet Size', 'newspack-plugin' ) }
 								/>
 								<Button
 									onClick={ () => this.setState( { device: 'phone' } ) }
 									variant={ 'phone' === device && 'primary' }
 									icon={ mobile }
-									label={ __( 'Preview Phone Size', 'newspack' ) }
+									label={ __( 'Preview Phone Size', 'newspack-plugin' ) }
 								/>
 							</ButtonGroup>
 						</div>
@@ -104,7 +104,7 @@ class WebPreview extends Component {
 									this.setState( { isPreviewVisible: false, loaded: false } );
 								} }
 								icon={ closeSmall }
-								label={ __( 'Close Preview', 'newspack' ) }
+								label={ __( 'Close Preview', 'newspack-plugin' ) }
 							/>
 						</div>
 					</div>
@@ -112,7 +112,7 @@ class WebPreview extends Component {
 						{ ! loaded && (
 							<div className="newspack-web-preview__is-waiting">
 								<Waiting isLeft />
-								{ __( 'Loading…', 'newspack' ) }
+								{ __( 'Loading…', 'newspack-plugin' ) }
 							</div>
 						) }
 						<iframe
@@ -166,7 +166,7 @@ class WebPreview extends Component {
 
 WebPreview.defaultProps = {
 	url: '//newspack.com',
-	label: __( 'Preview', 'newspack' ),
+	label: __( 'Preview', 'newspack-plugin' ),
 	onLoad: () => {},
 };
 

package/src/web-preview/style.scss

@@ -2,8 +2,8 @@
  * Web Preview
  */
 
-@use '../../../shared/scss/colors';
-@use '~@wordpress/base-styles/colors' as wp-colors;
+@use "../../../shared/scss/colors";
+@use "~@wordpress/base-styles/colors" as wp-colors;
 
 .newspack-web-preview {
 	// Color
@@ -14,7 +14,7 @@
 	--wp-admin-theme-color-darker-20: #{colors.$primary-700};
 	--wp-admin-theme-color-darker-20--rgb: #{colors.$primary-700--rgb};
 
-	background: rgba( black, 0.7 );
+	background: rgba(black, 0.7);
 	box-sizing: border-box;
 	height: 100%;
 	left: 0;
@@ -54,7 +54,7 @@
 
 	&__content {
 		background: wp-colors.$gray-100;
-		height: calc( 100% - 49px );
+		height: calc(100% - 49px);
 		-webkit-overflow-scrolling: touch;
 		overflow-x: hidden;
 		width: 100%;
@@ -81,7 +81,7 @@
 		margin: -12px 0 0;
 		position: absolute;
 		top: 50%;
-		transform: translateX( -50% );
+		transform: translateX(-50%);
 	}
 
 	&__toolbar {

package/src/with-wizard/index.js

@@ -105,7 +105,7 @@ export default function withWizard( WrappedComponent, requiredPlugins ) {
 					<Notice noticeText={ message } isError rawHTML />
 					<Card buttonsCard noBorder className="justify-end">
 						<Button isPrimary href={ fallbackURL }>
-							{ __( 'Return to Dashboard', 'newspack' ) }
+							{ __( 'Return to Dashboard', 'newspack-plugin' ) }
 						</Button>
 					</Card>
 				</Modal>
@@ -219,7 +219,7 @@ export default function withWizard( WrappedComponent, requiredPlugins ) {
 											<Button
 												isLink
 												href={ newspack_urls.dashboard }
-												label={ __( 'Return to Dashboard', 'newspack' ) }
+												label={ __( 'Return to Dashboard', 'newspack-plugin' ) }
 												showTooltip={ true }
 												icon={ home }
 												iconSize={ 36 }
@@ -229,8 +229,8 @@ export default function withWizard( WrappedComponent, requiredPlugins ) {
 											<div>
 												<h2>
 													{ requiredPlugins.length > 1
-														? __( 'Required plugins', 'newspack' )
-														: __( 'Required plugin', 'newspack' ) }
+														? __( 'Required plugins', 'newspack-plugin' )
+														: __( 'Required plugin', 'newspack-plugin' ) }
 												</h2>
 											</div>
 										</div>