Update to use clientId

WordPress · Jul 19, 2018 · d412ad3 · d412ad3
1 parent ec6850a
commit d412ad3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/editor/components/block-controls/multi-block-controls.js b/editor/components/block-controls/multi-block-controls.js
@@ -74,7 +74,7 @@ export const withMultiBlockSupport = ( component, attributeName ) => createHighe
 					[ attributeName ]: newValue,
 				};
 				for ( let i = 0; i < props.multiSelectedBlocks.length; i++ ) {
-					newProps.onMultiBlockChange( props.multiSelectedBlocks[ i ].uid, newAttributes );
+					newProps.onMultiBlockChange( props.multiSelectedBlocks[ i ].clientId, newAttributes );
 				}
 			};
 		}

diff --git a/editor/components/block-edit/context.js b/editor/components/block-edit/context.js
@@ -75,7 +75,7 @@ const isFirstOrOnlyBlockSelectedHOC = createHigherOrderComponent( ( OriginalComp
 	return ( props ) => {
 		return (
 			<Consumer>
-				{ ( { isSelected, uid } ) => ( isSelected || ( uid === props.firstMultiSelectedBlockUid && props.allSelectedBlocksOfSameType ) ) && (
+				{ ( { isSelected, clientId } ) => ( isSelected || ( clientId === props.getFirstMultiSelectedBlockClientId && props.allSelectedBlocksOfSameType ) ) && (
 					<OriginalComponent { ...props } />
 				) }
 			</Consumer>
@@ -88,12 +88,12 @@ export const isFirstOrOnlyBlockSelected = ( component ) => {
 		withSelect( ( select ) => {
 			const {
 				getMultiSelectedBlocks,
-				getFirstMultiSelectedBlockUid,
+				getFirstMultiSelectedBlockClientId,
 				isMultiSelecting,
 			} = select( 'core/editor' );
 			const allSelectedBlocksOfSameType = uniq( getMultiSelectedBlocks().map( ( { name } ) => name ) ).length === 1;
 			return {
-				firstMultiSelectedBlockUid: getFirstMultiSelectedBlockUid(),
+				getFirstMultiSelectedBlockClientId: getFirstMultiSelectedBlockClientId(),
 				isSelecting: isMultiSelecting(),
 				selectedBlocks: getMultiSelectedBlocks(),
 				allSelectedBlocksOfSameType,