Merge branch 'amp-stories-redux' into amp-story/1963-call-to-action

ampproject · Apr 4, 2019 · 256522e · 256522e
2 parents 98c24dd + bd02987
commit 256522e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/assets/css/amp-stories.css b/assets/css/amp-stories.css
@@ -41,9 +41,11 @@ amp-story-grid-layer[template="fill"] .wp-block-image { margin: 0; }
 	color: inherit;
 }
 
-.is-style-rounded {
+.is-style-rounded,
+.is-style-rounded img {
     border-radius: 5px;
 }
-.is-style-rounded img {
-	border-radius: 5px;
+
+.is-style-half-rounded {
+	border-radius: 4px 4px 26px 26px;
 }
diff --git a/assets/src/amp-story-editor-blocks.js b/assets/src/amp-story-editor-blocks.js
@@ -137,6 +137,11 @@ domReady( () => {
 		label: __( 'Rounded', 'amp' ),
 	} );
 
+	registerBlockStyle( 'amp/amp-story-text', {
+		name: 'half-rounded',
+		label: __( 'Half Rounded', 'amp' ),
+	} );
+
 	registerBlockStyle( 'core/image', {
 		name: 'rounded',
 		label: __( 'Rounded', 'amp' ),

diff --git a/assets/src/blocks/amp-story-text/edit.js b/assets/src/blocks/amp-story-text/edit.js
@@ -234,8 +234,16 @@ class TextBlockEdit extends Component {
 						identifier="content"
 						wrapperClassName="wp-block-amp-story-text"
 						tagName="p"
-						value={ content }
-						onChange={ ( value ) => setAttributes( { content: value } ) }
+						// Ensure line breaks are normalised to HTML.
+						value={ content.replace( /\n/g, '<br>' ) }
+						onChange={ ( nextContent ) => {
+							setAttributes( {
+								// Ensure line breaks are normalised to characters. This
+								// saves space, is easier to read, and ensures display
+								// filters work correctly.
+								content: nextContent.replace( /<br ?\/?>/g, '\n' ),
+							} );
+						} }
 						onReplace={ this.onReplace }
 						style={ {
 							backgroundColor: backgroundColor.color,

diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
@@ -846,6 +846,8 @@ function ( $font ) use ( $name ) {
 	public static function render_block_with_google_fonts( $props, $content ) {
 		$prop_name = 'ampFontFamily';
 
+		$content = nl2br( $content, false );
+
 		// Short-circuit if no font family present.
 		if ( empty( $props[ $prop_name ] ) ) {
 			return $content;

diff --git a/tests/test-class-amp-service-worker.php b/tests/test-class-amp-service-worker.php
@@ -246,6 +246,9 @@ function () {
 		$this->assertEquals( 'exited', $exception->getMessage() );
 		$output = ob_get_clean();
 		$this->assertContains( '<script>navigator.serviceWorker.register', $output );
+
+		// Go back home to clean up 🤷!
+		$this->go_to( home_url() );
 	}
 
 }