Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix page crashing when duplicating immovable blocks #3593

Merged
merged 12 commits into from
Oct 23, 2019
Merged

Fix page crashing when duplicating immovable blocks #3593

Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e82a1ac
Add logic for removing 'illegal' immovable blocks.
miina Oct 22, 2019
40fae40
Add snackbar notice when a block gets removed.
miina Oct 22, 2019
58b22d6
Add count to snackbar message.
miina Oct 22, 2019
0197f85
Use the immovable blocks directly instead of using a function.
miina Oct 22, 2019
a22cd90
Update assets/src/stories-editor/blocks/amp-story-page/edit.js
miina Oct 22, 2019
d3e4b74
Use getBlockOrder once only
miina Oct 22, 2019
a3bece8
Merge branch 'fix/3467-page_crash_on_duplicate' of github.com:ampproj…
miina Oct 22, 2019
005d62e
Fix slicing and remove pop()
miina Oct 22, 2019
63850c9
Remove redundant code.
miina Oct 22, 2019
2eccdec
Remove more redundant code.
miina Oct 22, 2019
86d3216
Merge conflict.
miina Oct 22, 2019
f5d7b21
Slightly update wording
swissspidy Oct 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 41 additions & 19 deletions assets/src/stories-editor/blocks/amp-story-page/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
} from '@wordpress/block-editor';
import { useEffect, useRef } from '@wordpress/element';
import { useSelect, useDispatch } from '@wordpress/data';
import { _n, sprintf } from '@wordpress/i18n';

/**
* Internal dependencies
Expand Down Expand Up @@ -57,19 +58,21 @@ const PageEdit = ( {
backgroundColors,
} = attributes;

const { moveBlockToPosition } = useDispatch( 'core/block-editor' );
const { moveBlockToPosition, removeBlocks } = useDispatch( 'core/block-editor' );
const { createErrorNotice } = useDispatch( 'core/notices' );

const {
media,
videoFeaturedImage,
pagesOrder,
childrenOrder,
immovableBlocks,
storySettingsAttributes,
autoAdvanceAfterOptions,
allowedVideoMimeTypes,
} = useSelect( ( select ) => {
const { getMedia } = select( 'core' );
const { getBlockOrder } = select( 'core/block-editor' );
const { getBlockOrder, getBlocksByClientId } = select( 'core/block-editor' );
const { getSettings } = select( 'amp/story' );

const mediaObject = mediaId ? getMedia( mediaId ) : undefined;
Expand All @@ -83,13 +86,15 @@ const PageEdit = ( {
const { getEditedPostAttribute } = select( 'core/editor' );
const postMeta = getEditedPostAttribute( 'meta' ) || {};
const { storySettings } = getSettings();
const innerBlocksIds = getBlockOrder( clientId );
const innerBlocks = getBlocksByClientId( innerBlocksIds );

return {
media: mediaObject,
videoFeaturedImage: videoThumbnail,
getBlockOrder,
immovableBlocks: innerBlocks.filter( ( { name } ) => ! ALLOWED_MOVABLE_BLOCKS.includes( name ) ),
pagesOrder: getBlockOrder(),
childrenOrder: getBlockOrder( clientId ),
childrenOrder: innerBlocksIds,
storySettingsAttributes: metaToAttributeNames( postMeta ),
autoAdvanceAfterOptions: storySettings.autoAdvanceAfterOptions,
allowedVideoMimeTypes: getSettings().allowedVideoMimeTypes,
Expand Down Expand Up @@ -142,28 +147,45 @@ const PageEdit = ( {
}
}, [ mediaType, mediaUrl ] );

// If there is more than one immovable block, leave only the last and remove the others.
useEffect( () => {
if ( immovableBlocks.length > 1 ) {
const blocksToRemove = immovableBlocks.slice( 0, -1 ).map( ( { clientId: blockId } ) => blockId );
removeBlocks( blocksToRemove );
const removeMessage = sprintf(
_n(
'%d block removed. Only one CTA/Attachment block allowed per Page.',
'%d blocks removed. Only one CTA/Attachment block allowed per Page.',
blocksToRemove.length,
'amp'
),
blocksToRemove.length
);
createErrorNotice(
removeMessage,
{
type: 'snackbar',
isDismissible: true,
}
);
}
}, [ childrenOrder, clientId, createErrorNotice, immovableBlocks, removeBlocks ] );

useEffect( () => {
if ( childrenOrder.length <= 1 ) {
return;
}
const ctaBlock = getCallToActionBlock( clientId );
const attachmentBlock = getPageAttachmentBlock( clientId );

let blockToMove = null;

if ( ctaBlock ) {
blockToMove = ctaBlock;
} else if ( attachmentBlock ) {
blockToMove = attachmentBlock;
// If there is an illegal number of immovable blocks (more than 1).
if ( 1 !== immovableBlocks.length ) {
return;
}
const blockToMove = immovableBlocks[ 0 ];

if ( blockToMove ) {
// If the either CTA or Attachment is not the last block, move it there.
if ( childrenOrder[ childrenOrder.length - 1 ] !== blockToMove.clientId ) {
moveBlockToPosition( blockToMove.clientId, clientId, clientId, childrenOrder.length - 1 );
}
// If the either CTA or Attachment is not the last block, move it there.
if ( childrenOrder[ childrenOrder.length - 1 ] !== blockToMove.clientId ) {
moveBlockToPosition( blockToMove.clientId, clientId, clientId, childrenOrder.length - 1 );
}
}, [ childrenOrder, clientId, moveBlockToPosition ] );
}, [ childrenOrder, clientId, moveBlockToPosition, immovableBlocks ] );

const style = {
backgroundImage: IMAGE_BACKGROUND_TYPE === mediaType && mediaUrl ? `url(${ mediaUrl })` : undefined,
Expand Down