Fix to always paste new content on top layer (#3600)

Make sure to paste on the top layer by using second argument of `insertBlocks` set to number of blocks on page.
ampproject · Oct 23, 2019 · 7e86f8e · 7e86f8e
1 parent faa1f8a
commit 7e86f8e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/assets/src/stories-editor/blocks/amp-story-page/copy-paste-handler.js b/assets/src/stories-editor/blocks/amp-story-page/copy-paste-handler.js
@@ -20,6 +20,7 @@ function CopyPasteHandler( { children, onCopy, clientId, isSelected } ) {
 		isFirstPage,
 		canUserUseUnfilteredHTML,
 		getCopiedMarkupState,
+		blocksOnPage,
 	} = useSelect(
 		( select ) => {
 			const {
@@ -32,6 +33,7 @@ function CopyPasteHandler( { children, onCopy, clientId, isSelected } ) {
 				isFirstPage: getBlockOrder().indexOf( clientId ) === 0,
 				canUserUseUnfilteredHTML: __experimentalCanUserUseUnfilteredHTML,
 				getCopiedMarkupState: getCopiedMarkup,
+				blocksOnPage: getBlockOrder( clientId ),
 			};
 		}, [ clientId ]
 	);
@@ -76,7 +78,7 @@ function CopyPasteHandler( { children, onCopy, clientId, isSelected } ) {
 		} );
 
 		if ( content.length > 0 ) {
-			insertBlocks( ensureAllowedBlocksOnPaste( content, clientId, isFirstPage ), null, clientId );
+			insertBlocks( ensureAllowedBlocksOnPaste( content, clientId, isFirstPage ), blocksOnPage.length, clientId );
 		}
 	};
 

diff --git a/assets/src/stories-editor/components/context-menu/index.js b/assets/src/stories-editor/components/context-menu/index.js
@@ -110,16 +110,19 @@ const ContextMenu = ( props ) => {
 		}
 
 		const isFirstPage = getBlockOrder().indexOf( pageClientId ) === 0;
-		insertBlocks( ensureAllowedBlocksOnPaste( content, pageClientId, isFirstPage ), null, pageClientId ).then( ( { blocks } ) => {
-			for ( const block of blocks ) {
-				if ( ALLOWED_MOVABLE_BLOCKS.includes( block.name ) ) {
-					updateBlockAttributes( block.clientId, {
-						positionTop: insidePercentageY,
-						positionLeft: insidePercentageX,
-					} );
+		const blocksOnPage = getBlockOrder( pageClientId );
+		insertBlocks( ensureAllowedBlocksOnPaste( content, pageClientId, isFirstPage ), blocksOnPage.length, pageClientId )
+			.then( ( { blocks } ) => {
+				for ( const block of blocks ) {
+					if ( ALLOWED_MOVABLE_BLOCKS.includes( block.name ) ) {
+						updateBlockAttributes( block.clientId, {
+							positionTop: insidePercentageY,
+							positionLeft: insidePercentageX,
+						} );
+					}
 				}
-			}
-		} ).catch( () => {} );
+			} )
+			.catch( () => {} );
 	};
 
 	const cutBlock = ( clientId ) => {