From a0ec88565b6f1ddeb89d09b4ad22b47d827eebda Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 2 May 2019 21:39:45 +0200
Subject: [PATCH 01/19] Prevent themes from overriding font sizes in stories

---
 includes/class-amp-story-post-type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
index ab85742e631..a7562d6cde2 100644
--- a/includes/class-amp-story-post-type.php
+++ b/includes/class-amp-story-post-type.php
@@ -439,7 +439,7 @@ public static function enqueue_general_styles() {
 	 */
 	public static function filter_block_editor_settings( $editor_settings, $post ) {
 		if ( self::POST_TYPE_SLUG === $post->post_type ) {
-			unset( $editor_settings['colors'] );
+			unset( $editor_settings['fontSizes'], $editor_settings['colors'] );
 		}
 
 		if ( get_current_screen()->is_block_editor && isset( $editor_settings['styles'] ) ) {

From 489bbe6c9faf569155e2b4428494fb21b2f00507 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Thu, 2 May 2019 22:09:03 +0200
Subject: [PATCH 02/19] Revert de81615e3af6ce79cac8dc09208608d758306d3b

---
 assets/src/helpers.js | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/assets/src/helpers.js b/assets/src/helpers.js
index 318dccb6be6..baad3d1a412 100644
--- a/assets/src/helpers.js
+++ b/assets/src/helpers.js
@@ -13,7 +13,7 @@ import { count } from '@wordpress/wordcount';
 import { __, _x, sprintf } from '@wordpress/i18n';
 import { select, dispatch } from '@wordpress/data';
 import { createBlock } from '@wordpress/blocks';
-import { getColorClassName, getColorObjectByAttributeValues, RichText } from '@wordpress/block-editor';
+import { getColorClassName, getColorObjectByAttributeValues, getFontSize, RichText } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -887,14 +887,14 @@ export const getStylesFromBlockAttributes = ( {
 } ) => {
 	const textClass = getColorClassName( 'color', textColor );
 
-	const { colors } = select( 'core/block-editor' ).getSettings();
+	const { colors, fontSizes } = select( 'core/block-editor' ).getSettings();
 
 	/*
      * Calculate font size using vw to make it responsive.
      *
      * Get the font size in px based on the slug with fallback to customFontSize.
      */
-	const userFontSize = fontSize ? getFontSizeFromSlug( fontSize ) : customFontSize;
+	const userFontSize = fontSize ? getFontSize( fontSizes, fontSize, customFontSize ).size : customFontSize;
 	const fontSizeResponsive = userFontSize && ( ( userFontSize / STORY_PAGE_INNER_WIDTH ) * 100 ).toFixed( 2 ) + 'vw';
 
 	const appliedBackgroundColor = getBackgroundColorWithOpacity( colors, backgroundColor, customBackgroundColor, opacity );
@@ -909,25 +909,6 @@ export const getStylesFromBlockAttributes = ( {
 	};
 };
 
-/**
- * Get font size from slug.
- *
- * @param {string} slug Font slug.
- * @return {number} Font size in pixels.
- */
-const getFontSizeFromSlug = ( slug ) => {
-	switch ( slug ) {
-		case 'small':
-			return 19.5;
-		case 'large':
-			return 36.5;
-		case 'huge':
-			return 49.5;
-		default:
-			return 16;
-	}
-};
-
 export const getMetaBlockSettings = ( { attribute, placeholder, tagName = 'p', isEditable = false } ) => {
 	const supports = {
 		anchor: true,

From bd7d5f0cdda5a805f9cc99af69a90084b5b0c880 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Thu, 2 May 2019 16:02:10 -0500
Subject: [PATCH 03/19] Remove the inline height styling on the Latest Stores
 block

This seemed to make the height too high.
Though more testing might show it was needed.
---
 includes/class-amp-story-post-type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
index ab85742e631..adc4f98ee7c 100644
--- a/includes/class-amp-story-post-type.php
+++ b/includes/class-amp-story-post-type.php
@@ -1196,7 +1196,7 @@ public static function render_block_latest_stories( $attributes ) {
 			<?php if ( $is_amp_carousel ) : ?>
 				<amp-carousel layout="fixed-height" height="<?php echo esc_attr( $min_height ); ?>" type="carousel" class="latest-stories-carousel">
 			<?php else : ?>
-				<ul class="latest-stories-carousel" style="height:<?php echo esc_attr( $min_height ); ?>px;">
+				<ul class="latest-stories-carousel">
 			<?php endif; ?>
 				<?php foreach ( $story_query->posts as $post ) : ?>
 					<<?php echo $is_amp_carousel ? 'div' : 'li'; ?> class="slide latest-stories__slide">

From 90283ef0e982a5f75e26f383c4b2940e9d486f31 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sun, 5 May 2019 16:28:51 -0500
Subject: [PATCH 04/19] Fix an issue in the AMP Story embed where there wasn't
 enough height.

Also, remove disallowed attributes,
like security and marginheight.
---
 includes/class-amp-story-post-type.php   | 47 ++++++++++++++++++++++++
 tests/test-class-amp-story-post-type.php | 35 ++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
index adc4f98ee7c..632b0ce5d60 100644
--- a/includes/class-amp-story-post-type.php
+++ b/includes/class-amp-story-post-type.php
@@ -195,6 +195,9 @@ public static function register() {
 		// In the block editor, remove the title from above the AMP Stories embed.
 		add_filter( 'embed_html', array( __CLASS__, 'remove_title_from_embed' ), 10, 2 );
 
+		// Change some attributes for the AMP story embed.
+		add_filter( 'embed_html', array( __CLASS__, 'change_embed_iframe_attributes' ), 10, 2 );
+
 		// Override the render_callback for AMP story embeds.
 		add_filter( 'pre_render_block', array( __CLASS__, 'override_story_embed_callback' ), 10, 2 );
 
@@ -1368,4 +1371,48 @@ public static function remove_title_from_embed( $output, $post ) {
 
 		return preg_replace( '/<blockquote class="wp-embedded-content">.*?<\/blockquote>/', '', $output );
 	}
+
+	/**
+	 * Changes attributes of the AMP Story embed <iframe>.
+	 *
+	 * The embed typically appears in the editor in an <iframe>, and without an <iframe> on the front-end.
+	 * The height of the <iframe> isn't enough to display the full story, so this increases it.
+	 * Also, this removes attributes that AMP does not allow for the <amp-iframe>, like marginwidth.
+	 *
+	 * @param string  $output The embed output.
+	 * @param WP_Post $post The post for the embed.
+	 * @return string The filtered embed output.
+	 */
+	public static function change_embed_iframe_attributes( $output, $post ) {
+		if ( self::POST_TYPE_SLUG !== get_post_type( $post ) ) {
+			return $output;
+		}
+
+		preg_match( '/<iframe sandbox="allow-scripts" [^>]*>/', $output, $matches );
+		if ( ! $matches ) {
+			return $output;
+		}
+
+		$original_iframe = $matches[0];
+		$new_iframe      = preg_replace(
+			'/(?<=\sheight=")\w+(?=")/',
+			strval( ( self::STORY_LARGE_IMAGE_DIMENSION / 2 ) + 4 ),
+			$original_iframe
+		);
+
+		// Remove attributes that AMP doesn't allow for the <amp-iframe>.
+		if ( is_amp_endpoint() ) {
+			$new_iframe = preg_replace(
+				array(
+					'/\ssecurity="[\w]+"/',
+					'/\smarginwidth="[\w]+"/',
+					'/\smarginheight="[\w]+"/',
+				),
+				'',
+				$new_iframe
+			);
+		}
+
+		return str_replace( $original_iframe, $new_iframe, $output );
+	}
 }
diff --git a/tests/test-class-amp-story-post-type.php b/tests/test-class-amp-story-post-type.php
index 0ec9306cb07..8c6460b9ffb 100644
--- a/tests/test-class-amp-story-post-type.php
+++ b/tests/test-class-amp-story-post-type.php
@@ -35,6 +35,7 @@ public function tearDown() {
 
 		$wp_rewrite->set_permalink_structure( false );
 		unset( $_SERVER['HTTPS'] );
+		unset( $GLOBALS['current_screen'] );
 		parent::tearDown();
 	}
 
@@ -307,6 +308,40 @@ public function test_remove_title_from_embed() {
 		$this->assertEquals( $initial_output, AMP_Story_Post_Type::remove_title_from_embed( $output_with_blockquote, $correct_post ) );
 	}
 
+	/**
+	 * Test change_embed_iframe_attributes.
+	 *
+	 * @covers \AMP_Editor_Blocks::change_embed_iframe_attributes()
+	 */
+	public function test_change_embed_iframe_attributes() {
+		$original_embed_markup = '<iframe sandbox="allow-scripts" width="600" height="343" security="restricted" marginwidth="10" marginheight="10">';
+		$non_amp_story         = $this->factory()->post->create_and_get();
+
+		// This isn't an AMP story embed, so it shouldn't change the markup.
+		$this->assertEquals( $original_embed_markup, AMP_Story_Post_Type::change_embed_iframe_attributes( $original_embed_markup, $non_amp_story ) );
+
+		// This is an AMP story embed, but the markup doesn't have an <iframe>, so it shouldn't be changed.
+		$amp_story                   = $this->factory()->post->create_and_get( array( 'post_type' => AMP_Story_Post_Type::POST_TYPE_SLUG ) );
+		$embed_markup_without_iframe = '<div class="wp-embed"><img src="https://example.com/baz.jpeg></div>';
+		$this->assertEquals( $embed_markup_without_iframe, AMP_Story_Post_Type::change_embed_iframe_attributes( $embed_markup_without_iframe, $amp_story ) );
+
+		// This is an AMP story embed, so it should change the height.
+		$this->assertEquals(
+			'<iframe sandbox="allow-scripts" width="600" height="468" security="restricted" marginwidth="10" marginheight="10">',
+			AMP_Story_Post_Type::change_embed_iframe_attributes( $original_embed_markup, $amp_story )
+		);
+
+		// Simulate this being an AMP endpoint, and avoid a _doing_it_wrong() warning for is_amp_endpoint().
+		add_theme_support( 'amp' );
+		do_action( 'wp' );
+
+		// This is an AMP endpoint, so it should also remove other illegal attributes.
+		$this->assertEquals(
+			'<iframe sandbox="allow-scripts" width="600" height="468">',
+			AMP_Story_Post_Type::change_embed_iframe_attributes( $original_embed_markup, $amp_story )
+		);
+	}
+
 	/**
 	 * Creates amp_story posts with featured images of given heights.
 	 *

From 55096cc7e126e89aa3bf010bbce95e0fee905c55 Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sun, 5 May 2019 16:42:02 -0500
Subject: [PATCH 05/19] Address a failed unit test

Maybe another test method used
add_theme_support( 'amp' ),
and that was not cleared for this test.
---
 tests/test-class-amp-story-post-type.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test-class-amp-story-post-type.php b/tests/test-class-amp-story-post-type.php
index 8c6460b9ffb..5520711e206 100644
--- a/tests/test-class-amp-story-post-type.php
+++ b/tests/test-class-amp-story-post-type.php
@@ -314,6 +314,7 @@ public function test_remove_title_from_embed() {
 	 * @covers \AMP_Editor_Blocks::change_embed_iframe_attributes()
 	 */
 	public function test_change_embed_iframe_attributes() {
+		remove_theme_support( 'amp' );
 		$original_embed_markup = '<iframe sandbox="allow-scripts" width="600" height="343" security="restricted" marginwidth="10" marginheight="10">';
 		$non_amp_story         = $this->factory()->post->create_and_get();
 

From e288e14bc00e74780a777e3cf52a2050c62da56e Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sun, 5 May 2019 17:04:31 -0500
Subject: [PATCH 06/19] Override box-shadow styling for the AMP Story embed
 card

Twenty Seventeen has a style rule for :hover,
which applies changes the display.
So override this, by going to box-shadow: none
---
 assets/css/amp-story-card.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/assets/css/amp-story-card.css b/assets/css/amp-story-card.css
index 2ef3c7041b9..e14ae0e0f42 100644
--- a/assets/css/amp-story-card.css
+++ b/assets/css/amp-story-card.css
@@ -29,6 +29,11 @@ div.amp-block-latest-stories > ul.latest-stories-carousel {
 	overflow-x: hidden;
 }
 
+.amp-story-embed .latest_stories__link:hover {
+	box-shadow: none;
+	-webkit-box-shadow: none;
+}
+
 /* Applies the darker gradient background, to allow the white text to display even against a white featured image. */
 .latest_stories__link:after {
 	display: block;

From 144e09b021911ca6f71e5690497e06310d4b071b Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sat, 11 May 2019 18:59:56 -0500
Subject: [PATCH 07/19] Remove the logic that stripped attributes disallowed in
 AMP

As Miina raised, it's not likely that they'll appear
on the front-end.
This filter operates on the editor display.
I couldn't find a case where they appeared on the front-end.
---
 includes/class-amp-story-post-type.php   | 31 +++++-------------------
 tests/test-class-amp-story-post-type.php | 10 --------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
index 632b0ce5d60..0b214736697 100644
--- a/includes/class-amp-story-post-type.php
+++ b/includes/class-amp-story-post-type.php
@@ -1388,31 +1388,12 @@ public static function change_embed_iframe_attributes( $output, $post ) {
 			return $output;
 		}
 
-		preg_match( '/<iframe sandbox="allow-scripts" [^>]*>/', $output, $matches );
-		if ( ! $matches ) {
-			return $output;
-		}
-
-		$original_iframe = $matches[0];
-		$new_iframe      = preg_replace(
-			'/(?<=\sheight=")\w+(?=")/',
-			strval( ( self::STORY_LARGE_IMAGE_DIMENSION / 2 ) + 4 ),
-			$original_iframe
+		// Add 4px more height, as the <iframe> needs that to display the full image.
+		$new_height = strval( ( self::STORY_LARGE_IMAGE_DIMENSION / 2 ) + 4 );
+		return preg_replace(
+			'/(<iframe sandbox="allow-scripts"[^>]*\sheight=")(\w+)("[^>]*>)/',
+			sprintf( '${1}%s${3}', $new_height ),
+			$output
 		);
-
-		// Remove attributes that AMP doesn't allow for the <amp-iframe>.
-		if ( is_amp_endpoint() ) {
-			$new_iframe = preg_replace(
-				array(
-					'/\ssecurity="[\w]+"/',
-					'/\smarginwidth="[\w]+"/',
-					'/\smarginheight="[\w]+"/',
-				),
-				'',
-				$new_iframe
-			);
-		}
-
-		return str_replace( $original_iframe, $new_iframe, $output );
 	}
 }
diff --git a/tests/test-class-amp-story-post-type.php b/tests/test-class-amp-story-post-type.php
index 5520711e206..ccfc0fdf380 100644
--- a/tests/test-class-amp-story-post-type.php
+++ b/tests/test-class-amp-story-post-type.php
@@ -331,16 +331,6 @@ public function test_change_embed_iframe_attributes() {
 			'<iframe sandbox="allow-scripts" width="600" height="468" security="restricted" marginwidth="10" marginheight="10">',
 			AMP_Story_Post_Type::change_embed_iframe_attributes( $original_embed_markup, $amp_story )
 		);
-
-		// Simulate this being an AMP endpoint, and avoid a _doing_it_wrong() warning for is_amp_endpoint().
-		add_theme_support( 'amp' );
-		do_action( 'wp' );
-
-		// This is an AMP endpoint, so it should also remove other illegal attributes.
-		$this->assertEquals(
-			'<iframe sandbox="allow-scripts" width="600" height="468">',
-			AMP_Story_Post_Type::change_embed_iframe_attributes( $original_embed_markup, $amp_story )
-		);
 	}
 
 	/**

From 4c13a01e319ae5ed05a6d2fd99f0c62e6978edee Mon Sep 17 00:00:00 2001
From: Ryan Kienstra <kienstraryan@gmail.com>
Date: Sat, 11 May 2019 19:26:21 -0500
Subject: [PATCH 08/19] Update the DocBlock for the recent change

This now only changes the height, not other attributes.
So remove the explanations for them.
---
 includes/class-amp-story-post-type.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/includes/class-amp-story-post-type.php b/includes/class-amp-story-post-type.php
index 0b214736697..64306f3a3f0 100644
--- a/includes/class-amp-story-post-type.php
+++ b/includes/class-amp-story-post-type.php
@@ -1373,11 +1373,10 @@ public static function remove_title_from_embed( $output, $post ) {
 	}
 
 	/**
-	 * Changes attributes of the AMP Story embed <iframe>.
+	 * Changes the height of the AMP Story embed <iframe>.
 	 *
-	 * The embed typically appears in the editor in an <iframe>, and without an <iframe> on the front-end.
+	 * In the block editor, this embed typically appears in an <iframe>, though on the front-end it's not in an <iframe>.
 	 * The height of the <iframe> isn't enough to display the full story, so this increases it.
-	 * Also, this removes attributes that AMP does not allow for the <amp-iframe>, like marginwidth.
 	 *
 	 * @param string  $output The embed output.
 	 * @param WP_Post $post The post for the embed.

From 6879b11fec670a9b1328b2a5e9a5231312ed50eb Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 13 May 2019 15:22:23 -0700
Subject: [PATCH 09/19] Add class name to toolbar in order to hide alignment
 options for selected block

---
 .../blocks/amp-story-page/edit.css            |  8 +++----
 assets/src/stories-editor/index.js            | 24 +++++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/assets/src/stories-editor/blocks/amp-story-page/edit.css b/assets/src/stories-editor/blocks/amp-story-page/edit.css
index ed40186fa2c..b1e698f3b02 100644
--- a/assets/src/stories-editor/blocks/amp-story-page/edit.css
+++ b/assets/src/stories-editor/blocks/amp-story-page/edit.css
@@ -146,10 +146,10 @@ div[data-type="amp/amp-story-page"] .wp-block-image {
  * Hackily hide the alignment options from the image block since they are irrelevant for an image block in a story.
  * In the future the underlying alignment buttons should be removed entirely. See <https://github.com/ampproject/amp-wp/issues/2115>.
  */
-.editor-block-list__block[data-type="core/image"] > div.editor-block-list__block-edit.block-editor-block-list__block-edit > div.editor-block-contextual-toolbar.block-editor-block-contextual-toolbar > div.editor-block-toolbar.block-editor-block-toolbar > div:nth-child(2),
-.editor-block-list__block[data-type="core/pullquote"] > div.editor-block-list__block-edit.block-editor-block-list__block-edit > div.editor-block-contextual-toolbar.block-editor-block-contextual-toolbar > div.editor-block-toolbar.block-editor-block-toolbar > div:nth-child(2),
-.editor-block-list__block[data-type="core/embed"] > div.editor-block-list__block-edit.block-editor-block-list__block-edit > div.editor-block-contextual-toolbar.block-editor-block-contextual-toolbar > div.editor-block-toolbar.block-editor-block-toolbar > div:nth-child(2),
-.editor-block-list__block[data-type="core/video"] > div.editor-block-list__block-edit.block-editor-block-list__block-edit > div.editor-block-contextual-toolbar.block-editor-block-contextual-toolbar > div.editor-block-toolbar.block-editor-block-toolbar > div:nth-child(2) {
+.edit-post-header-toolbar__block-toolbar[data-block-name="core/image"] .block-editor-block-toolbar > .components-toolbar,
+.edit-post-header-toolbar__block-toolbar[data-block-name="core/pullquote"] .block-editor-block-toolbar > .components-toolbar,
+.edit-post-header-toolbar__block-toolbar[data-block-name="core/embed"] .block-editor-block-toolbar > .components-toolbar,
+.edit-post-header-toolbar__block-toolbar[data-block-name="core/video"] .block-editor-block-toolbar > .components-toolbar {
 	display: none;
 }
 
diff --git a/assets/src/stories-editor/index.js b/assets/src/stories-editor/index.js
index 86fa93e98b2..b1bc74d67e2 100644
--- a/assets/src/stories-editor/index.js
+++ b/assets/src/stories-editor/index.js
@@ -54,6 +54,7 @@ import { ALLOWED_BLOCKS } from './constants';
 import store from './store';
 
 const {
+	getSelectedBlock,
 	getSelectedBlockClientId,
 	getBlocksByClientId,
 	getClientIdsWithDescendants,
@@ -147,25 +148,34 @@ let allBlocksWithChildren = getClientIdsWithDescendants();
 
 let editorMode = getEditorMode();
 
+let selectedBlock;
+
 subscribe( async () => {
 	maybeInitializeAnimations();
 
 	const defaultBlockName = getDefaultBlockName();
-	const selectedBlockClientId = getSelectedBlockClientId();
+	const newSelectedBlock = getSelectedBlock();
 
 	// Switch default block depending on context
-	if ( selectedBlockClientId ) {
-		const selectedBlock = getBlock( selectedBlockClientId );
-
-		if ( 'amp/amp-story-page' === selectedBlock.name && 'amp/amp-story-page' !== defaultBlockName ) {
+	if ( newSelectedBlock ) {
+		if ( 'amp/amp-story-page' === newSelectedBlock.name && 'amp/amp-story-page' !== defaultBlockName ) {
 			setDefaultBlockName( 'amp/amp-story-page' );
-		} else if ( 'amp/amp-story-page' !== selectedBlock.name && 'amp/amp-story-text' !== defaultBlockName ) {
+		} else if ( 'amp/amp-story-page' !== newSelectedBlock.name && 'amp/amp-story-text' !== defaultBlockName ) {
 			setDefaultBlockName( 'amp/amp-story-text' );
 		}
-	} else if ( ! selectedBlockClientId && 'amp/amp-story-page' !== defaultBlockName ) {
+	} else if ( 'amp/amp-story-page' !== defaultBlockName ) {
 		setDefaultBlockName( 'amp/amp-story-page' );
 	}
 
+	if ( selectedBlock !== newSelectedBlock ) {
+		const toolbar = document.querySelector( '.edit-post-header-toolbar__block-toolbar' );
+		if ( toolbar ) {
+			toolbar.setAttribute( 'data-block-name', newSelectedBlock ? newSelectedBlock.name : '' );
+		}
+	}
+
+	selectedBlock = newSelectedBlock;
+
 	const newBlockOrder = getBlockOrder();
 	const newlyAddedPages = newBlockOrder.find( ( block ) => ! blockOrder.includes( block ) );
 	const deletedPages = blockOrder.filter( ( block ) => ! newBlockOrder.includes( block ) );

From 4a13c256cbffef81a6c6ba86281b7750b3ee168c Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 13 May 2019 15:38:07 -0700
Subject: [PATCH 10/19] Change selector to also enable hiding video toggles

---
 assets/css/amp-stories.css                               | 8 ++++++++
 assets/src/stories-editor/blocks/amp-story-page/edit.css | 8 ++++----
 assets/src/stories-editor/index.js                       | 6 +++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/assets/css/amp-stories.css b/assets/css/amp-stories.css
index 73f07f87dec..19856149d37 100644
--- a/assets/css/amp-stories.css
+++ b/assets/css/amp-stories.css
@@ -74,3 +74,11 @@ amp-story-grid-layer amp-img > img {
 .is-style-white.wp-block-quote {
 	background-image: url("../images/quote-white.svg");
 }
+
+/**
+ * See https://github.com/ampproject/amp-wp/issues/2283
+ */
+.edit-post-layout[data-block-name="core/video"] .edit-post-settings-sidebar__panel-block .block-editor-block-inspector__card + div > .components-panel__body:first-child .components-toggle-control:nth-child(2),
+.edit-post-layout[data-block-name="core/video"] .edit-post-settings-sidebar__panel-block .block-editor-block-inspector__card + div > .components-panel__body:first-child .components-toggle-control:nth-child(6) {
+	display: none;
+}
diff --git a/assets/src/stories-editor/blocks/amp-story-page/edit.css b/assets/src/stories-editor/blocks/amp-story-page/edit.css
index b1e698f3b02..afcd9152b04 100644
--- a/assets/src/stories-editor/blocks/amp-story-page/edit.css
+++ b/assets/src/stories-editor/blocks/amp-story-page/edit.css
@@ -146,10 +146,10 @@ div[data-type="amp/amp-story-page"] .wp-block-image {
  * Hackily hide the alignment options from the image block since they are irrelevant for an image block in a story.
  * In the future the underlying alignment buttons should be removed entirely. See <https://github.com/ampproject/amp-wp/issues/2115>.
  */
-.edit-post-header-toolbar__block-toolbar[data-block-name="core/image"] .block-editor-block-toolbar > .components-toolbar,
-.edit-post-header-toolbar__block-toolbar[data-block-name="core/pullquote"] .block-editor-block-toolbar > .components-toolbar,
-.edit-post-header-toolbar__block-toolbar[data-block-name="core/embed"] .block-editor-block-toolbar > .components-toolbar,
-.edit-post-header-toolbar__block-toolbar[data-block-name="core/video"] .block-editor-block-toolbar > .components-toolbar {
+.edit-post-layout[data-block-name="core/image"] .edit-post-header-toolbar__block-toolbar  .block-editor-block-toolbar > .components-toolbar,
+.edit-post-layout[data-block-name="core/pullquote"] .edit-post-header-toolbar__block-toolbar  .block-editor-block-toolbar > .components-toolbar,
+.edit-post-layout[data-block-name="core/embed"] .edit-post-header-toolbar__block-toolbar  .block-editor-block-toolbar > .components-toolbar,
+.edit-post-layout[data-block-name="core/video"] .edit-post-header-toolbar__block-toolbar  .block-editor-block-toolbar > .components-toolbar {
 	display: none;
 }
 
diff --git a/assets/src/stories-editor/index.js b/assets/src/stories-editor/index.js
index b1bc74d67e2..7b88c387d52 100644
--- a/assets/src/stories-editor/index.js
+++ b/assets/src/stories-editor/index.js
@@ -168,9 +168,9 @@ subscribe( async () => {
 	}
 
 	if ( selectedBlock !== newSelectedBlock ) {
-		const toolbar = document.querySelector( '.edit-post-header-toolbar__block-toolbar' );
-		if ( toolbar ) {
-			toolbar.setAttribute( 'data-block-name', newSelectedBlock ? newSelectedBlock.name : '' );
+		const editPostLayout = document.querySelector( '.edit-post-layout' );
+		if ( editPostLayout ) {
+			editPostLayout.setAttribute( 'data-block-name', newSelectedBlock ? newSelectedBlock.name : '' );
 		}
 	}
 

From d8ef3ca68900adb452fcf29e8d6743cb215ebb7f Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 13 May 2019 15:38:14 -0700
Subject: [PATCH 11/19] Remove unused import

---
 assets/src/stories-editor/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/assets/src/stories-editor/index.js b/assets/src/stories-editor/index.js
index 7b88c387d52..1aec6cbcb96 100644
--- a/assets/src/stories-editor/index.js
+++ b/assets/src/stories-editor/index.js
@@ -55,7 +55,6 @@ import store from './store';
 
 const {
 	getSelectedBlock,
-	getSelectedBlockClientId,
 	getBlocksByClientId,
 	getClientIdsWithDescendants,
 	getBlockRootClientId,

From 22208f3c2418c3ff30e17c150c46c449cb6ef3ca Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 13 May 2019 14:52:40 -0700
Subject: [PATCH 12/19] Update amphtml to 1905021827420

* Add `object-fit` and `object-position` to `amp-img`, `amp-anim`, and `amp-video`.
* Add support for `amp-link-rewriter`.
* Upgrade `amp-experiment` from `0.1` to `1.0`.
* Remove requirements for `amp-addthis` data attributes.
---
 .../class-amp-allowed-tags-generated.php      | 89 +++++++++++++++++--
 tests/test-class-amp-theme-support.php        |  4 +-
 tests/test-tag-and-attribute-sanitizer.php    | 12 +++
 3 files changed, 96 insertions(+), 9 deletions(-)

diff --git a/includes/sanitizers/class-amp-allowed-tags-generated.php b/includes/sanitizers/class-amp-allowed-tags-generated.php
index d6eac64a4cf..89f76e1e23c 100644
--- a/includes/sanitizers/class-amp-allowed-tags-generated.php
+++ b/includes/sanitizers/class-amp-allowed-tags-generated.php
@@ -13,7 +13,7 @@
  */
 class AMP_Allowed_Tags_Generated {
 
-	private static $spec_file_revision = 855;
+	private static $spec_file_revision = 859;
 	private static $minimum_validator_revision_required = 375;
 
 	private static $descendant_tag_lists = array(
@@ -740,13 +740,7 @@ class AMP_Allowed_Tags_Generated {
 		'amp-addthis' => array(
 			array(
 				'attr_spec_list' => array(
-					'data-class-name' => array(
-						'mandatory' => false,
-					),
 					'data-product-code' => array(),
-					'data-pub-id' => array(
-						'mandatory' => true,
-					),
 					'data-share-media' => array(
 						'value_url' => array(
 							'allow_empty' => true,
@@ -824,6 +818,8 @@ class AMP_Allowed_Tags_Generated {
 							'',
 						),
 					),
+					'object-fit' => array(),
+					'object-position' => array(),
 					'src' => array(
 						'alternative_names' => array(
 							'srcset',
@@ -3221,6 +3217,8 @@ class AMP_Allowed_Tags_Generated {
 							'',
 						),
 					),
+					'object-fit' => array(),
+					'object-position' => array(),
 					'placeholder' => array(),
 					'src' => array(
 						'alternative_names' => array(
@@ -3500,6 +3498,28 @@ class AMP_Allowed_Tags_Generated {
 				),
 			),
 		),
+		'amp-link-rewriter' => array(
+			array(
+				'attr_spec_list' => array(),
+				'tag_spec' => array(
+					'amp_layout' => array(
+						'supported_layouts' => array(
+							1,
+						),
+					),
+					'child_tags' => array(
+						'first_child_tag_name_oneof' => array(
+							'script',
+						),
+						'mandatory_num_child_tags' => 1,
+					),
+					'requires_extension' => array(
+						'amp-link-rewriter',
+					),
+					'unique' => true,
+				),
+			),
+		),
 		'amp-list' => array(
 			array(
 				'attr_spec_list' => array(
@@ -5241,6 +5261,8 @@ class AMP_Allowed_Tags_Generated {
 							'',
 						),
 					),
+					'object-fit' => array(),
+					'object-position' => array(),
 					'placeholder' => array(),
 					'poster' => array(),
 					'preload' => array(
@@ -5348,6 +5370,8 @@ class AMP_Allowed_Tags_Generated {
 							'',
 						),
 					),
+					'object-fit' => array(),
+					'object-position' => array(),
 					'placeholder' => array(),
 					'poster' => array(
 						'mandatory' => true,
@@ -11878,6 +11902,7 @@ class AMP_Allowed_Tags_Generated {
 						'requires_usage' => 2,
 						'version' => array(
 							'0.1',
+							'1.0',
 							'latest',
 						),
 					),
@@ -12637,6 +12662,56 @@ class AMP_Allowed_Tags_Generated {
 					),
 				),
 			),
+			array(
+				'attr_spec_list' => array(
+					'async' => array(
+						'mandatory' => true,
+						'value' => array(
+							'',
+						),
+					),
+					'nonce' => array(),
+					'type' => array(
+						'value_casei' => array(
+							'text/javascript',
+						),
+					),
+				),
+				'tag_spec' => array(
+					'extension_spec' => array(
+						'name' => 'amp-link-rewriter',
+						'version' => array(
+							'0.1',
+							'latest',
+						),
+					),
+				),
+			),
+			array(
+				'attr_spec_list' => array(
+					'nonce' => array(),
+					'type' => array(
+						'dispatch_key' => 3,
+						'mandatory' => true,
+						'value_casei' => array(
+							'application/json',
+						),
+					),
+				),
+				'cdata' => array(
+					'blacklisted_cdata_regex' => array(
+						'error_message' => 'html comments',
+						'regex' => '<!--',
+					),
+				),
+				'tag_spec' => array(
+					'mandatory_parent' => 'amp-link-rewriter',
+					'requires_extension' => array(
+						'amp-link-rewriter',
+					),
+					'spec_name' => 'amp-link-rewriter extension .json script',
+				),
+			),
 			array(
 				'attr_spec_list' => array(
 					'async' => array(
diff --git a/tests/test-class-amp-theme-support.php b/tests/test-class-amp-theme-support.php
index 44c92435534..59550781a0e 100644
--- a/tests/test-class-amp-theme-support.php
+++ b/tests/test-class-amp-theme-support.php
@@ -1348,10 +1348,10 @@ function ( $url ) {
 			'<link rel="preconnect" href="https://fonts.gstatic.com/" crossorigin="">',
 			'<link rel="dns-prefetch" href="//cdn.ampproject.org">',
 			'<link rel="preload" as="script" href="https://cdn.ampproject.org/v0.js">',
-			'<link rel="preload" as="script" href="https://cdn.ampproject.org/v0/amp-experiment-0.1.js">',
+			'<link rel="preload" as="script" href="https://cdn.ampproject.org/v0/amp-experiment-1.0.js">',
 			'<link rel="preload" as="script" href="https://cdn.ampproject.org/v0/amp-dynamic-css-classes-0.1.js">',
 			'<script type="text/javascript" src="https://cdn.ampproject.org/v0.js" async></script>',
-			'<script src="https://cdn.ampproject.org/v0/amp-experiment-0.1.js" async="" custom-element="amp-experiment"></script>',
+			'<script src="https://cdn.ampproject.org/v0/amp-experiment-1.0.js" async="" custom-element="amp-experiment"></script>',
 			'<script async custom-element="amp-dynamic-css-classes" src="https://cdn.ampproject.org/v0/amp-dynamic-css-classes-0.1.js"></script>',
 			'<script type="text/javascript" src="https://cdn.ampproject.org/v0/amp-list-0.1.js" async custom-element="amp-list"></script>',
 			'<script type="text/javascript" src="https://cdn.ampproject.org/v0/amp-mathml-0.1.js" async custom-element="amp-mathml"></script>',
diff --git a/tests/test-tag-and-attribute-sanitizer.php b/tests/test-tag-and-attribute-sanitizer.php
index c33e325da42..447119605a7 100644
--- a/tests/test-tag-and-attribute-sanitizer.php
+++ b/tests/test-tag-and-attribute-sanitizer.php
@@ -1450,6 +1450,18 @@ function() {
 				null,
 				array( 'amp-script' ),
 			),
+
+			'amp_img_with_object_fit_position' => array(
+				'<amp-img src="http://placehold.it/400x500" width="300" height="300" object-fit="none" object-position="right top" layout="intrinsic"></amp-img>',
+				null,
+				array(),
+			),
+
+			'amp_link_rewriter' => array(
+				'<amp-link-rewriter layout="nodisplay"><script type="application/json">{}</script></amp-link-rewriter>',
+				null,
+				array( 'amp-link-rewriter' ),
+			),
 		);
 	}
 

From c01b87c59bad7423944a7863580545f1307a099e Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 13 May 2019 12:24:07 -0700
Subject: [PATCH 13/19] Use unescaped-Unicode in JSON amp-bind state for more
 comments instances

Fixes #2286
---
 includes/class-amp-theme-support.php                 | 6 +++---
 includes/sanitizers/class-amp-comments-sanitizer.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index eb7b9fb3a5c..6f85e91d5ca 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1167,9 +1167,9 @@ public static function filter_comment_form_defaults( $args ) {
 			str_replace(
 				'%s',
 				sprintf( '" + %s.replyToName + "', $state_id ),
-				wp_json_encode( $args['title_reply_to'] )
+				wp_json_encode( $args['title_reply_to'], JSON_UNESCAPED_UNICODE )
 			),
-			wp_json_encode( $args['title_reply'] )
+			wp_json_encode( $args['title_reply'], JSON_UNESCAPED_UNICODE )
 		);
 
 		$args['title_reply_before'] .= sprintf(
@@ -1252,7 +1252,7 @@ public static function filter_cancel_comment_reply_link( $formatted_link, $link,
 			esc_url( remove_query_arg( 'replytocom' ) . '#' . $respond_id ),
 			isset( $_GET['replytocom'] ) ? '' : ' hidden', // phpcs:ignore
 			esc_attr( sprintf( '%s.values.comment_parent == "0"', self::get_comment_form_state_id( get_the_ID() ) ) ),
-			esc_attr( sprintf( 'tap:AMP.setState( %s )', wp_json_encode( $tap_state ) ) ),
+			esc_attr( sprintf( 'tap:AMP.setState( %s )', wp_json_encode( $tap_state, JSON_UNESCAPED_UNICODE ) ) ),
 			esc_html( $text )
 		);
 	}
diff --git a/includes/sanitizers/class-amp-comments-sanitizer.php b/includes/sanitizers/class-amp-comments-sanitizer.php
index 8a0cdb4eb65..f2176140476 100644
--- a/includes/sanitizers/class-amp-comments-sanitizer.php
+++ b/includes/sanitizers/class-amp-comments-sanitizer.php
@@ -147,7 +147,7 @@ protected function process_comment_form( $comment_form ) {
 		$script = $this->dom->createElement( 'script' );
 		$script->setAttribute( 'type', 'application/json' );
 		$amp_state->appendChild( $script );
-		$script->appendChild( $this->dom->createTextNode( wp_json_encode( $form_state ) ) );
+		$script->appendChild( $this->dom->createTextNode( wp_json_encode( $form_state, JSON_UNESCAPED_UNICODE ) ) );
 		$comment_form->insertBefore( $amp_state, $comment_form->firstChild );
 
 		// Update state when submitting form.
@@ -172,7 +172,7 @@ protected function process_comment_form( $comment_form ) {
 			sprintf(
 				'submit-success:AMP.setState( { %s: %s } )',
 				$state_id,
-				wp_json_encode( $form_reset_state )
+				wp_json_encode( $form_reset_state, JSON_UNESCAPED_UNICODE )
 			),
 		);
 		$comment_form->setAttribute( 'on', implode( ';', $on ) );

From db1e60dc5236a67a2f57b82742cabe7272eb28d9 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 13 May 2019 12:25:32 -0700
Subject: [PATCH 14/19] Use unescaped-Unicode for Schema.org metadata in
 non-Reader mode

Amends #1997
---
 includes/class-amp-theme-support.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/class-amp-theme-support.php b/includes/class-amp-theme-support.php
index 6f85e91d5ca..a561c76ee5b 100644
--- a/includes/class-amp-theme-support.php
+++ b/includes/class-amp-theme-support.php
@@ -1334,7 +1334,7 @@ public static function ensure_required_markup( DOMDocument $dom, $script_handles
 		if ( ! $schema_org_meta_script ) {
 			$script = $dom->createElement( 'script' );
 			$script->setAttribute( 'type', 'application/ld+json' );
-			$script->appendChild( $dom->createTextNode( wp_json_encode( amp_get_schemaorg_metadata() ) ) );
+			$script->appendChild( $dom->createTextNode( wp_json_encode( amp_get_schemaorg_metadata(), JSON_UNESCAPED_UNICODE ) ) );
 			$head->appendChild( $script );
 		}
 

From 39d3a57500234742c063fcc101153062999b32ad Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Mon, 13 May 2019 17:17:53 -0700
Subject: [PATCH 15/19] Prevent using video icon as poster when no featured
 image assigned

---
 assets/src/stories-editor/blocks/amp-story-page/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/src/stories-editor/blocks/amp-story-page/edit.js b/assets/src/stories-editor/blocks/amp-story-page/edit.js
index 9bd6ece9d7a..46c80a45d86 100644
--- a/assets/src/stories-editor/blocks/amp-story-page/edit.js
+++ b/assets/src/stories-editor/blocks/amp-story-page/edit.js
@@ -88,7 +88,7 @@ class EditPage extends Component {
 			mediaUrl: media.url,
 			mediaId: media.id,
 			mediaType,
-			poster: VIDEO_BACKGROUND_TYPE === mediaType && media.image ? media.image.src : undefined,
+			poster: VIDEO_BACKGROUND_TYPE === mediaType && media.image && media.image.src !== media.icon ? media.image.src : undefined,
 		} );
 	}
 

From 2df7cdf7698c12c6547fc085705f13666d6a5514 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Mon, 13 May 2019 21:05:45 -0700
Subject: [PATCH 16/19] Fix block navigation label class name to correct
 styling

---
 assets/src/components/block-navigation/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/src/components/block-navigation/index.js b/assets/src/components/block-navigation/index.js
index e94ab0f3d10..a89942dfdef 100644
--- a/assets/src/components/block-navigation/index.js
+++ b/assets/src/components/block-navigation/index.js
@@ -51,9 +51,9 @@ function BlockNavigation( { blocks, selectBlock, selectedBlockClientId, isReorde
 	return (
 		<NavigableMenu
 			role="presentation"
-			className="editor-block-navigation__container block-editor-block-navigation__container"
+			className="block-editor-block-navigation__container"
 		>
-			<p className="editor-block-navigation__label">{ __( 'Block Navigation', 'amp' ) }</p>
+			<p className="block-editor-block-navigation__label">{ __( 'Block Navigation', 'amp' ) }</p>
 			{ hasBlocks && (
 				<BlockNavigationList
 					blocks={ blocks }
@@ -62,7 +62,7 @@ function BlockNavigation( { blocks, selectBlock, selectedBlockClientId, isReorde
 				/>
 			) }
 			{ ! hasBlocks && (
-				<p className="editor-block-navigation__paragraph">
+				<p className="block-editor-block-navigation__paragraph">
 					{ __( 'No blocks created yet.', 'amp' ) }
 				</p>
 			) }

From 235db15b3afa42738ddba47de9337705121b6a77 Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Tue, 14 May 2019 09:10:46 -0700
Subject: [PATCH 17/19] Patch test_add_block_source_comments for Gutenberg 5.7
 update

---
 tests/validation/test-class-amp-validation-manager.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/validation/test-class-amp-validation-manager.php b/tests/validation/test-class-amp-validation-manager.php
index 169cf273e45..012c53d1d0b 100644
--- a/tests/validation/test-class-amp-validation-manager.php
+++ b/tests/validation/test-class-amp-validation-manager.php
@@ -726,7 +726,7 @@ public function get_block_data() {
 			'latest_posts' => array(
 				'<!-- wp:latest-posts {"postsToShow":1,"categories":""} /-->',
 				sprintf(
-					'<!--amp-source-stack {"block_name":"core\/latest-posts","post_id":{{post_id}},"block_content_index":0,"block_attrs":{"postsToShow":1,"categories":""},"type":"%1$s","name":"%2$s","function":"%3$s"}--><ul class="wp-block-latest-posts"><li><a href="{{url}}">{{title}}</a></li></ul><!--/amp-source-stack {"block_name":"core\/latest-posts","post_id":{{post_id}},"block_attrs":{"postsToShow":1,"categories":""},"type":"%1$s","name":"%2$s","function":"%3$s"}-->',
+					'<!--amp-source-stack {"block_name":"core\/latest-posts","post_id":{{post_id}},"block_content_index":0,"block_attrs":{"postsToShow":1,"categories":""},"type":"%1$s","name":"%2$s","function":"%3$s"}--><ul class="wp-block-latest-posts wp-block-latest-posts__list"><li><a href="{{url}}">{{title}}</a></li></ul><!--/amp-source-stack {"block_name":"core\/latest-posts","post_id":{{post_id}},"block_attrs":{"postsToShow":1,"categories":""},"type":"%1$s","name":"%2$s","function":"%3$s"}-->',
 					$is_gutenberg ? 'plugin' : 'core',
 					$is_gutenberg ? 'gutenberg' : 'wp-includes',
 					$latest_posts_block->render_callback
@@ -788,6 +788,14 @@ public function test_add_block_source_comments( $content, $expected, $query ) {
 			),
 			$expected
 		);
+
+		// Temporary patch to support running unit tests in Gutenberg<5.7.0.
+		$rendered_block = str_replace(
+			'class="wp-block-latest-posts"',
+			'class="wp-block-latest-posts wp-block-latest-posts__list"',
+			$rendered_block
+		);
+
 		$this->assertEquals(
 			preg_replace( '/(?<=>)\s+(?=<)/', '', str_replace( '%d', $post->ID, $expected ) ),
 			preg_replace( '/(?<=>)\s+(?=<)/', '', $rendered_block )

From 8ef45f3ee953427534a1731f2cb852c007c30c11 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Tue, 14 May 2019 16:46:56 -0700
Subject: [PATCH 18/19] Get color object to pass to
 getBackgroundColorWithOpacity()

---
 assets/src/stories-editor/helpers/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/src/stories-editor/helpers/index.js b/assets/src/stories-editor/helpers/index.js
index 63fbe2e79ce..d5a5d6962d1 100644
--- a/assets/src/stories-editor/helpers/index.js
+++ b/assets/src/stories-editor/helpers/index.js
@@ -13,7 +13,7 @@ import { count } from '@wordpress/wordcount';
 import { _x } from '@wordpress/i18n';
 import { select, dispatch } from '@wordpress/data';
 import { createBlock } from '@wordpress/blocks';
-import { getColorClassName, getFontSize, RichText } from '@wordpress/block-editor';
+import { getColorClassName, getColorObjectByAttributeValues, getFontSize, RichText } from '@wordpress/block-editor';
 
 /**
  * Internal dependencies
@@ -909,7 +909,7 @@ export const getStylesFromBlockAttributes = ( {
 	const userFontSize = fontSize ? getFontSize( fontSizes, fontSize, customFontSize ).size : customFontSize;
 	const fontSizeResponsive = userFontSize && ( ( userFontSize / STORY_PAGE_INNER_WIDTH ) * 100 ).toFixed( 2 ) + 'vw';
 
-	const appliedBackgroundColor = getBackgroundColorWithOpacity( colors, backgroundColor, customBackgroundColor, opacity );
+	const appliedBackgroundColor = getBackgroundColorWithOpacity( colors, getColorObjectByAttributeValues( colors, backgroundColor, customBackgroundColor ), customBackgroundColor, opacity );
 
 	return {
 		backgroundColor: appliedBackgroundColor,

From c195425f3fc8ab5f6e694b915c2defba4e8eed5d Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Wed, 15 May 2019 12:14:39 -0700
Subject: [PATCH 19/19] Update packages

---
 package-lock.json | 68 +++++++++++++++++++++++++++++------------------
 package.json      |  6 ++---
 2 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 864f7507bab..2d9945b1046 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4079,20 +4079,20 @@
       }
     },
     "browserslist": {
-      "version": "4.5.6",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.5.6.tgz",
-      "integrity": "sha512-o/hPOtbU9oX507lIqon+UvPYqpx3mHc8cV3QemSBTXwkG8gSQSK6UKvXcE/DcleU3+A59XTUHyCvZ5qGy8xVAg==",
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.0.tgz",
+      "integrity": "sha512-Jk0YFwXBuMOOol8n6FhgkDzn3mY9PYLYGk29zybF05SbRTsMgPqmTNeQQhOghCxq5oFqAXE3u4sYddr4C0uRhg==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000963",
-        "electron-to-chromium": "^1.3.127",
-        "node-releases": "^1.1.17"
+        "caniuse-lite": "^1.0.30000967",
+        "electron-to-chromium": "^1.3.133",
+        "node-releases": "^1.1.19"
       },
       "dependencies": {
         "caniuse-lite": {
-          "version": "1.0.30000963",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000963.tgz",
-          "integrity": "sha512-n4HUiullc7Lw0LyzpeLa2ffP8KxFBGdxqD/8G3bSL6oB758hZ2UE2CVK+tQN958tJIi0/tfpjAc67aAtoHgnrQ==",
+          "version": "1.0.30000967",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000967.tgz",
+          "integrity": "sha512-rUBIbap+VJfxTzrM4akJ00lkvVb5/n5v3EGXfWzSH5zT8aJmGzjA8HWhJ4U6kCpzxozUSnB+yvAYDRPY6mRpgQ==",
           "dev": true
         }
       }
@@ -5712,9 +5712,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.129",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.129.tgz",
-      "integrity": "sha512-puirJsgZnedlFEmRa7WEUIaS8ZgHHn7d7inph+RiapCc0x80hdoDyEEpR9z3aRUSZy4fGxOTOFcxnGmySlrmhA==",
+      "version": "1.3.134",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.134.tgz",
+      "integrity": "sha512-C3uK2SrtWg/gSWaluLHWSHjyebVZCe4ZC0NVgTAoTq8tCR9FareRK5T7R7AS/nPZShtlEcjVMX1kQ8wi4nU68w==",
       "dev": true
     },
     "elliptic": {
@@ -10932,9 +10932,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.17",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.17.tgz",
-      "integrity": "sha512-/SCjetyta1m7YXLgtACZGDYJdCSIBAWorDWkGCGZlydP2Ll7J48l7j/JxNYZ+xsgSPbWfdulVS/aY+GdjUsQ7Q==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.19.tgz",
+      "integrity": "sha512-SH/B4WwovHbulIALsQllAVwqZZD1kPmKCqrhGfR29dXjLAVZMHvBjD3S6nL9D/J9QkmZ1R92/0wCMDKXUUvyyA==",
       "dev": true,
       "requires": {
         "semver": "^5.3.0"
@@ -11242,9 +11242,9 @@
       }
     },
     "null-loader": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-1.0.0.tgz",
-      "integrity": "sha512-mYLDjDVTkjTlFoidxRhzO75rdcwfVXfw5G5zpj8sXnBkHtKJxMk4hTcRR4i5SOhDB6EvcQuYriy6IV23eq6uog==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/null-loader/-/null-loader-2.0.0.tgz",
+      "integrity": "sha512-PhEeA3v/tAacxC5dNO1i2yXzGVWWrZ9jTx+TMEJ716amvnBXzvrxIwy9HW7MyJsHe8ACQzpiQgbrAjDRMA7gcg==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.2.3",
@@ -15574,26 +15574,42 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
-      "integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.4.tgz",
+      "integrity": "sha512-64IiILNQlACWZLzFlpzNaG0bpQ4ytaB7fwOsbpsdIV70AfLUmIGGeuKL0YV2WmtcrURjE2aOvHD4/lrFV3Rg+Q==",
       "dev": true,
       "requires": {
-        "cacache": "^11.0.2",
+        "cacache": "^11.3.2",
         "find-cache-dir": "^2.0.0",
+        "is-wsl": "^1.1.0",
         "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.4.0",
+        "serialize-javascript": "^1.7.0",
         "source-map": "^0.6.1",
-        "terser": "^3.16.1",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "terser": "^3.17.0",
+        "webpack-sources": "^1.3.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
+        "serialize-javascript": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
+          "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        },
+        "worker-farm": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+          "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+          "dev": true,
+          "requires": {
+            "errno": "~0.1.7"
+          }
         }
       }
     },
diff --git a/package.json b/package.json
index 821fbbbcf2d..27f43874f10 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "babel-jest": "24.8.0",
     "babel-loader": "8.0.6",
     "babel-plugin-inline-react-svg": "1.1.0",
-    "browserslist": "4.5.6",
+    "browserslist": "4.6.0",
     "core-js": "3.0.1",
     "cross-env": "5.2.0",
     "css-loader": "2.1.1",
@@ -73,7 +73,7 @@
     "mini-css-extract-plugin": "0.6.0",
     "moment": "2.24.0",
     "npm-run-all": "4.1.5",
-    "null-loader": "1.0.0",
+    "null-loader": "2.0.0",
     "optimize-css-assets-webpack-plugin": "5.0.1",
     "postcss": "7.0.16",
     "postcss-color-function": "4.1.0",
@@ -84,7 +84,7 @@
     "rtlcss-webpack-plugin": "4.0.0",
     "source-map-loader": "0.2.4",
     "svg-inline-loader": "0.8.0",
-    "terser-webpack-plugin": "1.2.3",
+    "terser-webpack-plugin": "1.2.4",
     "uuid": "3.3.2",
     "webpack": "4.31.0",
     "webpack-cli": "3.3.2"