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

Handle cut keyboard requests. #3231

Merged
merged 1 commit into from
Sep 12, 2019
Merged

Handle cut keyboard requests. #3231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 24 additions & 2 deletions assets/src/stories-editor/blocks/amp-story-page/copy-paste-handler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { withDispatch, useSelect, useDispatch } from '@wordpress/data';
*/
import { ensureAllowedBlocksOnPaste } from '../../helpers';

function CopyPasteHandler( { children, onCopy, clientId, isSelected } ) {
function CopyPasteHandler( { children, onCopy, onCut, clientId, isSelected } ) {
const {
isFirstPage,
canUserUseUnfilteredHTML,
Expand Down Expand Up @@ -79,7 +79,7 @@ function CopyPasteHandler( { children, onCopy, clientId, isSelected } ) {
};

return (
<div onCopy={ onCopy } onPaste={ onPaste }>
<div onCopy={ onCopy } onPaste={ onPaste } onCut={ onCut }>
{ children }
</div>
);
Expand All @@ -90,6 +90,7 @@ CopyPasteHandler.propTypes = {
clientId: PropTypes.string.isRequired,
isSelected: PropTypes.bool.isRequired,
onCopy: PropTypes.func.isRequired,
onCut: PropTypes.func.isRequired,
};

export default withDispatch( ( dispatch, ownProps, { select } ) => {
Expand All @@ -98,6 +99,7 @@ export default withDispatch( ( dispatch, ownProps, { select } ) => {
getSelectedBlockClientIds,
hasMultiSelection,
} = select( 'core/block-editor' );
const { removeBlock } = dispatch( 'core/block-editor' );
const { clearCopiedMarkup, setCopiedMarkup } = dispatch( 'amp/story' );

/**
Expand All @@ -122,7 +124,27 @@ export default withDispatch( ( dispatch, ownProps, { select } ) => {
setCopiedMarkup( serialized );
};

/**
* Cut handler for ensuring that the store's cutMarkup is in sync with what's actually in clipBoard.
* If it's not a block that's being cut, let's clear the cutMarkup.
* Otherwise, let's set the cut markup.
*/
const onCut = () => {
const selectedBlockClientIds = getSelectedBlockClientIds();

if ( selectedBlockClientIds.length === 0 ) {
return;
}
// Reuse code in onCode.
onCopy();
// Remove selected Blocks.
for ( const clientId of selectedBlockClientIds ) {
removeBlock( clientId );
}
};

return {
onCopy,
onCut,
};
} )( CopyPasteHandler );