Address some oxlint warnings

swissspidy · Dec 13, 2023 · 671dbd4 · 671dbd4
1 parent 4b30e68
commit 671dbd4
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 214 deletions.
diff --git a/packages/edit-post/src/blockMediaPanel/coverControls.tsx b/packages/edit-post/src/blockMediaPanel/coverControls.tsx
@@ -50,13 +50,11 @@ export function CoverControls( props: CoverControlsProps ) {
 				onSuccess={ onChange }
 			/>
 			{ 'video' === props.attributes.backgroundType ? (
-				<>
-					<MuteVideo
-						id={ props.attributes.id }
-						url={ props.attributes.url }
-						onChange={ onChange }
-					/>
-				</>
+				<MuteVideo
+					id={ props.attributes.id }
+					url={ props.attributes.url }
+					onChange={ onChange }
+				/>
 			) : null }
 			<DebugInfo id={ props.attributes.id } />
 		</Fragment>

diff --git a/packages/edit-post/src/blockMediaPanel/index.tsx b/packages/edit-post/src/blockMediaPanel/index.tsx
@@ -43,59 +43,27 @@ type PerBlockControlsProps = MediaPanelProps;
 function PerBlockControls( props: PerBlockControlsProps ) {
 	switch ( props.name ) {
 		case 'core/video':
-			return (
-				<>
-					<VideoControls { ...props } />
-				</>
-			);
+			return <VideoControls { ...props } />;
 		case 'core/image':
-			return (
-				<>
-					<ImageControls { ...props } />
-				</>
-			);
+			return <ImageControls { ...props } />;
 
 		case 'core/audio':
-			return (
-				<>
-					<AudioControls { ...props } />
-				</>
-			);
+			return <AudioControls { ...props } />;
 
 		case 'core/media-text':
-			return (
-				<>
-					<MediaTextControls { ...props } />
-				</>
-			);
+			return <MediaTextControls { ...props } />;
 
 		case 'core/gallery':
-			return (
-				<>
-					<GalleryControls { ...props } />
-				</>
-			);
+			return <GalleryControls { ...props } />;
 
 		case 'core/cover':
-			return (
-				<>
-					<CoverControls { ...props } />
-				</>
-			);
+			return <CoverControls { ...props } />;
 
 		case 'core/post-featured-image':
-			return (
-				<>
-					<PostFeaturedImageControls />
-				</>
-			);
+			return <PostFeaturedImageControls />;
 
 		case 'core/site-logo':
-			return (
-				<>
-					<SiteLogoControls { ...props } />
-				</>
-			);
+			return <SiteLogoControls { ...props } />;
 
 		default:
 			return null;

diff --git a/packages/edit-post/src/blockMediaPanel/mediaTextControls.tsx b/packages/edit-post/src/blockMediaPanel/mediaTextControls.tsx
@@ -49,13 +49,11 @@ export function MediaTextControls( props: MediaTextControlsProps ) {
 				onSuccess={ onChange }
 			/>
 			{ 'video' === props.attributes.mediaType ? (
-				<>
-					<MuteVideo
-						id={ props.attributes.mediaId }
-						url={ props.attributes.mediaUrl }
-						onChange={ onChange }
-					/>
-				</>
+				<MuteVideo
+					id={ props.attributes.mediaId }
+					url={ props.attributes.mediaUrl }
+					onChange={ onChange }
+				/>
 			) : null }
 			<DebugInfo id={ props.attributes.mediaId } />
 		</Fragment>

diff --git a/packages/edit-post/src/blockMediaPanel/recordingControls.tsx b/packages/edit-post/src/blockMediaPanel/recordingControls.tsx
@@ -58,18 +58,15 @@ function InputControls() {
 	} ) );
 
 	// Videos can be recorded with or without audio.
-	const audioControls = [
-		...audioDevices.map( ( device ) => ( {
-			title: device.label,
-			onClick: () => {
-				void setAudioInput( device.deviceId );
-			},
-			isActive: audioInput === device.deviceId,
-			role: 'menuitemradio',
-			icon:
-				hasAudio && audioInput === device.deviceId ? check : undefined,
-		} ) ),
-	];
+	const audioControls = audioDevices.map( ( device ) => ( {
+		title: device.label,
+		onClick: () => {
+			void setAudioInput( device.deviceId );
+		},
+		isActive: audioInput === device.deviceId,
+		role: 'menuitemradio',
+		icon: hasAudio && audioInput === device.deviceId ? check : undefined,
+	} ) );
 
 	if ( 'video' === recordingType ) {
 		audioControls.unshift( {

diff --git a/packages/edit-post/src/crossOriginIsolation/index.ts b/packages/edit-post/src/crossOriginIsolation/index.ts
@@ -9,6 +9,30 @@ function forceCrossOrigin( imgCrossOrigin: CrossOriginValue, url: string ) {
 	return 'anonymous' as CrossOriginValue;
 }
 
+async function waitForChildren( element: Element ) {
+	return new Promise< void >( ( resolve ) => {
+		if ( ! element ) {
+			return resolve();
+		}
+
+		if ( element.children.length ) {
+			return resolve();
+		}
+
+		const obs = new MutationObserver( () => {
+			if ( element.children.length ) {
+				obs.disconnect();
+				resolve();
+			}
+		} );
+
+		obs.observe( element, {
+			childList: true,
+			subtree: true,
+		} );
+	} );
+}
+
 if ( window.crossOriginIsolated ) {
 	addFilter(
 		'media.crossOrigin',
@@ -66,30 +90,6 @@ if ( window.crossOriginIsolated ) {
 		} );
 	} );
 
-	async function waitForChildren( element: Element ) {
-		return new Promise< void >( ( resolve ) => {
-			if ( ! element ) {
-				return resolve();
-			}
-
-			if ( element.children.length ) {
-				return resolve();
-			}
-
-			const obs = new MutationObserver( () => {
-				if ( element.children.length ) {
-					observer.disconnect();
-					resolve();
-				}
-			} );
-
-			obs.observe( element, {
-				childList: true,
-				subtree: true,
-			} );
-		} );
-	}
-
 	const unsubscribe = subscribe( async () => {
 		const wrapperEl = document.querySelector(
 			'.edit-post-layout__metaboxes'