Automattic
diff --git a/‎.distignore‎
Lines changed: 1 addition & 0 deletions b/‎.distignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎CHANGELOG.md‎
Lines changed: 48 additions & 0 deletions b/‎CHANGELOG.md‎
Lines changed: 48 additions & 0 deletions
diff --git a/‎assets/blocks/reader-registration/index.php‎
Lines changed: 6 additions & 6 deletions b/‎assets/blocks/reader-registration/index.php‎
Lines changed: 6 additions & 6 deletions
diff --git a/‎assets/components/src/action-card/index.js‎
Lines changed: 42 additions & 8 deletions b/‎assets/components/src/action-card/index.js‎
Lines changed: 42 additions & 8 deletions
diff --git a/‎assets/components/src/action-card/style.scss‎
Lines changed: 79 additions & 0 deletions b/‎assets/components/src/action-card/style.scss‎
Lines changed: 79 additions & 0 deletions
diff --git a/‎assets/components/src/consts.js‎
Lines changed: 1 addition & 0 deletions b/‎assets/components/src/consts.js‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎assets/components/src/image-upload/index.js‎
Lines changed: 9 additions & 3 deletions b/‎assets/components/src/image-upload/index.js‎
Lines changed: 9 additions & 3 deletions
diff --git a/‎assets/components/src/index.js‎
Lines changed: 2 additions & 0 deletions b/‎assets/components/src/index.js‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎assets/components/src/notice/index.js‎
Lines changed: 2 additions & 0 deletions b/‎assets/components/src/notice/index.js‎
Lines changed: 2 additions & 0 deletions
@@ -6,6 +6,7 @@
 *.config.js
 .git
 .gitlab-ci.yml
+.hooks
 .travis.yml
 .DS_Store
 Thumbs.db
 
