Merge bug fixes into wp/trunk

packages/api-fetch/src/middlewares/preloading.js

@@ -34,7 +34,11 @@ const createPreloadingMiddleware = ( preloadedData ) => ( options, next ) => {
 
 		if ( parse && 'GET' === method && preloadedData[ path ] ) {
 			return Promise.resolve( preloadedData[ path ].body );
-		} else if ( 'OPTIONS' === method && preloadedData[ method ][ path ] ) {
+		} else if (
+			'OPTIONS' === method &&
+			preloadedData[ method ] &&
+			preloadedData[ method ][ path ]
+		) {
 			return Promise.resolve( preloadedData[ method ][ path ] );
 		}
 	}

packages/api-fetch/src/middlewares/test/preloading.js

@@ -25,20 +25,29 @@ describe( 'Preloading Middleware', () => {
 		} );
 	} );
 
-	it( 'should move to the next middleware if no preloaded data', () => {
-		const preloadedData = {};
-		const prelooadingMiddleware = createPreloadingMiddleware( preloadedData );
-		const requestOptions = {
-			method: 'GET',
-			path: 'wp/v2/posts',
-		};
+	describe.each( [
+		[ 'GET' ],
+		[ 'OPTIONS' ],
+	] )( '%s', ( method ) => {
+		describe.each( [
+			[ 'all empty', {} ],
+			[ 'method empty', { [ method ]: {} } ],
+		] )( '%s', ( label, preloadedData ) => {
+			it( 'should move to the next middleware if no preloaded data', () => {
+				const prelooadingMiddleware = createPreloadingMiddleware( preloadedData );
+				const requestOptions = {
+					method,
+					path: 'wp/v2/posts',
+				};
 
-		const callback = ( options ) => {
-			expect( options ).toBe( requestOptions );
-			return true;
-		};
+				const callback = ( options ) => {
+					expect( options ).toBe( requestOptions );
+					return true;
+				};
 
-		const ret = prelooadingMiddleware( requestOptions, callback );
-		expect( ret ).toBe( true );
+				const ret = prelooadingMiddleware( requestOptions, callback );
+				expect( ret ).toBe( true );
+			} );
+		} );
 	} );
 } );

packages/block-editor/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.0.0 (Unreleased)
+
+### Breaking Changes
+
+- `CopyHandler` will now only catch cut/copy events coming from its `props.children`, instead of from anywhere in the `document`.
+
 ## 1.0.0 (2019-03-06)
 
 ### New Features

packages/block-editor/src/components/block-list/style.scss

@@ -904,6 +904,12 @@
 	.block-editor-block-contextual-toolbar > * {
 		pointer-events: auto;
 	}
+
+	// Full-aligned blocks have negative margins on the parent of the toolbar, so additional position adjustment is not required.
+	&[data-align="full"] .block-editor-block-contextual-toolbar {
+		left: 0;
+		right: 0;
+	}
 }
 
 .block-editor-block-list__block.is-focus-mode:not(.is-multi-selected) > .block-editor-block-contextual-toolbar {

packages/block-editor/src/components/block-settings-menu/block-convert-button.js

@@ -15,7 +15,6 @@ export default function BlockConvertButton( { shouldRender, onClick, small } ) {
 			className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
 			onClick={ onClick }
 			icon="screenoptions"
-			label={ small ? label : undefined }
 		>
 			{ ! small && label }
 		</MenuItem>

packages/block-editor/src/components/block-settings-menu/block-mode-toggle.js

@@ -26,7 +26,6 @@ export function BlockModeToggle( { blockType, mode, onToggleMode, small = false
 			className="editor-block-settings-menu__control block-editor-block-settings-menu__control"
 			onClick={ onToggleMode }
 			icon="html"
-			label={ small ? label : undefined }
 		>
 			{ ! small && label }
 		</MenuItem>

packages/block-editor/src/components/copy-handler/index.js

@@ -1,33 +1,17 @@
 /**
  * WordPress dependencies
  */
-import { Component } from '@wordpress/element';
 import { serialize } from '@wordpress/blocks';
 import { documentHasSelection } from '@wordpress/dom';
 import { withDispatch } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
 
-class CopyHandler extends Component {
-	constructor() {
-		super( ...arguments );
-
-		this.onCopy = ( event ) => this.props.onCopy( event );
-		this.onCut = ( event ) => this.props.onCut( event );
-	}
-
-	componentDidMount() {
-		document.addEventListener( 'copy', this.onCopy );
-		document.addEventListener( 'cut', this.onCut );
-	}
-
-	componentWillUnmount() {
-		document.removeEventListener( 'copy', this.onCopy );
-		document.removeEventListener( 'cut', this.onCut );
-	}
-
-	render() {
-		return null;
-	}
+function CopyHandler( { children, onCopy, onCut } ) {
+	return (
+		<div onCopy={ onCopy } onCut={ onCut }>
+			{ children }
+		</div>
+	);
 }
 
 export default compose( [