ClipboardButton make onFinishCopy optional attribute

WordPress · Jun 12, 2020 · dcd525a · dcd525a
1 parent 60825bf
commit dcd525a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/packages/block-editor/src/components/block-actions/index.js b/packages/block-editor/src/components/block-actions/index.js
@@ -85,7 +85,6 @@ export default function BlockActions( { clientIds, children } ) {
 			}
 			replaceBlocks( clientIds, newBlocks );
 		},
-
 		onUngroup() {
 			if ( ! blocks.length ) {
 				return;

diff --git a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
@@ -98,7 +98,6 @@ export function BlockSettingsDropdown( { clientIds, ...props } ) {
 									role="menuitem"
 									className="components-menu-item__button"
 									onCopy={ onCopy }
-									onFinishCopy={ onClose }
 								>
 									{ __( 'Copy' ) }
 								</ClipboardButton>

diff --git a/packages/components/src/clipboard-button/index.js b/packages/components/src/clipboard-button/index.js
@@ -31,9 +31,9 @@ export default function ClipboardButton( {
 			return;
 		}
 
-		if ( hasCopied ) {
+		if ( hasCopied && typeof onCopy === 'function' ) {
 			onCopy();
-		} else {
+		} else if ( typeof onFinishCopy === 'function' ) {
 			onFinishCopy();
 		}