@@ -1,3 +1,51 @@
+# [1.114.0-alpha.4](https://github.com/Automattic/newspack-plugin/compare/v1.114.0-alpha.3...v1.114.0-alpha.4) (2023-05-08)
+
+
+### Bug Fixes
+
+* check for required plugins in RAS setup wizard ([#2442](https://github.com/Automattic/newspack-plugin/issues/2442)) ([0d5bb63](https://github.com/Automattic/newspack-plugin/commit/0d5bb63e028a13f47712150787f707593a68e969))
+
+# [1.114.0-alpha.3](https://github.com/Automattic/newspack-plugin/compare/v1.114.0-alpha.2...v1.114.0-alpha.3) (2023-05-03)
+
+
+### Bug Fixes
+
+* **ras-defaults:** feedback from QA ([#2437](https://github.com/Automattic/newspack-plugin/issues/2437)) ([1dd1f36](https://github.com/Automattic/newspack-plugin/commit/1dd1f369427c137f9c24a72a559370a264b77def))
+
+
+### Features
+
+* **auth:** support "register modal" hash url ([#2427](https://github.com/Automattic/newspack-plugin/issues/2427)) ([fcb1199](https://github.com/Automattic/newspack-plugin/commit/fcb119964dbe6e977efa0ce5d236b736a6af79b0))
+
+# [1.114.0-alpha.2](https://github.com/Automattic/newspack-plugin/compare/v1.114.0-alpha.1...v1.114.0-alpha.2) (2023-05-03)
+
+
+### Bug Fixes
+
+* **ras-defaults:** updates for design review feedback ([#2435](https://github.com/Automattic/newspack-plugin/issues/2435)) ([3aa6de7](https://github.com/Automattic/newspack-plugin/commit/3aa6de7e9a77d9640f3b42c2e9bf8182f3dc2d1b))
+
+
+### Features
+
+* update NRH settings page and redirect behavior ([#2425](https://github.com/Automattic/newspack-plugin/issues/2425)) ([f7a6c6b](https://github.com/Automattic/newspack-plugin/commit/f7a6c6b5d9ef5876c1128407b541a6d8cd986a95))
+
+# [1.114.0-alpha.1](https://github.com/Automattic/newspack-plugin/compare/v1.113.0...v1.114.0-alpha.1) (2023-04-28)
+
+
+### Bug Fixes
+
+* add filter to prompt conflicts check ([#2421](https://github.com/Automattic/newspack-plugin/issues/2421)) ([8d1c1d3](https://github.com/Automattic/newspack-plugin/commit/8d1c1d3e17ae51f97a7d783b05c4fef4a2b6660e))
+* ensure .hooks is excluded from the dist ZIP ([#2420](https://github.com/Automattic/newspack-plugin/issues/2420)) ([75f8f36](https://github.com/Automattic/newspack-plugin/commit/75f8f3665bc19ee65333726906e42a1a8724ef25))
+* **newsletters:** only attempt token verification for Constant Contact ([#2407](https://github.com/Automattic/newspack-plugin/issues/2407)) ([c58f9a8](https://github.com/Automattic/newspack-plugin/commit/c58f9a8c8036d5c86987768a20117bf7d3c00d68))
+* **perfmatters:** exclude Jetpack and Newsletters css delay ([#2410](https://github.com/Automattic/newspack-plugin/issues/2410)) ([d2b167c](https://github.com/Automattic/newspack-plugin/commit/d2b167c19ecc851ef8a3a3a1d052d28c23a1ac83))
+
+
+### Features
+
+* memberships block patterns ([#2406](https://github.com/Automattic/newspack-plugin/issues/2406)) ([c96555a](https://github.com/Automattic/newspack-plugin/commit/c96555a7297b82644dfa67fb873692411890debc))
+* RAS setup UI and default Campaigns wizard ([#2426](https://github.com/Automattic/newspack-plugin/issues/2426)) ([a1d4eb7](https://github.com/Automattic/newspack-plugin/commit/a1d4eb7aad13449cb1d847fb25ee2414028fdb69)), closes [#2381](https://github.com/Automattic/newspack-plugin/issues/2381) [#2366](https://github.com/Automattic/newspack-plugin/issues/2366) [#2382](https://github.com/Automattic/newspack-plugin/issues/2382)
+* **sign-in:** body class when in modal and url hash ([#2414](https://github.com/Automattic/newspack-plugin/issues/2414)) ([aea4dc9](https://github.com/Automattic/newspack-plugin/commit/aea4dc949439f459465fa15c695639a65dcb26f8))
+
 # [1.113.0](https://github.com/Automattic/newspack-plugin/compare/v1.112.1...v1.113.0) (2023-04-24)
 
 
 
@@ -28,7 +28,7 @@ function register_block() {
 	);
 
 	// No need to register block styles if Reader Activation is disabled.
-	if ( ! Reader_Activation::is_enabled() ) {
+	if ( ! Reader_Activation::is_enabled( false ) ) {
 		return;
 	}
 
@@ -54,8 +54,8 @@ function register_block() {
  * Enqueue front-end scripts.
  */
 function enqueue_scripts() {
-	// No need to enqueue scripts if Reader Activation is disabled.
-	if ( ! Reader_Activation::is_enabled() ) {
+	// No need to enqueue scripts if Reader Activation is disabled and not a preview request.
+	if ( ! Reader_Activation::allow_reg_block_render() ) {
 		return;
 	}
 
@@ -99,8 +99,8 @@ function get_form_id() {
  * @param string  $content Block content (inner blocks) – success state in this case.
  */
 function render_block( $attrs, $content ) {
-	// Render nothing if Reader Activation is disabled.
-	if ( ! Reader_Activation::is_enabled() ) {
+	// Render nothing if Reader Activation is disabled and not a preview request.
+	if ( ! Reader_Activation::allow_reg_block_render() ) {
 		return '';
 	}
 
@@ -152,7 +152,7 @@ function render_block( $attrs, $content ) {
 	if (
 		! \is_preview() &&
 		! $is_admin_preview &&
-		( ! method_exists( 'Newspack_Popups', 'is_preview_request' ) || ! \Newspack_Popups::is_preview_request() ) &&
+		( ! method_exists( '\Newspack_Popups', 'is_preview_request' ) || ! \Newspack_Popups::is_preview_request() ) &&
 		(
 			\is_user_logged_in() ||
 			( isset( $_GET['newspack_reader'] ) && absint( $_GET['newspack_reader'] ) )
 
@@ -7,7 +7,7 @@
  */
 import { Component } from '@wordpress/element';
 import { ExternalLink, ToggleControl } from '@wordpress/components';
-import { Icon, check } from '@wordpress/icons';
+import { Icon, check, chevronDown, chevronUp } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -21,12 +21,21 @@ import './style.scss';
 import classnames from 'classnames';
 
 class ActionCard extends Component {
-	backgroundImageStyles = url => {
-		return url ? { backgroundImage: `url(${ url })` } : {};
+	state = {
+		expanded: false,
 	};
 
 	/**
-	 * Render
+	 * When the collapse prop is updated to true, collapse the card if already expanded.
+	 */
+	componentDidUpdate( prevProps ) {
+		if ( ! prevProps.collapse && this.props.collapse && this.state.expanded ) {
+			this.setState( { expanded: false } );
+		}
+	}
+
+	/**
+	 * Render.
 	 */
 	render() {
 		const {
@@ -60,19 +69,31 @@ class ActionCard extends Component {
 			toggleChecked,
 			toggleOnChange,
 			hasGreyHeader,
+			hasWhiteHeader,
 			isPending,
+			expandable = false,
 		} = this.props;
+
+		const { expanded } = this.state;
+
 		const hasChildren = notification || children;
 		const classes = classnames(
 			'newspack-action-card',
 			simple && 'newspack-card--is-clickable',
 			hasGreyHeader && 'newspack-card--has-grey-header',
+			hasWhiteHeader && 'newspack-card--has-white-header',
 			hasChildren && 'newspack-card--has-children',
 			indent && 'newspack-card--indent',
 			isSmall && 'is-small',
 			isMedium && 'is-medium',
+			checkbox && 'has-checkbox',
+			expandable && 'is-expandable',
+			actionContent && 'has-action-content',
 			className
 		);
+		const backgroundImageStyles = url => {
+			return url ? { backgroundImage: `url(${ url })` } : {};
+		};
 		const titleProps =
 			toggleOnChange && ! titleLink && ! disabled
 				? { onClick: () => toggleOnChange( ! toggleChecked ), tabIndex: '0' }
@@ -95,7 +116,7 @@ class ActionCard extends Component {
 							<a href={ imageLink }>
 								<div
 									className="newspack-action-card__image"
-									style={ this.backgroundImageStyles( image ) }
+									style={ backgroundImageStyles( image ) }
 								/>
 							</a>
 						</div>
@@ -118,7 +139,13 @@ class ActionCard extends Component {
 						<Grid columns={ 1 } gutter={ 8 } noMargin>
 							<h2>
 								<span className="newspack-action-card__title" { ...titleProps }>
-									{ titleLink ? <a href={ titleLink }>{ title }</a> : title }
+									{ titleLink && <a href={ titleLink }>{ title }</a> }
+									{ ! titleLink && expandable && (
+										<Button isLink onClick={ () => this.setState( { expanded: ! expanded } ) }>
+											{ title }
+										</Button>
+									) }
+									{ ! titleLink && ! expandable && title }
 								</span>
 								{ badges?.length &&
 									badges.map( ( badgeText, i ) => (
@@ -135,7 +162,7 @@ class ActionCard extends Component {
 							) }
 						</Grid>
 					</div>
-					{ ( actionText || isDisplayingSecondaryAction || actionContent ) && (
+					{ ! expandable && ( actionText || isDisplayingSecondaryAction || actionContent ) && (
 						<div className="newspack-action-card__region newspack-action-card__region-right">
 							{ /* eslint-disable no-nested-ternary */ }
 							{ actionContent && actionContent }
@@ -176,6 +203,11 @@ class ActionCard extends Component {
 							) }
 						</div>
 					) }
+					{ expandable && (
+						<Button onClick={ () => this.setState( { expanded: ! expanded } ) }>
+							<Icon icon={ expanded ? chevronUp : chevronDown } height={ 24 } width={ 24 } />
+						</Button>
+					) }
 				</div>
 				{ notification && (
 					<div className="newspack-action-card__notification newspack-action-card__region-children">
@@ -193,7 +225,9 @@ class ActionCard extends Component {
 						) }
 					</div>
 				) }
-				{ children && <div className="newspack-action-card__region-children">{ children }</div> }
+				{ children && ( ( expandable && expanded ) || ! expandable ) && (
+					<div className="newspack-action-card__region-children">{ children }</div>
+				) }
 			</Card>
 		);
 	}
 
@@ -146,6 +146,24 @@
 		}
 	}
 
+	// 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;
+			}
+		}
+	}
+
 	// Has grey header
 
 	&.newspack-card--has-grey-header {
@@ -155,6 +173,11 @@
 			.newspack-action-card__region-top {
 				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 {
@@ -168,6 +191,13 @@
 		}
 	}
 
+	&.newspack-card--has-white-header {
+		.newspack-action-card__region-top {
+			background-color: transparent;
+			border: none !important;
+		}
+	}
+
 	// Indent
 
 	&.newspack-card--indent {
@@ -348,6 +378,12 @@
 				margin-top: 0;
 			}
 		}
+
+		&.newspack-action-card__region-children {
+			.newspack-notice {
+				margin-top: 32px;
+			}
+		}
 	}
 
 	// Image
@@ -393,6 +429,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
 
 	& + & {
 
@@ -1,2 +1,3 @@
 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';
@@ -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>
 					) }
 
@@ -30,6 +30,8 @@ export { default as SectionHeader } from './section-header';
 export { default as SelectControl } from './select-control';
 export { default as DateRangePicker } from './date-range-picker';
 export { default as Settings } from './settings';
+export { default as StepsList } from './steps-list';
+export { default as StepsListItem } from './steps-list-item';
 export { default as StyleCard } from './style-card';
 export { default as TabbedNavigation } from './tabbed-navigation';
 export { default as TextControl } from './text-control';
 
@@ -28,6 +28,7 @@ class Notice extends Component {
 			className,
 			debugMode,
 			isError,
+			isHandoff,
 			isHelp,
 			isSuccess,
 			isWarning,
@@ -41,6 +42,7 @@ class Notice extends Component {
 			className,
 			debugMode && 'newspack-notice__is-debug',
 			isError && 'newspack-notice__is-error',
+			isHandoff && 'newspack-notice__is-handoff',
 			isHelp && 'newspack-notice__is-help',
 			isSuccess && 'newspack-notice__is-success',
 			isWarning && 'newspack-notice__is-warning'
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`export const NEWSPACK_SITE_URL = 'https://newspack.com';`
`2`	`2`	export const NEWSPACK_SUPPORT_URL = `${ NEWSPACK_SITE_URL }/support`;
	`3`	`+export const HANDOFF_KEY = 'newspack_wizard_handoff_message';`