From f8ee53e8868f187b96842af80b1a4d0981dbf2d6 Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Mon, 4 Dec 2023 21:16:47 +0900
Subject: [PATCH] Remove unnecessary styles and classes

---
 packages/block-library/src/form/edit.js | 30 +--------------------
 packages/block-library/src/form/save.js | 35 ++-----------------------
 2 files changed, 3 insertions(+), 62 deletions(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 41980080b9ea6b..7f479a9b2ce47a 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -7,10 +7,6 @@ import {
 	useBlockProps,
 	useInnerBlocksProps,
 	InspectorControls,
-	__experimentalUseBorderProps as useBorderProps,
-	__experimentalUseColorProps as useColorProps,
-	__experimentalGetSpacingClassesAndStyles as useSpacingProps,
-	getTypographyClassesAndStyles as useTypographyProps,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { TextControl, SelectControl, PanelBody } from '@wordpress/components';
@@ -24,11 +20,6 @@ import {
 	formSubmissionNotificationError,
 } from './utils.js';
 
-/**
- * External dependencies
- */
-import classNames from 'classnames';
-
 const ALLOWED_BLOCKS = [
 	'core/paragraph',
 	'core/heading',
@@ -69,7 +60,7 @@ const TEMPLATE = [
 	[ 'core/form-submit-button', {} ],
 ];
 
-const Edit = ( { attributes, setAttributes, className, clientId } ) => {
+const Edit = ( { attributes, setAttributes, clientId } ) => {
 	const { action, method, email, submissionMethod } = attributes;
 	const blockProps = useBlockProps();
 
@@ -92,11 +83,6 @@ const Edit = ( { attributes, setAttributes, className, clientId } ) => {
 			: InnerBlocks.ButtonBlockAppender,
 	} );
 
-	const borderProps = useBorderProps( attributes );
-	const colorProps = useColorProps( attributes );
-	const spacingProps = useSpacingProps( attributes );
-	const typographyProps = useTypographyProps( attributes );
-
 	return (
 		<>
 			<InspectorControls>
@@ -186,20 +172,6 @@ const Edit = ( { attributes, setAttributes, className, clientId } ) => {
 			) }
 			<form
 				{ ...innerBlocksProps }
-				style={ {
-					...borderProps.style,
-					...colorProps.style,
-					...spacingProps.style,
-					...typographyProps.style,
-				} }
-				className={ classNames(
-					className,
-					'wp-block-form',
-					colorProps.className,
-					borderProps.className,
-					spacingProps.className,
-					typographyProps.className
-				) }
 				encType={ submissionMethod === 'email' ? 'text/plain' : null }
 			/>
 		</>
diff --git a/packages/block-library/src/form/save.js b/packages/block-library/src/form/save.js
index b4d3970ed9cb0e..9d944f13effa91 100644
--- a/packages/block-library/src/form/save.js
+++ b/packages/block-library/src/form/save.js
@@ -1,46 +1,15 @@
 /**
  * WordPress dependencies
  */
-import {
-	InnerBlocks,
-	useBlockProps,
-	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
-	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
-	__experimentalGetSpacingClassesAndStyles as getSpacingClassesAndStyles,
-	getTypographyClassesAndStyles as useTypographyProps,
-} from '@wordpress/block-editor';
+import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
 
-/**
- * External dependencies
- */
-import classNames from 'classnames';
-
-const Save = ( { attributes, className } ) => {
+const Save = ( { attributes } ) => {
 	const blockProps = useBlockProps.save();
 	const { submissionMethod } = attributes;
 
-	const borderProps = getBorderClassesAndStyles( attributes );
-	const colorProps = getColorClassesAndStyles( attributes );
-	const spacingProps = getSpacingClassesAndStyles( attributes );
-	const typographyProps = useTypographyProps( attributes );
-
 	return (
 		<form
 			{ ...blockProps }
-			style={ {
-				...borderProps.style,
-				...colorProps.style,
-				...spacingProps.style,
-				...typographyProps.style,
-			} }
-			className={ classNames(
-				className,
-				'wp-block-form',
-				colorProps.className,
-				borderProps.className,
-				spacingProps.className,
-				typographyProps.className
-			) }
 			encType={ submissionMethod === 'email' ? 'text/plain' : null }
 		>
 			<InnerBlocks.Content />