Block Library: Remove store subscriptions from Audio and Video blocks (…

…#57449) * Block Library: Remove store subscriptions from Audio and Video blocks * Fix typos
WordPress · Jan 3, 2024 · d3071ca · d3071ca
1 parent 55a170b
commit d3071ca
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 40 deletions.
diff --git a/packages/block-library/src/audio/edit.js b/packages/block-library/src/audio/edit.js
@@ -42,32 +42,19 @@ function AudioEdit( {
 	className,
 	setAttributes,
 	onReplace,
-	isSelected,
+	isSelected: isSingleSelected,
 	insertBlocksAfter,
 } ) {
 	const { id, autoplay, loop, preload, src } = attributes;
 	const isTemporaryAudio = ! id && isBlobURL( src );
-	const { mediaUpload, multiAudioSelection } = useSelect( ( select ) => {
-		const { getSettings, getMultiSelectedBlockClientIds, getBlockName } =
-			select( blockEditorStore );
-		const multiSelectedClientIds = getMultiSelectedBlockClientIds();
-
-		return {
-			mediaUpload: getSettings().mediaUpload,
-			multiAudioSelection:
-				multiSelectedClientIds.length &&
-				multiSelectedClientIds.every(
-					( _clientId ) => getBlockName( _clientId ) === 'core/audio'
-				),
-		};
-	}, [] );
+	const { getSettings } = useSelect( blockEditorStore );
 
 	useEffect( () => {
 		if ( ! id && isBlobURL( src ) ) {
 			const file = getBlobByURL( src );
 
 			if ( file ) {
-				mediaUpload( {
+				getSettings().mediaUpload( {
 					filesList: [ file ],
 					onFileChange: ( [ media ] ) => onSelectAudio( media ),
 					onError: ( e ) => onUploadError( e ),
@@ -156,7 +143,7 @@ function AudioEdit( {
 
 	return (
 		<>
-			{ ! multiAudioSelection && (
+			{ isSingleSelected && (
 				<BlockControls group="other">
 					<MediaReplaceFlow
 						mediaId={ id }
@@ -212,17 +199,17 @@ function AudioEdit( {
 					so the user clicking on it won't play the
 					file or change the position slider when the controls are enabled.
 				*/ }
-				<Disabled isDisabled={ ! isSelected }>
+				<Disabled isDisabled={ ! isSingleSelected }>
 					<audio controls="controls" src={ src } />
 				</Disabled>
 				{ isTemporaryAudio && <Spinner /> }
 				<Caption
 					attributes={ attributes }
 					setAttributes={ setAttributes }
-					isSelected={ isSelected }
+					isSelected={ isSingleSelected }
 					insertBlocksAfter={ insertBlocksAfter }
 					label={ __( 'Audio caption text' ) }
-					showToolbarButton={ ! multiAudioSelection }
+					showToolbarButton={ isSingleSelected }
 				/>
 			</figure>
 		</>

diff --git a/packages/block-library/src/video/edit.js b/packages/block-library/src/video/edit.js
@@ -63,7 +63,7 @@ const ALLOWED_MEDIA_TYPES = [ 'video' ];
 const VIDEO_POSTER_ALLOWED_MEDIA_TYPES = [ 'image' ];
 
 function VideoEdit( {
-	isSelected,
+	isSelected: isSingleSelected,
 	attributes,
 	className,
 	setAttributes,
@@ -75,26 +75,13 @@ function VideoEdit( {
 	const posterImageButton = useRef();
 	const { id, controls, poster, src, tracks } = attributes;
 	const isTemporaryVideo = ! id && isBlobURL( src );
-	const { mediaUpload, multiVideoSelection } = useSelect( ( select ) => {
-		const { getSettings, getMultiSelectedBlockClientIds, getBlockName } =
-			select( blockEditorStore );
-		const multiSelectedClientIds = getMultiSelectedBlockClientIds();
-
-		return {
-			mediaUpload: getSettings().mediaUpload,
-			multiVideoSelection:
-				multiSelectedClientIds.length &&
-				multiSelectedClientIds.every(
-					( _clientId ) => getBlockName( _clientId ) === 'core/video'
-				),
-		};
-	}, [] );
+	const { getSettings } = useSelect( blockEditorStore );
 
 	useEffect( () => {
 		if ( ! id && isBlobURL( src ) ) {
 			const file = getBlobByURL( src );
 			if ( file ) {
-				mediaUpload( {
+				getSettings().mediaUpload( {
 					filesList: [ file ],
 					onFileChange: ( [ media ] ) => onSelectVideo( media ),
 					onError: onUploadError,
@@ -195,7 +182,7 @@ function VideoEdit( {
 
 	return (
 		<>
-			{ ! multiVideoSelection && (
+			{ isSingleSelected && (
 				<>
 					<BlockControls>
 						<TracksEditor
@@ -281,7 +268,7 @@ function VideoEdit( {
 					so the user clicking on it won't play the
 					video when the controls are enabled.
 				*/ }
-				<Disabled isDisabled={ ! isSelected }>
+				<Disabled isDisabled={ ! isSingleSelected }>
 					<video
 						controls={ controls }
 						poster={ poster }
@@ -295,10 +282,10 @@ function VideoEdit( {
 				<Caption
 					attributes={ attributes }
 					setAttributes={ setAttributes }
-					isSelected={ isSelected }
+					isSelected={ isSingleSelected }
 					insertBlocksAfter={ insertBlocksAfter }
 					label={ __( 'Video caption text' ) }
-					showToolbarButton={ ! multiVideoSelection }
+					showToolbarButton={ isSingleSelected }
 				/>
 			</figure>
 		</>