From cb1d87cc0a2807d8d4874fe7c4f09c5bb0bd0eb2 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 16 Sep 2022 10:23:17 +0300
Subject: [PATCH 001/133] Initial forms POC

---
 docs/reference-guides/core-blocks.md          |  18 +++
 packages/block-library/src/form/block.json    |  10 ++
 packages/block-library/src/form/edit.js       |  14 ++
 .../block-library/src/form/edit.native.js     | 137 ++++++++++++++++++
 packages/block-library/src/form/index.js      |  18 +++
 packages/block-library/src/form/init.js       |   6 +
 packages/block-library/src/form/save.js       |  14 ++
 packages/block-library/src/index.js           |   4 +
 .../block-library/src/input-field/block.json  |  26 ++++
 .../block-library/src/input-field/edit.js     | 119 +++++++++++++++
 .../block-library/src/input-field/index.js    |  18 +++
 .../block-library/src/input-field/save.js     |  35 +++++
 12 files changed, 419 insertions(+)
 create mode 100644 packages/block-library/src/form/block.json
 create mode 100644 packages/block-library/src/form/edit.js
 create mode 100644 packages/block-library/src/form/edit.native.js
 create mode 100644 packages/block-library/src/form/index.js
 create mode 100644 packages/block-library/src/form/init.js
 create mode 100644 packages/block-library/src/form/save.js
 create mode 100644 packages/block-library/src/input-field/block.json
 create mode 100644 packages/block-library/src/input-field/edit.js
 create mode 100644 packages/block-library/src/input-field/index.js
 create mode 100644 packages/block-library/src/input-field/save.js

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index a7570bf590a397..907489e06d573e 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -277,6 +277,15 @@ Display footnotes added to the page. ([Source](https://github.com/WordPress/gute
 -	**Supports:** color (background, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~html~~, ~~multiple~~, ~~reusable~~
 -	**Attributes:** 
 
+## Form
+
+A form. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/form))
+
+-	**Name:** core/form
+-	**Category:** common
+-	**Supports:** 
+-	**Attributes:** 
+
 ## Classic
 
 Use the classic WordPress editor. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/freeform))
@@ -341,6 +350,15 @@ Insert an image to make a visual statement. ([Source](https://github.com/WordPre
 -	**Supports:** anchor, color (~~background~~, ~~text~~), filter (duotone)
 -	**Attributes:** align, alt, aspectRatio, caption, height, href, id, lightbox, linkClass, linkDestination, linkTarget, rel, scale, sizeSlug, title, url, width
 
+## Input field
+
+The basic building block for forms. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/input-field))
+
+-	**Name:** core/input-field
+-	**Category:** common
+-	**Supports:** 
+-	**Attributes:** inlineLabel, label, type
+
 ## Latest Comments
 
 Display a list of your most recent comments. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/latest-comments))
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
new file mode 100644
index 00000000000000..b9bdd98d5f6190
--- /dev/null
+++ b/packages/block-library/src/form/block.json
@@ -0,0 +1,10 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "core/form",
+	"title": "Form",
+	"category": "common",
+	"description": "A form.",
+	"keywords": [ "container", "wrapper", "row", "section" ],
+	"textdomain": "default"
+}
diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
new file mode 100644
index 00000000000000..2bc463fcdde574
--- /dev/null
+++ b/packages/block-library/src/form/edit.js
@@ -0,0 +1,14 @@
+/**
+ * WordPress dependencies
+ */
+import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+
+const Edit = () => {
+	const blockProps = useBlockProps();
+	return (
+		<form { ...blockProps }>
+			<InnerBlocks />
+		</form>
+	);
+};
+export default Edit;
diff --git a/packages/block-library/src/form/edit.native.js b/packages/block-library/src/form/edit.native.js
new file mode 100644
index 00000000000000..b04211b725a911
--- /dev/null
+++ b/packages/block-library/src/form/edit.native.js
@@ -0,0 +1,137 @@
+/**
+ * External dependencies
+ */
+import { View } from 'react-native';
+
+/**
+ * WordPress dependencies
+ */
+import { withSelect } from '@wordpress/data';
+import {
+	compose,
+	withPreferredColorScheme,
+	useResizeObserver,
+} from '@wordpress/compose';
+import {
+	InnerBlocks,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import { useCallback } from '@wordpress/element';
+import { alignmentHelpers } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import styles from './editor.scss';
+
+const { isFullWidth } = alignmentHelpers;
+
+function GroupEdit( {
+	attributes,
+	hasInnerBlocks,
+	isSelected,
+	isLastInnerBlockSelected,
+	getStylesFromColorScheme,
+	style,
+	blockWidth,
+} ) {
+	const { align } = attributes;
+	const [ resizeObserver, sizes ] = useResizeObserver();
+	const { width } = sizes || { width: 0 };
+
+	const renderAppender = useCallback(
+		() => (
+			<View
+				style={ [
+					! hasInnerBlocks && styles.groupAppender,
+					isFullWidth( align ) &&
+						! hasInnerBlocks &&
+						styles.fullwidthGroupAppender,
+					isFullWidth( align ) &&
+						hasInnerBlocks &&
+						styles.fullwidthHasInnerGroupAppender,
+				] }
+			>
+				<InnerBlocks.ButtonBlockAppender />
+			</View>
+		),
+		[ align, hasInnerBlocks ]
+	);
+
+	if ( ! isSelected && ! hasInnerBlocks ) {
+		return (
+			<View
+				style={ [
+					getStylesFromColorScheme(
+						styles.groupPlaceholder,
+						styles.groupPlaceholderDark
+					),
+					! hasInnerBlocks && {
+						...styles.marginVerticalDense,
+						...styles.marginHorizontalNone,
+					},
+				] }
+			/>
+		);
+	}
+
+	return (
+		<View
+			style={ [
+				isSelected && hasInnerBlocks && styles.innerBlocks,
+				style,
+				isSelected &&
+					hasInnerBlocks &&
+					style?.backgroundColor &&
+					styles.hasBackgroundAppender,
+				isLastInnerBlockSelected &&
+					style?.backgroundColor &&
+					styles.isLastInnerBlockSelected,
+			] }
+		>
+			{ resizeObserver }
+			<InnerBlocks
+				renderAppender={ isSelected && renderAppender }
+				parentWidth={ width }
+				blockWidth={ blockWidth }
+			/>
+		</View>
+	);
+}
+
+export default compose( [
+	withSelect( ( select, { clientId } ) => {
+		const {
+			getBlock,
+			getBlockIndex,
+			hasSelectedInnerBlock,
+			getBlockRootClientId,
+			getSelectedBlockClientId,
+			getBlockAttributes,
+		} = select( blockEditorStore );
+
+		const block = getBlock( clientId );
+		const hasInnerBlocks = !! ( block && block.innerBlocks.length );
+		const isInnerBlockSelected =
+			hasInnerBlocks && hasSelectedInnerBlock( clientId, true );
+		let isLastInnerBlockSelected = false;
+
+		if ( isInnerBlockSelected ) {
+			const { innerBlocks } = block;
+			const selectedBlockClientId = getSelectedBlockClientId();
+			const totalInnerBlocks = innerBlocks.length - 1;
+			const blockIndex = getBlockIndex( selectedBlockClientId );
+			isLastInnerBlockSelected = totalInnerBlocks === blockIndex;
+		}
+
+		const parentId = getBlockRootClientId( clientId );
+		const parentBlockAlignment = getBlockAttributes( parentId )?.align;
+
+		return {
+			hasInnerBlocks,
+			isLastInnerBlockSelected,
+			parentBlockAlignment,
+		};
+	} ),
+	withPreferredColorScheme,
+] )( GroupEdit );
diff --git a/packages/block-library/src/form/index.js b/packages/block-library/src/form/index.js
new file mode 100644
index 00000000000000..4c60b5f5c20639
--- /dev/null
+++ b/packages/block-library/src/form/index.js
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import initBlock from '../utils/init-block';
+import edit from './edit';
+import metadata from './block.json';
+import save from './save';
+
+const { name } = metadata;
+
+export { metadata, name };
+
+export const settings = {
+	edit,
+	save,
+};
+
+export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/form/init.js b/packages/block-library/src/form/init.js
new file mode 100644
index 00000000000000..79f0492c2cb2f8
--- /dev/null
+++ b/packages/block-library/src/form/init.js
@@ -0,0 +1,6 @@
+/**
+ * Internal dependencies
+ */
+import { init } from './';
+
+export default init();
diff --git a/packages/block-library/src/form/save.js b/packages/block-library/src/form/save.js
new file mode 100644
index 00000000000000..72991db918c5e4
--- /dev/null
+++ b/packages/block-library/src/form/save.js
@@ -0,0 +1,14 @@
+/**
+ * WordPress dependencies
+ */
+import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+
+const Save = () => {
+	const blockProps = useBlockProps.save();
+	return (
+		<form { ...blockProps }>
+			<InnerBlocks.Content />
+		</form>
+	);
+};
+export default Save;
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index 736b552bf4259b..b9e9be4788a49d 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -48,12 +48,14 @@ import * as cover from './cover';
 import * as details from './details';
 import * as embed from './embed';
 import * as file from './file';
+import * as form from './form';
 import * as gallery from './gallery';
 import * as group from './group';
 import * as heading from './heading';
 import * as homeLink from './home-link';
 import * as html from './html';
 import * as image from './image';
+import * as inputField from './input-field';
 import * as latestComments from './latest-comments';
 import * as latestPosts from './latest-posts';
 import * as list from './list';
@@ -150,8 +152,10 @@ const getAllBlocks = () => {
 		details,
 		embed,
 		file,
+		form,
 		group,
 		html,
+		inputField,
 		latestComments,
 		latestPosts,
 		mediaText,
diff --git a/packages/block-library/src/input-field/block.json b/packages/block-library/src/input-field/block.json
new file mode 100644
index 00000000000000..2465312d7f437f
--- /dev/null
+++ b/packages/block-library/src/input-field/block.json
@@ -0,0 +1,26 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "core/input-field",
+	"title": "Input field",
+	"category": "common",
+	"parent": [ "core/form" ],
+	"description": "The basic building block for forms.",
+	"keywords": [ "input", "text", "textarea" ],
+	"textdomain": "default",
+	"attributes": {
+		"type": {
+			"type": "string",
+			"default": "text"
+		},
+		"label": {
+			"type": "string",
+			"default": "Label"
+		},
+		"inlineLabel": {
+			"type": "boolean",
+			"default": false
+		}
+	},
+	"style": [ "wp-block-input-field" ]
+}
diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
new file mode 100644
index 00000000000000..f8fab23c58e1c7
--- /dev/null
+++ b/packages/block-library/src/input-field/edit.js
@@ -0,0 +1,119 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { InspectorControls } from '@wordpress/block-editor';
+import {
+	PanelBody,
+	CustomSelectControl,
+	TextControl,
+	CheckboxControl,
+} from '@wordpress/components';
+
+const inputTypeOptions = [
+	{
+		key: 'text',
+		name: __( 'Text' ),
+	},
+	{
+		key: 'textarea',
+		name: __( 'Textarea' ),
+	},
+	{
+		key: 'email',
+		name: __( 'Email' ),
+	},
+	{
+		key: 'url',
+		name: __( 'URL' ),
+	},
+	{
+		key: 'tel',
+		name: __( 'Telephone' ),
+	},
+	{
+		key: 'number',
+		name: __( 'Number' ),
+	},
+	{
+		key: 'datetime-local',
+		name: __( 'Date and time' ),
+	},
+	{
+		key: 'submit',
+		name: __( 'Submit' ),
+	},
+];
+
+function InputFieldBlock( { attributes, setAttributes } ) {
+	const { type, label, inlineLabel } = attributes;
+
+	return (
+		<>
+			<InspectorControls>
+				<PanelBody title={ __( 'Input settings' ) }>
+					<CustomSelectControl
+						label={ __( 'Type' ) }
+						value={ inputTypeOptions.find(
+							( option ) => option.key === type
+						) }
+						options={ inputTypeOptions }
+						onChange={ ( newVal ) => {
+							setAttributes( {
+								type: newVal?.selectedItem?.key,
+							} );
+						} }
+					/>
+					<TextControl
+						label={ __( 'Label' ) }
+						value={ label }
+						onChange={ ( newVal ) => {
+							setAttributes( {
+								label: newVal,
+							} );
+						} }
+					/>
+					<CheckboxControl
+						label={ __( 'Inline label' ) }
+						checked={ attributes.inlineLabel }
+						onChange={ ( newVal ) => {
+							setAttributes( {
+								inlineLabel: newVal,
+							} );
+						} }
+					/>
+				</PanelBody>
+			</InspectorControls>
+
+			{ type === 'textarea' && (
+				<label>
+					{ inlineLabel && label && <span>{ label }</span> }
+					{ ! inlineLabel && label && <p>{ label }</p> }
+					<textarea className="wp-block-input-field" />
+				</label>
+			) }
+
+			{ type === 'submit' && (
+				<div className="wp-block-buttons">
+					<div className="wp-block-button">
+						<input
+							className="wp-block-button__link wp-element-button"
+							type="submit"
+							value={ label }
+						/>
+					</div>
+				</div>
+			) }
+
+			{ type !== 'textarea' && type !== 'submit' && (
+				<label>
+					{ inlineLabel && label && <span>{ label }</span> }
+					{ ! inlineLabel && label && <p>{ label }</p> }
+					<input className="wp-block-input-field" type={ type } />
+				</label>
+			) }
+		</>
+	);
+}
+
+export default InputFieldBlock;
diff --git a/packages/block-library/src/input-field/index.js b/packages/block-library/src/input-field/index.js
new file mode 100644
index 00000000000000..4c60b5f5c20639
--- /dev/null
+++ b/packages/block-library/src/input-field/index.js
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import initBlock from '../utils/init-block';
+import edit from './edit';
+import metadata from './block.json';
+import save from './save';
+
+const { name } = metadata;
+
+export { metadata, name };
+
+export const settings = {
+	edit,
+	save,
+};
+
+export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/input-field/save.js b/packages/block-library/src/input-field/save.js
new file mode 100644
index 00000000000000..c8255bb0aec396
--- /dev/null
+++ b/packages/block-library/src/input-field/save.js
@@ -0,0 +1,35 @@
+export default function save( { attributes } ) {
+	const { type, label, inlineLabel } = attributes;
+
+	return (
+		<>
+			{ type === 'textarea' && (
+				<label>
+					{ inlineLabel && label && <span>{ label }</span> }
+					{ ! inlineLabel && label && <p>{ label }</p> }
+					<textarea className="wp-block-input-field" />
+				</label>
+			) }
+
+			{ type === 'submit' && (
+				<div className="wp-block-buttons">
+					<div className="wp-block-button">
+						<input
+							className="wp-block-button__link wp-element-button"
+							type="submit"
+							value={ label }
+						/>
+					</div>
+				</div>
+			) }
+
+			{ type !== 'textarea' && type !== 'submit' && (
+				<label>
+					{ inlineLabel && label && <span>{ label }</span> }
+					{ ! inlineLabel && label && <p>{ label }</p> }
+					<input className="wp-block-input-field" type={ type } />
+				</label>
+			) }
+		</>
+	);
+}

From e3f0028efd3ff2357cb568e1aaabf95da768ef50 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 16 Sep 2022 10:56:36 +0300
Subject: [PATCH 002/133] this was just copy-pasted :facepalm:

---
 .../block-library/src/form/edit.native.js     | 137 ------------------
 1 file changed, 137 deletions(-)
 delete mode 100644 packages/block-library/src/form/edit.native.js

diff --git a/packages/block-library/src/form/edit.native.js b/packages/block-library/src/form/edit.native.js
deleted file mode 100644
index b04211b725a911..00000000000000
--- a/packages/block-library/src/form/edit.native.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * External dependencies
- */
-import { View } from 'react-native';
-
-/**
- * WordPress dependencies
- */
-import { withSelect } from '@wordpress/data';
-import {
-	compose,
-	withPreferredColorScheme,
-	useResizeObserver,
-} from '@wordpress/compose';
-import {
-	InnerBlocks,
-	store as blockEditorStore,
-} from '@wordpress/block-editor';
-import { useCallback } from '@wordpress/element';
-import { alignmentHelpers } from '@wordpress/components';
-
-/**
- * Internal dependencies
- */
-import styles from './editor.scss';
-
-const { isFullWidth } = alignmentHelpers;
-
-function GroupEdit( {
-	attributes,
-	hasInnerBlocks,
-	isSelected,
-	isLastInnerBlockSelected,
-	getStylesFromColorScheme,
-	style,
-	blockWidth,
-} ) {
-	const { align } = attributes;
-	const [ resizeObserver, sizes ] = useResizeObserver();
-	const { width } = sizes || { width: 0 };
-
-	const renderAppender = useCallback(
-		() => (
-			<View
-				style={ [
-					! hasInnerBlocks && styles.groupAppender,
-					isFullWidth( align ) &&
-						! hasInnerBlocks &&
-						styles.fullwidthGroupAppender,
-					isFullWidth( align ) &&
-						hasInnerBlocks &&
-						styles.fullwidthHasInnerGroupAppender,
-				] }
-			>
-				<InnerBlocks.ButtonBlockAppender />
-			</View>
-		),
-		[ align, hasInnerBlocks ]
-	);
-
-	if ( ! isSelected && ! hasInnerBlocks ) {
-		return (
-			<View
-				style={ [
-					getStylesFromColorScheme(
-						styles.groupPlaceholder,
-						styles.groupPlaceholderDark
-					),
-					! hasInnerBlocks && {
-						...styles.marginVerticalDense,
-						...styles.marginHorizontalNone,
-					},
-				] }
-			/>
-		);
-	}
-
-	return (
-		<View
-			style={ [
-				isSelected && hasInnerBlocks && styles.innerBlocks,
-				style,
-				isSelected &&
-					hasInnerBlocks &&
-					style?.backgroundColor &&
-					styles.hasBackgroundAppender,
-				isLastInnerBlockSelected &&
-					style?.backgroundColor &&
-					styles.isLastInnerBlockSelected,
-			] }
-		>
-			{ resizeObserver }
-			<InnerBlocks
-				renderAppender={ isSelected && renderAppender }
-				parentWidth={ width }
-				blockWidth={ blockWidth }
-			/>
-		</View>
-	);
-}
-
-export default compose( [
-	withSelect( ( select, { clientId } ) => {
-		const {
-			getBlock,
-			getBlockIndex,
-			hasSelectedInnerBlock,
-			getBlockRootClientId,
-			getSelectedBlockClientId,
-			getBlockAttributes,
-		} = select( blockEditorStore );
-
-		const block = getBlock( clientId );
-		const hasInnerBlocks = !! ( block && block.innerBlocks.length );
-		const isInnerBlockSelected =
-			hasInnerBlocks && hasSelectedInnerBlock( clientId, true );
-		let isLastInnerBlockSelected = false;
-
-		if ( isInnerBlockSelected ) {
-			const { innerBlocks } = block;
-			const selectedBlockClientId = getSelectedBlockClientId();
-			const totalInnerBlocks = innerBlocks.length - 1;
-			const blockIndex = getBlockIndex( selectedBlockClientId );
-			isLastInnerBlockSelected = totalInnerBlocks === blockIndex;
-		}
-
-		const parentId = getBlockRootClientId( clientId );
-		const parentBlockAlignment = getBlockAttributes( parentId )?.align;
-
-		return {
-			hasInnerBlocks,
-			isLastInnerBlockSelected,
-			parentBlockAlignment,
-		};
-	} ),
-	withPreferredColorScheme,
-] )( GroupEdit );

From f54a4a81bb46d15b4b5a1f7b526d72fb6b5f5aeb Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 20 Sep 2022 14:35:53 +0300
Subject: [PATCH 003/133] Use RichText for labels

---
 .../block-library/src/input-field/edit.js     | 29 +++++++++++++++++--
 .../block-library/src/input-field/save.js     |  4 +++
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index f8fab23c58e1c7..54ddd7d52f61b3 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -2,7 +2,11 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { InspectorControls } from '@wordpress/block-editor';
+import {
+	InspectorControls,
+	RichText,
+	useBlockProps,
+} from '@wordpress/block-editor';
 import {
 	PanelBody,
 	CustomSelectControl,
@@ -47,6 +51,7 @@ const inputTypeOptions = [
 
 function InputFieldBlock( { attributes, setAttributes } ) {
 	const { type, label, inlineLabel } = attributes;
+	const blockProps = useBlockProps();
 
 	return (
 		<>
@@ -86,11 +91,13 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 			</InspectorControls>
 
 			{ type === 'textarea' && (
+				/* eslint-disable jsx-a11y/label-has-associated-control */
 				<label>
 					{ inlineLabel && label && <span>{ label }</span> }
 					{ ! inlineLabel && label && <p>{ label }</p> }
 					<textarea className="wp-block-input-field" />
 				</label>
+				/* eslint-enable jsx-a11y/label-has-associated-control */
 			) }
 
 			{ type === 'submit' && (
@@ -106,11 +113,27 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 			) }
 
 			{ type !== 'textarea' && type !== 'submit' && (
+				/* eslint-disable jsx-a11y/label-has-associated-control */
 				<label>
-					{ inlineLabel && label && <span>{ label }</span> }
-					{ ! inlineLabel && label && <p>{ label }</p> }
+					<RichText
+						identifier="label"
+						tagName={ inlineLabel ? 'span' : 'p' }
+						{ ...blockProps }
+						value={ label }
+						onChange={ ( newContent ) =>
+							setAttributes( { label: newContent } )
+						}
+						aria-label={
+							label ? __( 'Label' ) : __( 'Empty label' )
+						}
+						data-empty={ label ? false : true }
+						placeholder={ __( 'Type the label for this input' ) }
+						__unstableEmbedURLOnPaste
+						__unstableAllowPrefixTransformations
+					/>
 					<input className="wp-block-input-field" type={ type } />
 				</label>
+				/* eslint-enable jsx-a11y/label-has-associated-control */
 			) }
 		</>
 	);
diff --git a/packages/block-library/src/input-field/save.js b/packages/block-library/src/input-field/save.js
index c8255bb0aec396..3b36f4ba5fde76 100644
--- a/packages/block-library/src/input-field/save.js
+++ b/packages/block-library/src/input-field/save.js
@@ -4,11 +4,13 @@ export default function save( { attributes } ) {
 	return (
 		<>
 			{ type === 'textarea' && (
+				/* eslint-disable jsx-a11y/label-has-associated-control */
 				<label>
 					{ inlineLabel && label && <span>{ label }</span> }
 					{ ! inlineLabel && label && <p>{ label }</p> }
 					<textarea className="wp-block-input-field" />
 				</label>
+				/* eslint-enable jsx-a11y/label-has-associated-control */
 			) }
 
 			{ type === 'submit' && (
@@ -24,11 +26,13 @@ export default function save( { attributes } ) {
 			) }
 
 			{ type !== 'textarea' && type !== 'submit' && (
+				/* eslint-disable jsx-a11y/label-has-associated-control */
 				<label>
 					{ inlineLabel && label && <span>{ label }</span> }
 					{ ! inlineLabel && label && <p>{ label }</p> }
 					<input className="wp-block-input-field" type={ type } />
 				</label>
+				/* eslint-enable jsx-a11y/label-has-associated-control */
 			) }
 		</>
 	);

From 360479398760e83b477896bebc81606a16d5727a Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 21 Sep 2022 14:14:30 +0300
Subject: [PATCH 004/133] Make things editable

---
 .../block-library/src/input-field/edit.js     | 79 ++++++++++++-------
 .../block-library/src/input-field/save.js     |  9 ++-
 2 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index 54ddd7d52f61b3..f9369888e54052 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -10,9 +10,9 @@ import {
 import {
 	PanelBody,
 	CustomSelectControl,
-	TextControl,
 	CheckboxControl,
 } from '@wordpress/components';
+import { useRef } from '@wordpress/element';
 
 const inputTypeOptions = [
 	{
@@ -52,6 +52,11 @@ const inputTypeOptions = [
 function InputFieldBlock( { attributes, setAttributes } ) {
 	const { type, label, inlineLabel } = attributes;
 	const blockProps = useBlockProps();
+	const ref = useRef();
+
+	if ( ref.current ) {
+		ref.current.focus();
+	}
 
 	return (
 		<>
@@ -69,24 +74,17 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 							} );
 						} }
 					/>
-					<TextControl
-						label={ __( 'Label' ) }
-						value={ label }
-						onChange={ ( newVal ) => {
-							setAttributes( {
-								label: newVal,
-							} );
-						} }
-					/>
-					<CheckboxControl
-						label={ __( 'Inline label' ) }
-						checked={ attributes.inlineLabel }
-						onChange={ ( newVal ) => {
-							setAttributes( {
-								inlineLabel: newVal,
-							} );
-						} }
-					/>
+					{ type !== 'submit' && (
+						<CheckboxControl
+							label={ __( 'Inline label' ) }
+							checked={ attributes.inlineLabel }
+							onChange={ ( newVal ) => {
+								setAttributes( {
+									inlineLabel: newVal,
+								} );
+							} }
+						/>
+					) }
 				</PanelBody>
 			</InspectorControls>
 
@@ -95,7 +93,10 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 				<label>
 					{ inlineLabel && label && <span>{ label }</span> }
 					{ ! inlineLabel && label && <p>{ label }</p> }
-					<textarea className="wp-block-input-field" />
+					<textarea
+						className="wp-block-input-field"
+						disabled="true"
+					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */
 			) }
@@ -103,11 +104,30 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 			{ type === 'submit' && (
 				<div className="wp-block-buttons">
 					<div className="wp-block-button">
-						<input
+						<button
 							className="wp-block-button__link wp-element-button"
-							type="submit"
-							value={ label }
-						/>
+							disabled="true"
+						>
+							<RichText
+								identifier="label"
+								tagName={ inlineLabel ? 'span' : 'p' }
+								{ ...blockProps }
+								value={ label }
+								onChange={ ( newLabel ) =>
+									setAttributes( { label: newLabel } )
+								}
+								ref={ ref.current }
+								aria-label={
+									label ? __( 'Label' ) : __( 'Empty label' )
+								}
+								data-empty={ label ? false : true }
+								placeholder={ __(
+									'Type the label for this input'
+								) }
+								__unstableEmbedURLOnPaste
+								__unstableAllowPrefixTransformations
+							/>
+						</button>
 					</div>
 				</div>
 			) }
@@ -120,9 +140,10 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						tagName={ inlineLabel ? 'span' : 'p' }
 						{ ...blockProps }
 						value={ label }
-						onChange={ ( newContent ) =>
-							setAttributes( { label: newContent } )
+						onChange={ ( newLabel ) =>
+							setAttributes( { label: newLabel } )
 						}
+						ref={ ref.current }
 						aria-label={
 							label ? __( 'Label' ) : __( 'Empty label' )
 						}
@@ -131,7 +152,11 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						__unstableEmbedURLOnPaste
 						__unstableAllowPrefixTransformations
 					/>
-					<input className="wp-block-input-field" type={ type } />
+					<input
+						className="wp-block-input-field"
+						type={ type }
+						disabled="true"
+					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */
 			) }
diff --git a/packages/block-library/src/input-field/save.js b/packages/block-library/src/input-field/save.js
index 3b36f4ba5fde76..c1090953d18bcd 100644
--- a/packages/block-library/src/input-field/save.js
+++ b/packages/block-library/src/input-field/save.js
@@ -16,11 +16,12 @@ export default function save( { attributes } ) {
 			{ type === 'submit' && (
 				<div className="wp-block-buttons">
 					<div className="wp-block-button">
-						<input
+						<button
 							className="wp-block-button__link wp-element-button"
-							type="submit"
-							value={ label }
-						/>
+							disabled="true"
+						>
+							{ label }
+						</button>
 					</div>
 				</div>
 			) }

From e57a17812a522473f94182c40c6612314b86d84e Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 21 Sep 2022 14:53:24 +0300
Subject: [PATCH 005/133] Add initial PHP implementation & filters for form
 action & method

---
 lib/blocks.php                                |  1 +
 packages/block-library/src/form/block.json    | 12 +++-
 packages/block-library/src/form/index.php     | 72 +++++++++++++++++++
 .../block-library/src/input-field/edit.js     |  1 +
 4 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 packages/block-library/src/form/index.php

diff --git a/lib/blocks.php b/lib/blocks.php
index 537fa9ce4b45e1..ecd7165af5cf0d 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -66,6 +66,7 @@ function gutenberg_reregister_core_block_types() {
 				'comments.php'                     => 'core/comments',
 				'footnotes.php'                    => 'core/footnotes',
 				'file.php'                         => 'core/file',
+				'form.php'                         => 'core/form',
 				'home-link.php'                    => 'core/home-link',
 				'image.php'                        => 'core/image',
 				'gallery.php'                      => 'core/gallery',
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index b9bdd98d5f6190..d3562cf72d84af 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -6,5 +6,15 @@
 	"category": "common",
 	"description": "A form.",
 	"keywords": [ "container", "wrapper", "row", "section" ],
-	"textdomain": "default"
+	"textdomain": "default",
+	"attributes": {
+		"action": {
+			"type": "string",
+			"default": "#"
+		},
+		"method": {
+			"type": "string",
+			"default": "get"
+		}
+	}
 }
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
new file mode 100644
index 00000000000000..b17c6ea50135c9
--- /dev/null
+++ b/packages/block-library/src/form/index.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Server-side rendering of the `core/form` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/form` block on server.
+ *
+ * @param array    $attributes The block attributes.
+ * @param string   $content The saved content.
+ * @param WP_Block $block The parsed block.
+ *
+ * @return string The content of the block being rendered.
+ */
+function render_block_core_form( $attributes, $content, $block ) {
+
+	// Build the form action attribute.
+	$action = empty( $attributes['action'] ) ? '' : $attributes['action'];
+	$action = empty( $action ) ? '#' : $action;
+
+	/**
+	 * Filters the form action attribute.
+	 *
+	 * @param string $action The form action attribute.
+	 * @param array  $attributes The block attributes.
+	 * @param string $content The saved content.
+	 * @param WP_Block $block The parsed block.
+	 *
+	 * @return string The form action attribute.
+	 */
+	$action = apply_filters( 'block_form', $action, $attributes, $content, $block );
+
+	// Build the form method attribute.
+	$method = empty( $attributes['method'] ) ? '' : $attributes['method'];
+	$method = empty( $method ) || ( 'get' !== strtolower( $method ) && 'post' !== strtolower( $method ) ) ? 'get' : $method;
+	/**
+	 * Filters the form method attribute.
+	 *
+	 * @param string $method The form method attribute.
+	 * @param array  $attributes The block attributes.
+	 * @param string $content The saved content.
+	 * @param WP_Block $block The parsed block.
+	 *
+	 * @return string The form method attribute.
+	 */
+	$method = apply_filters( 'block_form_method', $method, $attributes, $content, $block );
+
+	return str_replace(
+		'<form ',
+		sprintf(
+			'<form action="%1$s" method="%2$s" ',
+			esc_attr( $action ),
+			esc_attr( $method )
+		),
+		$content
+	);
+}
+
+/**
+ * Registers the `core/form` block on server.
+ */
+function register_block_core_form() {
+	register_block_type_from_metadata(
+		__DIR__ . '/form',
+		array(
+			'render_callback' => 'render_block_core_form',
+		)
+	);
+}
+add_action( 'init', 'register_block_core_form' );
diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index f9369888e54052..b3b26a88dfba9a 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -10,6 +10,7 @@ import {
 import {
 	PanelBody,
 	CustomSelectControl,
+	TextControl,
 	CheckboxControl,
 } from '@wordpress/components';
 import { useRef } from '@wordpress/element';

From 0a72468456532a3376636d52a1152e779baf24b7 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 21 Sep 2022 15:03:40 +0300
Subject: [PATCH 006/133] Add name attribute in fields

---
 docs/reference-guides/core-blocks.md           |  4 ++--
 .../block-library/src/input-field/block.json   |  3 +++
 packages/block-library/src/input-field/edit.js | 15 ++++++++++++++-
 packages/block-library/src/input-field/save.js | 18 +++++++++++-------
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 907489e06d573e..22dcb34196e3d2 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -284,7 +284,7 @@ A form. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/blo
 -	**Name:** core/form
 -	**Category:** common
 -	**Supports:** 
--	**Attributes:** 
+-	**Attributes:** action, method
 
 ## Classic
 
@@ -357,7 +357,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Name:** core/input-field
 -	**Category:** common
 -	**Supports:** 
--	**Attributes:** inlineLabel, label, type
+-	**Attributes:** inlineLabel, label, name, type
 
 ## Latest Comments
 
diff --git a/packages/block-library/src/input-field/block.json b/packages/block-library/src/input-field/block.json
index 2465312d7f437f..1d41a626aec17c 100644
--- a/packages/block-library/src/input-field/block.json
+++ b/packages/block-library/src/input-field/block.json
@@ -13,6 +13,9 @@
 			"type": "string",
 			"default": "text"
 		},
+		"name": {
+			"type": "string"
+		},
 		"label": {
 			"type": "string",
 			"default": "Label"
diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index b3b26a88dfba9a..5afd73b944b712 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -51,7 +51,7 @@ const inputTypeOptions = [
 ];
 
 function InputFieldBlock( { attributes, setAttributes } ) {
-	const { type, label, inlineLabel } = attributes;
+	const { type, name, label, inlineLabel } = attributes;
 	const blockProps = useBlockProps();
 	const ref = useRef();
 
@@ -75,6 +75,17 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 							} );
 						} }
 					/>
+					{ type !== 'submit' && (
+						<TextControl
+							label={ __( 'Name' ) }
+							value={ name }
+							onChange={ ( newVal ) => {
+								setAttributes( {
+									name: newVal,
+								} );
+							} }
+						/>
+					) }
 					{ type !== 'submit' && (
 						<CheckboxControl
 							label={ __( 'Inline label' ) }
@@ -97,6 +108,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 					<textarea
 						className="wp-block-input-field"
 						disabled="true"
+						name={ name }
 					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */
@@ -156,6 +168,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 					<input
 						className="wp-block-input-field"
 						type={ type }
+						name={ name }
 						disabled="true"
 					/>
 				</label>
diff --git a/packages/block-library/src/input-field/save.js b/packages/block-library/src/input-field/save.js
index c1090953d18bcd..9bdc83306a1c0c 100644
--- a/packages/block-library/src/input-field/save.js
+++ b/packages/block-library/src/input-field/save.js
@@ -1,5 +1,5 @@
 export default function save( { attributes } ) {
-	const { type, label, inlineLabel } = attributes;
+	const { type, name, label, inlineLabel } = attributes;
 
 	return (
 		<>
@@ -8,7 +8,10 @@ export default function save( { attributes } ) {
 				<label>
 					{ inlineLabel && label && <span>{ label }</span> }
 					{ ! inlineLabel && label && <p>{ label }</p> }
-					<textarea className="wp-block-input-field" />
+					<textarea
+						className="wp-block-input-field"
+						name={ name || label }
+					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */
 			) }
@@ -16,10 +19,7 @@ export default function save( { attributes } ) {
 			{ type === 'submit' && (
 				<div className="wp-block-buttons">
 					<div className="wp-block-button">
-						<button
-							className="wp-block-button__link wp-element-button"
-							disabled="true"
-						>
+						<button className="wp-block-button__link wp-element-button">
 							{ label }
 						</button>
 					</div>
@@ -31,7 +31,11 @@ export default function save( { attributes } ) {
 				<label>
 					{ inlineLabel && label && <span>{ label }</span> }
 					{ ! inlineLabel && label && <p>{ label }</p> }
-					<input className="wp-block-input-field" type={ type } />
+					<input
+						className="wp-block-input-field"
+						type={ type }
+						name={ name || label }
+					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */
 			) }

From 9e58c751a3d23c49dcaa0d1a71d8fda387323ec0 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 23 Sep 2022 14:02:47 +0300
Subject: [PATCH 007/133] rename action

---
 packages/block-library/src/form/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index b17c6ea50135c9..3661f6e72301c3 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -30,7 +30,7 @@ function render_block_core_form( $attributes, $content, $block ) {
 	 *
 	 * @return string The form action attribute.
 	 */
-	$action = apply_filters( 'block_form', $action, $attributes, $content, $block );
+	$action = apply_filters( 'block_form_action', $action, $attributes, $content, $block );
 
 	// Build the form method attribute.
 	$method = empty( $attributes['method'] ) ? '' : $attributes['method'];

From d9f587e5c6bf8b4e81d645e7a89932f396684b4a Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 29 Sep 2022 10:32:56 +0300
Subject: [PATCH 008/133] Default form submissions to POST instead of GET

---
 packages/block-library/src/form/block.json | 2 +-
 packages/block-library/src/form/index.php  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index d3562cf72d84af..30d509fab6d48a 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -14,7 +14,7 @@
 		},
 		"method": {
 			"type": "string",
-			"default": "get"
+			"default": "post"
 		}
 	}
 }
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 3661f6e72301c3..5bf28635046394 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -34,7 +34,7 @@ function render_block_core_form( $attributes, $content, $block ) {
 
 	// Build the form method attribute.
 	$method = empty( $attributes['method'] ) ? '' : $attributes['method'];
-	$method = empty( $method ) || ( 'get' !== strtolower( $method ) && 'post' !== strtolower( $method ) ) ? 'get' : $method;
+	$method = empty( $method ) || ( 'get' !== strtolower( $method ) && 'post' !== strtolower( $method ) ) ? 'post' : $method;
 	/**
 	 * Filters the form method attribute.
 	 *

From c47ee84dee6af8dd2c761e3d750f93593f5619f8 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 29 Sep 2022 10:33:18 +0300
Subject: [PATCH 009/133] Add default action to send an email on
 form-submission

---
 packages/block-library/src/form/index.php | 45 ++++++++++++++++++++---
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 5bf28635046394..b2a34188d3455c 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -47,12 +47,19 @@ function render_block_core_form( $attributes, $content, $block ) {
 	 */
 	$method = apply_filters( 'block_form_method', $method, $attributes, $content, $block );
 
+	$form_hash = md5( json_encode( array( $attributes, $block ) ) );
 	return str_replace(
-		'<form ',
-		sprintf(
-			'<form action="%1$s" method="%2$s" ',
-			esc_attr( $action ),
-			esc_attr( $method )
+		array(
+			'<form ',
+			'</form>',
+		),
+		array(
+			sprintf(
+				'<form action="%1$s" method="%2$s" ',
+				esc_attr( $action ),
+				esc_attr( $method )
+			),
+			'<input type="hidden" name="block-form-hash" value="' . $form_hash . '" /><form>',
 		),
 		$content
 	);
@@ -70,3 +77,31 @@ function register_block_core_form() {
 	);
 }
 add_action( 'init', 'register_block_core_form' );
+
+/**
+ * Handles the form submission.
+ *
+ * This is the default action, which sends an email to the admin.
+ * To override the default action, first remove the default action:
+ * remove_action( 'wp', 'submit_core_form_block' );
+ * Then add your own action by creating a function and hooking it to the 'wp' action.
+ */
+function submit_core_form_block() {
+	if ( ! isset( $_POST['block-form-hash'] ) ) {
+		return;
+	}
+	$content = sprintf(
+		/* translators: %s: The request URI. */
+		__( 'Form submission from %1$s', 'gutenberg' ) . '</br>',
+		esc_url( get_site_url() . $_SERVER['REQUEST_URI'] )
+	);
+	foreach ( $_POST as $key => $value ) {
+		if ( 'block-form-hash' === $key ) {
+			continue;
+		}
+		$content .= $key . ': ' . $value . '</br>';
+	}
+
+	wp_mail( get_option( 'admin_email' ), __( 'Form submission', 'gutenberg' ), $content );
+}
+add_action( 'wp', 'submit_core_form_block' );

From 68d4322b80e509f883f622df82ee3ef124f743c5 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 3 Oct 2022 11:27:33 +0200
Subject: [PATCH 010/133] Move "name" attribute to the Advanced section.

---
 .../block-library/src/input-field/edit.js     | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index 5afd73b944b712..2e1ec9f2dd7781 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -75,17 +75,6 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 							} );
 						} }
 					/>
-					{ type !== 'submit' && (
-						<TextControl
-							label={ __( 'Name' ) }
-							value={ name }
-							onChange={ ( newVal ) => {
-								setAttributes( {
-									name: newVal,
-								} );
-							} }
-						/>
-					) }
 					{ type !== 'submit' && (
 						<CheckboxControl
 							label={ __( 'Inline label' ) }
@@ -99,6 +88,23 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 					) }
 				</PanelBody>
 			</InspectorControls>
+			{ type !== 'submit' && (
+				<InspectorControls __experimentalGroup="advanced">
+					<TextControl
+						autoComplete="off"
+						label={ __( 'Name' ) }
+						value={ name }
+						onChange={ ( newVal ) => {
+							setAttributes( {
+								name: newVal,
+							} );
+						} }
+						help={ __(
+							'Affects the "name" atribute of the input element, and is used as a name for the form submission results.'
+						) }
+					/>
+				</InspectorControls>
+			) }
 
 			{ type === 'textarea' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */

From 031e301b787cd7181ecb73eaa14769c9518c22a0 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 3 Oct 2022 11:31:38 +0200
Subject: [PATCH 011/133] Add checkbox field-type

---
 packages/block-library/src/input-field/edit.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index 2e1ec9f2dd7781..d8e8f77c1164e1 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -24,6 +24,10 @@ const inputTypeOptions = [
 		key: 'textarea',
 		name: __( 'Textarea' ),
 	},
+	{
+		key: 'checkbox',
+		name: __( 'Checkbox' ),
+	},
 	{
 		key: 'email',
 		name: __( 'Email' ),

From ccbd77729075bd4533f3d8aaab9be555351eb4a2 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 3 Oct 2022 12:14:06 +0200
Subject: [PATCH 012/133] update block.json

---
 .../block-library/src/input-field/block.json  | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/input-field/block.json b/packages/block-library/src/input-field/block.json
index 1d41a626aec17c..b22aac8cdd9e9a 100644
--- a/packages/block-library/src/input-field/block.json
+++ b/packages/block-library/src/input-field/block.json
@@ -6,7 +6,26 @@
 	"category": "common",
 	"parent": [ "core/form" ],
 	"description": "The basic building block for forms.",
-	"keywords": [ "input", "text", "textarea" ],
+	"keywords": [
+		"input",
+		"text",
+		"textarea",
+		"checkbox",
+		"email",
+		"url",
+		"tel",
+		"number",
+		"range",
+		"date",
+		"time",
+		"password",
+		"radio",
+		"select",
+		"file",
+		"submit",
+		"button",
+		"form"
+	],
 	"textdomain": "default",
 	"attributes": {
 		"type": {
@@ -25,5 +44,5 @@
 			"default": false
 		}
 	},
-	"style": [ "wp-block-input-field" ]
+	"style": [ "wp-block-input-field", "wp-block-buttons", "wp-block-button" ]
 }

From f0f5fc8c1653802ef1e3edd158e5641e9eaef114 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 3 Oct 2022 12:14:25 +0200
Subject: [PATCH 013/133] Add a class on labels

---
 packages/block-library/src/input-field/edit.js | 4 ++--
 packages/block-library/src/input-field/save.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index d8e8f77c1164e1..5170f62ab8919f 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -112,7 +112,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 
 			{ type === 'textarea' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label>
+				<label className="wp-block-input-field-label">
 					{ inlineLabel && label && <span>{ label }</span> }
 					{ ! inlineLabel && label && <p>{ label }</p> }
 					<textarea
@@ -157,7 +157,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 
 			{ type !== 'textarea' && type !== 'submit' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label>
+				<label className="wp-block-input-field-label">
 					<RichText
 						identifier="label"
 						tagName={ inlineLabel ? 'span' : 'p' }
diff --git a/packages/block-library/src/input-field/save.js b/packages/block-library/src/input-field/save.js
index 9bdc83306a1c0c..44f3f512ea36ce 100644
--- a/packages/block-library/src/input-field/save.js
+++ b/packages/block-library/src/input-field/save.js
@@ -5,7 +5,7 @@ export default function save( { attributes } ) {
 		<>
 			{ type === 'textarea' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label>
+				<label className="wp-block-input-field-label">
 					{ inlineLabel && label && <span>{ label }</span> }
 					{ ! inlineLabel && label && <p>{ label }</p> }
 					<textarea
@@ -28,7 +28,7 @@ export default function save( { attributes } ) {
 
 			{ type !== 'textarea' && type !== 'submit' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label>
+				<label className="wp-block-input-field-label">
 					{ inlineLabel && label && <span>{ label }</span> }
 					{ ! inlineLabel && label && <p>{ label }</p> }
 					<input

From 44fa12a5946ed6c9163be22b7e88bdd96bd256ac Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 3 Oct 2022 12:16:11 +0200
Subject: [PATCH 014/133] Add test stylesheet

---
 packages/block-library/src/input-field/style.scss | 4 ++++
 packages/block-library/src/style.scss             | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 packages/block-library/src/input-field/style.scss

diff --git a/packages/block-library/src/input-field/style.scss b/packages/block-library/src/input-field/style.scss
new file mode 100644
index 00000000000000..a072e33beb56d6
--- /dev/null
+++ b/packages/block-library/src/input-field/style.scss
@@ -0,0 +1,4 @@
+.wp-block-input-field-label {
+	display: block;
+	background: #f00 !important;
+}
diff --git a/packages/block-library/src/style.scss b/packages/block-library/src/style.scss
index c4b0a37e6354d7..f2dd94f69afbf5 100644
--- a/packages/block-library/src/style.scss
+++ b/packages/block-library/src/style.scss
@@ -18,6 +18,7 @@
 @import "./group/style.scss";
 @import "./heading/style.scss";
 @import "./image/style.scss";
+@import "./input-field/style.scss";
 @import "./latest-comments/style.scss";
 @import "./latest-posts/style.scss";
 @import "./list/style.scss";

From 9cb6468eed82ab1102d737750f36d86dbd6d22af Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 3 Oct 2022 13:28:38 +0200
Subject: [PATCH 015/133] fix input styles loading

---
 lib/blocks.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/blocks.php b/lib/blocks.php
index ecd7165af5cf0d..fe545f64c8f10d 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -24,6 +24,7 @@ function gutenberg_reregister_core_block_types() {
 				'details',
 				'group',
 				'html',
+				'input-field',
 				'list',
 				'list-item',
 				'media-text',

From ca6275a95bb929e364b5ccf3b8dcbbb3243afcc4 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 3 Oct 2022 13:44:50 +0200
Subject: [PATCH 016/133] basic styles

---
 .../block-library/src/input-field/style.scss  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/input-field/style.scss b/packages/block-library/src/input-field/style.scss
index a072e33beb56d6..680272f5750a5f 100644
--- a/packages/block-library/src/input-field/style.scss
+++ b/packages/block-library/src/input-field/style.scss
@@ -1,4 +1,21 @@
 .wp-block-input-field-label {
 	display: block;
-	background: #f00 !important;
+
+	p {
+		margin-block-end: 0;
+		margin-bottom: 0;
+	}
+}
+
+.wp-block-input-field {
+	padding: 0.5em;
+	border: 1px solid currentColor;
+	opacity: 0.75;
+	border-radius: 0;
+
+	&:focus,
+	&:active,
+	&:focus-within {
+		outline: 2px solid currentColor;
+	}
 }

From 26a5cafb86954981054e09da374b1cfa7c3ebbc7 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 3 Oct 2022 13:51:23 +0200
Subject: [PATCH 017/133] split input-types array to a separate utils file

---
 .../block-library/src/input-field/edit.js     | 46 +++----------------
 .../block-library/src/input-field/utils.js    | 43 +++++++++++++++++
 2 files changed, 49 insertions(+), 40 deletions(-)
 create mode 100644 packages/block-library/src/input-field/utils.js

diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index 5170f62ab8919f..d076521367b5fd 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -15,44 +15,10 @@ import {
 } from '@wordpress/components';
 import { useRef } from '@wordpress/element';
 
-const inputTypeOptions = [
-	{
-		key: 'text',
-		name: __( 'Text' ),
-	},
-	{
-		key: 'textarea',
-		name: __( 'Textarea' ),
-	},
-	{
-		key: 'checkbox',
-		name: __( 'Checkbox' ),
-	},
-	{
-		key: 'email',
-		name: __( 'Email' ),
-	},
-	{
-		key: 'url',
-		name: __( 'URL' ),
-	},
-	{
-		key: 'tel',
-		name: __( 'Telephone' ),
-	},
-	{
-		key: 'number',
-		name: __( 'Number' ),
-	},
-	{
-		key: 'datetime-local',
-		name: __( 'Date and time' ),
-	},
-	{
-		key: 'submit',
-		name: __( 'Submit' ),
-	},
-];
+/**
+ * Internal dependencies
+ */
+import { INPUT_TYPES } from './utils';
 
 function InputFieldBlock( { attributes, setAttributes } ) {
 	const { type, name, label, inlineLabel } = attributes;
@@ -69,10 +35,10 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 				<PanelBody title={ __( 'Input settings' ) }>
 					<CustomSelectControl
 						label={ __( 'Type' ) }
-						value={ inputTypeOptions.find(
+						value={ INPUT_TYPES.find(
 							( option ) => option.key === type
 						) }
-						options={ inputTypeOptions }
+						options={ INPUT_TYPES }
 						onChange={ ( newVal ) => {
 							setAttributes( {
 								type: newVal?.selectedItem?.key,
diff --git a/packages/block-library/src/input-field/utils.js b/packages/block-library/src/input-field/utils.js
new file mode 100644
index 00000000000000..45f43c1e9135e4
--- /dev/null
+++ b/packages/block-library/src/input-field/utils.js
@@ -0,0 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+export const INPUT_TYPES = [
+	{
+		key: 'text',
+		name: __( 'Text' ),
+	},
+	{
+		key: 'textarea',
+		name: __( 'Textarea' ),
+	},
+	{
+		key: 'checkbox',
+		name: __( 'Checkbox' ),
+	},
+	{
+		key: 'email',
+		name: __( 'Email' ),
+	},
+	{
+		key: 'url',
+		name: __( 'URL' ),
+	},
+	{
+		key: 'tel',
+		name: __( 'Telephone' ),
+	},
+	{
+		key: 'number',
+		name: __( 'Number' ),
+	},
+	{
+		key: 'datetime-local',
+		name: __( 'Date and time' ),
+	},
+	{
+		key: 'submit',
+		name: __( 'Submit' ),
+	},
+];

From a98ba8f4fd7cffad6f25247bb2f7d79656bb4c4d Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Oct 2022 09:33:17 +0300
Subject: [PATCH 018/133] add ALLOWED_BLOCKS in forms

---
 packages/block-library/src/form/edit.js | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 2bc463fcdde574..d81171d3c7e085 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -1,14 +1,23 @@
 /**
  * WordPress dependencies
  */
-import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
+
+const ALLOWED_BLOCKS = [
+	'core/paragraph',
+	'core/heading',
+	'core/input-field',
+	'core/columns',
+	'core/group',
+];
 
 const Edit = () => {
 	const blockProps = useBlockProps();
-	return (
-		<form { ...blockProps }>
-			<InnerBlocks />
-		</form>
-	);
+
+	const innerBlocksProps = useInnerBlocksProps( blockProps, {
+		allowedBlocks: ALLOWED_BLOCKS,
+	} );
+
+	return <form { ...innerBlocksProps } />;
 };
 export default Edit;

From ea5579104868be46c7539e4623677f20d1b75c8a Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Oct 2022 09:34:11 +0300
Subject: [PATCH 019/133] Add input fields variations

---
 .../block-library/src/input-field/block.json  | 21 +----
 .../block-library/src/input-field/index.js    |  2 +
 .../block-library/src/input-field/utils.js    |  8 +-
 .../src/input-field/variations.js             | 81 +++++++++++++++++++
 4 files changed, 88 insertions(+), 24 deletions(-)
 create mode 100644 packages/block-library/src/input-field/variations.js

diff --git a/packages/block-library/src/input-field/block.json b/packages/block-library/src/input-field/block.json
index b22aac8cdd9e9a..c1d0afda2d1c5d 100644
--- a/packages/block-library/src/input-field/block.json
+++ b/packages/block-library/src/input-field/block.json
@@ -6,26 +6,7 @@
 	"category": "common",
 	"parent": [ "core/form" ],
 	"description": "The basic building block for forms.",
-	"keywords": [
-		"input",
-		"text",
-		"textarea",
-		"checkbox",
-		"email",
-		"url",
-		"tel",
-		"number",
-		"range",
-		"date",
-		"time",
-		"password",
-		"radio",
-		"select",
-		"file",
-		"submit",
-		"button",
-		"form"
-	],
+	"keywords": [ "input", "form" ],
 	"textdomain": "default",
 	"attributes": {
 		"type": {
diff --git a/packages/block-library/src/input-field/index.js b/packages/block-library/src/input-field/index.js
index 4c60b5f5c20639..b700e0ade6ca7f 100644
--- a/packages/block-library/src/input-field/index.js
+++ b/packages/block-library/src/input-field/index.js
@@ -5,6 +5,7 @@ import initBlock from '../utils/init-block';
 import edit from './edit';
 import metadata from './block.json';
 import save from './save';
+import variations from './variations';
 
 const { name } = metadata;
 
@@ -13,6 +14,7 @@ export { metadata, name };
 export const settings = {
 	edit,
 	save,
+	variations,
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/input-field/utils.js b/packages/block-library/src/input-field/utils.js
index 45f43c1e9135e4..2d4113bf0518eb 100644
--- a/packages/block-library/src/input-field/utils.js
+++ b/packages/block-library/src/input-field/utils.js
@@ -32,10 +32,10 @@ export const INPUT_TYPES = [
 		key: 'number',
 		name: __( 'Number' ),
 	},
-	{
-		key: 'datetime-local',
-		name: __( 'Date and time' ),
-	},
+	// {
+	// 	key: 'datetime-local',
+	// 	name: __( 'Date and time' ),
+	// },
 	{
 		key: 'submit',
 		name: __( 'Submit' ),
diff --git a/packages/block-library/src/input-field/variations.js b/packages/block-library/src/input-field/variations.js
new file mode 100644
index 00000000000000..3456a30a37b4b8
--- /dev/null
+++ b/packages/block-library/src/input-field/variations.js
@@ -0,0 +1,81 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+const variations = [
+	{
+		name: 'text',
+		title: __( 'Text input' ),
+		description: __( 'Plain text input field.' ),
+		attributes: { type: 'text' },
+		isDefault: true,
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) =>
+			! blockAttributes?.type || blockAttributes?.type === 'text',
+	},
+	{
+		name: 'textarea',
+		title: __( 'Textarea input' ),
+		description: __( 'Textarea input field.' ),
+		attributes: { type: 'textarea' },
+		isDefault: true,
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) => blockAttributes?.type === 'textarea',
+	},
+	{
+		name: 'checkbox',
+		title: __( 'Checkbox input' ),
+		description: __( 'Checkbox input field.' ),
+		attributes: { type: 'checkbox' },
+		isDefault: true,
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) => blockAttributes?.type === 'checkbox',
+	},
+	{
+		name: 'email',
+		title: __( 'Email input' ),
+		description: __( 'Email input field.' ),
+		attributes: { type: 'email' },
+		isDefault: true,
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) => blockAttributes?.type === 'email',
+	},
+	{
+		name: 'url',
+		title: __( 'URL input' ),
+		description: __( 'URL input field.' ),
+		attributes: { type: 'url' },
+		isDefault: true,
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) => blockAttributes?.type === 'url',
+	},
+	{
+		name: 'tel',
+		title: __( 'Telephone input' ),
+		description: __( 'Telephone input field.' ),
+		attributes: { type: 'tel' },
+		isDefault: true,
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) => blockAttributes?.type === 'tel',
+	},
+	{
+		name: 'number',
+		title: __( 'Number input' ),
+		description: __( 'Number input field.' ),
+		attributes: { type: 'number' },
+		isDefault: true,
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) => blockAttributes?.type === 'number',
+	},
+	{
+		name: 'submit',
+		title: __( 'Submit button' ),
+		attributes: { type: 'submit' },
+		isDefault: true,
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) => blockAttributes?.type === 'submit',
+	},
+];
+
+export default variations;

From 2cfd07794a055600524e9144c810531587dd2e63 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Oct 2022 09:45:26 +0300
Subject: [PATCH 020/133] fix admin styles for inputs

---
 packages/block-library/src/input-field/style.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/input-field/style.scss b/packages/block-library/src/input-field/style.scss
index 680272f5750a5f..1133b7fdf0c8f4 100644
--- a/packages/block-library/src/input-field/style.scss
+++ b/packages/block-library/src/input-field/style.scss
@@ -7,7 +7,8 @@
 	}
 }
 
-.wp-block-input-field {
+input.wp-block-input-field,
+textarea.wp-block-input-field {
 	padding: 0.5em;
 	border: 1px solid currentColor;
 	opacity: 0.75;

From 0aed66e1da8386a88620a07449d89e7ca5034e6e Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Oct 2022 10:21:56 +0300
Subject: [PATCH 021/133] refactor inline labels & other fixes

---
 .../block-library/src/input-field/edit.js     | 42 ++++++++++++++++---
 .../block-library/src/input-field/save.js     | 27 +++++++++---
 .../block-library/src/input-field/style.scss  | 20 +++++++--
 3 files changed, 73 insertions(+), 16 deletions(-)

diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index d076521367b5fd..9e16f12f0909e7 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
+
 /**
  * WordPress dependencies
  */
@@ -78,9 +83,29 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 
 			{ type === 'textarea' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label className="wp-block-input-field-label">
-					{ inlineLabel && label && <span>{ label }</span> }
-					{ ! inlineLabel && label && <p>{ label }</p> }
+				<label
+					className={ classNames( 'wp-block-input-field-label', {
+						'is-label-inline': inlineLabel,
+					} ) }
+				>
+					<RichText
+						identifier="label"
+						tagName="div"
+						className="wp-block-input-field-label__content"
+						{ ...blockProps }
+						value={ label }
+						onChange={ ( newLabel ) =>
+							setAttributes( { label: newLabel } )
+						}
+						ref={ ref.current }
+						aria-label={
+							label ? __( 'Label' ) : __( 'Empty label' )
+						}
+						data-empty={ label ? false : true }
+						placeholder={ __( 'Type the label for this input' ) }
+						__unstableEmbedURLOnPaste
+						__unstableAllowPrefixTransformations
+					/>
 					<textarea
 						className="wp-block-input-field"
 						disabled="true"
@@ -99,7 +124,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						>
 							<RichText
 								identifier="label"
-								tagName={ inlineLabel ? 'span' : 'p' }
+								tagName="div"
 								{ ...blockProps }
 								value={ label }
 								onChange={ ( newLabel ) =>
@@ -123,10 +148,15 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 
 			{ type !== 'textarea' && type !== 'submit' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label className="wp-block-input-field-label">
+				<label
+					className={ classNames( 'wp-block-input-field-label', {
+						'is-label-inline': inlineLabel,
+					} ) }
+				>
 					<RichText
 						identifier="label"
-						tagName={ inlineLabel ? 'span' : 'p' }
+						tagName="span"
+						className="wp-block-input-field-label__content"
 						{ ...blockProps }
 						value={ label }
 						onChange={ ( newLabel ) =>
diff --git a/packages/block-library/src/input-field/save.js b/packages/block-library/src/input-field/save.js
index 44f3f512ea36ce..dc8bcea1e076ec 100644
--- a/packages/block-library/src/input-field/save.js
+++ b/packages/block-library/src/input-field/save.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import classNames from 'classnames';
+
 export default function save( { attributes } ) {
 	const { type, name, label, inlineLabel } = attributes;
 
@@ -5,9 +10,14 @@ export default function save( { attributes } ) {
 		<>
 			{ type === 'textarea' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label className="wp-block-input-field-label">
-					{ inlineLabel && label && <span>{ label }</span> }
-					{ ! inlineLabel && label && <p>{ label }</p> }
+				<label
+					className={ classNames( 'wp-block-input-field-label', {
+						'is-label-inline': inlineLabel,
+					} ) }
+				>
+					<div className="wp-block-input-field-label__content">
+						{ label }
+					</div>
 					<textarea
 						className="wp-block-input-field"
 						name={ name || label }
@@ -28,9 +38,14 @@ export default function save( { attributes } ) {
 
 			{ type !== 'textarea' && type !== 'submit' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label className="wp-block-input-field-label">
-					{ inlineLabel && label && <span>{ label }</span> }
-					{ ! inlineLabel && label && <p>{ label }</p> }
+				<label
+					className={ classNames( 'wp-block-input-field-label', {
+						'is-label-inline': inlineLabel,
+					} ) }
+				>
+					<div className="wp-block-input-field-label__content">
+						{ label }
+					</div>
 					<input
 						className="wp-block-input-field"
 						type={ type }
diff --git a/packages/block-library/src/input-field/style.scss b/packages/block-library/src/input-field/style.scss
index 1133b7fdf0c8f4..7de8e8b3d64d16 100644
--- a/packages/block-library/src/input-field/style.scss
+++ b/packages/block-library/src/input-field/style.scss
@@ -1,12 +1,20 @@
 .wp-block-input-field-label {
-	display: block;
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	gap: 0.25em;
 
-	p {
-		margin-block-end: 0;
-		margin-bottom: 0;
+	&.is-label-inline {
+		flex-direction: row;
+		gap: 0.5em;
+		align-items: center;
 	}
 }
 
+.wp-block-input-field-label__content {
+	width: fit-content;
+}
+
 input.wp-block-input-field,
 textarea.wp-block-input-field {
 	padding: 0.5em;
@@ -20,3 +28,7 @@ textarea.wp-block-input-field {
 		outline: 2px solid currentColor;
 	}
 }
+
+textarea.wp-block-input-field {
+	min-height: 10em;
+}

From a5423ab687c61721587a518969a5d229e4e4769a Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Oct 2022 10:37:01 +0300
Subject: [PATCH 022/133] Allow marking fields as required

---
 docs/reference-guides/core-blocks.md            |  2 +-
 .../block-library/src/input-field/block.json    |  4 ++++
 packages/block-library/src/input-field/edit.js  | 17 ++++++++++++++++-
 packages/block-library/src/input-field/save.js  |  6 +++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 22dcb34196e3d2..d079f4302e330a 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -357,7 +357,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Name:** core/input-field
 -	**Category:** common
 -	**Supports:** 
--	**Attributes:** inlineLabel, label, name, type
+-	**Attributes:** inlineLabel, label, name, required, type
 
 ## Latest Comments
 
diff --git a/packages/block-library/src/input-field/block.json b/packages/block-library/src/input-field/block.json
index c1d0afda2d1c5d..5732261a644fe4 100644
--- a/packages/block-library/src/input-field/block.json
+++ b/packages/block-library/src/input-field/block.json
@@ -23,6 +23,10 @@
 		"inlineLabel": {
 			"type": "boolean",
 			"default": false
+		},
+		"required": {
+			"type": "boolean",
+			"default": false
 		}
 	},
 	"style": [ "wp-block-input-field", "wp-block-buttons", "wp-block-button" ]
diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/input-field/edit.js
index 9e16f12f0909e7..2defbdb798129f 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/input-field/edit.js
@@ -26,7 +26,7 @@ import { useRef } from '@wordpress/element';
 import { INPUT_TYPES } from './utils';
 
 function InputFieldBlock( { attributes, setAttributes } ) {
-	const { type, name, label, inlineLabel } = attributes;
+	const { type, name, label, inlineLabel, required } = attributes;
 	const blockProps = useBlockProps();
 	const ref = useRef();
 
@@ -61,6 +61,17 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 							} }
 						/>
 					) }
+					{ type !== 'submit' && (
+						<CheckboxControl
+							label={ __( 'Required' ) }
+							checked={ attributes.required }
+							onChange={ ( newVal ) => {
+								setAttributes( {
+									required: newVal,
+								} );
+							} }
+						/>
+					) }
 				</PanelBody>
 			</InspectorControls>
 			{ type !== 'submit' && (
@@ -110,6 +121,8 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						className="wp-block-input-field"
 						disabled="true"
 						name={ name }
+						required={ required }
+						aria-required={ required }
 					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */
@@ -176,6 +189,8 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						type={ type }
 						name={ name }
 						disabled="true"
+						required={ required }
+						aria-required={ required }
 					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */
diff --git a/packages/block-library/src/input-field/save.js b/packages/block-library/src/input-field/save.js
index dc8bcea1e076ec..9b6a7ba9a306a6 100644
--- a/packages/block-library/src/input-field/save.js
+++ b/packages/block-library/src/input-field/save.js
@@ -4,7 +4,7 @@
 import classNames from 'classnames';
 
 export default function save( { attributes } ) {
-	const { type, name, label, inlineLabel } = attributes;
+	const { type, name, label, inlineLabel, required } = attributes;
 
 	return (
 		<>
@@ -21,6 +21,8 @@ export default function save( { attributes } ) {
 					<textarea
 						className="wp-block-input-field"
 						name={ name || label }
+						required={ required }
+						aria-required={ required }
 					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */
@@ -50,6 +52,8 @@ export default function save( { attributes } ) {
 						className="wp-block-input-field"
 						type={ type }
 						name={ name || label }
+						required={ required }
+						aria-required={ required }
 					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */

From f4118dfa190206582a93c9324d619b57f2c3d173 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Oct 2022 10:51:59 +0300
Subject: [PATCH 023/133] Allow defining a form-ID

---
 docs/reference-guides/core-blocks.md       |  2 +-
 packages/block-library/src/form/block.json |  4 +++
 packages/block-library/src/form/edit.js    | 34 ++++++++++++++++++++--
 packages/block-library/src/form/index.php  |  5 ++--
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index d079f4302e330a..c394bb01f659e7 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -284,7 +284,7 @@ A form. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/blo
 -	**Name:** core/form
 -	**Category:** common
 -	**Supports:** 
--	**Attributes:** action, method
+-	**Attributes:** action, formId, method
 
 ## Classic
 
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index 30d509fab6d48a..fe7da5ebe5b368 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -15,6 +15,10 @@
 		"method": {
 			"type": "string",
 			"default": "post"
+		},
+		"formId": {
+			"type": "string",
+			"default": ""
 		}
 	}
 }
diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index d81171d3c7e085..e303cde8690e2d 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -1,7 +1,13 @@
 /**
  * WordPress dependencies
  */
-import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
+import { __ } from '@wordpress/i18n';
+import {
+	useBlockProps,
+	useInnerBlocksProps,
+	InspectorControls,
+} from '@wordpress/block-editor';
+import { PanelBody, TextControl } from '@wordpress/components';
 
 const ALLOWED_BLOCKS = [
 	'core/paragraph',
@@ -11,13 +17,35 @@ const ALLOWED_BLOCKS = [
 	'core/group',
 ];
 
-const Edit = () => {
+const Edit = ( { attributes, setAttributes } ) => {
+	const { formId } = attributes;
 	const blockProps = useBlockProps();
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
 		allowedBlocks: ALLOWED_BLOCKS,
 	} );
 
-	return <form { ...innerBlocksProps } />;
+	return (
+		<>
+			<InspectorControls>
+				<PanelBody title={ __( 'Form settings' ) }>
+					<TextControl
+						autoComplete="off"
+						label={ __( 'Form ID' ) }
+						value={ formId }
+						onChange={ ( newVal ) => {
+							setAttributes( {
+								formId: newVal,
+							} );
+						} }
+						help={ __(
+							'Unique identifier for this form. This value gets sent along with the form submission.'
+						) }
+					/>
+				</PanelBody>
+			</InspectorControls>
+			<form { ...innerBlocksProps } />;
+		</>
+	);
 };
 export default Edit;
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index b2a34188d3455c..d58ebc64624514 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -47,7 +47,8 @@ function render_block_core_form( $attributes, $content, $block ) {
 	 */
 	$method = apply_filters( 'block_form_method', $method, $attributes, $content, $block );
 
-	$form_hash = md5( json_encode( array( $attributes, $block ) ) );
+	$form_id = empty( $attributes['formId'] ) ? md5( json_encode( array( $attributes, $block ) ) ) : $attributes['formId'];
+
 	return str_replace(
 		array(
 			'<form ',
@@ -59,7 +60,7 @@ function render_block_core_form( $attributes, $content, $block ) {
 				esc_attr( $action ),
 				esc_attr( $method )
 			),
-			'<input type="hidden" name="block-form-hash" value="' . $form_hash . '" /><form>',
+			'<input type="hidden" name="block-form-id" value="' . esc_attr( $form_id ) . '" /><form>',
 		),
 		$content
 	);

From 08f761ea773905b25b06227a9a7ac987de9bd3ff Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Oct 2022 13:18:02 +0300
Subject: [PATCH 024/133] generate fixtures

---
 .../fixtures/blocks/core__form.html           | 21 +++++
 .../fixtures/blocks/core__form.json           | 68 ++++++++++++++
 .../fixtures/blocks/core__form.parsed.json    | 88 +++++++++++++++++
 .../blocks/core__form.serialized.html         | 21 +++++
 .../fixtures/blocks/core__input-field.html    | 19 ++++
 .../fixtures/blocks/core__input-field.json    | 57 +++++++++++
 .../blocks/core__input-field.parsed.json      | 94 +++++++++++++++++++
 .../blocks/core__input-field.serialized.html  | 19 ++++
 8 files changed, 387 insertions(+)
 create mode 100644 test/integration/fixtures/blocks/core__form.html
 create mode 100644 test/integration/fixtures/blocks/core__form.json
 create mode 100644 test/integration/fixtures/blocks/core__form.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form.serialized.html
 create mode 100644 test/integration/fixtures/blocks/core__input-field.html
 create mode 100644 test/integration/fixtures/blocks/core__input-field.json
 create mode 100644 test/integration/fixtures/blocks/core__input-field.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__input-field.serialized.html

diff --git a/test/integration/fixtures/blocks/core__form.html b/test/integration/fixtures/blocks/core__form.html
new file mode 100644
index 00000000000000..9015fe38dd19c7
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form.html
@@ -0,0 +1,21 @@
+<!-- wp:form {"formId":"the-form-id"} -->
+<form class="wp-block-form"><!-- wp:input-field {"label":"Name - required, inline label","inlineLabel":true,"required":true} -->
+<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Name - required, inline label</div><input class="wp-block-input-field" type="text" name="Name - required, inline label" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"checkbox","label":"Checkbox - inline label","inlineLabel":true,"required":true} -->
+<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Checkbox - inline label</div><input class="wp-block-input-field" type="checkbox" name="Checkbox - inline label" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"email","label":"Email - required","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email - required</div><input class="wp-block-input-field" type="email" name="Email - required" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"textarea","label":"Textarea input"} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Textarea input</div><textarea class="wp-block-input-field" name="Textarea input" aria-required="false"></textarea></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"submit","label":"Submit"} -->
+<div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>
+<!-- /wp:input-field --></form>
+<!-- /wp:form -->
diff --git a/test/integration/fixtures/blocks/core__form.json b/test/integration/fixtures/blocks/core__form.json
new file mode 100644
index 00000000000000..0c9f29ac87ee0c
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form.json
@@ -0,0 +1,68 @@
+[
+	{
+		"name": "core/form",
+		"isValid": true,
+		"attributes": {
+			"action": "#",
+			"method": "post",
+			"formId": "the-form-id"
+		},
+		"innerBlocks": [
+			{
+				"name": "core/input-field",
+				"isValid": true,
+				"attributes": {
+					"type": "text",
+					"label": "Name - required, inline label",
+					"inlineLabel": true,
+					"required": true
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/input-field",
+				"isValid": true,
+				"attributes": {
+					"type": "checkbox",
+					"label": "Checkbox - inline label",
+					"inlineLabel": true,
+					"required": true
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/input-field",
+				"isValid": true,
+				"attributes": {
+					"type": "email",
+					"label": "Email - required",
+					"inlineLabel": false,
+					"required": true
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/input-field",
+				"isValid": true,
+				"attributes": {
+					"type": "textarea",
+					"label": "Textarea input",
+					"inlineLabel": false,
+					"required": false
+				},
+				"innerBlocks": []
+			},
+			{
+				"name": "core/input-field",
+				"isValid": true,
+				"attributes": {
+					"type": "submit",
+					"label": "Submit",
+					"inlineLabel": false,
+					"required": false
+				},
+				"innerBlocks": []
+			}
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form.parsed.json b/test/integration/fixtures/blocks/core__form.parsed.json
new file mode 100644
index 00000000000000..1cb360568ad8fb
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form.parsed.json
@@ -0,0 +1,88 @@
+[
+	{
+		"blockName": "core/form",
+		"attrs": {
+			"formId": "the-form-id"
+		},
+		"innerBlocks": [
+			{
+				"blockName": "core/input-field",
+				"attrs": {
+					"label": "Name - required, inline label",
+					"inlineLabel": true,
+					"required": true
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Name - required, inline label</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name - required, inline label\" required aria-required=\"true\"/></label>\n",
+				"innerContent": [
+					"\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Name - required, inline label</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name - required, inline label\" required aria-required=\"true\"/></label>\n"
+				]
+			},
+			{
+				"blockName": "core/input-field",
+				"attrs": {
+					"type": "checkbox",
+					"label": "Checkbox - inline label",
+					"inlineLabel": true,
+					"required": true
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Checkbox - inline label</div><input class=\"wp-block-input-field\" type=\"checkbox\" name=\"Checkbox - inline label\" required aria-required=\"true\"/></label>\n",
+				"innerContent": [
+					"\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Checkbox - inline label</div><input class=\"wp-block-input-field\" type=\"checkbox\" name=\"Checkbox - inline label\" required aria-required=\"true\"/></label>\n"
+				]
+			},
+			{
+				"blockName": "core/input-field",
+				"attrs": {
+					"type": "email",
+					"label": "Email - required",
+					"required": true
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email - required</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email - required\" required aria-required=\"true\"/></label>\n",
+				"innerContent": [
+					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email - required</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email - required\" required aria-required=\"true\"/></label>\n"
+				]
+			},
+			{
+				"blockName": "core/input-field",
+				"attrs": {
+					"type": "textarea",
+					"label": "Textarea input"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Textarea input</div><textarea class=\"wp-block-input-field\" name=\"Textarea input\" aria-required=\"false\"></textarea></label>\n",
+				"innerContent": [
+					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Textarea input</div><textarea class=\"wp-block-input-field\" name=\"Textarea input\" aria-required=\"false\"></textarea></label>\n"
+				]
+			},
+			{
+				"blockName": "core/input-field",
+				"attrs": {
+					"type": "submit",
+					"label": "Submit"
+				},
+				"innerBlocks": [],
+				"innerHTML": "\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n",
+				"innerContent": [
+					"\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n"
+				]
+			}
+		],
+		"innerHTML": "\n<form class=\"wp-block-form\">\n\n\n\n\n\n\n\n</form>\n",
+		"innerContent": [
+			"\n<form class=\"wp-block-form\">",
+			null,
+			"\n\n",
+			null,
+			"\n\n",
+			null,
+			"\n\n",
+			null,
+			"\n\n",
+			null,
+			"</form>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form.serialized.html b/test/integration/fixtures/blocks/core__form.serialized.html
new file mode 100644
index 00000000000000..9015fe38dd19c7
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form.serialized.html
@@ -0,0 +1,21 @@
+<!-- wp:form {"formId":"the-form-id"} -->
+<form class="wp-block-form"><!-- wp:input-field {"label":"Name - required, inline label","inlineLabel":true,"required":true} -->
+<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Name - required, inline label</div><input class="wp-block-input-field" type="text" name="Name - required, inline label" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"checkbox","label":"Checkbox - inline label","inlineLabel":true,"required":true} -->
+<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Checkbox - inline label</div><input class="wp-block-input-field" type="checkbox" name="Checkbox - inline label" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"email","label":"Email - required","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email - required</div><input class="wp-block-input-field" type="email" name="Email - required" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"textarea","label":"Textarea input"} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Textarea input</div><textarea class="wp-block-input-field" name="Textarea input" aria-required="false"></textarea></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"submit","label":"Submit"} -->
+<div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>
+<!-- /wp:input-field --></form>
+<!-- /wp:form -->
diff --git a/test/integration/fixtures/blocks/core__input-field.html b/test/integration/fixtures/blocks/core__input-field.html
new file mode 100644
index 00000000000000..2574bc62f5c7cb
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__input-field.html
@@ -0,0 +1,19 @@
+<!-- wp:input-field {"label":"Name - required, inline label","inlineLabel":true,"required":true} -->
+<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Name - required, inline label</div><input class="wp-block-input-field" type="text" name="Name - required, inline label" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"checkbox","label":"Checkbox - inline label","inlineLabel":true,"required":true} -->
+<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Checkbox - inline label</div><input class="wp-block-input-field" type="checkbox" name="Checkbox - inline label" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"email","label":"Email - required","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email - required</div><input class="wp-block-input-field" type="email" name="Email - required" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"textarea","label":"Textarea input"} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Textarea input</div><textarea class="wp-block-input-field" name="Textarea input" aria-required="false"></textarea></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"submit","label":"Submit"} -->
+<div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>
+<!-- /wp:input-field -->
diff --git a/test/integration/fixtures/blocks/core__input-field.json b/test/integration/fixtures/blocks/core__input-field.json
new file mode 100644
index 00000000000000..488701c5558f76
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__input-field.json
@@ -0,0 +1,57 @@
+[
+	{
+		"name": "core/input-field",
+		"isValid": true,
+		"attributes": {
+			"type": "text",
+			"label": "Name - required, inline label",
+			"inlineLabel": true,
+			"required": true
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/input-field",
+		"isValid": true,
+		"attributes": {
+			"type": "checkbox",
+			"label": "Checkbox - inline label",
+			"inlineLabel": true,
+			"required": true
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/input-field",
+		"isValid": true,
+		"attributes": {
+			"type": "email",
+			"label": "Email - required",
+			"inlineLabel": false,
+			"required": true
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/input-field",
+		"isValid": true,
+		"attributes": {
+			"type": "textarea",
+			"label": "Textarea input",
+			"inlineLabel": false,
+			"required": false
+		},
+		"innerBlocks": []
+	},
+	{
+		"name": "core/input-field",
+		"isValid": true,
+		"attributes": {
+			"type": "submit",
+			"label": "Submit",
+			"inlineLabel": false,
+			"required": false
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__input-field.parsed.json b/test/integration/fixtures/blocks/core__input-field.parsed.json
new file mode 100644
index 00000000000000..886e3e6d35ad8e
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__input-field.parsed.json
@@ -0,0 +1,94 @@
+[
+	{
+		"blockName": "core/input-field",
+		"attrs": {
+			"label": "Name - required, inline label",
+			"inlineLabel": true,
+			"required": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Name - required, inline label</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name - required, inline label\" required aria-required=\"true\"/></label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Name - required, inline label</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name - required, inline label\" required aria-required=\"true\"/></label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/input-field",
+		"attrs": {
+			"type": "checkbox",
+			"label": "Checkbox - inline label",
+			"inlineLabel": true,
+			"required": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Checkbox - inline label</div><input class=\"wp-block-input-field\" type=\"checkbox\" name=\"Checkbox - inline label\" required aria-required=\"true\"/></label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Checkbox - inline label</div><input class=\"wp-block-input-field\" type=\"checkbox\" name=\"Checkbox - inline label\" required aria-required=\"true\"/></label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/input-field",
+		"attrs": {
+			"type": "email",
+			"label": "Email - required",
+			"required": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email - required</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email - required\" required aria-required=\"true\"/></label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email - required</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email - required\" required aria-required=\"true\"/></label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/input-field",
+		"attrs": {
+			"type": "textarea",
+			"label": "Textarea input"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Textarea input</div><textarea class=\"wp-block-input-field\" name=\"Textarea input\" aria-required=\"false\"></textarea></label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Textarea input</div><textarea class=\"wp-block-input-field\" name=\"Textarea input\" aria-required=\"false\"></textarea></label>\n"
+		]
+	},
+	{
+		"blockName": null,
+		"attrs": {},
+		"innerBlocks": [],
+		"innerHTML": "\n\n",
+		"innerContent": [ "\n\n" ]
+	},
+	{
+		"blockName": "core/input-field",
+		"attrs": {
+			"type": "submit",
+			"label": "Submit"
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n",
+		"innerContent": [
+			"\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__input-field.serialized.html b/test/integration/fixtures/blocks/core__input-field.serialized.html
new file mode 100644
index 00000000000000..2574bc62f5c7cb
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__input-field.serialized.html
@@ -0,0 +1,19 @@
+<!-- wp:input-field {"label":"Name - required, inline label","inlineLabel":true,"required":true} -->
+<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Name - required, inline label</div><input class="wp-block-input-field" type="text" name="Name - required, inline label" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"checkbox","label":"Checkbox - inline label","inlineLabel":true,"required":true} -->
+<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Checkbox - inline label</div><input class="wp-block-input-field" type="checkbox" name="Checkbox - inline label" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"email","label":"Email - required","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email - required</div><input class="wp-block-input-field" type="email" name="Email - required" required aria-required="true"/></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"textarea","label":"Textarea input"} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Textarea input</div><textarea class="wp-block-input-field" name="Textarea input" aria-required="false"></textarea></label>
+<!-- /wp:input-field -->
+
+<!-- wp:input-field {"type":"submit","label":"Submit"} -->
+<div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>
+<!-- /wp:input-field -->

From 5d6a8e4184013e49b45dc2fdd7ab92de7d119baa Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Oct 2022 13:33:11 +0300
Subject: [PATCH 025/133] typo

---
 packages/block-library/src/form/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index e303cde8690e2d..6fe41ec88053af 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -44,7 +44,7 @@ const Edit = ( { attributes, setAttributes } ) => {
 					/>
 				</PanelBody>
 			</InspectorControls>
-			<form { ...innerBlocksProps } />;
+			<form { ...innerBlocksProps } />
 		</>
 	);
 };

From 6022f689656ec736d9ff6771e94478301bfeef43 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Oct 2022 13:50:26 +0300
Subject: [PATCH 026/133] forgot to rename these 2

---
 packages/block-library/src/form/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index d58ebc64624514..fbe4f704b56a70 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -88,7 +88,7 @@ function register_block_core_form() {
  * Then add your own action by creating a function and hooking it to the 'wp' action.
  */
 function submit_core_form_block() {
-	if ( ! isset( $_POST['block-form-hash'] ) ) {
+	if ( ! isset( $_POST['block-form-id'] ) ) {
 		return;
 	}
 	$content = sprintf(
@@ -97,7 +97,7 @@ function submit_core_form_block() {
 		esc_url( get_site_url() . $_SERVER['REQUEST_URI'] )
 	);
 	foreach ( $_POST as $key => $value ) {
-		if ( 'block-form-hash' === $key ) {
+		if ( 'block-form-id' === $key ) {
 			continue;
 		}
 		$content .= $key . ': ' . $value . '</br>';

From 00e6211efed2144134302e75f3dd07b2a53eed26 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 18 Oct 2022 08:26:31 +0300
Subject: [PATCH 027/133] Add a template

---
 packages/block-library/src/form/edit.js | 42 +++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 6fe41ec88053af..e334c8db2d7ac9 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -17,12 +17,54 @@ const ALLOWED_BLOCKS = [
 	'core/group',
 ];
 
+const TEMPLATE = [
+	[
+		'core/input-field',
+		{
+			type: 'text',
+			label: __( 'Name' ),
+			required: true,
+		},
+	],
+	[
+		'core/input-field',
+		{
+			type: 'email',
+			label: __( 'Email' ),
+			required: true,
+		},
+	],
+	[
+		'core/input-field',
+		{
+			type: 'url',
+			label: __( 'Website' ),
+		},
+	],
+	[
+		'core/input-field',
+		{
+			type: 'textarea',
+			label: __( 'Comment' ),
+			required: true,
+		},
+	],
+	[
+		'core/input-field',
+		{
+			type: 'submit',
+			label: __( 'Submit' ),
+		},
+	],
+];
+
 const Edit = ( { attributes, setAttributes } ) => {
 	const { formId } = attributes;
 	const blockProps = useBlockProps();
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
 		allowedBlocks: ALLOWED_BLOCKS,
+		template: TEMPLATE,
 	} );
 
 	return (

From f13aa48f512d133c236ff2dd7c967bb3d64c36a8 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 18 Oct 2022 08:38:44 +0300
Subject: [PATCH 028/133] Add block supports

---
 docs/reference-guides/core-blocks.md       |  2 +-
 packages/block-library/src/form/block.json | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index c394bb01f659e7..5d1d8caa1b2558 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -283,7 +283,7 @@ A form. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/blo
 
 -	**Name:** core/form
 -	**Category:** common
--	**Supports:** 
+-	**Supports:** anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
 -	**Attributes:** action, formId, method
 
 ## Classic
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index fe7da5ebe5b368..7b2f9e87ebc9d0 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -20,5 +20,35 @@
 			"type": "string",
 			"default": ""
 		}
+	},
+	"supports": {
+		"anchor": true,
+		"className": false,
+		"color": {
+			"gradients": true,
+			"link": true,
+			"__experimentalDefaultControls": {
+				"background": true,
+				"text": true
+			}
+		},
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
+		"typography": {
+			"fontSize": true,
+			"lineHeight": true,
+			"__experimentalFontFamily": true,
+			"__experimentalTextDecoration": true,
+			"__experimentalFontStyle": true,
+			"__experimentalFontWeight": true,
+			"__experimentalLetterSpacing": true,
+			"__experimentalTextTransform": true,
+			"__experimentalDefaultControls": {
+				"fontSize": true
+			}
+		},
+		"__experimentalSelector": "form"
 	}
 }

From d91871fa099a9ec0e553349f84da399d31e04dea Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 18 Oct 2022 08:42:03 +0300
Subject: [PATCH 029/133] Styling tweak

---
 packages/block-library/src/input-field/style.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/block-library/src/input-field/style.scss b/packages/block-library/src/input-field/style.scss
index 7de8e8b3d64d16..4b7da822d7f7f7 100644
--- a/packages/block-library/src/input-field/style.scss
+++ b/packages/block-library/src/input-field/style.scss
@@ -21,6 +21,7 @@ textarea.wp-block-input-field {
 	border: 1px solid currentColor;
 	opacity: 0.75;
 	border-radius: 0;
+	font-size: 1em;
 
 	&:focus,
 	&:active,

From 9fad79b6b82d82d7737382eb70438953f460ad43 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 18 Oct 2022 10:09:21 +0300
Subject: [PATCH 030/133] Mark as an experiment

---
 lib/experimental/editor-settings.php | 12 ++++++++++++
 lib/experiments-page.php             | 11 +++++++++++
 packages/block-library/src/index.js  |  6 ++++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/lib/experimental/editor-settings.php b/lib/experimental/editor-settings.php
index c09b5cde0f16bc..00c929a3312a41 100644
--- a/lib/experimental/editor-settings.php
+++ b/lib/experimental/editor-settings.php
@@ -33,3 +33,15 @@ function gutenberg_enable_experiments() {
 }
 
 add_action( 'admin_init', 'gutenberg_enable_experiments' );
+
+/**
+ * Sets a global JS variable used to trigger the availability of form & input blocks.
+ */
+function gutenberg_enable_form_input_blocks() {
+	$gutenberg_experiments = get_option( 'gutenberg-experiments' );
+	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-form-blocks', $gutenberg_experiments ) ) {
+		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableFormBlocks = true', 'before' );
+	}
+}
+
+add_action( 'admin_init', 'gutenberg_enable_form_input_blocks' );
diff --git a/lib/experiments-page.php b/lib/experiments-page.php
index 133d968ba2cb76..90a88fd9592885 100644
--- a/lib/experiments-page.php
+++ b/lib/experiments-page.php
@@ -78,6 +78,17 @@ function gutenberg_initialize_experiments_settings() {
 			'id'    => 'gutenberg-color-randomizer',
 		)
 	);
+	add_settings_field(
+		'gutenberg-form-blocks',
+		__( 'Form and input blocks ', 'gutenberg' ),
+		'gutenberg_display_experiment_field',
+		'gutenberg-experiments',
+		'gutenberg_experiments_section',
+		array(
+			'label' => __( 'Test new blocks to allow building forms (Warning: The new feature is not ready. You may experience UX issues that are being addressed)', 'gutenberg' ),
+			'id'    => 'gutenberg-form-blocks',
+		)
+	);
 
 	add_settings_field(
 		'gutenberg-group-grid-variation',
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index b9e9be4788a49d..decf863e538501 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -152,10 +152,8 @@ const getAllBlocks = () => {
 		details,
 		embed,
 		file,
-		form,
 		group,
 		html,
-		inputField,
 		latestComments,
 		latestPosts,
 		mediaText,
@@ -232,6 +230,10 @@ const getAllBlocks = () => {
 		queryTitle,
 		postAuthorBiography,
 	];
+	if ( window?.__experimentalEnableFormBlocks ) {
+		blocks.push( form );
+		blocks.push( inputField );
+	}
 
 	// When in a WordPress context, conditionally
 	// add the classic block and TinyMCE editor

From 774f31e473d2d6225ab769b8961ac2cc6f03e310 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 18 Oct 2022 13:59:18 +0300
Subject: [PATCH 031/133] fixtures

---
 .../fixtures/blocks/core__form.html           | 18 ++--
 .../fixtures/blocks/core__form.json           | 53 ++++++------
 .../fixtures/blocks/core__form.parsed.json    | 40 ++++-----
 .../blocks/core__form.serialized.html         | 26 +++---
 .../fixtures/blocks/core__input-field.html    | 20 +----
 .../fixtures/blocks/core__input-field.json    | 53 +-----------
 .../blocks/core__input-field.parsed.json      | 86 +------------------
 .../blocks/core__input-field.serialized.html  | 20 +----
 8 files changed, 74 insertions(+), 242 deletions(-)

diff --git a/test/integration/fixtures/blocks/core__form.html b/test/integration/fixtures/blocks/core__form.html
index 9015fe38dd19c7..d6eafc3a66e136 100644
--- a/test/integration/fixtures/blocks/core__form.html
+++ b/test/integration/fixtures/blocks/core__form.html
@@ -1,18 +1,18 @@
-<!-- wp:form {"formId":"the-form-id"} -->
-<form class="wp-block-form"><!-- wp:input-field {"label":"Name - required, inline label","inlineLabel":true,"required":true} -->
-<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Name - required, inline label</div><input class="wp-block-input-field" type="text" name="Name - required, inline label" required aria-required="true"/></label>
+<!-- wp:form -->
+<form><!-- wp:input-field {"label":"Name","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Name</div><input class="wp-block-input-field" type="text" name="Name" required aria-required="true"/></label>
 <!-- /wp:input-field -->
 
-<!-- wp:input-field {"type":"checkbox","label":"Checkbox - inline label","inlineLabel":true,"required":true} -->
-<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Checkbox - inline label</div><input class="wp-block-input-field" type="checkbox" name="Checkbox - inline label" required aria-required="true"/></label>
+<!-- wp:input-field {"type":"email","label":"Email","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email</div><input class="wp-block-input-field" type="email" name="Email" required aria-required="true"/></label>
 <!-- /wp:input-field -->
 
-<!-- wp:input-field {"type":"email","label":"Email - required","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email - required</div><input class="wp-block-input-field" type="email" name="Email - required" required aria-required="true"/></label>
+<!-- wp:input-field {"type":"url","label":"Website"} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Website</div><input class="wp-block-input-field" type="url" name="Website" aria-required="false"/></label>
 <!-- /wp:input-field -->
 
-<!-- wp:input-field {"type":"textarea","label":"Textarea input"} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Textarea input</div><textarea class="wp-block-input-field" name="Textarea input" aria-required="false"></textarea></label>
+<!-- wp:input-field {"type":"textarea","label":"Comment","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Comment</div><textarea class="wp-block-input-field" name="Comment" required aria-required="true"></textarea></label>
 <!-- /wp:input-field -->
 
 <!-- wp:input-field {"type":"submit","label":"Submit"} -->
diff --git a/test/integration/fixtures/blocks/core__form.json b/test/integration/fixtures/blocks/core__form.json
index 0c9f29ac87ee0c..69b5ad818cf26d 100644
--- a/test/integration/fixtures/blocks/core__form.json
+++ b/test/integration/fixtures/blocks/core__form.json
@@ -1,65 +1,60 @@
 [
 	{
-		"name": "core/form",
+		"name": "core/missing",
 		"isValid": true,
 		"attributes": {
-			"action": "#",
-			"method": "post",
-			"formId": "the-form-id"
+			"originalName": "core/form",
+			"originalUndelimitedContent": "<form>\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n</form>",
+			"originalContent": "<!-- wp:form -->\n<form>\n<!-- wp:input-field {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->\n<!-- wp:input-field {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->\n<!-- wp:input-field {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:input-field -->\n<!-- wp:input-field {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:input-field -->\n<!-- wp:input-field {\"type\":\"submit\",\"label\":\"Submit\"} -->\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n<!-- /wp:input-field -->\n</form>\n<!-- /wp:form -->"
 		},
 		"innerBlocks": [
 			{
-				"name": "core/input-field",
+				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"type": "text",
-					"label": "Name - required, inline label",
-					"inlineLabel": true,
-					"required": true
+					"originalName": "core/input-field",
+					"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
+					"originalContent": "<!-- wp:input-field {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->"
 				},
 				"innerBlocks": []
 			},
 			{
-				"name": "core/input-field",
+				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"type": "checkbox",
-					"label": "Checkbox - inline label",
-					"inlineLabel": true,
-					"required": true
+					"originalName": "core/input-field",
+					"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>",
+					"originalContent": "<!-- wp:input-field {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->"
 				},
 				"innerBlocks": []
 			},
 			{
-				"name": "core/input-field",
+				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"type": "email",
-					"label": "Email - required",
-					"inlineLabel": false,
-					"required": true
+					"originalName": "core/input-field",
+					"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>",
+					"originalContent": "<!-- wp:input-field {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:input-field -->"
 				},
 				"innerBlocks": []
 			},
 			{
-				"name": "core/input-field",
+				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"type": "textarea",
-					"label": "Textarea input",
-					"inlineLabel": false,
-					"required": false
+					"originalName": "core/input-field",
+					"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required aria-required=\"true\"></textarea></label>",
+					"originalContent": "<!-- wp:input-field {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:input-field -->"
 				},
 				"innerBlocks": []
 			},
 			{
-				"name": "core/input-field",
+				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"type": "submit",
-					"label": "Submit",
-					"inlineLabel": false,
-					"required": false
+					"originalName": "core/input-field",
+					"originalUndelimitedContent": "<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>",
+					"originalContent": "<!-- wp:input-field {\"type\":\"submit\",\"label\":\"Submit\"} -->\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n<!-- /wp:input-field -->"
 				},
 				"innerBlocks": []
 			}
diff --git a/test/integration/fixtures/blocks/core__form.parsed.json b/test/integration/fixtures/blocks/core__form.parsed.json
index 1cb360568ad8fb..49fad1dca14920 100644
--- a/test/integration/fixtures/blocks/core__form.parsed.json
+++ b/test/integration/fixtures/blocks/core__form.parsed.json
@@ -1,60 +1,56 @@
 [
 	{
 		"blockName": "core/form",
-		"attrs": {
-			"formId": "the-form-id"
-		},
+		"attrs": {},
 		"innerBlocks": [
 			{
 				"blockName": "core/input-field",
 				"attrs": {
-					"label": "Name - required, inline label",
-					"inlineLabel": true,
+					"label": "Name",
 					"required": true
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Name - required, inline label</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name - required, inline label\" required aria-required=\"true\"/></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Name - required, inline label</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name - required, inline label\" required aria-required=\"true\"/></label>\n"
+					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
 				]
 			},
 			{
 				"blockName": "core/input-field",
 				"attrs": {
-					"type": "checkbox",
-					"label": "Checkbox - inline label",
-					"inlineLabel": true,
+					"type": "email",
+					"label": "Email",
 					"required": true
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Checkbox - inline label</div><input class=\"wp-block-input-field\" type=\"checkbox\" name=\"Checkbox - inline label\" required aria-required=\"true\"/></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Checkbox - inline label</div><input class=\"wp-block-input-field\" type=\"checkbox\" name=\"Checkbox - inline label\" required aria-required=\"true\"/></label>\n"
+					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n"
 				]
 			},
 			{
 				"blockName": "core/input-field",
 				"attrs": {
-					"type": "email",
-					"label": "Email - required",
-					"required": true
+					"type": "url",
+					"label": "Website"
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email - required</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email - required\" required aria-required=\"true\"/></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email - required</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email - required\" required aria-required=\"true\"/></label>\n"
+					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n"
 				]
 			},
 			{
 				"blockName": "core/input-field",
 				"attrs": {
 					"type": "textarea",
-					"label": "Textarea input"
+					"label": "Comment",
+					"required": true
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Textarea input</div><textarea class=\"wp-block-input-field\" name=\"Textarea input\" aria-required=\"false\"></textarea></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Textarea input</div><textarea class=\"wp-block-input-field\" name=\"Textarea input\" aria-required=\"false\"></textarea></label>\n"
+					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n"
 				]
 			},
 			{
@@ -70,9 +66,9 @@
 				]
 			}
 		],
-		"innerHTML": "\n<form class=\"wp-block-form\">\n\n\n\n\n\n\n\n</form>\n",
+		"innerHTML": "\n<form>\n\n\n\n\n\n\n\n</form>\n",
 		"innerContent": [
-			"\n<form class=\"wp-block-form\">",
+			"\n<form>",
 			null,
 			"\n\n",
 			null,
diff --git a/test/integration/fixtures/blocks/core__form.serialized.html b/test/integration/fixtures/blocks/core__form.serialized.html
index 9015fe38dd19c7..c414d7a360f79e 100644
--- a/test/integration/fixtures/blocks/core__form.serialized.html
+++ b/test/integration/fixtures/blocks/core__form.serialized.html
@@ -1,21 +1,19 @@
-<!-- wp:form {"formId":"the-form-id"} -->
-<form class="wp-block-form"><!-- wp:input-field {"label":"Name - required, inline label","inlineLabel":true,"required":true} -->
-<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Name - required, inline label</div><input class="wp-block-input-field" type="text" name="Name - required, inline label" required aria-required="true"/></label>
+<!-- wp:form -->
+<form>
+<!-- wp:input-field {"label":"Name","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Name</div><input class="wp-block-input-field" type="text" name="Name" required="" aria-required="true"></label>
 <!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"checkbox","label":"Checkbox - inline label","inlineLabel":true,"required":true} -->
-<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Checkbox - inline label</div><input class="wp-block-input-field" type="checkbox" name="Checkbox - inline label" required aria-required="true"/></label>
+<!-- wp:input-field {"type":"email","label":"Email","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email</div><input class="wp-block-input-field" type="email" name="Email" required="" aria-required="true"></label>
 <!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"email","label":"Email - required","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email - required</div><input class="wp-block-input-field" type="email" name="Email - required" required aria-required="true"/></label>
+<!-- wp:input-field {"type":"url","label":"Website"} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Website</div><input class="wp-block-input-field" type="url" name="Website" aria-required="false"></label>
 <!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"textarea","label":"Textarea input"} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Textarea input</div><textarea class="wp-block-input-field" name="Textarea input" aria-required="false"></textarea></label>
+<!-- wp:input-field {"type":"textarea","label":"Comment","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Comment</div><textarea class="wp-block-input-field" name="Comment" required="" aria-required="true"></textarea></label>
 <!-- /wp:input-field -->
-
 <!-- wp:input-field {"type":"submit","label":"Submit"} -->
 <div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>
-<!-- /wp:input-field --></form>
+<!-- /wp:input-field -->
+</form>
 <!-- /wp:form -->
diff --git a/test/integration/fixtures/blocks/core__input-field.html b/test/integration/fixtures/blocks/core__input-field.html
index 2574bc62f5c7cb..2d43ac55103b01 100644
--- a/test/integration/fixtures/blocks/core__input-field.html
+++ b/test/integration/fixtures/blocks/core__input-field.html
@@ -1,19 +1,3 @@
-<!-- wp:input-field {"label":"Name - required, inline label","inlineLabel":true,"required":true} -->
-<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Name - required, inline label</div><input class="wp-block-input-field" type="text" name="Name - required, inline label" required aria-required="true"/></label>
-<!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"checkbox","label":"Checkbox - inline label","inlineLabel":true,"required":true} -->
-<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Checkbox - inline label</div><input class="wp-block-input-field" type="checkbox" name="Checkbox - inline label" required aria-required="true"/></label>
-<!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"email","label":"Email - required","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email - required</div><input class="wp-block-input-field" type="email" name="Email - required" required aria-required="true"/></label>
-<!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"textarea","label":"Textarea input"} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Textarea input</div><textarea class="wp-block-input-field" name="Textarea input" aria-required="false"></textarea></label>
-<!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"submit","label":"Submit"} -->
-<div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>
+<!-- wp:input-field {"label":"Name","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Name</div><input class="wp-block-input-field" type="text" name="Name" required aria-required="true"/></label>
 <!-- /wp:input-field -->
diff --git a/test/integration/fixtures/blocks/core__input-field.json b/test/integration/fixtures/blocks/core__input-field.json
index 488701c5558f76..b0b6d508faeee9 100644
--- a/test/integration/fixtures/blocks/core__input-field.json
+++ b/test/integration/fixtures/blocks/core__input-field.json
@@ -1,56 +1,11 @@
 [
 	{
-		"name": "core/input-field",
+		"name": "core/missing",
 		"isValid": true,
 		"attributes": {
-			"type": "text",
-			"label": "Name - required, inline label",
-			"inlineLabel": true,
-			"required": true
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/input-field",
-		"isValid": true,
-		"attributes": {
-			"type": "checkbox",
-			"label": "Checkbox - inline label",
-			"inlineLabel": true,
-			"required": true
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/input-field",
-		"isValid": true,
-		"attributes": {
-			"type": "email",
-			"label": "Email - required",
-			"inlineLabel": false,
-			"required": true
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/input-field",
-		"isValid": true,
-		"attributes": {
-			"type": "textarea",
-			"label": "Textarea input",
-			"inlineLabel": false,
-			"required": false
-		},
-		"innerBlocks": []
-	},
-	{
-		"name": "core/input-field",
-		"isValid": true,
-		"attributes": {
-			"type": "submit",
-			"label": "Submit",
-			"inlineLabel": false,
-			"required": false
+			"originalName": "core/input-field",
+			"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
+			"originalContent": "<!-- wp:input-field {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->"
 		},
 		"innerBlocks": []
 	}
diff --git a/test/integration/fixtures/blocks/core__input-field.parsed.json b/test/integration/fixtures/blocks/core__input-field.parsed.json
index 886e3e6d35ad8e..d731db37db5fbd 100644
--- a/test/integration/fixtures/blocks/core__input-field.parsed.json
+++ b/test/integration/fixtures/blocks/core__input-field.parsed.json
@@ -2,93 +2,13 @@
 	{
 		"blockName": "core/input-field",
 		"attrs": {
-			"label": "Name - required, inline label",
-			"inlineLabel": true,
+			"label": "Name",
 			"required": true
 		},
 		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Name - required, inline label</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name - required, inline label\" required aria-required=\"true\"/></label>\n",
+		"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
 		"innerContent": [
-			"\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Name - required, inline label</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name - required, inline label\" required aria-required=\"true\"/></label>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/input-field",
-		"attrs": {
-			"type": "checkbox",
-			"label": "Checkbox - inline label",
-			"inlineLabel": true,
-			"required": true
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Checkbox - inline label</div><input class=\"wp-block-input-field\" type=\"checkbox\" name=\"Checkbox - inline label\" required aria-required=\"true\"/></label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-input-field-label is-label-inline\"><div class=\"wp-block-input-field-label__content\">Checkbox - inline label</div><input class=\"wp-block-input-field\" type=\"checkbox\" name=\"Checkbox - inline label\" required aria-required=\"true\"/></label>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/input-field",
-		"attrs": {
-			"type": "email",
-			"label": "Email - required",
-			"required": true
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email - required</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email - required\" required aria-required=\"true\"/></label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email - required</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email - required\" required aria-required=\"true\"/></label>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/input-field",
-		"attrs": {
-			"type": "textarea",
-			"label": "Textarea input"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Textarea input</div><textarea class=\"wp-block-input-field\" name=\"Textarea input\" aria-required=\"false\"></textarea></label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Textarea input</div><textarea class=\"wp-block-input-field\" name=\"Textarea input\" aria-required=\"false\"></textarea></label>\n"
-		]
-	},
-	{
-		"blockName": null,
-		"attrs": {},
-		"innerBlocks": [],
-		"innerHTML": "\n\n",
-		"innerContent": [ "\n\n" ]
-	},
-	{
-		"blockName": "core/input-field",
-		"attrs": {
-			"type": "submit",
-			"label": "Submit"
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n",
-		"innerContent": [
-			"\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n"
+			"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
 		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__input-field.serialized.html b/test/integration/fixtures/blocks/core__input-field.serialized.html
index 2574bc62f5c7cb..5e444498bf5ffc 100644
--- a/test/integration/fixtures/blocks/core__input-field.serialized.html
+++ b/test/integration/fixtures/blocks/core__input-field.serialized.html
@@ -1,19 +1,3 @@
-<!-- wp:input-field {"label":"Name - required, inline label","inlineLabel":true,"required":true} -->
-<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Name - required, inline label</div><input class="wp-block-input-field" type="text" name="Name - required, inline label" required aria-required="true"/></label>
-<!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"checkbox","label":"Checkbox - inline label","inlineLabel":true,"required":true} -->
-<label class="wp-block-input-field-label is-label-inline"><div class="wp-block-input-field-label__content">Checkbox - inline label</div><input class="wp-block-input-field" type="checkbox" name="Checkbox - inline label" required aria-required="true"/></label>
-<!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"email","label":"Email - required","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email - required</div><input class="wp-block-input-field" type="email" name="Email - required" required aria-required="true"/></label>
-<!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"textarea","label":"Textarea input"} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Textarea input</div><textarea class="wp-block-input-field" name="Textarea input" aria-required="false"></textarea></label>
-<!-- /wp:input-field -->
-
-<!-- wp:input-field {"type":"submit","label":"Submit"} -->
-<div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>
+<!-- wp:input-field {"label":"Name","required":true} -->
+<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Name</div><input class="wp-block-input-field" type="text" name="Name" required="" aria-required="true"></label>
 <!-- /wp:input-field -->

From 2b781a051fa8b9f9a1c1905ed731b76a252370bd Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 24 Oct 2022 12:14:06 +0300
Subject: [PATCH 032/133] Rename input-field block to form-input

---
 docs/reference-guides/core-blocks.md          | 18 +++++------
 lib/blocks.php                                |  2 +-
 .../{input-field => form-input}/block.json    |  4 +--
 .../src/{input-field => form-input}/edit.js   | 12 +++----
 .../src/{input-field => form-input}/index.js  |  0
 .../src/{input-field => form-input}/save.js   | 12 +++----
 .../{input-field => form-input}/style.scss    | 10 +++---
 .../src/{input-field => form-input}/utils.js  |  0
 .../{input-field => form-input}/variations.js |  0
 packages/block-library/src/form/edit.js       | 12 +++----
 packages/block-library/src/index.js           |  4 +--
 packages/block-library/src/style.scss         |  2 +-
 .../fixtures/blocks/core__form-input.html     |  3 ++
 .../fixtures/blocks/core__form-input.json     | 12 +++++++
 .../blocks/core__form-input.parsed.json       | 14 ++++++++
 .../blocks/core__form-input.serialized.html   |  3 ++
 .../fixtures/blocks/core__form.html           | 28 ++++++++--------
 .../fixtures/blocks/core__form.json           | 32 +++++++++----------
 .../fixtures/blocks/core__form.parsed.json    | 26 +++++++--------
 .../blocks/core__form.serialized.html         | 28 ++++++++--------
 .../fixtures/blocks/core__input-field.html    |  3 --
 .../fixtures/blocks/core__input-field.json    | 12 -------
 .../blocks/core__input-field.parsed.json      | 14 --------
 .../blocks/core__input-field.serialized.html  |  3 --
 24 files changed, 127 insertions(+), 127 deletions(-)
 rename packages/block-library/src/{input-field => form-input}/block.json (84%)
 rename packages/block-library/src/{input-field => form-input}/edit.js (93%)
 rename packages/block-library/src/{input-field => form-input}/index.js (100%)
 rename packages/block-library/src/{input-field => form-input}/save.js (79%)
 rename packages/block-library/src/{input-field => form-input}/style.scss (70%)
 rename packages/block-library/src/{input-field => form-input}/utils.js (100%)
 rename packages/block-library/src/{input-field => form-input}/variations.js (100%)
 create mode 100644 test/integration/fixtures/blocks/core__form-input.html
 create mode 100644 test/integration/fixtures/blocks/core__form-input.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input.parsed.json
 create mode 100644 test/integration/fixtures/blocks/core__form-input.serialized.html
 delete mode 100644 test/integration/fixtures/blocks/core__input-field.html
 delete mode 100644 test/integration/fixtures/blocks/core__input-field.json
 delete mode 100644 test/integration/fixtures/blocks/core__input-field.parsed.json
 delete mode 100644 test/integration/fixtures/blocks/core__input-field.serialized.html

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 5d1d8caa1b2558..b2080f50e36114 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -286,6 +286,15 @@ A form. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/blo
 -	**Supports:** anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
 -	**Attributes:** action, formId, method
 
+## Input field
+
+The basic building block for forms. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/form-input))
+
+-	**Name:** core/form-input
+-	**Category:** common
+-	**Supports:** 
+-	**Attributes:** inlineLabel, label, name, required, type
+
 ## Classic
 
 Use the classic WordPress editor. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/freeform))
@@ -350,15 +359,6 @@ Insert an image to make a visual statement. ([Source](https://github.com/WordPre
 -	**Supports:** anchor, color (~~background~~, ~~text~~), filter (duotone)
 -	**Attributes:** align, alt, aspectRatio, caption, height, href, id, lightbox, linkClass, linkDestination, linkTarget, rel, scale, sizeSlug, title, url, width
 
-## Input field
-
-The basic building block for forms. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/input-field))
-
--	**Name:** core/input-field
--	**Category:** common
--	**Supports:** 
--	**Attributes:** inlineLabel, label, name, required, type
-
 ## Latest Comments
 
 Display a list of your most recent comments. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/latest-comments))
diff --git a/lib/blocks.php b/lib/blocks.php
index fe545f64c8f10d..b1e7095346ebe9 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -22,9 +22,9 @@ function gutenberg_reregister_core_block_types() {
 				'column',
 				'columns',
 				'details',
+				'form-input',
 				'group',
 				'html',
-				'input-field',
 				'list',
 				'list-item',
 				'media-text',
diff --git a/packages/block-library/src/input-field/block.json b/packages/block-library/src/form-input/block.json
similarity index 84%
rename from packages/block-library/src/input-field/block.json
rename to packages/block-library/src/form-input/block.json
index 5732261a644fe4..3c5d185f0325de 100644
--- a/packages/block-library/src/input-field/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -1,7 +1,7 @@
 {
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
-	"name": "core/input-field",
+	"name": "core/form-input",
 	"title": "Input field",
 	"category": "common",
 	"parent": [ "core/form" ],
@@ -29,5 +29,5 @@
 			"default": false
 		}
 	},
-	"style": [ "wp-block-input-field", "wp-block-buttons", "wp-block-button" ]
+	"style": [ "wp-block-form-input", "wp-block-buttons", "wp-block-button" ]
 }
diff --git a/packages/block-library/src/input-field/edit.js b/packages/block-library/src/form-input/edit.js
similarity index 93%
rename from packages/block-library/src/input-field/edit.js
rename to packages/block-library/src/form-input/edit.js
index 2defbdb798129f..a839250f780a2f 100644
--- a/packages/block-library/src/input-field/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -95,14 +95,14 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 			{ type === 'textarea' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
 				<label
-					className={ classNames( 'wp-block-input-field-label', {
+					className={ classNames( 'wp-block-form-input-label', {
 						'is-label-inline': inlineLabel,
 					} ) }
 				>
 					<RichText
 						identifier="label"
 						tagName="div"
-						className="wp-block-input-field-label__content"
+						className="wp-block-form-input-label__content"
 						{ ...blockProps }
 						value={ label }
 						onChange={ ( newLabel ) =>
@@ -118,7 +118,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						__unstableAllowPrefixTransformations
 					/>
 					<textarea
-						className="wp-block-input-field"
+						className="wp-block-form-input"
 						disabled="true"
 						name={ name }
 						required={ required }
@@ -162,14 +162,14 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 			{ type !== 'textarea' && type !== 'submit' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
 				<label
-					className={ classNames( 'wp-block-input-field-label', {
+					className={ classNames( 'wp-block-form-input-label', {
 						'is-label-inline': inlineLabel,
 					} ) }
 				>
 					<RichText
 						identifier="label"
 						tagName="span"
-						className="wp-block-input-field-label__content"
+						className="wp-block-form-input-label__content"
 						{ ...blockProps }
 						value={ label }
 						onChange={ ( newLabel ) =>
@@ -185,7 +185,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						__unstableAllowPrefixTransformations
 					/>
 					<input
-						className="wp-block-input-field"
+						className="wp-block-form-input"
 						type={ type }
 						name={ name }
 						disabled="true"
diff --git a/packages/block-library/src/input-field/index.js b/packages/block-library/src/form-input/index.js
similarity index 100%
rename from packages/block-library/src/input-field/index.js
rename to packages/block-library/src/form-input/index.js
diff --git a/packages/block-library/src/input-field/save.js b/packages/block-library/src/form-input/save.js
similarity index 79%
rename from packages/block-library/src/input-field/save.js
rename to packages/block-library/src/form-input/save.js
index 9b6a7ba9a306a6..f6c8d070a54bad 100644
--- a/packages/block-library/src/input-field/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -11,15 +11,15 @@ export default function save( { attributes } ) {
 			{ type === 'textarea' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
 				<label
-					className={ classNames( 'wp-block-input-field-label', {
+					className={ classNames( 'wp-block-form-input-label', {
 						'is-label-inline': inlineLabel,
 					} ) }
 				>
-					<div className="wp-block-input-field-label__content">
+					<div className="wp-block-form-input-label__content">
 						{ label }
 					</div>
 					<textarea
-						className="wp-block-input-field"
+						className="wp-block-form-input"
 						name={ name || label }
 						required={ required }
 						aria-required={ required }
@@ -41,15 +41,15 @@ export default function save( { attributes } ) {
 			{ type !== 'textarea' && type !== 'submit' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
 				<label
-					className={ classNames( 'wp-block-input-field-label', {
+					className={ classNames( 'wp-block-form-input-label', {
 						'is-label-inline': inlineLabel,
 					} ) }
 				>
-					<div className="wp-block-input-field-label__content">
+					<div className="wp-block-form-input-label__content">
 						{ label }
 					</div>
 					<input
-						className="wp-block-input-field"
+						className="wp-block-form-input"
 						type={ type }
 						name={ name || label }
 						required={ required }
diff --git a/packages/block-library/src/input-field/style.scss b/packages/block-library/src/form-input/style.scss
similarity index 70%
rename from packages/block-library/src/input-field/style.scss
rename to packages/block-library/src/form-input/style.scss
index 4b7da822d7f7f7..b82654e9965149 100644
--- a/packages/block-library/src/input-field/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -1,4 +1,4 @@
-.wp-block-input-field-label {
+.wp-block-form-input-label {
 	width: 100%;
 	display: flex;
 	flex-direction: column;
@@ -11,12 +11,12 @@
 	}
 }
 
-.wp-block-input-field-label__content {
+.wp-block-form-input-label__content {
 	width: fit-content;
 }
 
-input.wp-block-input-field,
-textarea.wp-block-input-field {
+input.wp-block-form-input,
+textarea.wp-block-form-input {
 	padding: 0.5em;
 	border: 1px solid currentColor;
 	opacity: 0.75;
@@ -30,6 +30,6 @@ textarea.wp-block-input-field {
 	}
 }
 
-textarea.wp-block-input-field {
+textarea.wp-block-form-input {
 	min-height: 10em;
 }
diff --git a/packages/block-library/src/input-field/utils.js b/packages/block-library/src/form-input/utils.js
similarity index 100%
rename from packages/block-library/src/input-field/utils.js
rename to packages/block-library/src/form-input/utils.js
diff --git a/packages/block-library/src/input-field/variations.js b/packages/block-library/src/form-input/variations.js
similarity index 100%
rename from packages/block-library/src/input-field/variations.js
rename to packages/block-library/src/form-input/variations.js
diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index e334c8db2d7ac9..6b341b0f50045f 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -12,14 +12,14 @@ import { PanelBody, TextControl } from '@wordpress/components';
 const ALLOWED_BLOCKS = [
 	'core/paragraph',
 	'core/heading',
-	'core/input-field',
+	'core/form-input',
 	'core/columns',
 	'core/group',
 ];
 
 const TEMPLATE = [
 	[
-		'core/input-field',
+		'core/form-input',
 		{
 			type: 'text',
 			label: __( 'Name' ),
@@ -27,7 +27,7 @@ const TEMPLATE = [
 		},
 	],
 	[
-		'core/input-field',
+		'core/form-input',
 		{
 			type: 'email',
 			label: __( 'Email' ),
@@ -35,14 +35,14 @@ const TEMPLATE = [
 		},
 	],
 	[
-		'core/input-field',
+		'core/form-input',
 		{
 			type: 'url',
 			label: __( 'Website' ),
 		},
 	],
 	[
-		'core/input-field',
+		'core/form-input',
 		{
 			type: 'textarea',
 			label: __( 'Comment' ),
@@ -50,7 +50,7 @@ const TEMPLATE = [
 		},
 	],
 	[
-		'core/input-field',
+		'core/form-input',
 		{
 			type: 'submit',
 			label: __( 'Submit' ),
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index decf863e538501..e50379c2f2b9f5 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -49,13 +49,13 @@ import * as details from './details';
 import * as embed from './embed';
 import * as file from './file';
 import * as form from './form';
+import * as formInput from './form-input';
 import * as gallery from './gallery';
 import * as group from './group';
 import * as heading from './heading';
 import * as homeLink from './home-link';
 import * as html from './html';
 import * as image from './image';
-import * as inputField from './input-field';
 import * as latestComments from './latest-comments';
 import * as latestPosts from './latest-posts';
 import * as list from './list';
@@ -232,7 +232,7 @@ const getAllBlocks = () => {
 	];
 	if ( window?.__experimentalEnableFormBlocks ) {
 		blocks.push( form );
-		blocks.push( inputField );
+		blocks.push( formInput );
 	}
 
 	// When in a WordPress context, conditionally
diff --git a/packages/block-library/src/style.scss b/packages/block-library/src/style.scss
index f2dd94f69afbf5..790e09535f4b69 100644
--- a/packages/block-library/src/style.scss
+++ b/packages/block-library/src/style.scss
@@ -14,11 +14,11 @@
 @import "./details/style.scss";
 @import "./embed/style.scss";
 @import "./file/style.scss";
+@import "./form-input/style.scss";
 @import "./gallery/style.scss";
 @import "./group/style.scss";
 @import "./heading/style.scss";
 @import "./image/style.scss";
-@import "./input-field/style.scss";
 @import "./latest-comments/style.scss";
 @import "./latest-posts/style.scss";
 @import "./list/style.scss";
diff --git a/test/integration/fixtures/blocks/core__form-input.html b/test/integration/fixtures/blocks/core__form-input.html
new file mode 100644
index 00000000000000..561a2d2143eb3d
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"label":"Name","required":true} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Name</div><input class="wp-block-form-input" type="text" name="Name" required aria-required="true"/></label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input.json b/test/integration/fixtures/blocks/core__form-input.json
new file mode 100644
index 00000000000000..aac821cf5f4084
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input.json
@@ -0,0 +1,12 @@
+[
+	{
+		"name": "core/missing",
+		"isValid": true,
+		"attributes": {
+			"originalName": "core/form-input",
+			"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
+			"originalContent": "<!-- wp:form-input {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->"
+		},
+		"innerBlocks": []
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input.parsed.json b/test/integration/fixtures/blocks/core__form-input.parsed.json
new file mode 100644
index 00000000000000..b63d9ae4a54275
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input.parsed.json
@@ -0,0 +1,14 @@
+[
+	{
+		"blockName": "core/form-input",
+		"attrs": {
+			"label": "Name",
+			"required": true
+		},
+		"innerBlocks": [],
+		"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
+		"innerContent": [
+			"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
+		]
+	}
+]
diff --git a/test/integration/fixtures/blocks/core__form-input.serialized.html b/test/integration/fixtures/blocks/core__form-input.serialized.html
new file mode 100644
index 00000000000000..4ce44752125c56
--- /dev/null
+++ b/test/integration/fixtures/blocks/core__form-input.serialized.html
@@ -0,0 +1,3 @@
+<!-- wp:form-input {"label":"Name","required":true} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Name</div><input class="wp-block-form-input" type="text" name="Name" required="" aria-required="true"></label>
+<!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form.html b/test/integration/fixtures/blocks/core__form.html
index d6eafc3a66e136..9cb6242dd56e90 100644
--- a/test/integration/fixtures/blocks/core__form.html
+++ b/test/integration/fixtures/blocks/core__form.html
@@ -1,21 +1,21 @@
 <!-- wp:form -->
-<form><!-- wp:input-field {"label":"Name","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Name</div><input class="wp-block-input-field" type="text" name="Name" required aria-required="true"/></label>
-<!-- /wp:input-field -->
+<form><!-- wp:form-input {"label":"Name","required":true} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Name</div><input class="wp-block-form-input" type="text" name="Name" required aria-required="true"/></label>
+<!-- /wp:form-input -->
 
-<!-- wp:input-field {"type":"email","label":"Email","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email</div><input class="wp-block-input-field" type="email" name="Email" required aria-required="true"/></label>
-<!-- /wp:input-field -->
+<!-- wp:form-input {"type":"email","label":"Email","required":true} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Email</div><input class="wp-block-form-input" type="email" name="Email" required aria-required="true"/></label>
+<!-- /wp:form-input -->
 
-<!-- wp:input-field {"type":"url","label":"Website"} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Website</div><input class="wp-block-input-field" type="url" name="Website" aria-required="false"/></label>
-<!-- /wp:input-field -->
+<!-- wp:form-input {"type":"url","label":"Website"} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Website</div><input class="wp-block-form-input" type="url" name="Website" aria-required="false"/></label>
+<!-- /wp:form-input -->
 
-<!-- wp:input-field {"type":"textarea","label":"Comment","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Comment</div><textarea class="wp-block-input-field" name="Comment" required aria-required="true"></textarea></label>
-<!-- /wp:input-field -->
+<!-- wp:form-input {"type":"textarea","label":"Comment","required":true} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Comment</div><textarea class="wp-block-form-input" name="Comment" required aria-required="true"></textarea></label>
+<!-- /wp:form-input -->
 
-<!-- wp:input-field {"type":"submit","label":"Submit"} -->
+<!-- wp:form-input {"type":"submit","label":"Submit"} -->
 <div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>
-<!-- /wp:input-field --></form>
+<!-- /wp:form-input --></form>
 <!-- /wp:form -->
diff --git a/test/integration/fixtures/blocks/core__form.json b/test/integration/fixtures/blocks/core__form.json
index 69b5ad818cf26d..c37c25f7a228c6 100644
--- a/test/integration/fixtures/blocks/core__form.json
+++ b/test/integration/fixtures/blocks/core__form.json
@@ -4,17 +4,17 @@
 		"isValid": true,
 		"attributes": {
 			"originalName": "core/form",
-			"originalUndelimitedContent": "<form>\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n</form>",
-			"originalContent": "<!-- wp:form -->\n<form>\n<!-- wp:input-field {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->\n<!-- wp:input-field {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->\n<!-- wp:input-field {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:input-field -->\n<!-- wp:input-field {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:input-field -->\n<!-- wp:input-field {\"type\":\"submit\",\"label\":\"Submit\"} -->\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n<!-- /wp:input-field -->\n</form>\n<!-- /wp:form -->"
+			"originalUndelimitedContent": "<form>\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n</form>",
+			"originalContent": "<!-- wp:form -->\n<form>\n<!-- wp:form-input {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"submit\",\"label\":\"Submit\"} -->\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n<!-- /wp:form-input -->\n</form>\n<!-- /wp:form -->"
 		},
 		"innerBlocks": [
 			{
 				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"originalName": "core/input-field",
-					"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
-					"originalContent": "<!-- wp:input-field {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->"
+					"originalName": "core/form-input",
+					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
+					"originalContent": "<!-- wp:form-input {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->"
 				},
 				"innerBlocks": []
 			},
@@ -22,9 +22,9 @@
 				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"originalName": "core/input-field",
-					"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>",
-					"originalContent": "<!-- wp:input-field {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->"
+					"originalName": "core/form-input",
+					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>",
+					"originalContent": "<!-- wp:form-input {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->"
 				},
 				"innerBlocks": []
 			},
@@ -32,9 +32,9 @@
 				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"originalName": "core/input-field",
-					"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>",
-					"originalContent": "<!-- wp:input-field {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:input-field -->"
+					"originalName": "core/form-input",
+					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>",
+					"originalContent": "<!-- wp:form-input {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:form-input -->"
 				},
 				"innerBlocks": []
 			},
@@ -42,9 +42,9 @@
 				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"originalName": "core/input-field",
-					"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required aria-required=\"true\"></textarea></label>",
-					"originalContent": "<!-- wp:input-field {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:input-field -->"
+					"originalName": "core/form-input",
+					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>",
+					"originalContent": "<!-- wp:form-input {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:form-input -->"
 				},
 				"innerBlocks": []
 			},
@@ -52,9 +52,9 @@
 				"name": "core/missing",
 				"isValid": true,
 				"attributes": {
-					"originalName": "core/input-field",
+					"originalName": "core/form-input",
 					"originalUndelimitedContent": "<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>",
-					"originalContent": "<!-- wp:input-field {\"type\":\"submit\",\"label\":\"Submit\"} -->\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n<!-- /wp:input-field -->"
+					"originalContent": "<!-- wp:form-input {\"type\":\"submit\",\"label\":\"Submit\"} -->\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n<!-- /wp:form-input -->"
 				},
 				"innerBlocks": []
 			}
diff --git a/test/integration/fixtures/blocks/core__form.parsed.json b/test/integration/fixtures/blocks/core__form.parsed.json
index 49fad1dca14920..9bb9c2adf8a8e1 100644
--- a/test/integration/fixtures/blocks/core__form.parsed.json
+++ b/test/integration/fixtures/blocks/core__form.parsed.json
@@ -4,57 +4,57 @@
 		"attrs": {},
 		"innerBlocks": [
 			{
-				"blockName": "core/input-field",
+				"blockName": "core/form-input",
 				"attrs": {
 					"label": "Name",
 					"required": true
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
+					"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
 				]
 			},
 			{
-				"blockName": "core/input-field",
+				"blockName": "core/form-input",
 				"attrs": {
 					"type": "email",
 					"label": "Email",
 					"required": true
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Email</div><input class=\"wp-block-input-field\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n"
+					"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n"
 				]
 			},
 			{
-				"blockName": "core/input-field",
+				"blockName": "core/form-input",
 				"attrs": {
 					"type": "url",
 					"label": "Website"
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Website</div><input class=\"wp-block-input-field\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n"
+					"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n"
 				]
 			},
 			{
-				"blockName": "core/input-field",
+				"blockName": "core/form-input",
 				"attrs": {
 					"type": "textarea",
 					"label": "Comment",
 					"required": true
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Comment</div><textarea class=\"wp-block-input-field\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n"
+					"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n"
 				]
 			},
 			{
-				"blockName": "core/input-field",
+				"blockName": "core/form-input",
 				"attrs": {
 					"type": "submit",
 					"label": "Submit"
diff --git a/test/integration/fixtures/blocks/core__form.serialized.html b/test/integration/fixtures/blocks/core__form.serialized.html
index c414d7a360f79e..fd03e1d64bc6fe 100644
--- a/test/integration/fixtures/blocks/core__form.serialized.html
+++ b/test/integration/fixtures/blocks/core__form.serialized.html
@@ -1,19 +1,19 @@
 <!-- wp:form -->
 <form>
-<!-- wp:input-field {"label":"Name","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Name</div><input class="wp-block-input-field" type="text" name="Name" required="" aria-required="true"></label>
-<!-- /wp:input-field -->
-<!-- wp:input-field {"type":"email","label":"Email","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Email</div><input class="wp-block-input-field" type="email" name="Email" required="" aria-required="true"></label>
-<!-- /wp:input-field -->
-<!-- wp:input-field {"type":"url","label":"Website"} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Website</div><input class="wp-block-input-field" type="url" name="Website" aria-required="false"></label>
-<!-- /wp:input-field -->
-<!-- wp:input-field {"type":"textarea","label":"Comment","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Comment</div><textarea class="wp-block-input-field" name="Comment" required="" aria-required="true"></textarea></label>
-<!-- /wp:input-field -->
-<!-- wp:input-field {"type":"submit","label":"Submit"} -->
+<!-- wp:form-input {"label":"Name","required":true} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Name</div><input class="wp-block-form-input" type="text" name="Name" required="" aria-required="true"></label>
+<!-- /wp:form-input -->
+<!-- wp:form-input {"type":"email","label":"Email","required":true} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Email</div><input class="wp-block-form-input" type="email" name="Email" required="" aria-required="true"></label>
+<!-- /wp:form-input -->
+<!-- wp:form-input {"type":"url","label":"Website"} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Website</div><input class="wp-block-form-input" type="url" name="Website" aria-required="false"></label>
+<!-- /wp:form-input -->
+<!-- wp:form-input {"type":"textarea","label":"Comment","required":true} -->
+<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Comment</div><textarea class="wp-block-form-input" name="Comment" required="" aria-required="true"></textarea></label>
+<!-- /wp:form-input -->
+<!-- wp:form-input {"type":"submit","label":"Submit"} -->
 <div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>
-<!-- /wp:input-field -->
+<!-- /wp:form-input -->
 </form>
 <!-- /wp:form -->
diff --git a/test/integration/fixtures/blocks/core__input-field.html b/test/integration/fixtures/blocks/core__input-field.html
deleted file mode 100644
index 2d43ac55103b01..00000000000000
--- a/test/integration/fixtures/blocks/core__input-field.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:input-field {"label":"Name","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Name</div><input class="wp-block-input-field" type="text" name="Name" required aria-required="true"/></label>
-<!-- /wp:input-field -->
diff --git a/test/integration/fixtures/blocks/core__input-field.json b/test/integration/fixtures/blocks/core__input-field.json
deleted file mode 100644
index b0b6d508faeee9..00000000000000
--- a/test/integration/fixtures/blocks/core__input-field.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
-	{
-		"name": "core/missing",
-		"isValid": true,
-		"attributes": {
-			"originalName": "core/input-field",
-			"originalUndelimitedContent": "<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
-			"originalContent": "<!-- wp:input-field {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:input-field -->"
-		},
-		"innerBlocks": []
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__input-field.parsed.json b/test/integration/fixtures/blocks/core__input-field.parsed.json
deleted file mode 100644
index d731db37db5fbd..00000000000000
--- a/test/integration/fixtures/blocks/core__input-field.parsed.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-	{
-		"blockName": "core/input-field",
-		"attrs": {
-			"label": "Name",
-			"required": true
-		},
-		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
-		"innerContent": [
-			"\n<label class=\"wp-block-input-field-label\"><div class=\"wp-block-input-field-label__content\">Name</div><input class=\"wp-block-input-field\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
-		]
-	}
-]
diff --git a/test/integration/fixtures/blocks/core__input-field.serialized.html b/test/integration/fixtures/blocks/core__input-field.serialized.html
deleted file mode 100644
index 5e444498bf5ffc..00000000000000
--- a/test/integration/fixtures/blocks/core__input-field.serialized.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- wp:input-field {"label":"Name","required":true} -->
-<label class="wp-block-input-field-label"><div class="wp-block-input-field-label__content">Name</div><input class="wp-block-input-field" type="text" name="Name" required="" aria-required="true"></label>
-<!-- /wp:input-field -->

From 256151603e7e21e939073858e16133753f5d5fa3 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 24 Oct 2022 13:58:50 +0300
Subject: [PATCH 033/133] Add default init.js file for the form-input block

---
 packages/block-library/src/form-input/init.js | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packages/block-library/src/form-input/init.js

diff --git a/packages/block-library/src/form-input/init.js b/packages/block-library/src/form-input/init.js
new file mode 100644
index 00000000000000..79f0492c2cb2f8
--- /dev/null
+++ b/packages/block-library/src/form-input/init.js
@@ -0,0 +1,6 @@
+/**
+ * Internal dependencies
+ */
+import { init } from './';
+
+export default init();

From 7812b808db3cc5bfeb31641b29e2413cec325fd6 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Nov 2022 10:23:56 +0200
Subject: [PATCH 034/133] Use WP_HTML_Tag_Processor

---
 packages/block-library/src/form/index.php | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index fbe4f704b56a70..d0c0016940d4bf 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -49,20 +49,17 @@ function render_block_core_form( $attributes, $content, $block ) {
 
 	$form_id = empty( $attributes['formId'] ) ? md5( json_encode( array( $attributes, $block ) ) ) : $attributes['formId'];
 
+	// Add the form action & method.
+	$processed_content = new WP_HTML_Tag_Processor( $content );
+	$processed_content->next_tag( 'form' );
+	$processed_content->set_attribute( 'action', esc_attr( $action ) );
+	$processed_content->set_attribute( 'method', esc_attr( $method ) );
+
+	// Inject a hidden input with the block form-ID.
 	return str_replace(
-		array(
-			'<form ',
-			'</form>',
-		),
-		array(
-			sprintf(
-				'<form action="%1$s" method="%2$s" ',
-				esc_attr( $action ),
-				esc_attr( $method )
-			),
-			'<input type="hidden" name="block-form-id" value="' . esc_attr( $form_id ) . '" /><form>',
-		),
-		$content
+		'</form>',
+		'<input type="hidden" name="block-form-id" value="' . esc_attr( $form_id ) . '" /><form>',
+		$processed_content->get_updated_html()
 	);
 }
 

From 791490e57507f6d25c1d7f6b9588d223579ba651 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Nov 2022 10:35:38 +0200
Subject: [PATCH 035/133] use the HTML for the label

---
 packages/block-library/src/form-input/block.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 3c5d185f0325de..b21e3e0558629c 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -18,7 +18,9 @@
 		},
 		"label": {
 			"type": "string",
-			"default": "Label"
+			"default": "Label",
+			"selector": ".wp-block-form-input-label__content",
+			"source": "html"
 		},
 		"inlineLabel": {
 			"type": "boolean",

From 06faa933023215dc5f1caccd2cc25c714af45c06 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Nov 2022 10:39:18 +0200
Subject: [PATCH 036/133] Use an attribute for "required"

---
 packages/block-library/src/form-input/block.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index b21e3e0558629c..c7ad078f65724a 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -28,7 +28,10 @@
 		},
 		"required": {
 			"type": "boolean",
-			"default": false
+			"default": false,
+			"selector": ".wp-block-form-input",
+			"source": "attribute",
+			"attribute": "required"
 		}
 	},
 	"style": [ "wp-block-form-input", "wp-block-buttons", "wp-block-button" ]

From 86427f040c5334618ba42c1c8f6cc31bd70dec3c Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Nov 2022 10:43:54 +0200
Subject: [PATCH 037/133] fix for submit button label

---
 packages/block-library/src/form-input/block.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index c7ad078f65724a..24465cf2d829b3 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -19,7 +19,7 @@
 		"label": {
 			"type": "string",
 			"default": "Label",
-			"selector": ".wp-block-form-input-label__content",
+			"selector": ".wp-block-form-input-label__content,button",
 			"source": "html"
 		},
 		"inlineLabel": {

From 7316fb4c451c82a1f8a1e5e925f8339bcd24efab Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 15 Nov 2022 14:35:32 +0200
Subject: [PATCH 038/133] Add placeholder to inputs

---
 docs/reference-guides/core-blocks.md          |  2 +-
 .../block-library/src/form-input/block.json   |  6 ++++++
 packages/block-library/src/form-input/edit.js | 21 ++++++++++++++-----
 packages/block-library/src/form-input/save.js |  4 +++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index b2080f50e36114..9fe8ad8c08c21b 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -293,7 +293,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Name:** core/form-input
 -	**Category:** common
 -	**Supports:** 
--	**Attributes:** inlineLabel, label, name, required, type
+-	**Attributes:** inlineLabel, label, name, placeholder, required, type
 
 ## Classic
 
diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 24465cf2d829b3..0f8038bfccacb4 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -32,6 +32,12 @@
 			"selector": ".wp-block-form-input",
 			"source": "attribute",
 			"attribute": "required"
+		},
+		"placeholder": {
+			"type": "string",
+			"selector": ".wp-block-form-input",
+			"source": "attribute",
+			"attribute": "placeholder"
 		}
 	},
 	"style": [ "wp-block-form-input", "wp-block-buttons", "wp-block-button" ]
diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index a839250f780a2f..ce59a57eceb822 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -26,7 +26,8 @@ import { useRef } from '@wordpress/element';
 import { INPUT_TYPES } from './utils';
 
 function InputFieldBlock( { attributes, setAttributes } ) {
-	const { type, name, label, inlineLabel, required } = attributes;
+	const { type, name, label, inlineLabel, required, placeholder } =
+		attributes;
 	const blockProps = useBlockProps();
 	const ref = useRef();
 
@@ -185,11 +186,21 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						__unstableAllowPrefixTransformations
 					/>
 					<input
-						className="wp-block-form-input"
 						type={ type }
-						name={ name }
-						disabled="true"
-						required={ required }
+						className="wp-block-form-input"
+						aria-label={ __( 'Optional placeholder text' ) }
+						// We hide the placeholder field's placeholder when there is a value. This
+						// stops screen readers from reading the placeholder field's placeholder
+						// which is confusing.
+						placeholder={
+							placeholder
+								? undefined
+								: __( 'Optional placeholder…' )
+						}
+						value={ placeholder }
+						onChange={ ( event ) =>
+							setAttributes( { placeholder: event.target.value } )
+						}
 						aria-required={ required }
 					/>
 				</label>
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index f6c8d070a54bad..2ce44197d2d9a7 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -4,7 +4,8 @@
 import classNames from 'classnames';
 
 export default function save( { attributes } ) {
-	const { type, name, label, inlineLabel, required } = attributes;
+	const { type, name, label, inlineLabel, required, placeholder } =
+		attributes;
 
 	return (
 		<>
@@ -54,6 +55,7 @@ export default function save( { attributes } ) {
 						name={ name || label }
 						required={ required }
 						aria-required={ required }
+						placeholder={ placeholder || undefined }
 					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */

From cdbf8bacab74d11f3ca4ecd876f62b26eb68aece Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 15 Nov 2022 14:35:32 +0200
Subject: [PATCH 039/133] Revert "Add placeholder to inputs"

This reverts commit c0e6e63d8371f5c6340577c3135eb7993fc1992e.
---
 docs/reference-guides/core-blocks.md          |  2 +-
 .../block-library/src/form-input/block.json   |  6 ------
 packages/block-library/src/form-input/edit.js | 21 +++++--------------
 packages/block-library/src/form-input/save.js |  4 +---
 4 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 9fe8ad8c08c21b..b2080f50e36114 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -293,7 +293,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Name:** core/form-input
 -	**Category:** common
 -	**Supports:** 
--	**Attributes:** inlineLabel, label, name, placeholder, required, type
+-	**Attributes:** inlineLabel, label, name, required, type
 
 ## Classic
 
diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 0f8038bfccacb4..24465cf2d829b3 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -32,12 +32,6 @@
 			"selector": ".wp-block-form-input",
 			"source": "attribute",
 			"attribute": "required"
-		},
-		"placeholder": {
-			"type": "string",
-			"selector": ".wp-block-form-input",
-			"source": "attribute",
-			"attribute": "placeholder"
 		}
 	},
 	"style": [ "wp-block-form-input", "wp-block-buttons", "wp-block-button" ]
diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index ce59a57eceb822..a839250f780a2f 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -26,8 +26,7 @@ import { useRef } from '@wordpress/element';
 import { INPUT_TYPES } from './utils';
 
 function InputFieldBlock( { attributes, setAttributes } ) {
-	const { type, name, label, inlineLabel, required, placeholder } =
-		attributes;
+	const { type, name, label, inlineLabel, required } = attributes;
 	const blockProps = useBlockProps();
 	const ref = useRef();
 
@@ -186,21 +185,11 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						__unstableAllowPrefixTransformations
 					/>
 					<input
-						type={ type }
 						className="wp-block-form-input"
-						aria-label={ __( 'Optional placeholder text' ) }
-						// We hide the placeholder field's placeholder when there is a value. This
-						// stops screen readers from reading the placeholder field's placeholder
-						// which is confusing.
-						placeholder={
-							placeholder
-								? undefined
-								: __( 'Optional placeholder…' )
-						}
-						value={ placeholder }
-						onChange={ ( event ) =>
-							setAttributes( { placeholder: event.target.value } )
-						}
+						type={ type }
+						name={ name }
+						disabled="true"
+						required={ required }
 						aria-required={ required }
 					/>
 				</label>
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index 2ce44197d2d9a7..f6c8d070a54bad 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -4,8 +4,7 @@
 import classNames from 'classnames';
 
 export default function save( { attributes } ) {
-	const { type, name, label, inlineLabel, required, placeholder } =
-		attributes;
+	const { type, name, label, inlineLabel, required } = attributes;
 
 	return (
 		<>
@@ -55,7 +54,6 @@ export default function save( { attributes } ) {
 						name={ name || label }
 						required={ required }
 						aria-required={ required }
-						placeholder={ placeholder || undefined }
 					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */

From dd3b81fee2ef0e66e3cb07bbdf8176247c4a195c Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 22 Nov 2022 08:56:22 +0200
Subject: [PATCH 040/133] Remove identifier

---
 packages/block-library/src/form-input/edit.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index a839250f780a2f..be5758292ff97e 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -100,7 +100,6 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 					} ) }
 				>
 					<RichText
-						identifier="label"
 						tagName="div"
 						className="wp-block-form-input-label__content"
 						{ ...blockProps }
@@ -136,7 +135,6 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 							disabled="true"
 						>
 							<RichText
-								identifier="label"
 								tagName="div"
 								{ ...blockProps }
 								value={ label }
@@ -167,7 +165,6 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 					} ) }
 				>
 					<RichText
-						identifier="label"
 						tagName="span"
 						className="wp-block-form-input-label__content"
 						{ ...blockProps }

From 6fedc10876da287965cab690e381fdf55d86b826 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 22 Nov 2022 09:16:57 +0200
Subject: [PATCH 041/133] cleanup

---
 packages/block-library/src/form-input/edit.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index be5758292ff97e..51125ffafc171d 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -113,8 +113,6 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						}
 						data-empty={ label ? false : true }
 						placeholder={ __( 'Type the label for this input' ) }
-						__unstableEmbedURLOnPaste
-						__unstableAllowPrefixTransformations
 					/>
 					<textarea
 						className="wp-block-form-input"
@@ -149,8 +147,6 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 								placeholder={ __(
 									'Type the label for this input'
 								) }
-								__unstableEmbedURLOnPaste
-								__unstableAllowPrefixTransformations
 							/>
 						</button>
 					</div>
@@ -172,14 +168,11 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						onChange={ ( newLabel ) =>
 							setAttributes( { label: newLabel } )
 						}
-						ref={ ref.current }
 						aria-label={
 							label ? __( 'Label' ) : __( 'Empty label' )
 						}
 						data-empty={ label ? false : true }
 						placeholder={ __( 'Type the label for this input' ) }
-						__unstableEmbedURLOnPaste
-						__unstableAllowPrefixTransformations
 					/>
 					<input
 						className="wp-block-form-input"

From 24280db81b1067a4fc68129767be0acded2f60ca Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 22 Nov 2022 09:23:25 +0200
Subject: [PATCH 042/133] re-introduce placeholders

---
 docs/reference-guides/core-blocks.md          |  2 +-
 .../block-library/src/form-input/block.json   |  6 ++++++
 packages/block-library/src/form-input/edit.js | 21 ++++++++++++++-----
 packages/block-library/src/form-input/save.js |  4 +++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index b2080f50e36114..9fe8ad8c08c21b 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -293,7 +293,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Name:** core/form-input
 -	**Category:** common
 -	**Supports:** 
--	**Attributes:** inlineLabel, label, name, required, type
+-	**Attributes:** inlineLabel, label, name, placeholder, required, type
 
 ## Classic
 
diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 24465cf2d829b3..0f8038bfccacb4 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -32,6 +32,12 @@
 			"selector": ".wp-block-form-input",
 			"source": "attribute",
 			"attribute": "required"
+		},
+		"placeholder": {
+			"type": "string",
+			"selector": ".wp-block-form-input",
+			"source": "attribute",
+			"attribute": "placeholder"
 		}
 	},
 	"style": [ "wp-block-form-input", "wp-block-buttons", "wp-block-button" ]
diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 51125ffafc171d..c8fdc75cc2a203 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -26,7 +26,8 @@ import { useRef } from '@wordpress/element';
 import { INPUT_TYPES } from './utils';
 
 function InputFieldBlock( { attributes, setAttributes } ) {
-	const { type, name, label, inlineLabel, required } = attributes;
+	const { type, name, label, inlineLabel, required, placeholder } =
+		attributes;
 	const blockProps = useBlockProps();
 	const ref = useRef();
 
@@ -175,11 +176,21 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						placeholder={ __( 'Type the label for this input' ) }
 					/>
 					<input
-						className="wp-block-form-input"
 						type={ type }
-						name={ name }
-						disabled="true"
-						required={ required }
+						className="wp-block-form-input"
+						aria-label={ __( 'Optional placeholder text' ) }
+						// We hide the placeholder field's placeholder when there is a value. This
+						// stops screen readers from reading the placeholder field's placeholder
+						// which is confusing.
+						placeholder={
+							placeholder
+								? undefined
+								: __( 'Optional placeholder…' )
+						}
+						value={ placeholder }
+						onChange={ ( event ) =>
+							setAttributes( { placeholder: event.target.value } )
+						}
 						aria-required={ required }
 					/>
 				</label>
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index f6c8d070a54bad..2ce44197d2d9a7 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -4,7 +4,8 @@
 import classNames from 'classnames';
 
 export default function save( { attributes } ) {
-	const { type, name, label, inlineLabel, required } = attributes;
+	const { type, name, label, inlineLabel, required, placeholder } =
+		attributes;
 
 	return (
 		<>
@@ -54,6 +55,7 @@ export default function save( { attributes } ) {
 						name={ name || label }
 						required={ required }
 						aria-required={ required }
+						placeholder={ placeholder || undefined }
 					/>
 				</label>
 				/* eslint-enable jsx-a11y/label-has-associated-control */

From 3dcedc0fd85f419c8a128955d4c0637ebbb0f099 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 22 Nov 2022 09:23:55 +0200
Subject: [PATCH 043/133] Use a div instead of label in the editor to avoid
 on-click focus issues

---
 packages/block-library/src/form-input/edit.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index c8fdc75cc2a203..799e73f7b57252 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -94,8 +94,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 			) }
 
 			{ type === 'textarea' && (
-				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label
+				<div
 					className={ classNames( 'wp-block-form-input-label', {
 						'is-label-inline': inlineLabel,
 					} ) }
@@ -122,8 +121,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						required={ required }
 						aria-required={ required }
 					/>
-				</label>
-				/* eslint-enable jsx-a11y/label-has-associated-control */
+				</div>
 			) }
 
 			{ type === 'submit' && (
@@ -155,8 +153,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 			) }
 
 			{ type !== 'textarea' && type !== 'submit' && (
-				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label
+				<div
 					className={ classNames( 'wp-block-form-input-label', {
 						'is-label-inline': inlineLabel,
 					} ) }
@@ -193,8 +190,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						}
 						aria-required={ required }
 					/>
-				</label>
-				/* eslint-enable jsx-a11y/label-has-associated-control */
+				</div>
 			) }
 		</>
 	);

From e2a9153e14718cd7dad85db7b11cd403cd251f3a Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 22 Nov 2022 09:34:44 +0200
Subject: [PATCH 044/133] Simplification for textareas

---
 packages/block-library/src/form-input/edit.js | 36 ++-----------------
 packages/block-library/src/form-input/save.js | 26 +++-----------
 2 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 799e73f7b57252..965921187b755e 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -30,6 +30,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 		attributes;
 	const blockProps = useBlockProps();
 	const ref = useRef();
+	const TagName = type === 'textarea' ? 'textarea' : 'input';
 
 	if ( ref.current ) {
 		ref.current.focus();
@@ -93,37 +94,6 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 				</InspectorControls>
 			) }
 
-			{ type === 'textarea' && (
-				<div
-					className={ classNames( 'wp-block-form-input-label', {
-						'is-label-inline': inlineLabel,
-					} ) }
-				>
-					<RichText
-						tagName="div"
-						className="wp-block-form-input-label__content"
-						{ ...blockProps }
-						value={ label }
-						onChange={ ( newLabel ) =>
-							setAttributes( { label: newLabel } )
-						}
-						ref={ ref.current }
-						aria-label={
-							label ? __( 'Label' ) : __( 'Empty label' )
-						}
-						data-empty={ label ? false : true }
-						placeholder={ __( 'Type the label for this input' ) }
-					/>
-					<textarea
-						className="wp-block-form-input"
-						disabled="true"
-						name={ name }
-						required={ required }
-						aria-required={ required }
-					/>
-				</div>
-			) }
-
 			{ type === 'submit' && (
 				<div className="wp-block-buttons">
 					<div className="wp-block-button">
@@ -152,7 +122,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 				</div>
 			) }
 
-			{ type !== 'textarea' && type !== 'submit' && (
+			{ type !== 'submit' && (
 				<div
 					className={ classNames( 'wp-block-form-input-label', {
 						'is-label-inline': inlineLabel,
@@ -172,7 +142,7 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						data-empty={ label ? false : true }
 						placeholder={ __( 'Type the label for this input' ) }
 					/>
-					<input
+					<TagName
 						type={ type }
 						className="wp-block-form-input"
 						aria-label={ __( 'Optional placeholder text' ) }
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index 2ce44197d2d9a7..f8c14f474bb684 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -7,28 +7,10 @@ export default function save( { attributes } ) {
 	const { type, name, label, inlineLabel, required, placeholder } =
 		attributes;
 
+	const TagName = type === 'textarea' ? 'textarea' : 'input';
+
 	return (
 		<>
-			{ type === 'textarea' && (
-				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label
-					className={ classNames( 'wp-block-form-input-label', {
-						'is-label-inline': inlineLabel,
-					} ) }
-				>
-					<div className="wp-block-form-input-label__content">
-						{ label }
-					</div>
-					<textarea
-						className="wp-block-form-input"
-						name={ name || label }
-						required={ required }
-						aria-required={ required }
-					/>
-				</label>
-				/* eslint-enable jsx-a11y/label-has-associated-control */
-			) }
-
 			{ type === 'submit' && (
 				<div className="wp-block-buttons">
 					<div className="wp-block-button">
@@ -39,7 +21,7 @@ export default function save( { attributes } ) {
 				</div>
 			) }
 
-			{ type !== 'textarea' && type !== 'submit' && (
+			{ type !== 'submit' && (
 				/* eslint-disable jsx-a11y/label-has-associated-control */
 				<label
 					className={ classNames( 'wp-block-form-input-label', {
@@ -49,7 +31,7 @@ export default function save( { attributes } ) {
 					<div className="wp-block-form-input-label__content">
 						{ label }
 					</div>
-					<input
+					<TagName
 						className="wp-block-form-input"
 						type={ type }
 						name={ name || label }

From b6c8210c04a2ed5824c9f494b952728cd045ae9d Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 22 Nov 2022 09:59:11 +0200
Subject: [PATCH 045/133] Use the big appender when there are no inner blocks

---
 packages/block-library/src/form/edit.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 6b341b0f50045f..33536a9fa2b483 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -3,11 +3,14 @@
  */
 import { __ } from '@wordpress/i18n';
 import {
+	InnerBlocks,
 	useBlockProps,
 	useInnerBlocksProps,
 	InspectorControls,
+	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { PanelBody, TextControl } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
 
 const ALLOWED_BLOCKS = [
 	'core/paragraph',
@@ -58,13 +61,27 @@ const TEMPLATE = [
 	],
 ];
 
-const Edit = ( { attributes, setAttributes } ) => {
+const Edit = ( { attributes, setAttributes, clientId } ) => {
 	const { formId } = attributes;
 	const blockProps = useBlockProps();
 
+	const { hasInnerBlocks } = useSelect(
+		( select ) => {
+			const { getBlock } = select( blockEditorStore );
+			const block = getBlock( clientId );
+			return {
+				hasInnerBlocks: !! ( block && block.innerBlocks.length ),
+			};
+		},
+		[ clientId ]
+	);
+
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
 		allowedBlocks: ALLOWED_BLOCKS,
 		template: TEMPLATE,
+		renderAppender: hasInnerBlocks
+			? undefined
+			: InnerBlocks.ButtonBlockAppender,
 	} );
 
 	return (

From 56d8240de668a5c0f0a2192e9f0daed410e619bf Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 22 Nov 2022 14:20:37 +0200
Subject: [PATCH 046/133] Add form-submit-button block

---
 docs/reference-guides/core-blocks.md          |  9 +++++
 lib/blocks.php                                |  1 +
 .../src/form-submit-button/block.json         | 15 +++++++++
 .../src/form-submit-button/edit.js            | 33 +++++++++++++++++++
 .../src/form-submit-button/index.js           | 18 ++++++++++
 .../src/form-submit-button/init.js            |  6 ++++
 .../src/form-submit-button/save.js            | 14 ++++++++
 packages/block-library/src/index.js           |  2 ++
 8 files changed, 98 insertions(+)
 create mode 100644 packages/block-library/src/form-submit-button/block.json
 create mode 100644 packages/block-library/src/form-submit-button/edit.js
 create mode 100644 packages/block-library/src/form-submit-button/index.js
 create mode 100644 packages/block-library/src/form-submit-button/init.js
 create mode 100644 packages/block-library/src/form-submit-button/save.js

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 9fe8ad8c08c21b..b2fd7b1c186e09 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -295,6 +295,15 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Supports:** 
 -	**Attributes:** inlineLabel, label, name, placeholder, required, type
 
+## Form submit button
+
+A submission button for forms. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/form-submit-button))
+
+-	**Name:** core/form-submit-button
+-	**Category:** common
+-	**Supports:** ~~lock~~, ~~multiple~~
+-	**Attributes:** 
+
 ## Classic
 
 Use the classic WordPress editor. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/freeform))
diff --git a/lib/blocks.php b/lib/blocks.php
index b1e7095346ebe9..2035f99a860cd1 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -23,6 +23,7 @@ function gutenberg_reregister_core_block_types() {
 				'columns',
 				'details',
 				'form-input',
+				'form-submit-button',
 				'group',
 				'html',
 				'list',
diff --git a/packages/block-library/src/form-submit-button/block.json b/packages/block-library/src/form-submit-button/block.json
new file mode 100644
index 00000000000000..eae1334418057e
--- /dev/null
+++ b/packages/block-library/src/form-submit-button/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "core/form-submit-button",
+	"title": "Form submit button",
+	"category": "common",
+	"parent": [ "core/form" ],
+	"description": "A submission button for forms.",
+	"keywords": [ "submit", "button", "form" ],
+	"textdomain": "default",
+	"supports": {
+		"lock": false,
+		"multiple": false
+	}
+}
diff --git a/packages/block-library/src/form-submit-button/edit.js b/packages/block-library/src/form-submit-button/edit.js
new file mode 100644
index 00000000000000..f8d7a65c6877a6
--- /dev/null
+++ b/packages/block-library/src/form-submit-button/edit.js
@@ -0,0 +1,33 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useBlockProps, useInnerBlocksProps } from '@wordpress/block-editor';
+
+const TEMPLATE = [
+	[
+		'core/buttons',
+		{},
+		[
+			[
+				'core/button',
+				{
+					text: __( 'Submit' ),
+					tagName: 'button',
+				},
+			],
+		],
+	],
+];
+const Edit = () => {
+	const blockProps = useBlockProps();
+	const innerBlocksProps = useInnerBlocksProps( blockProps, {
+		allowedBlocks: TEMPLATE,
+		template: TEMPLATE,
+		templateLock: 'all',
+	} );
+	return (
+		<div className="wp-block-form-submit-wrapper" { ...innerBlocksProps } />
+	);
+};
+export default Edit;
diff --git a/packages/block-library/src/form-submit-button/index.js b/packages/block-library/src/form-submit-button/index.js
new file mode 100644
index 00000000000000..4c60b5f5c20639
--- /dev/null
+++ b/packages/block-library/src/form-submit-button/index.js
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import initBlock from '../utils/init-block';
+import edit from './edit';
+import metadata from './block.json';
+import save from './save';
+
+const { name } = metadata;
+
+export { metadata, name };
+
+export const settings = {
+	edit,
+	save,
+};
+
+export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/form-submit-button/init.js b/packages/block-library/src/form-submit-button/init.js
new file mode 100644
index 00000000000000..79f0492c2cb2f8
--- /dev/null
+++ b/packages/block-library/src/form-submit-button/init.js
@@ -0,0 +1,6 @@
+/**
+ * Internal dependencies
+ */
+import { init } from './';
+
+export default init();
diff --git a/packages/block-library/src/form-submit-button/save.js b/packages/block-library/src/form-submit-button/save.js
new file mode 100644
index 00000000000000..ba361ebe9db209
--- /dev/null
+++ b/packages/block-library/src/form-submit-button/save.js
@@ -0,0 +1,14 @@
+/**
+ * WordPress dependencies
+ */
+import { useBlockProps, InnerBlocks } from '@wordpress/block-editor';
+
+const Save = () => {
+	const blockProps = useBlockProps.save();
+	return (
+		<div className="wp-block-form-submit-wrapper" { ...blockProps }>
+			<InnerBlocks.Content />
+		</div>
+	);
+};
+export default Save;
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index e50379c2f2b9f5..387e53f05a930e 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -50,6 +50,7 @@ import * as embed from './embed';
 import * as file from './file';
 import * as form from './form';
 import * as formInput from './form-input';
+import * as formSubmitButton from './form-submit-button';
 import * as gallery from './gallery';
 import * as group from './group';
 import * as heading from './heading';
@@ -233,6 +234,7 @@ const getAllBlocks = () => {
 	if ( window?.__experimentalEnableFormBlocks ) {
 		blocks.push( form );
 		blocks.push( formInput );
+		blocks.push( formSubmitButton );
 	}
 
 	// When in a WordPress context, conditionally

From 21344a5ba987526d13226f2f64f309f18ca014b0 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 22 Nov 2022 14:21:05 +0200
Subject: [PATCH 047/133] implement form-submit button & improve variations

---
 .../block-library/src/form-input/block.json   |   4 +-
 packages/block-library/src/form-input/edit.js | 185 ++++++------------
 packages/block-library/src/form-input/save.js |  50 ++---
 .../block-library/src/form-input/utils.js     |  43 ----
 .../src/form-input/variations.js              |  24 +--
 packages/block-library/src/form/edit.js       |   9 +-
 6 files changed, 93 insertions(+), 222 deletions(-)
 delete mode 100644 packages/block-library/src/form-input/utils.js

diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 0f8038bfccacb4..0856504f1b67d5 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -19,7 +19,7 @@
 		"label": {
 			"type": "string",
 			"default": "Label",
-			"selector": ".wp-block-form-input-label__content,button",
+			"selector": ".wp-block-form-input-label__content",
 			"source": "html"
 		},
 		"inlineLabel": {
@@ -40,5 +40,5 @@
 			"attribute": "placeholder"
 		}
 	},
-	"style": [ "wp-block-form-input", "wp-block-buttons", "wp-block-button" ]
+	"style": [ "wp-block-form-input" ]
 }
diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 965921187b755e..ce9ffef40a30f4 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -12,18 +12,9 @@ import {
 	RichText,
 	useBlockProps,
 } from '@wordpress/block-editor';
-import {
-	PanelBody,
-	CustomSelectControl,
-	TextControl,
-	CheckboxControl,
-} from '@wordpress/components';
-import { useRef } from '@wordpress/element';
+import { PanelBody, TextControl, CheckboxControl } from '@wordpress/components';
 
-/**
- * Internal dependencies
- */
-import { INPUT_TYPES } from './utils';
+import { useRef } from '@wordpress/element';
 
 function InputFieldBlock( { attributes, setAttributes } ) {
 	const { type, name, label, inlineLabel, required, placeholder } =
@@ -40,128 +31,78 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 		<>
 			<InspectorControls>
 				<PanelBody title={ __( 'Input settings' ) }>
-					<CustomSelectControl
-						label={ __( 'Type' ) }
-						value={ INPUT_TYPES.find(
-							( option ) => option.key === type
-						) }
-						options={ INPUT_TYPES }
+					<CheckboxControl
+						label={ __( 'Inline label' ) }
+						checked={ attributes.inlineLabel }
 						onChange={ ( newVal ) => {
 							setAttributes( {
-								type: newVal?.selectedItem?.key,
+								inlineLabel: newVal,
 							} );
 						} }
 					/>
-					{ type !== 'submit' && (
-						<CheckboxControl
-							label={ __( 'Inline label' ) }
-							checked={ attributes.inlineLabel }
-							onChange={ ( newVal ) => {
-								setAttributes( {
-									inlineLabel: newVal,
-								} );
-							} }
-						/>
-					) }
-					{ type !== 'submit' && (
-						<CheckboxControl
-							label={ __( 'Required' ) }
-							checked={ attributes.required }
-							onChange={ ( newVal ) => {
-								setAttributes( {
-									required: newVal,
-								} );
-							} }
-						/>
-					) }
-				</PanelBody>
-			</InspectorControls>
-			{ type !== 'submit' && (
-				<InspectorControls __experimentalGroup="advanced">
-					<TextControl
-						autoComplete="off"
-						label={ __( 'Name' ) }
-						value={ name }
+					<CheckboxControl
+						label={ __( 'Required' ) }
+						checked={ attributes.required }
 						onChange={ ( newVal ) => {
 							setAttributes( {
-								name: newVal,
+								required: newVal,
 							} );
 						} }
-						help={ __(
-							'Affects the "name" atribute of the input element, and is used as a name for the form submission results.'
-						) }
 					/>
-				</InspectorControls>
-			) }
-
-			{ type === 'submit' && (
-				<div className="wp-block-buttons">
-					<div className="wp-block-button">
-						<button
-							className="wp-block-button__link wp-element-button"
-							disabled="true"
-						>
-							<RichText
-								tagName="div"
-								{ ...blockProps }
-								value={ label }
-								onChange={ ( newLabel ) =>
-									setAttributes( { label: newLabel } )
-								}
-								ref={ ref.current }
-								aria-label={
-									label ? __( 'Label' ) : __( 'Empty label' )
-								}
-								data-empty={ label ? false : true }
-								placeholder={ __(
-									'Type the label for this input'
-								) }
-							/>
-						</button>
-					</div>
-				</div>
-			) }
-
-			{ type !== 'submit' && (
-				<div
-					className={ classNames( 'wp-block-form-input-label', {
+				</PanelBody>
+			</InspectorControls>
+			<InspectorControls __experimentalGroup="advanced">
+				<TextControl
+					autoComplete="off"
+					label={ __( 'Name' ) }
+					value={ name }
+					onChange={ ( newVal ) => {
+						setAttributes( {
+							name: newVal,
+						} );
+					} }
+					help={ __(
+						'Affects the "name" atribute of the input element, and is used as a name for the form submission results.'
+					) }
+				/>
+			</InspectorControls>
+			<div
+				className={ classNames(
+					'wp-block-form-input-wrapper wp-block-form-input-label',
+					{
 						'is-label-inline': inlineLabel,
-					} ) }
-				>
-					<RichText
-						tagName="span"
-						className="wp-block-form-input-label__content"
-						{ ...blockProps }
-						value={ label }
-						onChange={ ( newLabel ) =>
-							setAttributes( { label: newLabel } )
-						}
-						aria-label={
-							label ? __( 'Label' ) : __( 'Empty label' )
-						}
-						data-empty={ label ? false : true }
-						placeholder={ __( 'Type the label for this input' ) }
-					/>
-					<TagName
-						type={ type }
-						className="wp-block-form-input"
-						aria-label={ __( 'Optional placeholder text' ) }
-						// We hide the placeholder field's placeholder when there is a value. This
-						// stops screen readers from reading the placeholder field's placeholder
-						// which is confusing.
-						placeholder={
-							placeholder
-								? undefined
-								: __( 'Optional placeholder…' )
-						}
-						value={ placeholder }
-						onChange={ ( event ) =>
-							setAttributes( { placeholder: event.target.value } )
-						}
-						aria-required={ required }
-					/>
-				</div>
-			) }
+					}
+				) }
+			>
+				<RichText
+					tagName="span"
+					className="wp-block-form-input-label__content"
+					{ ...blockProps }
+					value={ label }
+					onChange={ ( newLabel ) =>
+						setAttributes( { label: newLabel } )
+					}
+					aria-label={ label ? __( 'Label' ) : __( 'Empty label' ) }
+					data-empty={ label ? false : true }
+					placeholder={ __( 'Type the label for this input' ) }
+				/>
+				<TagName
+					type={ type }
+					className="wp-block-form-input"
+					aria-label={ __( 'Optional placeholder text' ) }
+					// We hide the placeholder field's placeholder when there is a value. This
+					// stops screen readers from reading the placeholder field's placeholder
+					// which is confusing.
+					placeholder={
+						placeholder ? undefined : __( 'Optional placeholder…' )
+					}
+					value={ placeholder }
+					onChange={ ( event ) =>
+						setAttributes( { placeholder: event.target.value } )
+					}
+					aria-required={ required }
+				/>
+			</div>
 		</>
 	);
 }
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index f8c14f474bb684..c5ceb61b67789b 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -9,39 +9,23 @@ export default function save( { attributes } ) {
 
 	const TagName = type === 'textarea' ? 'textarea' : 'input';
 
+	/* eslint-disable jsx-a11y/label-has-associated-control */
 	return (
-		<>
-			{ type === 'submit' && (
-				<div className="wp-block-buttons">
-					<div className="wp-block-button">
-						<button className="wp-block-button__link wp-element-button">
-							{ label }
-						</button>
-					</div>
-				</div>
-			) }
-
-			{ type !== 'submit' && (
-				/* eslint-disable jsx-a11y/label-has-associated-control */
-				<label
-					className={ classNames( 'wp-block-form-input-label', {
-						'is-label-inline': inlineLabel,
-					} ) }
-				>
-					<div className="wp-block-form-input-label__content">
-						{ label }
-					</div>
-					<TagName
-						className="wp-block-form-input"
-						type={ type }
-						name={ name || label }
-						required={ required }
-						aria-required={ required }
-						placeholder={ placeholder || undefined }
-					/>
-				</label>
-				/* eslint-enable jsx-a11y/label-has-associated-control */
-			) }
-		</>
+		<label
+			className={ classNames( 'wp-block-form-input-label', {
+				'is-label-inline': inlineLabel,
+			} ) }
+		>
+			<div className="wp-block-form-input-label__content">{ label }</div>
+			<TagName
+				className="wp-block-form-input"
+				type={ type }
+				name={ name || label }
+				required={ required }
+				aria-required={ required }
+				placeholder={ placeholder || undefined }
+			/>
+		</label>
 	);
+	/* eslint-enable jsx-a11y/label-has-associated-control */
 }
diff --git a/packages/block-library/src/form-input/utils.js b/packages/block-library/src/form-input/utils.js
deleted file mode 100644
index 2d4113bf0518eb..00000000000000
--- a/packages/block-library/src/form-input/utils.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
-export const INPUT_TYPES = [
-	{
-		key: 'text',
-		name: __( 'Text' ),
-	},
-	{
-		key: 'textarea',
-		name: __( 'Textarea' ),
-	},
-	{
-		key: 'checkbox',
-		name: __( 'Checkbox' ),
-	},
-	{
-		key: 'email',
-		name: __( 'Email' ),
-	},
-	{
-		key: 'url',
-		name: __( 'URL' ),
-	},
-	{
-		key: 'tel',
-		name: __( 'Telephone' ),
-	},
-	{
-		key: 'number',
-		name: __( 'Number' ),
-	},
-	// {
-	// 	key: 'datetime-local',
-	// 	name: __( 'Date and time' ),
-	// },
-	{
-		key: 'submit',
-		name: __( 'Submit' ),
-	},
-];
diff --git a/packages/block-library/src/form-input/variations.js b/packages/block-library/src/form-input/variations.js
index 3456a30a37b4b8..5165c21fb533ba 100644
--- a/packages/block-library/src/form-input/variations.js
+++ b/packages/block-library/src/form-input/variations.js
@@ -7,7 +7,7 @@ const variations = [
 	{
 		name: 'text',
 		title: __( 'Text input' ),
-		description: __( 'Plain text input field.' ),
+		description: __( 'A generic text input.' ),
 		attributes: { type: 'text' },
 		isDefault: true,
 		scope: [ 'inserter', 'transform' ],
@@ -17,7 +17,9 @@ const variations = [
 	{
 		name: 'textarea',
 		title: __( 'Textarea input' ),
-		description: __( 'Textarea input field.' ),
+		description: __(
+			'A textarea input to allow entering multiple lines of text.'
+		),
 		attributes: { type: 'textarea' },
 		isDefault: true,
 		scope: [ 'inserter', 'transform' ],
@@ -26,7 +28,7 @@ const variations = [
 	{
 		name: 'checkbox',
 		title: __( 'Checkbox input' ),
-		description: __( 'Checkbox input field.' ),
+		description: __( 'A simple checkbox input.' ),
 		attributes: { type: 'checkbox' },
 		isDefault: true,
 		scope: [ 'inserter', 'transform' ],
@@ -35,7 +37,7 @@ const variations = [
 	{
 		name: 'email',
 		title: __( 'Email input' ),
-		description: __( 'Email input field.' ),
+		description: __( 'Used for email addresses.' ),
 		attributes: { type: 'email' },
 		isDefault: true,
 		scope: [ 'inserter', 'transform' ],
@@ -44,7 +46,7 @@ const variations = [
 	{
 		name: 'url',
 		title: __( 'URL input' ),
-		description: __( 'URL input field.' ),
+		description: __( 'Used for URLs.' ),
 		attributes: { type: 'url' },
 		isDefault: true,
 		scope: [ 'inserter', 'transform' ],
@@ -53,7 +55,7 @@ const variations = [
 	{
 		name: 'tel',
 		title: __( 'Telephone input' ),
-		description: __( 'Telephone input field.' ),
+		description: __( 'Used for phone numbers.' ),
 		attributes: { type: 'tel' },
 		isDefault: true,
 		scope: [ 'inserter', 'transform' ],
@@ -62,20 +64,12 @@ const variations = [
 	{
 		name: 'number',
 		title: __( 'Number input' ),
-		description: __( 'Number input field.' ),
+		description: __( 'A numeric input.' ),
 		attributes: { type: 'number' },
 		isDefault: true,
 		scope: [ 'inserter', 'transform' ],
 		isActive: ( blockAttributes ) => blockAttributes?.type === 'number',
 	},
-	{
-		name: 'submit',
-		title: __( 'Submit button' ),
-		attributes: { type: 'submit' },
-		isDefault: true,
-		scope: [ 'inserter', 'transform' ],
-		isActive: ( blockAttributes ) => blockAttributes?.type === 'submit',
-	},
 ];
 
 export default variations;
diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 33536a9fa2b483..73a03d078c3380 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -16,6 +16,7 @@ const ALLOWED_BLOCKS = [
 	'core/paragraph',
 	'core/heading',
 	'core/form-input',
+	'core/form-submit-button',
 	'core/columns',
 	'core/group',
 ];
@@ -52,13 +53,7 @@ const TEMPLATE = [
 			required: true,
 		},
 	],
-	[
-		'core/form-input',
-		{
-			type: 'submit',
-			label: __( 'Submit' ),
-		},
-	],
+	[ 'core/form-submit-button', {} ],
 ];
 
 const Edit = ( { attributes, setAttributes, clientId } ) => {

From 9850eff71b9041f65fa80a5441e4e7ff2ca03511 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 23 Nov 2022 12:43:16 +0200
Subject: [PATCH 048/133] Add support for colors and border-radius to input
 blocks

---
 docs/reference-guides/core-blocks.md          |  2 +-
 .../block-library/src/form-input/block.json   | 25 +++++++++++++++--
 packages/block-library/src/form-input/edit.js | 28 +++++++++++++------
 packages/block-library/src/form-input/save.js | 28 +++++++++++++++++--
 .../block-library/src/form-input/style.scss   |  9 +++---
 5 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index b2fd7b1c186e09..92836a2841b46f 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -292,7 +292,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 
 -	**Name:** core/form-input
 -	**Category:** common
--	**Supports:** 
+-	**Supports:** anchor, color (background, gradients, text), ~~reusable~~
 -	**Attributes:** inlineLabel, label, name, placeholder, required, type
 
 ## Form submit button
diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 0856504f1b67d5..982bc4e9d3392c 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -19,7 +19,7 @@
 		"label": {
 			"type": "string",
 			"default": "Label",
-			"selector": ".wp-block-form-input-label__content",
+			"selector": ".wp-block-form-input__label-content",
 			"source": "html"
 		},
 		"inlineLabel": {
@@ -29,16 +29,35 @@
 		"required": {
 			"type": "boolean",
 			"default": false,
-			"selector": ".wp-block-form-input",
+			"selector": ".wp-block-form-input__input",
 			"source": "attribute",
 			"attribute": "required"
 		},
 		"placeholder": {
 			"type": "string",
-			"selector": ".wp-block-form-input",
+			"selector": ".wp-block-form-input__input",
 			"source": "attribute",
 			"attribute": "placeholder"
 		}
 	},
+	"supports": {
+		"anchor": true,
+		"color": {
+			"__experimentalSkipSerialization": true,
+			"gradients": true,
+			"__experimentalDefaultControls": {
+				"background": true,
+				"text": true
+			}
+		},
+		"reusable": false,
+		"__experimentalBorder": {
+			"radius": true,
+			"__experimentalSkipSerialization": true,
+			"__experimentalDefaultControls": {
+				"radius": true
+			}
+		}
+	},
 	"style": [ "wp-block-form-input" ]
 }
diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index ce9ffef40a30f4..fc8121132a836d 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -11,18 +11,22 @@ import {
 	InspectorControls,
 	RichText,
 	useBlockProps,
+	__experimentalUseBorderProps as useBorderProps,
+	__experimentalUseColorProps as useColorProps,
 } from '@wordpress/block-editor';
 import { PanelBody, TextControl, CheckboxControl } from '@wordpress/components';
 
 import { useRef } from '@wordpress/element';
 
-function InputFieldBlock( { attributes, setAttributes } ) {
+function InputFieldBlock( { attributes, setAttributes, className } ) {
 	const { type, name, label, inlineLabel, required, placeholder } =
 		attributes;
 	const blockProps = useBlockProps();
 	const ref = useRef();
 	const TagName = type === 'textarea' ? 'textarea' : 'input';
 
+	const borderProps = useBorderProps( attributes );
+	const colorProps = useColorProps( attributes );
 	if ( ref.current ) {
 		ref.current.focus();
 	}
@@ -67,16 +71,13 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 				/>
 			</InspectorControls>
 			<div
-				className={ classNames(
-					'wp-block-form-input-wrapper wp-block-form-input-label',
-					{
-						'is-label-inline': inlineLabel,
-					}
-				) }
+				className={ classNames( 'wp-block-form-input__label', {
+					'is-label-inline': inlineLabel,
+				} ) }
 			>
 				<RichText
 					tagName="span"
-					className="wp-block-form-input-label__content"
+					className="wp-block-form-input__label-content"
 					{ ...blockProps }
 					value={ label }
 					onChange={ ( newLabel ) =>
@@ -88,7 +89,12 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 				/>
 				<TagName
 					type={ type }
-					className="wp-block-form-input"
+					className={ classNames(
+						className,
+						'wp-block-form-input__input',
+						colorProps.className,
+						borderProps.className
+					) }
 					aria-label={ __( 'Optional placeholder text' ) }
 					// We hide the placeholder field's placeholder when there is a value. This
 					// stops screen readers from reading the placeholder field's placeholder
@@ -101,6 +107,10 @@ function InputFieldBlock( { attributes, setAttributes } ) {
 						setAttributes( { placeholder: event.target.value } )
 					}
 					aria-required={ required }
+					style={ {
+						...borderProps.style,
+						...colorProps.style,
+					} }
 				/>
 			</div>
 		</>
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index c5ceb61b67789b..ce4c371a64fa75 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -3,27 +3,49 @@
  */
 import classNames from 'classnames';
 
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
+	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
+} from '@wordpress/block-editor';
+
 export default function save( { attributes } ) {
 	const { type, name, label, inlineLabel, required, placeholder } =
 		attributes;
 
+	const borderProps = getBorderClassesAndStyles( attributes );
+	const colorProps = getColorClassesAndStyles( attributes );
+
+	const inputStyle = {
+		...borderProps.style,
+		...colorProps.style,
+	};
+
+	const inputClasses = classNames(
+		'wp-block-form-input__input',
+		colorProps.className,
+		borderProps.className
+	);
 	const TagName = type === 'textarea' ? 'textarea' : 'input';
 
 	/* eslint-disable jsx-a11y/label-has-associated-control */
 	return (
 		<label
-			className={ classNames( 'wp-block-form-input-label', {
+			className={ classNames( 'wp-block-form-input__label', {
 				'is-label-inline': inlineLabel,
 			} ) }
 		>
-			<div className="wp-block-form-input-label__content">{ label }</div>
+			<div className="wp-block-form-input__label-content">{ label }</div>
 			<TagName
-				className="wp-block-form-input"
+				className={ inputClasses }
 				type={ type }
 				name={ name || label }
 				required={ required }
 				aria-required={ required }
 				placeholder={ placeholder || undefined }
+				style={ inputStyle }
 			/>
 		</label>
 	);
diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index b82654e9965149..2610a617a7bf7f 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -1,4 +1,4 @@
-.wp-block-form-input-label {
+.wp-block-form-input__label {
 	width: 100%;
 	display: flex;
 	flex-direction: column;
@@ -11,12 +11,11 @@
 	}
 }
 
-.wp-block-form-input-label__content {
+.wp-block-form-input__label-content {
 	width: fit-content;
 }
 
-input.wp-block-form-input,
-textarea.wp-block-form-input {
+.wp-block-form-input__input {
 	padding: 0.5em;
 	border: 1px solid currentColor;
 	opacity: 0.75;
@@ -30,6 +29,6 @@ textarea.wp-block-form-input {
 	}
 }
 
-textarea.wp-block-form-input {
+textarea.wp-block-form-input__input {
 	min-height: 10em;
 }

From 82a6319f309632b8559d14c5b53f4534d70e8c8f Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 23 Nov 2022 13:37:42 +0200
Subject: [PATCH 049/133] make input fields select the block (wrong position
 for blockProps)

---
 packages/block-library/src/form-input/edit.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index fc8121132a836d..8883cfdb020159 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -31,7 +31,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 		ref.current.focus();
 	}
 
-	return (
+	const controls = (
 		<>
 			<InspectorControls>
 				<PanelBody title={ __( 'Input settings' ) }>
@@ -70,6 +70,12 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 					) }
 				/>
 			</InspectorControls>
+		</>
+	);
+
+	return (
+		<div { ...blockProps }>
+			{ controls }
 			<div
 				className={ classNames( 'wp-block-form-input__label', {
 					'is-label-inline': inlineLabel,
@@ -78,7 +84,6 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 				<RichText
 					tagName="span"
 					className="wp-block-form-input__label-content"
-					{ ...blockProps }
 					value={ label }
 					onChange={ ( newLabel ) =>
 						setAttributes( { label: newLabel } )
@@ -113,7 +118,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 					} }
 				/>
 			</div>
-		</>
+		</div>
 	);
 }
 

From 50a96922899f08fdee6d47030a2464d91bebeba7 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 23 Nov 2022 13:53:02 +0200
Subject: [PATCH 050/133] add __experimentalRole: content

---
 packages/block-library/src/form-input/block.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 982bc4e9d3392c..0c14e370f86044 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -20,7 +20,8 @@
 			"type": "string",
 			"default": "Label",
 			"selector": ".wp-block-form-input__label-content",
-			"source": "html"
+			"source": "html",
+			"__experimentalRole": "content"
 		},
 		"inlineLabel": {
 			"type": "boolean",
@@ -37,7 +38,8 @@
 			"type": "string",
 			"selector": ".wp-block-form-input__input",
 			"source": "attribute",
-			"attribute": "placeholder"
+			"attribute": "placeholder",
+			"__experimentalRole": "content"
 		}
 	},
 	"supports": {

From 54e3888d2ea7a9eee32a0d5c6a7ab2a1c78d89fb Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 23 Nov 2022 13:53:25 +0200
Subject: [PATCH 051/133] fix HTML escaping in labels

---
 packages/block-library/src/form-input/save.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index ce4c371a64fa75..2d2263c58da893 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -7,6 +7,7 @@ import classNames from 'classnames';
  * WordPress dependencies
  */
 import {
+	RichText,
 	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
 	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
 } from '@wordpress/block-editor';
@@ -37,7 +38,9 @@ export default function save( { attributes } ) {
 				'is-label-inline': inlineLabel,
 			} ) }
 		>
-			<div className="wp-block-form-input__label-content">{ label }</div>
+			<div className="wp-block-form-input__label-content">
+				<RichText.Content value={ label } />
+			</div>
 			<TagName
 				className={ inputClasses }
 				type={ type }

From d407c4d89a0a8f762b46f1f00b196502e836ee74 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 23 Nov 2022 14:03:06 +0200
Subject: [PATCH 052/133] CSS fixes

---
 .../block-library/src/form-input/style.scss   | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index 2610a617a7bf7f..2c1393459a82f8 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -16,16 +16,25 @@
 }
 
 .wp-block-form-input__input {
-	padding: 0.5em;
-	border: 1px solid currentColor;
-	opacity: 0.75;
-	border-radius: 0;
+	padding: 0 0.5em;
 	font-size: 1em;
 
-	&:focus,
-	&:active,
-	&:focus-within {
-		outline: 2px solid currentColor;
+	&[type="text"],
+	&[type="password"],
+	&[type="date"],
+	&[type="datetime"],
+	&[type="datetime-local"],
+	&[type="email"],
+	&[type="month"],
+	&[type="number"],
+	&[type="search"],
+	&[type="tel"],
+	&[type="time"],
+	&[type="url"],
+	&[type="week"] {
+		min-height: 2em;
+		line-height: 2;
+		border: 1px solid;
 	}
 }
 

From 4d11133bc739c8b7bb7cb85f59f3971c6f29d345 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 23 Nov 2022 14:33:33 +0200
Subject: [PATCH 053/133] Use a nonce to improve security

---
 packages/block-library/src/form/index.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index d0c0016940d4bf..d9aaafb724d029 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -55,10 +55,12 @@ function render_block_core_form( $attributes, $content, $block ) {
 	$processed_content->set_attribute( 'action', esc_attr( $action ) );
 	$processed_content->set_attribute( 'method', esc_attr( $method ) );
 
-	// Inject a hidden input with the block form-ID.
+	$nonce_field = wp_nonce_field( 'wp-block-form', '_wpnonce', true, false );
+
+	// Inject a hidden input with the nonce to strengthen security form-ID.
 	return str_replace(
 		'</form>',
-		'<input type="hidden" name="block-form-id" value="' . esc_attr( $form_id ) . '" /><form>',
+		$nonce_field . '</form>',
 		$processed_content->get_updated_html()
 	);
 }
@@ -85,16 +87,22 @@ function register_block_core_form() {
  * Then add your own action by creating a function and hooking it to the 'wp' action.
  */
 function submit_core_form_block() {
-	if ( ! isset( $_POST['block-form-id'] ) ) {
+
+	$has_valid_nonce = wp_verify_nonce( $_POST['_wpnonce'], 'wp-block-form' );
+	if ( ! $has_valid_nonce ) {
 		return;
 	}
+
+	$referer = wp_get_referer();
 	$content = sprintf(
 		/* translators: %s: The request URI. */
 		__( 'Form submission from %1$s', 'gutenberg' ) . '</br>',
-		esc_url( get_site_url() . $_SERVER['REQUEST_URI'] )
+		'<a href="' . esc_url( $referer ) . '">' . esc_url( $referer ) . '</a>'
 	);
+
+	$skip_fields = array( '_wpnonce', '_wp_http_referer' );
 	foreach ( $_POST as $key => $value ) {
-		if ( 'block-form-id' === $key ) {
+		if ( in_array( $key, $skip_fields, true ) ) {
 			continue;
 		}
 		$content .= $key . ': ' . $value . '</br>';

From bbfe6e98e02fc9b975833456c5938ade8bd399a5 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 24 Nov 2022 10:19:33 +0200
Subject: [PATCH 054/133] Check that the nonce exists before checking its
 validity.

---
 packages/block-library/src/form/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index d9aaafb724d029..8268ec54a1fdf3 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -88,7 +88,7 @@ function register_block_core_form() {
  */
 function submit_core_form_block() {
 
-	$has_valid_nonce = wp_verify_nonce( $_POST['_wpnonce'], 'wp-block-form' );
+	$has_valid_nonce = ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wp-block-form' );
 	if ( ! $has_valid_nonce ) {
 		return;
 	}

From dec8682d68180e2bfcc38b8d270ff0eda1885af3 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 29 Nov 2022 12:58:01 +0200
Subject: [PATCH 055/133] Use a new REST API endpoint for form submissions

---
 ...berg-rest-block-form-submit-controller.php | 111 ++++++++++++++++++
 packages/block-library/src/form/index.php     |  80 +------------
 2 files changed, 117 insertions(+), 74 deletions(-)
 create mode 100644 lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php

diff --git a/lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php b/lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php
new file mode 100644
index 00000000000000..ffa2ad17aed3f6
--- /dev/null
+++ b/lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * REST API: Gutenberg_REST_Block_Form_Submit_Controller class
+ *
+ * @package    WordPress
+ * @subpackage REST_API
+ * @since      6.2.0
+ */
+
+/**
+ * Core class used to submit forms (using the form block) via the REST API.
+ *
+ * @see   WP_REST_Controller
+ *
+ * @since 6.2.0
+ */
+class Gutenberg_REST_Block_Form_Submit_Controller extends WP_REST_Controller {
+
+	/**
+	 * The namespace of this controller's route.
+	 *
+	 * @since 6.2.0
+	 * @var string
+	 */
+	protected $namespace = 'wp/v2';
+
+	/**
+	 * The base of this controller's route.
+	 *
+	 * @since 6.2.0
+	 * @var string
+	 */
+	protected $rest_base = 'block-form-submit';
+
+	/**
+	 * Registers the routes for the objects of the controller.
+	 *
+	 * @see   register_rest_route()
+	 *
+	 * @since 6.2.0
+	 */
+	public function register_routes() {
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
+				array(
+					'methods'             => 'POST',
+					'callback'            => array( $this, 'form_submit' ),
+					'permission_callback' => array( $this, 'form_submit_permissions_check' ),
+				),
+			)
+		);
+	}
+
+	/**
+	 * Checks whether a given request has permission to read block patterns.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 *
+	 * @return WP_Error|bool True if the request has read access, WP_Error object otherwise.
+	 */
+	public function form_submit_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		return rest_cookie_check_errors( null );
+	}
+
+	/**
+	 * Retrieves all block pattern categories.
+	 *
+	 * @since 6.2.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 */
+	public function form_submit( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		$params = $request->get_params();
+
+		/**
+		 * Allow short-circuiting the form submission.
+		 *
+		 * @since 6.2.0
+		 *
+		 * @param array $params The form parameters.
+		 *
+		 * @return bool True if the form submission should be short-circuited, false otherwise.
+		 */
+		if ( apply_filters( 'gutenberg_form_submit_short_circuit', false, $params ) ) {
+			return;
+		}
+
+		$content = sprintf(
+			/* translators: %s: The request URI. */
+			__( 'Form submission from %1$s', 'gutenberg' ) . '</br>',
+			'<a href="' . esc_url( $params['_wp_http_referer'] ) . '">' . esc_url( $params['_wp_http_referer'] ) . '</a>'
+		);
+
+		$skip_fields = array( 'wp_rest', '_wp_http_referer' );
+		foreach ( $params as $key => $value ) {
+			if ( in_array( $key, $skip_fields, true ) ) {
+				continue;
+			}
+			$content .= $key . ': ' . $value . '</br>';
+		}
+
+		wp_mail( get_option( 'admin_email' ), __( 'Form submission', 'gutenberg' ), $content );
+
+		wp_safe_redirect( get_site_url( null, $params['_wp_http_referer'] ) );
+		exit;
+	}
+}
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 8268ec54a1fdf3..ce8b005f57dd98 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -8,54 +8,20 @@
 /**
  * Renders the `core/form` block on server.
  *
- * @param array    $attributes The block attributes.
- * @param string   $content The saved content.
- * @param WP_Block $block The parsed block.
+ * @param array  $attributes The block attributes.
+ * @param string $content The saved content.
  *
  * @return string The content of the block being rendered.
  */
-function render_block_core_form( $attributes, $content, $block ) {
-
-	// Build the form action attribute.
-	$action = empty( $attributes['action'] ) ? '' : $attributes['action'];
-	$action = empty( $action ) ? '#' : $action;
-
-	/**
-	 * Filters the form action attribute.
-	 *
-	 * @param string $action The form action attribute.
-	 * @param array  $attributes The block attributes.
-	 * @param string $content The saved content.
-	 * @param WP_Block $block The parsed block.
-	 *
-	 * @return string The form action attribute.
-	 */
-	$action = apply_filters( 'block_form_action', $action, $attributes, $content, $block );
-
-	// Build the form method attribute.
-	$method = empty( $attributes['method'] ) ? '' : $attributes['method'];
-	$method = empty( $method ) || ( 'get' !== strtolower( $method ) && 'post' !== strtolower( $method ) ) ? 'post' : $method;
-	/**
-	 * Filters the form method attribute.
-	 *
-	 * @param string $method The form method attribute.
-	 * @param array  $attributes The block attributes.
-	 * @param string $content The saved content.
-	 * @param WP_Block $block The parsed block.
-	 *
-	 * @return string The form method attribute.
-	 */
-	$method = apply_filters( 'block_form_method', $method, $attributes, $content, $block );
-
-	$form_id = empty( $attributes['formId'] ) ? md5( json_encode( array( $attributes, $block ) ) ) : $attributes['formId'];
+function render_block_core_form( $attributes, $content ) {
 
 	// Add the form action & method.
 	$processed_content = new WP_HTML_Tag_Processor( $content );
 	$processed_content->next_tag( 'form' );
-	$processed_content->set_attribute( 'action', esc_attr( $action ) );
-	$processed_content->set_attribute( 'method', esc_attr( $method ) );
+	$processed_content->set_attribute( 'action', esc_attr( rest_url( 'wp/v2/block-form-submit' ) ) );
+	$processed_content->set_attribute( 'method', 'post' );
 
-	$nonce_field = wp_nonce_field( 'wp-block-form', '_wpnonce', true, false );
+	$nonce_field = wp_nonce_field( 'wp-block-form', 'wp_rest', true, false );
 
 	// Inject a hidden input with the nonce to strengthen security form-ID.
 	return str_replace(
@@ -77,37 +43,3 @@ function register_block_core_form() {
 	);
 }
 add_action( 'init', 'register_block_core_form' );
-
-/**
- * Handles the form submission.
- *
- * This is the default action, which sends an email to the admin.
- * To override the default action, first remove the default action:
- * remove_action( 'wp', 'submit_core_form_block' );
- * Then add your own action by creating a function and hooking it to the 'wp' action.
- */
-function submit_core_form_block() {
-
-	$has_valid_nonce = ! empty( $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'wp-block-form' );
-	if ( ! $has_valid_nonce ) {
-		return;
-	}
-
-	$referer = wp_get_referer();
-	$content = sprintf(
-		/* translators: %s: The request URI. */
-		__( 'Form submission from %1$s', 'gutenberg' ) . '</br>',
-		'<a href="' . esc_url( $referer ) . '">' . esc_url( $referer ) . '</a>'
-	);
-
-	$skip_fields = array( '_wpnonce', '_wp_http_referer' );
-	foreach ( $_POST as $key => $value ) {
-		if ( in_array( $key, $skip_fields, true ) ) {
-			continue;
-		}
-		$content .= $key . ': ' . $value . '</br>';
-	}
-
-	wp_mail( get_option( 'admin_email' ), __( 'Form submission', 'gutenberg' ), $content );
-}
-add_action( 'wp', 'submit_core_form_block' );

From bb5b623094d45131ff90231bad3ffa0196f91dad Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 7 Dec 2022 09:49:49 +0200
Subject: [PATCH 056/133] Add support for link-colors

---
 packages/block-library/src/form/block.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index 7b2f9e87ebc9d0..c992540086fb47 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -29,7 +29,8 @@
 			"link": true,
 			"__experimentalDefaultControls": {
 				"background": true,
-				"text": true
+				"text": true,
+				"link": true
 			}
 		},
 		"spacing": {

From 9a18c9b072ffb7f01f8b74360b0a7d1fc8f518de Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 8 Dec 2022 11:04:20 +0200
Subject: [PATCH 057/133] Don't include rest_route in the email to be sent

---
 .../class-gutenberg-rest-block-form-submit-controller.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php b/lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php
index ffa2ad17aed3f6..33e4ae04357fc5 100644
--- a/lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php
+++ b/lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php
@@ -95,7 +95,7 @@ public function form_submit( $request ) { // phpcs:ignore VariableAnalysis.CodeA
 			'<a href="' . esc_url( $params['_wp_http_referer'] ) . '">' . esc_url( $params['_wp_http_referer'] ) . '</a>'
 		);
 
-		$skip_fields = array( 'wp_rest', '_wp_http_referer' );
+		$skip_fields = array( 'wp_rest', '_wp_http_referer', 'rest_route' );
 		foreach ( $params as $key => $value ) {
 			if ( in_array( $key, $skip_fields, true ) ) {
 				continue;

From 51b024391c4c93ea99e111238f7e281f1d5eebc4 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 20 Dec 2022 12:44:44 +0200
Subject: [PATCH 058/133] Add icons

---
 packages/block-library/src/form-input/block.json         | 1 +
 packages/block-library/src/form-input/variations.js      | 7 +++++++
 packages/block-library/src/form-submit-button/block.json | 1 +
 packages/block-library/src/form/block.json               | 1 +
 4 files changed, 10 insertions(+)

diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 0c14e370f86044..81387cc356b0b9 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -8,6 +8,7 @@
 	"description": "The basic building block for forms.",
 	"keywords": [ "input", "form" ],
 	"textdomain": "default",
+	"icon": "forms",
 	"attributes": {
 		"type": {
 			"type": "string",
diff --git a/packages/block-library/src/form-input/variations.js b/packages/block-library/src/form-input/variations.js
index 5165c21fb533ba..8014c2660d2927 100644
--- a/packages/block-library/src/form-input/variations.js
+++ b/packages/block-library/src/form-input/variations.js
@@ -7,6 +7,7 @@ const variations = [
 	{
 		name: 'text',
 		title: __( 'Text input' ),
+		icon: 'edit-page',
 		description: __( 'A generic text input.' ),
 		attributes: { type: 'text' },
 		isDefault: true,
@@ -17,6 +18,7 @@ const variations = [
 	{
 		name: 'textarea',
 		title: __( 'Textarea input' ),
+		icon: 'testimonial',
 		description: __(
 			'A textarea input to allow entering multiple lines of text.'
 		),
@@ -29,6 +31,7 @@ const variations = [
 		name: 'checkbox',
 		title: __( 'Checkbox input' ),
 		description: __( 'A simple checkbox input.' ),
+		icon: 'forms',
 		attributes: { type: 'checkbox' },
 		isDefault: true,
 		scope: [ 'inserter', 'transform' ],
@@ -37,6 +40,7 @@ const variations = [
 	{
 		name: 'email',
 		title: __( 'Email input' ),
+		icon: 'email',
 		description: __( 'Used for email addresses.' ),
 		attributes: { type: 'email' },
 		isDefault: true,
@@ -46,6 +50,7 @@ const variations = [
 	{
 		name: 'url',
 		title: __( 'URL input' ),
+		icon: 'admin-site',
 		description: __( 'Used for URLs.' ),
 		attributes: { type: 'url' },
 		isDefault: true,
@@ -55,6 +60,7 @@ const variations = [
 	{
 		name: 'tel',
 		title: __( 'Telephone input' ),
+		icon: 'phone',
 		description: __( 'Used for phone numbers.' ),
 		attributes: { type: 'tel' },
 		isDefault: true,
@@ -64,6 +70,7 @@ const variations = [
 	{
 		name: 'number',
 		title: __( 'Number input' ),
+		icon: 'edit-page',
 		description: __( 'A numeric input.' ),
 		attributes: { type: 'number' },
 		isDefault: true,
diff --git a/packages/block-library/src/form-submit-button/block.json b/packages/block-library/src/form-submit-button/block.json
index eae1334418057e..ea3f1389af0afe 100644
--- a/packages/block-library/src/form-submit-button/block.json
+++ b/packages/block-library/src/form-submit-button/block.json
@@ -4,6 +4,7 @@
 	"name": "core/form-submit-button",
 	"title": "Form submit button",
 	"category": "common",
+	"icon": "button",
 	"parent": [ "core/form" ],
 	"description": "A submission button for forms.",
 	"keywords": [ "submit", "button", "form" ],
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index c992540086fb47..012375d4ca8e54 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -7,6 +7,7 @@
 	"description": "A form.",
 	"keywords": [ "container", "wrapper", "row", "section" ],
 	"textdomain": "default",
+	"icon": "feedback",
 	"attributes": {
 		"action": {
 			"type": "string",

From 1ed94f1398ae311f13729e87755b5f276de7eba8 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 13 Jan 2023 11:11:21 +0200
Subject: [PATCH 059/133] fix alignment of checkboxes

---
 packages/block-library/src/form-input/style.scss | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index 2c1393459a82f8..3c4c87d40379e8 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -9,6 +9,18 @@
 		gap: 0.5em;
 		align-items: center;
 	}
+
+	/*
+	Small tweak to left-align the checkbox.
+	Even though `:has` is not currently supported in Firefox, this is a small tweak
+	and does not affect the functionality of the block or the user's experience.
+	There will be a minor inconsistency between browsers. However, it's more important to provide
+	a better experience for 80+% of users, until Firefor catches up and supports `:has`.
+	*/
+	&:has(input[type="checkbox"]) {
+		width: fit-content;
+		flex-direction: row-reverse;
+	}
 }
 
 .wp-block-form-input__label-content {

From 2134093a59a59b4b498f88119f73a789e7ddb676 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 13 Jan 2023 11:47:48 +0200
Subject: [PATCH 060/133] Remove color options from fields

---
 docs/reference-guides/core-blocks.md             | 2 +-
 packages/block-library/src/form-input/block.json | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 92836a2841b46f..33135c36d832b1 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -292,7 +292,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 
 -	**Name:** core/form-input
 -	**Category:** common
--	**Supports:** anchor, color (background, gradients, text), ~~reusable~~
+-	**Supports:** anchor, ~~reusable~~
 -	**Attributes:** inlineLabel, label, name, placeholder, required, type
 
 ## Form submit button
diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 81387cc356b0b9..c92925eed1397a 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -45,14 +45,6 @@
 	},
 	"supports": {
 		"anchor": true,
-		"color": {
-			"__experimentalSkipSerialization": true,
-			"gradients": true,
-			"__experimentalDefaultControls": {
-				"background": true,
-				"text": true
-			}
-		},
 		"reusable": false,
 		"__experimentalBorder": {
 			"radius": true,

From 92b0dfc0a5d20ac18b69f170e084d945379460e6 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 13 Jan 2023 12:47:45 +0200
Subject: [PATCH 061/133] Add margins support to inputs + default margin-bottom

---
 docs/reference-guides/core-blocks.md                     | 2 +-
 packages/block-library/src/form-input/block.json         | 3 +++
 packages/block-library/src/form-input/style.scss         | 1 +
 packages/block-library/src/form-submit-button/block.json | 3 ++-
 packages/block-library/src/form-submit-button/style.scss | 3 +++
 5 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 packages/block-library/src/form-submit-button/style.scss

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 33135c36d832b1..a69b38614c8d30 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -292,7 +292,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 
 -	**Name:** core/form-input
 -	**Category:** common
--	**Supports:** anchor, ~~reusable~~
+-	**Supports:** anchor, spacing (margin), ~~reusable~~
 -	**Attributes:** inlineLabel, label, name, placeholder, required, type
 
 ## Form submit button
diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index c92925eed1397a..c08ebe6c6fde42 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -46,6 +46,9 @@
 	"supports": {
 		"anchor": true,
 		"reusable": false,
+		"spacing": {
+			"margin": [ "top", "bottom" ]
+		},
 		"__experimentalBorder": {
 			"radius": true,
 			"__experimentalSkipSerialization": true,
diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index 3c4c87d40379e8..e9396f77900cb4 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -3,6 +3,7 @@
 	display: flex;
 	flex-direction: column;
 	gap: 0.25em;
+	margin-bottom: 0.5em;
 
 	&.is-label-inline {
 		flex-direction: row;
diff --git a/packages/block-library/src/form-submit-button/block.json b/packages/block-library/src/form-submit-button/block.json
index ea3f1389af0afe..8c53ff4d0ac69c 100644
--- a/packages/block-library/src/form-submit-button/block.json
+++ b/packages/block-library/src/form-submit-button/block.json
@@ -12,5 +12,6 @@
 	"supports": {
 		"lock": false,
 		"multiple": false
-	}
+	},
+	"style": [ "wp-block-form-submit-button" ]
 }
diff --git a/packages/block-library/src/form-submit-button/style.scss b/packages/block-library/src/form-submit-button/style.scss
new file mode 100644
index 00000000000000..400016b1618d47
--- /dev/null
+++ b/packages/block-library/src/form-submit-button/style.scss
@@ -0,0 +1,3 @@
+.wp-block-form-submit-wrapper {
+	margin-bottom: 0.5em;
+}

From 0fbaa3a02641dc970aa873871c0a0bdcd45615d3 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 16 Jan 2023 10:15:43 +0200
Subject: [PATCH 062/133] Fix the name attribute generated from labels

---
 packages/block-library/src/form-input/save.js | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index 2d2263c58da893..5dc104fec0f69a 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -2,6 +2,7 @@
  * External dependencies
  */
 import classNames from 'classnames';
+import removeAccents from 'remove-accents';
 
 /**
  * WordPress dependencies
@@ -12,6 +13,28 @@ import {
 	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
 } from '@wordpress/block-editor';
 
+/**
+ * Get the name attribute from a content string.
+ *
+ * @param {string} content The block content.
+ *
+ * @return {string} Returns the slug.
+ */
+const getNameFromLabel = ( content ) => {
+	const dummyElement = document.createElement( 'div' );
+	dummyElement.innerHTML = content;
+	// Get the slug.
+	return (
+		removeAccents( dummyElement.innerText )
+			// Convert anything that's not a letter or number to a hyphen.
+			.replace( /[^\p{L}\p{N}]+/gu, '-' )
+			// Convert to lowercase
+			.toLowerCase()
+			// Remove any remaining leading or trailing hyphens.
+			.replace( /(^-+)|(-+$)/g, '' )
+	);
+};
+
 export default function save( { attributes } ) {
 	const { type, name, label, inlineLabel, required, placeholder } =
 		attributes;
@@ -44,7 +67,7 @@ export default function save( { attributes } ) {
 			<TagName
 				className={ inputClasses }
 				type={ type }
-				name={ name || label }
+				name={ name || getNameFromLabel( label ) }
 				required={ required }
 				aria-required={ required }
 				placeholder={ placeholder || undefined }

From 10632be1793609d5d1434d40400e033661f1e252 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 15 Feb 2023 12:44:55 +0200
Subject: [PATCH 063/133] Move form-submissions class to the experimental
 folder

---
 ...s-gutenberg-rest-block-form-submit-controller.php | 12 ------------
 lib/load.php                                         |  2 ++
 2 files changed, 2 insertions(+), 12 deletions(-)
 rename lib/{compat/wordpress-6.2 => experimental}/class-gutenberg-rest-block-form-submit-controller.php (95%)

diff --git a/lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
similarity index 95%
rename from lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php
rename to lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
index 33e4ae04357fc5..ee21a319a0ea69 100644
--- a/lib/compat/wordpress-6.2/class-gutenberg-rest-block-form-submit-controller.php
+++ b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
@@ -11,15 +11,12 @@
  * Core class used to submit forms (using the form block) via the REST API.
  *
  * @see   WP_REST_Controller
- *
- * @since 6.2.0
  */
 class Gutenberg_REST_Block_Form_Submit_Controller extends WP_REST_Controller {
 
 	/**
 	 * The namespace of this controller's route.
 	 *
-	 * @since 6.2.0
 	 * @var string
 	 */
 	protected $namespace = 'wp/v2';
@@ -27,7 +24,6 @@ class Gutenberg_REST_Block_Form_Submit_Controller extends WP_REST_Controller {
 	/**
 	 * The base of this controller's route.
 	 *
-	 * @since 6.2.0
 	 * @var string
 	 */
 	protected $rest_base = 'block-form-submit';
@@ -36,8 +32,6 @@ class Gutenberg_REST_Block_Form_Submit_Controller extends WP_REST_Controller {
 	 * Registers the routes for the objects of the controller.
 	 *
 	 * @see   register_rest_route()
-	 *
-	 * @since 6.2.0
 	 */
 	public function register_routes() {
 		register_rest_route(
@@ -56,8 +50,6 @@ public function register_routes() {
 	/**
 	 * Checks whether a given request has permission to read block patterns.
 	 *
-	 * @since 6.2.0
-	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 *
 	 * @return WP_Error|bool True if the request has read access, WP_Error object otherwise.
@@ -69,8 +61,6 @@ public function form_submit_permissions_check( $request ) { // phpcs:ignore Vari
 	/**
 	 * Retrieves all block pattern categories.
 	 *
-	 * @since 6.2.0
-	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 */
 	public function form_submit( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
@@ -79,8 +69,6 @@ public function form_submit( $request ) { // phpcs:ignore VariableAnalysis.CodeA
 		/**
 		 * Allow short-circuiting the form submission.
 		 *
-		 * @since 6.2.0
-		 *
 		 * @param array $params The form parameters.
 		 *
 		 * @return bool True if the form submission should be short-circuited, false otherwise.
diff --git a/lib/load.php b/lib/load.php
index d87c53081903ea..69d43a38775cde 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -66,6 +66,8 @@ function gutenberg_is_experiment_enabled( $name ) {
 	}
 	require_once __DIR__ . '/experimental/class-gutenberg-rest-template-revision-count.php';
 	require_once __DIR__ . '/experimental/rest-api.php';
+
+	require_once __DIR__ . '/experimental/class-gutenberg-rest-block-form-submit-controller.php';
 }
 
 require __DIR__ . '/experimental/editor-settings.php';

From 7e907cdf66aa309b4f97afff9e1c3c6251b37a9a Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 17 Feb 2023 08:47:09 +0200
Subject: [PATCH 064/133] Add a filter for wp_kses_allowed_html

---
 .../wordpress-6.3/kses-allowed-html.php       | 39 +++++++++++++++++++
 lib/load.php                                  |  1 +
 2 files changed, 40 insertions(+)
 create mode 100644 lib/compat/wordpress-6.3/kses-allowed-html.php

diff --git a/lib/compat/wordpress-6.3/kses-allowed-html.php b/lib/compat/wordpress-6.3/kses-allowed-html.php
new file mode 100644
index 00000000000000..425101ac4ed3eb
--- /dev/null
+++ b/lib/compat/wordpress-6.3/kses-allowed-html.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Modifies the wp_kses_allowed_html array.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Add the form elements to the allowed tags array.
+ *
+ * @param array $allowedtags The allowed tags.
+ *
+ * @return array The allowed tags.
+ */
+function gutenberg_kses_allowed_html( $allowedtags ) {
+	$allowedtags['input'] = array(
+		'type'          => array(),
+		'name'          => array(),
+		'value'         => array(),
+		'checked'       => array(),
+		'required'      => array(),
+		'aria-required' => array(),
+		'class'         => array(),
+	);
+
+	$allowedtags['label'] = array(
+		'for'   => array(),
+		'class' => array(),
+	);
+
+	$allowedtags['textarea'] = array(
+		'name'          => array(),
+		'required'      => array(),
+		'aria-required' => array(),
+		'class'         => array(),
+	);
+	return $allowedtags;
+}
+add_filter( 'wp_kses_allowed_html', 'gutenberg_kses_allowed_html', 10, 2 );
diff --git a/lib/load.php b/lib/load.php
index 69d43a38775cde..4e74a6cd801d6f 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -49,6 +49,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require_once __DIR__ . '/compat/wordpress-6.3/block-patterns.php';
 	require_once __DIR__ . '/compat/wordpress-6.3/class-gutenberg-rest-blocks-controller.php';
 	require_once __DIR__ . '/compat/wordpress-6.3/footnotes.php';
+	require_once __DIR__ . '/compat/wordpress-6.3/kses-allowed-html.php';
 
 	// WordPress 6.4 compat.
 	require_once __DIR__ . '/compat/wordpress-6.4/class-gutenberg-rest-global-styles-revisions-controller-6-4.php';

From d3fee698baadd4767137686591359adf5444ac83 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 17 Feb 2023 09:49:13 +0200
Subject: [PATCH 065/133] Move rest-api registration to 6.3

---
 lib/compat/wordpress-6.3/rest-api.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/compat/wordpress-6.3/rest-api.php b/lib/compat/wordpress-6.3/rest-api.php
index fc0c295bdaaf83..50c74422e10832 100644
--- a/lib/compat/wordpress-6.3/rest-api.php
+++ b/lib/compat/wordpress-6.3/rest-api.php
@@ -5,6 +5,24 @@
  * @package gutenberg
  */
 
+/**
+ * Registers the block pattern directory.
+ */
+function gutenberg_register_rest_pattern_directory() {
+	$pattern_directory_controller = new Gutenberg_REST_Pattern_Directory_Controller_6_3();
+	$pattern_directory_controller->register_routes();
+}
+add_action( 'rest_api_init', 'gutenberg_register_rest_pattern_directory' );
+
+/**
+ * Registers the form-submit REST API controller.
+ */
+function gutenberg_register_rest_form_submit() {
+	$form_submit_controller = new Gutenberg_REST_Block_Form_Submit_Controller();
+	$form_submit_controller->register_routes();
+}
+add_action( 'rest_api_init', 'gutenberg_register_rest_form_submit' );
+
 /**
  * Updates `wp_template` and `wp_template_part` post types to use
  * Gutenberg's REST controllers

From a534371884a3cc57125eebac66feda6a40df0331 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 23 Feb 2023 13:35:13 +0200
Subject: [PATCH 066/133] change since to 6.3.0

---
 .../class-gutenberg-rest-block-form-submit-controller.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
index ee21a319a0ea69..4a17374eb91c99 100644
--- a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
+++ b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
@@ -4,7 +4,7 @@
  *
  * @package    WordPress
  * @subpackage REST_API
- * @since      6.2.0
+ * @since      6.3.0
  */
 
 /**

From 65aa09da36958e923791e0c8743d8ef137003d50 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 2 Mar 2023 16:08:10 +0200
Subject: [PATCH 067/133] Fix method comment

---
 .../class-gutenberg-rest-block-form-submit-controller.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
index 4a17374eb91c99..ef0745eecd7f17 100644
--- a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
+++ b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
@@ -59,7 +59,7 @@ public function form_submit_permissions_check( $request ) { // phpcs:ignore Vari
 	}
 
 	/**
-	 * Retrieves all block pattern categories.
+	 * Process the form submission.
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 */

From a66a8c499e5ff68c2f18bba4ce0825c68f12a311 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 3 Mar 2023 09:06:06 +0200
Subject: [PATCH 068/133] Remove restriction (1 per page) in form-submit-button

---
 docs/reference-guides/core-blocks.md                     | 2 +-
 packages/block-library/src/form-submit-button/block.json | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index a69b38614c8d30..15656913217b21 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -301,7 +301,7 @@ A submission button for forms. ([Source](https://github.com/WordPress/gutenberg/
 
 -	**Name:** core/form-submit-button
 -	**Category:** common
--	**Supports:** ~~lock~~, ~~multiple~~
+-	**Supports:** 
 -	**Attributes:** 
 
 ## Classic
diff --git a/packages/block-library/src/form-submit-button/block.json b/packages/block-library/src/form-submit-button/block.json
index 8c53ff4d0ac69c..faa938e9bbc244 100644
--- a/packages/block-library/src/form-submit-button/block.json
+++ b/packages/block-library/src/form-submit-button/block.json
@@ -9,9 +9,5 @@
 	"description": "A submission button for forms.",
 	"keywords": [ "submit", "button", "form" ],
 	"textdomain": "default",
-	"supports": {
-		"lock": false,
-		"multiple": false
-	},
 	"style": [ "wp-block-form-submit-button" ]
 }

From fc6a8e414a971bc347aee9ce958a6211292d4ff2 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 9 May 2023 11:33:28 +0300
Subject: [PATCH 069/133] Add a bottom margin so that the appender can appear

---
 packages/block-library/src/form-input/style.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index e9396f77900cb4..a9e516d39daf8f 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -31,6 +31,7 @@
 .wp-block-form-input__input {
 	padding: 0 0.5em;
 	font-size: 1em;
+	margin-bottom: 0.25em;
 
 	&[type="text"],
 	&[type="password"],

From 030f90ee183e64f3673b000b6e0535f39b17a33e Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 9 May 2023 11:35:18 +0300
Subject: [PATCH 070/133] Remove "Website" from default template

---
 packages/block-library/src/form/edit.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 73a03d078c3380..d2060ffd6e66ca 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -38,13 +38,6 @@ const TEMPLATE = [
 			required: true,
 		},
 	],
-	[
-		'core/form-input',
-		{
-			type: 'url',
-			label: __( 'Website' ),
-		},
-	],
 	[
 		'core/form-input',
 		{

From c6e57bca13fe8982c007ba591371797b7e13823a Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 6 Jun 2023 17:48:21 +0300
Subject: [PATCH 071/133] update the docs

---
 docs/reference-guides/core-blocks.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 15656913217b21..68aeb1856e1536 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -292,6 +292,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 
 -	**Name:** core/form-input
 -	**Category:** common
+-	**Parent:** core/form
 -	**Supports:** anchor, spacing (margin), ~~reusable~~
 -	**Attributes:** inlineLabel, label, name, placeholder, required, type
 
@@ -301,6 +302,7 @@ A submission button for forms. ([Source](https://github.com/WordPress/gutenberg/
 
 -	**Name:** core/form-submit-button
 -	**Category:** common
+-	**Parent:** core/form
 -	**Supports:** 
 -	**Attributes:** 
 

From 98785ddc8b43342bcb19136a9d8c348d503d2efb Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 19 Jun 2023 10:17:29 +0300
Subject: [PATCH 072/133] Update
 packages/block-library/src/form-input/style.scss

Co-authored-by: Carolina Nymark <myazalea@hotmail.com>
---
 packages/block-library/src/form-input/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index a9e516d39daf8f..35d8a37767a1d8 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -16,7 +16,7 @@
 	Even though `:has` is not currently supported in Firefox, this is a small tweak
 	and does not affect the functionality of the block or the user's experience.
 	There will be a minor inconsistency between browsers. However, it's more important to provide
-	a better experience for 80+% of users, until Firefor catches up and supports `:has`.
+	a better experience for 80+% of users, until Firefox catches up and supports `:has`.
 	*/
 	&:has(input[type="checkbox"]) {
 		width: fit-content;

From 41752733a719c271eb8193be9dffb1d1f6b39dc0 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 19 Jun 2023 10:46:26 +0300
Subject: [PATCH 073/133] Move to experimental

---
 lib/compat/wordpress-6.3/rest-api.php          | 18 ------------------
 .../kses-allowed-html.php                      |  0
 lib/experimental/rest-api.php                  |  8 ++++++++
 lib/load.php                                   |  1 +
 4 files changed, 9 insertions(+), 18 deletions(-)
 rename lib/{compat/wordpress-6.3 => experimental}/kses-allowed-html.php (100%)

diff --git a/lib/compat/wordpress-6.3/rest-api.php b/lib/compat/wordpress-6.3/rest-api.php
index 50c74422e10832..fc0c295bdaaf83 100644
--- a/lib/compat/wordpress-6.3/rest-api.php
+++ b/lib/compat/wordpress-6.3/rest-api.php
@@ -5,24 +5,6 @@
  * @package gutenberg
  */
 
-/**
- * Registers the block pattern directory.
- */
-function gutenberg_register_rest_pattern_directory() {
-	$pattern_directory_controller = new Gutenberg_REST_Pattern_Directory_Controller_6_3();
-	$pattern_directory_controller->register_routes();
-}
-add_action( 'rest_api_init', 'gutenberg_register_rest_pattern_directory' );
-
-/**
- * Registers the form-submit REST API controller.
- */
-function gutenberg_register_rest_form_submit() {
-	$form_submit_controller = new Gutenberg_REST_Block_Form_Submit_Controller();
-	$form_submit_controller->register_routes();
-}
-add_action( 'rest_api_init', 'gutenberg_register_rest_form_submit' );
-
 /**
  * Updates `wp_template` and `wp_template_part` post types to use
  * Gutenberg's REST controllers
diff --git a/lib/compat/wordpress-6.3/kses-allowed-html.php b/lib/experimental/kses-allowed-html.php
similarity index 100%
rename from lib/compat/wordpress-6.3/kses-allowed-html.php
rename to lib/experimental/kses-allowed-html.php
diff --git a/lib/experimental/rest-api.php b/lib/experimental/rest-api.php
index 7c6a9bf74d7395..aeb135d25fcd5d 100644
--- a/lib/experimental/rest-api.php
+++ b/lib/experimental/rest-api.php
@@ -28,6 +28,14 @@ function gutenberg_register_block_editor_settings() {
 }
 add_action( 'rest_api_init', 'gutenberg_register_block_editor_settings' );
 
+/**
+ * Registers the form-submit REST API controller.
+ */
+function gutenberg_register_rest_form_submit() {
+	$form_submit_controller = new Gutenberg_REST_Block_Form_Submit_Controller();
+	$form_submit_controller->register_routes();
+}
+add_action( 'rest_api_init', 'gutenberg_register_rest_form_submit' );
 
 /**
  * Shim for get_sample_permalink() to add support for auto-draft status.
diff --git a/lib/load.php b/lib/load.php
index 4e74a6cd801d6f..2a3e3fdabd5a50 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -69,6 +69,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require_once __DIR__ . '/experimental/rest-api.php';
 
 	require_once __DIR__ . '/experimental/class-gutenberg-rest-block-form-submit-controller.php';
+	require_once __DIR__ . '/experimental/kses-allowed-html.php';
 }
 
 require __DIR__ . '/experimental/editor-settings.php';

From ed2174f040282986ef9a2ce84fc810f435221d42 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 20 Jun 2023 10:26:40 +0300
Subject: [PATCH 074/133] Remove default values from block.json

---
 packages/block-library/src/form/block.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index 012375d4ca8e54..dfc0dce4ef47e4 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -10,12 +10,10 @@
 	"icon": "feedback",
 	"attributes": {
 		"action": {
-			"type": "string",
-			"default": "#"
+			"type": "string"
 		},
 		"method": {
-			"type": "string",
-			"default": "post"
+			"type": "string"
 		},
 		"formId": {
 			"type": "string",

From 44462ff1193b99c93a11fcfcc4c603dfb6ec56c6 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 20 Jun 2023 10:27:04 +0300
Subject: [PATCH 075/133] Tweak for comment-forms

---
 packages/block-library/src/form/index.php | 30 +++++++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index ce8b005f57dd98..c6242a2636b9d9 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -15,18 +15,38 @@
  */
 function render_block_core_form( $attributes, $content ) {
 
-	// Add the form action & method.
+	/**
+	 * Adds the action to the <form> element.
+	 *
+	 * - If no action is specified, the default is the REST API endpoint.
+	 * - If the action is `/wp-comments-post.php`, the form is a comment form.
+	 * - If the action is anything else, it is a custom form.
+	 */
 	$processed_content = new WP_HTML_Tag_Processor( $content );
 	$processed_content->next_tag( 'form' );
-	$processed_content->set_attribute( 'action', esc_attr( rest_url( 'wp/v2/block-form-submit' ) ) );
-	$processed_content->set_attribute( 'method', 'post' );
+	if ( empty( $attributes['action'] ) ) { // Default to the REST API endpoint.
+		$processed_content->set_attribute( 'action', esc_attr( rest_url( 'wp/v2/block-form-submit' ) ) );
+	} elseif ( '/wp-comments-post.php' === $attributes['action'] ) { // Comments.
+		$processed_content->set_attribute( 'action', esc_url( site_url( '/wp-comments-post.php' ) ) );
+	} else { // Custom.
+		$processed_content->set_attribute( 'action', esc_attr( $attributes['action'] ) );
+	}
 
-	$nonce_field = wp_nonce_field( 'wp-block-form', 'wp_rest', true, false );
+	// Add the method attribute. If it is not set, default to `post`.
+	$attributes['method'] = empty( $attributes['method'] ) ? 'post' : $attributes['method'];
+	$processed_content->set_attribute( 'method', $attributes['method'] );
+
+	$extra_fields = wp_nonce_field( 'wp-block-form', 'wp_rest', true, false );
+
+	// If the form is a comment form, add the post ID.
+	if ( '/wp-comments-post.php' === $attributes['action'] ) {
+		$extra_fields .= '<input type="hidden" name="comment_post_ID" value="' . get_the_ID() . '" id="comment_post_ID">';
+	}
 
 	// Inject a hidden input with the nonce to strengthen security form-ID.
 	return str_replace(
 		'</form>',
-		$nonce_field . '</form>',
+		$extra_fields . '</form>',
 		$processed_content->get_updated_html()
 	);
 }

From b40793e1c1a410cc6405d15294048fa866801b14 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 20 Jun 2023 10:44:24 +0300
Subject: [PATCH 076/133] fix rebase conflict

---
 lib/load.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/load.php b/lib/load.php
index 2a3e3fdabd5a50..dd8c11996b42cc 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -49,7 +49,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require_once __DIR__ . '/compat/wordpress-6.3/block-patterns.php';
 	require_once __DIR__ . '/compat/wordpress-6.3/class-gutenberg-rest-blocks-controller.php';
 	require_once __DIR__ . '/compat/wordpress-6.3/footnotes.php';
-	require_once __DIR__ . '/compat/wordpress-6.3/kses-allowed-html.php';
 
 	// WordPress 6.4 compat.
 	require_once __DIR__ . '/compat/wordpress-6.4/class-gutenberg-rest-global-styles-revisions-controller-6-4.php';

From 6c93881b2262380aa2c71c02d159276aa66ffc4c Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 20 Jun 2023 11:53:41 +0300
Subject: [PATCH 077/133] Use the sitename

---
 .../class-gutenberg-rest-block-form-submit-controller.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
index ef0745eecd7f17..b6df71dad9a5a0 100644
--- a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
+++ b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
@@ -80,7 +80,7 @@ public function form_submit( $request ) { // phpcs:ignore VariableAnalysis.CodeA
 		$content = sprintf(
 			/* translators: %s: The request URI. */
 			__( 'Form submission from %1$s', 'gutenberg' ) . '</br>',
-			'<a href="' . esc_url( $params['_wp_http_referer'] ) . '">' . esc_url( $params['_wp_http_referer'] ) . '</a>'
+			'<a href="' . esc_url( $params['_wp_http_referer'] ) . '">' . get_bloginfo( 'name' ) . '</a>'
 		);
 
 		$skip_fields = array( 'wp_rest', '_wp_http_referer', 'rest_route' );

From cf32b388361b96e36d9abe23280f3ef26fa5bda4 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 20 Jun 2023 11:57:43 +0300
Subject: [PATCH 078/133] Fix URL

---
 .../class-gutenberg-rest-block-form-submit-controller.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
index b6df71dad9a5a0..a112e5d47a711e 100644
--- a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
+++ b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
@@ -80,7 +80,7 @@ public function form_submit( $request ) { // phpcs:ignore VariableAnalysis.CodeA
 		$content = sprintf(
 			/* translators: %s: The request URI. */
 			__( 'Form submission from %1$s', 'gutenberg' ) . '</br>',
-			'<a href="' . esc_url( $params['_wp_http_referer'] ) . '">' . get_bloginfo( 'name' ) . '</a>'
+			'<a href="' . esc_url( get_site_url( null, $params['_wp_http_referer'] ) ) . '">' . get_bloginfo( 'name' ) . '</a>'
 		);
 
 		$skip_fields = array( 'wp_rest', '_wp_http_referer', 'rest_route' );

From 8cf086ea2c704fa280ad65a4d94d45a5e3ec9096 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 10 Jul 2023 11:11:42 +0300
Subject: [PATCH 079/133] Add advanced options to the form

---
 packages/block-library/src/form/edit.js | 31 +++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index d2060ffd6e66ca..60cafcf394da4b 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -9,7 +9,7 @@ import {
 	InspectorControls,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { PanelBody, TextControl } from '@wordpress/components';
+import { PanelBody, TextControl, SelectControl } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 
 const ALLOWED_BLOCKS = [
@@ -50,7 +50,7 @@ const TEMPLATE = [
 ];
 
 const Edit = ( { attributes, setAttributes, clientId } ) => {
-	const { formId } = attributes;
+	const { formId, action, method } = attributes;
 	const blockProps = useBlockProps();
 
 	const { hasInnerBlocks } = useSelect(
@@ -91,6 +91,33 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 					/>
 				</PanelBody>
 			</InspectorControls>
+			<InspectorControls group="advanced">
+				<TextControl
+					__nextHasNoMarginBottom
+					autoComplete="off"
+					label={ __( 'Form action' ) }
+					value={ action }
+					onChange={ ( newVal ) => {
+						setAttributes( {
+							action: newVal,
+						} );
+					} }
+					help={ __( 'Define where the form should be submitted.' ) }
+				/>
+				<SelectControl
+					__nextHasNoMarginBottom
+					label={ __( 'Form method' ) }
+					options={ [
+						{ label: 'Get', value: 'get' },
+						{ label: __( 'Post' ), value: 'post' },
+					] }
+					value={ method }
+					onChange={ ( value ) => setAttributes( { method: value } ) }
+					help={ __(
+						'Whether the form will submit a POST or GET request.'
+					) }
+				/>
+			</InspectorControls>
 			<form { ...innerBlocksProps } />
 		</>
 	);

From 3a90982264c0f8fea232fb5c98f435a98f632e86 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 10 Jul 2023 11:12:18 +0300
Subject: [PATCH 080/133] Remove REST-API endpoint & use the advanced fields

---
 ...berg-rest-block-form-submit-controller.php | 99 -------------------
 lib/experimental/rest-api.php                 |  9 --
 lib/load.php                                  |  1 -
 packages/block-library/src/form/index.php     | 47 +++++----
 4 files changed, 27 insertions(+), 129 deletions(-)
 delete mode 100644 lib/experimental/class-gutenberg-rest-block-form-submit-controller.php

diff --git a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php b/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
deleted file mode 100644
index a112e5d47a711e..00000000000000
--- a/lib/experimental/class-gutenberg-rest-block-form-submit-controller.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * REST API: Gutenberg_REST_Block_Form_Submit_Controller class
- *
- * @package    WordPress
- * @subpackage REST_API
- * @since      6.3.0
- */
-
-/**
- * Core class used to submit forms (using the form block) via the REST API.
- *
- * @see   WP_REST_Controller
- */
-class Gutenberg_REST_Block_Form_Submit_Controller extends WP_REST_Controller {
-
-	/**
-	 * The namespace of this controller's route.
-	 *
-	 * @var string
-	 */
-	protected $namespace = 'wp/v2';
-
-	/**
-	 * The base of this controller's route.
-	 *
-	 * @var string
-	 */
-	protected $rest_base = 'block-form-submit';
-
-	/**
-	 * Registers the routes for the objects of the controller.
-	 *
-	 * @see   register_rest_route()
-	 */
-	public function register_routes() {
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base,
-			array(
-				array(
-					'methods'             => 'POST',
-					'callback'            => array( $this, 'form_submit' ),
-					'permission_callback' => array( $this, 'form_submit_permissions_check' ),
-				),
-			)
-		);
-	}
-
-	/**
-	 * Checks whether a given request has permission to read block patterns.
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 *
-	 * @return WP_Error|bool True if the request has read access, WP_Error object otherwise.
-	 */
-	public function form_submit_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		return rest_cookie_check_errors( null );
-	}
-
-	/**
-	 * Process the form submission.
-	 *
-	 * @param WP_REST_Request $request Full details about the request.
-	 */
-	public function form_submit( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		$params = $request->get_params();
-
-		/**
-		 * Allow short-circuiting the form submission.
-		 *
-		 * @param array $params The form parameters.
-		 *
-		 * @return bool True if the form submission should be short-circuited, false otherwise.
-		 */
-		if ( apply_filters( 'gutenberg_form_submit_short_circuit', false, $params ) ) {
-			return;
-		}
-
-		$content = sprintf(
-			/* translators: %s: The request URI. */
-			__( 'Form submission from %1$s', 'gutenberg' ) . '</br>',
-			'<a href="' . esc_url( get_site_url( null, $params['_wp_http_referer'] ) ) . '">' . get_bloginfo( 'name' ) . '</a>'
-		);
-
-		$skip_fields = array( 'wp_rest', '_wp_http_referer', 'rest_route' );
-		foreach ( $params as $key => $value ) {
-			if ( in_array( $key, $skip_fields, true ) ) {
-				continue;
-			}
-			$content .= $key . ': ' . $value . '</br>';
-		}
-
-		wp_mail( get_option( 'admin_email' ), __( 'Form submission', 'gutenberg' ), $content );
-
-		wp_safe_redirect( get_site_url( null, $params['_wp_http_referer'] ) );
-		exit;
-	}
-}
diff --git a/lib/experimental/rest-api.php b/lib/experimental/rest-api.php
index aeb135d25fcd5d..bcc441c8b43824 100644
--- a/lib/experimental/rest-api.php
+++ b/lib/experimental/rest-api.php
@@ -28,15 +28,6 @@ function gutenberg_register_block_editor_settings() {
 }
 add_action( 'rest_api_init', 'gutenberg_register_block_editor_settings' );
 
-/**
- * Registers the form-submit REST API controller.
- */
-function gutenberg_register_rest_form_submit() {
-	$form_submit_controller = new Gutenberg_REST_Block_Form_Submit_Controller();
-	$form_submit_controller->register_routes();
-}
-add_action( 'rest_api_init', 'gutenberg_register_rest_form_submit' );
-
 /**
  * Shim for get_sample_permalink() to add support for auto-draft status.
  *
diff --git a/lib/load.php b/lib/load.php
index dd8c11996b42cc..a3a61407764b5c 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -67,7 +67,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require_once __DIR__ . '/experimental/class-gutenberg-rest-template-revision-count.php';
 	require_once __DIR__ . '/experimental/rest-api.php';
 
-	require_once __DIR__ . '/experimental/class-gutenberg-rest-block-form-submit-controller.php';
 	require_once __DIR__ . '/experimental/kses-allowed-html.php';
 }
 
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index c6242a2636b9d9..91ce12be6f561b 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -15,35 +15,23 @@
  */
 function render_block_core_form( $attributes, $content ) {
 
-	/**
-	 * Adds the action to the <form> element.
-	 *
-	 * - If no action is specified, the default is the REST API endpoint.
-	 * - If the action is `/wp-comments-post.php`, the form is a comment form.
-	 * - If the action is anything else, it is a custom form.
-	 */
 	$processed_content = new WP_HTML_Tag_Processor( $content );
 	$processed_content->next_tag( 'form' );
-	if ( empty( $attributes['action'] ) ) { // Default to the REST API endpoint.
-		$processed_content->set_attribute( 'action', esc_attr( rest_url( 'wp/v2/block-form-submit' ) ) );
-	} elseif ( '/wp-comments-post.php' === $attributes['action'] ) { // Comments.
-		$processed_content->set_attribute( 'action', esc_url( site_url( '/wp-comments-post.php' ) ) );
-	} else { // Custom.
-		$processed_content->set_attribute( 'action', esc_attr( $attributes['action'] ) );
+
+	// Get the action for this form.
+	$action = '';
+	if ( isset( $attributes['action'] ) ) {
+		$action = str_replace( '{SITE_URL}', site_url(), $attributes['action'] );
 	}
 
+	$processed_content->set_attribute( 'action', esc_attr( $action ) );
+
 	// Add the method attribute. If it is not set, default to `post`.
 	$attributes['method'] = empty( $attributes['method'] ) ? 'post' : $attributes['method'];
 	$processed_content->set_attribute( 'method', $attributes['method'] );
 
-	$extra_fields = wp_nonce_field( 'wp-block-form', 'wp_rest', true, false );
+	$extra_fields = apply_filters( 'render_block_core_form_extra_fields', '', $attributes );
 
-	// If the form is a comment form, add the post ID.
-	if ( '/wp-comments-post.php' === $attributes['action'] ) {
-		$extra_fields .= '<input type="hidden" name="comment_post_ID" value="' . get_the_ID() . '" id="comment_post_ID">';
-	}
-
-	// Inject a hidden input with the nonce to strengthen security form-ID.
 	return str_replace(
 		'</form>',
 		$extra_fields . '</form>',
@@ -51,6 +39,25 @@ function render_block_core_form( $attributes, $content ) {
 	);
 }
 
+/**
+ * Adds extra fields to the form.
+ *
+ * If the form is a comment form, adds the post ID as a hidden field,
+ * to allow the comment to be associated with the post.
+ *
+ * @param string $extra_fields The extra fields.
+ * @param array  $attributes   The block attributes.
+ *
+ * @return string The extra fields.
+ */
+function gutenberg_block_core_form_extra_fields_comment_form( $extra_fields, $attributes ) {
+	if ( ! empty( $attributes['action'] ) && str_ends_with( $attributes['action'], '/wp-comments-post.php' ) ) {
+		$extra_fields .= '<input type="hidden" name="comment_post_ID" value="' . get_the_ID() . '" id="comment_post_ID">';
+	}
+	return $extra_fields;
+}
+add_filter( 'render_block_core_form_extra_fields', 'gutenberg_block_core_form_extra_fields_comment_form', 10, 2 );
+
 /**
  * Registers the `core/form` block on server.
  */

From 48691fe670af2bbaac3f6a89d9a533d9cffe4238 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 10 Jul 2023 12:00:44 +0300
Subject: [PATCH 081/133] Add back empty line

---
 lib/experimental/rest-api.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/experimental/rest-api.php b/lib/experimental/rest-api.php
index bcc441c8b43824..7c6a9bf74d7395 100644
--- a/lib/experimental/rest-api.php
+++ b/lib/experimental/rest-api.php
@@ -28,6 +28,7 @@ function gutenberg_register_block_editor_settings() {
 }
 add_action( 'rest_api_init', 'gutenberg_register_block_editor_settings' );
 
+
 /**
  * Shim for get_sample_permalink() to add support for auto-draft status.
  *

From 93da56cfedfb4296f03e772e6198350a2098eb52 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 10 Jul 2023 12:38:20 +0300
Subject: [PATCH 082/133] Only add `action` if not empty

---
 packages/block-library/src/form/index.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 91ce12be6f561b..69ab03dde70462 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -24,7 +24,9 @@ function render_block_core_form( $attributes, $content ) {
 		$action = str_replace( '{SITE_URL}', site_url(), $attributes['action'] );
 	}
 
-	$processed_content->set_attribute( 'action', esc_attr( $action ) );
+	if ( ! empty( $action ) ) {
+		$processed_content->set_attribute( 'action', esc_attr( $action ) );
+	}
 
 	// Add the method attribute. If it is not set, default to `post`.
 	$attributes['method'] = empty( $attributes['method'] ) ? 'post' : $attributes['method'];

From b846130a11a8a01e2ab53a59f9c8bd5d71ba0b85 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 10 Jul 2023 12:38:37 +0300
Subject: [PATCH 083/133] Handle contact forms

---
 packages/block-library/src/form/index.php | 56 +++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 69ab03dde70462..f7dbabad2a2d28 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -60,6 +60,62 @@ function gutenberg_block_core_form_extra_fields_comment_form( $extra_fields, $at
 }
 add_filter( 'render_block_core_form_extra_fields', 'gutenberg_block_core_form_extra_fields_comment_form', 10, 2 );
 
+/**
+ * Adds extra fields to the form.
+ *
+ * If the form is a comment form, adds the post ID as a hidden field,
+ * to allow the comment to be associated with the post.
+ *
+ * @param string $extra_fields The extra fields.
+ * @param array  $attributes   The block attributes.
+ *
+ * @return string The extra fields.
+ */
+function gutenberg_block_core_form_extra_fields_contact_form( $extra_fields, $attributes ) {
+	if ( empty( $attributes['action'] ) ) {
+		$extra_fields .= wp_nonce_field( 'wp-block-form', 'wp_block_form', true, false );
+		$extra_fields .= '<input type="hidden" name="wp-send-email" value="1">';
+	}
+	return $extra_fields;
+}
+add_filter( 'render_block_core_form_extra_fields', 'gutenberg_block_core_form_extra_fields_contact_form', 10, 2 );
+
+/**
+ * Sends an email if the form is a contact form.
+ *
+ * @return void
+ */
+function gutenberg_block_core_form_email_if_action_is_empty() {
+	// Get the POST data.
+	$params = wp_unslash( $_POST );
+
+	// Bail early if not a form submission, or if the nonce is not valid.
+	if ( empty( $params['wp_block_form'] )
+		|| empty( $params['wp-send-email'] )
+		|| '1' !== $params['wp-send-email']
+		|| ! wp_verify_nonce( $params['wp_block_form'], 'wp-block-form' )
+	) {
+		return;
+	}
+
+	// Start building the email content.
+	$content = sprintf(
+		/* translators: %s: The request URI. */
+		__( 'Form submission from %1$s', 'gutenberg' ) . '</br>',
+		'<a href="' . esc_url( get_site_url( null, $params['_wp_http_referer'] ) ) . '">' . get_bloginfo( 'name' ) . '</a>'
+	);
+
+	$skip_fields = array( 'wp_block_form', '_wp_http_referer', 'wp-send-email' );
+	foreach ( $params as $key => $value ) {
+		if ( in_array( $key, $skip_fields, true ) ) {
+			continue;
+		}
+		$content .= $key . ': ' . $value . '</br>';
+	}
+	wp_mail( get_option( 'admin_email' ), __( 'Form submission', 'gutenberg' ), $content );
+}
+add_action( 'wp', 'gutenberg_block_core_form_email_if_action_is_empty' );
+
 /**
  * Registers the `core/form` block on server.
  */

From 680e79f5b00f3e3be2ba8afa1d13c36776c3d842 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 10 Jul 2023 12:39:53 +0300
Subject: [PATCH 084/133] Change help text to clarify what happens when value
 is empty

---
 packages/block-library/src/form/edit.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 60cafcf394da4b..5d70c1031b92bc 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -102,7 +102,9 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 							action: newVal,
 						} );
 					} }
-					help={ __( 'Define where the form should be submitted.' ) }
+					help={ __(
+						'Define where the form should be submitted. Leave empty to send an email to the site admin when a form gets submitted.'
+					) }
 				/>
 				<SelectControl
 					__nextHasNoMarginBottom

From 10781a9bc76b88d505398bd53906af2ab27e7b99 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 11 Jul 2023 11:01:10 +0300
Subject: [PATCH 085/133] fix doc

---
 packages/block-library/src/form/index.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index f7dbabad2a2d28..cc3917009d8a1d 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -63,8 +63,9 @@ function gutenberg_block_core_form_extra_fields_comment_form( $extra_fields, $at
 /**
  * Adds extra fields to the form.
  *
- * If the form is a comment form, adds the post ID as a hidden field,
- * to allow the comment to be associated with the post.
+ * If the form does not have an `action` defined, assume this is a contact form.
+ * Adds a nonce field and a hidden input to enable sending an email
+ * to the admin when the form is submitted.
  *
  * @param string $extra_fields The extra fields.
  * @param array  $attributes   The block attributes.

From bd47c0c075f9530fc401293215876251245195fa Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 11 Jul 2023 11:01:38 +0300
Subject: [PATCH 086/133] Add comment-form variation

---
 packages/block-library/src/form/index.js      |  2 +
 packages/block-library/src/form/variations.js | 54 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 packages/block-library/src/form/variations.js

diff --git a/packages/block-library/src/form/index.js b/packages/block-library/src/form/index.js
index 4c60b5f5c20639..b700e0ade6ca7f 100644
--- a/packages/block-library/src/form/index.js
+++ b/packages/block-library/src/form/index.js
@@ -5,6 +5,7 @@ import initBlock from '../utils/init-block';
 import edit from './edit';
 import metadata from './block.json';
 import save from './save';
+import variations from './variations';
 
 const { name } = metadata;
 
@@ -13,6 +14,7 @@ export { metadata, name };
 export const settings = {
 	edit,
 	save,
+	variations,
 };
 
 export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/form/variations.js b/packages/block-library/src/form/variations.js
new file mode 100644
index 00000000000000..ff8a0916556e78
--- /dev/null
+++ b/packages/block-library/src/form/variations.js
@@ -0,0 +1,54 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+const variations = [
+	{
+		name: 'comment-form',
+		title: __( 'Comment form' ),
+		icon: 'comments',
+		description: __( 'A comment form for posts and pages.' ),
+		attributes: {
+			action: '{SITE_URL}/wp-comments-post.php',
+			method: 'post',
+			formId: 'comment-form',
+		},
+		isDefault: false,
+		innerBlocks: [
+			[
+				'core/form-input',
+				{
+					type: 'text',
+					name: 'author',
+					label: __( 'Name' ),
+					required: true,
+				},
+			],
+			[
+				'core/form-input',
+				{
+					type: 'email',
+					name: 'email',
+					label: __( 'Email' ),
+					required: true,
+				},
+			],
+			[
+				'core/form-input',
+				{
+					type: 'textarea',
+					name: 'comment',
+					label: __( 'Comment' ),
+					required: true,
+				},
+			],
+			[ 'core/form-submit-button', {} ],
+		],
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) =>
+			! blockAttributes?.type || blockAttributes?.type === 'text',
+	},
+];
+
+export default variations;

From e54060817618765c1a9a008f8ee774601a189923 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 11 Jul 2023 11:28:44 +0300
Subject: [PATCH 087/133] Remove icon from comment-form variation

---
 packages/block-library/src/form/variations.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/block-library/src/form/variations.js b/packages/block-library/src/form/variations.js
index ff8a0916556e78..8a20ebcbaf0e71 100644
--- a/packages/block-library/src/form/variations.js
+++ b/packages/block-library/src/form/variations.js
@@ -7,7 +7,6 @@ const variations = [
 	{
 		name: 'comment-form',
 		title: __( 'Comment form' ),
-		icon: 'comments',
 		description: __( 'A comment form for posts and pages.' ),
 		attributes: {
 			action: '{SITE_URL}/wp-comments-post.php',

From f9d45046c39245fd4495d171ad0105ddd2cd4659 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 11 Jul 2023 11:41:28 +0300
Subject: [PATCH 088/133] Handle GET data in contact forms as well

---
 packages/block-library/src/form/index.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index cc3917009d8a1d..170cc31e3b5913 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -87,8 +87,11 @@ function gutenberg_block_core_form_extra_fields_contact_form( $extra_fields, $at
  * @return void
  */
 function gutenberg_block_core_form_email_if_action_is_empty() {
-	// Get the POST data.
+	// Get the POST or GET data.
 	$params = wp_unslash( $_POST );
+	if ( empty( $params['wp_block_form'] ) ) {
+		$params = wp_unslash( $_GET );
+	}
 
 	// Bail early if not a form submission, or if the nonce is not valid.
 	if ( empty( $params['wp_block_form'] )

From 75ac288070488c782d0a1ab740773d37685a86f1 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 11 Jul 2023 11:54:16 +0300
Subject: [PATCH 089/133] Redirect to same page on contact-form submission

---
 packages/block-library/src/form/index.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 170cc31e3b5913..420c5f97b752d4 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -117,6 +117,9 @@ function gutenberg_block_core_form_email_if_action_is_empty() {
 		$content .= $key . ': ' . $value . '</br>';
 	}
 	wp_mail( get_option( 'admin_email' ), __( 'Form submission', 'gutenberg' ), $content );
+
+	wp_safe_redirect( get_site_url( null, $params['_wp_http_referer'] ) );
+	exit;
 }
 add_action( 'wp', 'gutenberg_block_core_form_email_if_action_is_empty' );
 

From c19ff547c3a95b5ff4683d52d18fc6e297860124 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 11 Jul 2023 11:58:20 +0300
Subject: [PATCH 090/133] Increase padding-bottom to 0.5em

---
 packages/block-library/src/form-input/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index 35d8a37767a1d8..41a08850c5a028 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -31,7 +31,7 @@
 .wp-block-form-input__input {
 	padding: 0 0.5em;
 	font-size: 1em;
-	margin-bottom: 0.25em;
+	margin-bottom: 0.5em;
 
 	&[type="text"],
 	&[type="password"],

From e748cdace9ba5d7a467b12b5a1e5cdf48bd5c7fc Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 11 Jul 2023 13:27:37 +0300
Subject: [PATCH 091/133] Remove formId attribute. We already have an anchor

---
 docs/reference-guides/core-blocks.md          |  2 +-
 packages/block-library/src/form/block.json    |  4 ----
 packages/block-library/src/form/edit.js       | 21 ++-----------------
 packages/block-library/src/form/variations.js |  2 +-
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 68aeb1856e1536..892ad14e4eb54e 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -284,7 +284,7 @@ A form. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/blo
 -	**Name:** core/form
 -	**Category:** common
 -	**Supports:** anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
--	**Attributes:** action, formId, method
+-	**Attributes:** action, method
 
 ## Input field
 
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index dfc0dce4ef47e4..337db9255529ff 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -14,10 +14,6 @@
 		},
 		"method": {
 			"type": "string"
-		},
-		"formId": {
-			"type": "string",
-			"default": ""
 		}
 	},
 	"supports": {
diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 5d70c1031b92bc..6d6eb7ffc842fd 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -9,7 +9,7 @@ import {
 	InspectorControls,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { PanelBody, TextControl, SelectControl } from '@wordpress/components';
+import { TextControl, SelectControl } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 
 const ALLOWED_BLOCKS = [
@@ -50,7 +50,7 @@ const TEMPLATE = [
 ];
 
 const Edit = ( { attributes, setAttributes, clientId } ) => {
-	const { formId, action, method } = attributes;
+	const { action, method } = attributes;
 	const blockProps = useBlockProps();
 
 	const { hasInnerBlocks } = useSelect(
@@ -74,23 +74,6 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 
 	return (
 		<>
-			<InspectorControls>
-				<PanelBody title={ __( 'Form settings' ) }>
-					<TextControl
-						autoComplete="off"
-						label={ __( 'Form ID' ) }
-						value={ formId }
-						onChange={ ( newVal ) => {
-							setAttributes( {
-								formId: newVal,
-							} );
-						} }
-						help={ __(
-							'Unique identifier for this form. This value gets sent along with the form submission.'
-						) }
-					/>
-				</PanelBody>
-			</InspectorControls>
 			<InspectorControls group="advanced">
 				<TextControl
 					__nextHasNoMarginBottom
diff --git a/packages/block-library/src/form/variations.js b/packages/block-library/src/form/variations.js
index 8a20ebcbaf0e71..1b7e07b61d3230 100644
--- a/packages/block-library/src/form/variations.js
+++ b/packages/block-library/src/form/variations.js
@@ -11,7 +11,7 @@ const variations = [
 		attributes: {
 			action: '{SITE_URL}/wp-comments-post.php',
 			method: 'post',
-			formId: 'comment-form',
+			anchor: 'comment-form',
 		},
 		isDefault: false,
 		innerBlocks: [

From 2c34b2dd6449de122afc50bdc54c6ad2c55e726e Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 14 Jul 2023 11:05:18 +0300
Subject: [PATCH 092/133] labels cannot include div elements. Use a span
 instead.

---
 packages/block-library/src/form-input/edit.js | 4 ++--
 packages/block-library/src/form-input/save.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 8883cfdb020159..1e96893787d96c 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -76,7 +76,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 	return (
 		<div { ...blockProps }>
 			{ controls }
-			<div
+			<span
 				className={ classNames( 'wp-block-form-input__label', {
 					'is-label-inline': inlineLabel,
 				} ) }
@@ -117,7 +117,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 						...colorProps.style,
 					} }
 				/>
-			</div>
+			</span>
 		</div>
 	);
 }
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index 5dc104fec0f69a..53779c1ac4f4cb 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -61,9 +61,9 @@ export default function save( { attributes } ) {
 				'is-label-inline': inlineLabel,
 			} ) }
 		>
-			<div className="wp-block-form-input__label-content">
+			<span className="wp-block-form-input__label-content">
 				<RichText.Content value={ label } />
-			</div>
+			</span>
 			<TagName
 				className={ inputClasses }
 				type={ type }

From 325e4c3a3df6f9f0805836fe17ceeebfb2e8ca5d Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 14 Jul 2023 11:05:46 +0300
Subject: [PATCH 093/133] textarea elements should not have a type defined.

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

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 1e96893787d96c..276a5c1bb4314c 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -93,7 +93,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 					placeholder={ __( 'Type the label for this input' ) }
 				/>
 				<TagName
-					type={ type }
+					type={ 'textarea' === type ? undefined : type }
 					className={ classNames(
 						className,
 						'wp-block-form-input__input',
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index 53779c1ac4f4cb..09ef9725ac01a6 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -66,7 +66,7 @@ export default function save( { attributes } ) {
 			</span>
 			<TagName
 				className={ inputClasses }
-				type={ type }
+				type={ 'textarea' === type ? undefined : type }
 				name={ name || getNameFromLabel( label ) }
 				required={ required }
 				aria-required={ required }

From 82dd1422213426f69d14e33c99cbeabeefc87f78 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 14 Jul 2023 11:24:16 +0300
Subject: [PATCH 094/133] manually update fixtures

---
 .../fixtures/blocks/core__form-input.html     |  2 +-
 .../fixtures/blocks/core__form-input.json     |  4 ++--
 .../blocks/core__form-input.parsed.json       |  4 ++--
 .../blocks/core__form-input.serialized.html   |  2 +-
 .../fixtures/blocks/core__form.html           |  8 ++++----
 .../fixtures/blocks/core__form.json           | 20 +++++++++----------
 .../fixtures/blocks/core__form.parsed.json    | 16 +++++++--------
 .../blocks/core__form.serialized.html         |  8 ++++----
 8 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/test/integration/fixtures/blocks/core__form-input.html b/test/integration/fixtures/blocks/core__form-input.html
index 561a2d2143eb3d..718c592641bc32 100644
--- a/test/integration/fixtures/blocks/core__form-input.html
+++ b/test/integration/fixtures/blocks/core__form-input.html
@@ -1,3 +1,3 @@
 <!-- wp:form-input {"label":"Name","required":true} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Name</div><input class="wp-block-form-input" type="text" name="Name" required aria-required="true"/></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Name</span><input class="wp-block-form-input" type="text" name="Name" required aria-required="true"/></label>
 <!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form-input.json b/test/integration/fixtures/blocks/core__form-input.json
index aac821cf5f4084..33802bbcc2088d 100644
--- a/test/integration/fixtures/blocks/core__form-input.json
+++ b/test/integration/fixtures/blocks/core__form-input.json
@@ -4,8 +4,8 @@
 		"isValid": true,
 		"attributes": {
 			"originalName": "core/form-input",
-			"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
-			"originalContent": "<!-- wp:form-input {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->"
+			"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
+			"originalContent": "<!-- wp:form-input {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->"
 		},
 		"innerBlocks": []
 	}
diff --git a/test/integration/fixtures/blocks/core__form-input.parsed.json b/test/integration/fixtures/blocks/core__form-input.parsed.json
index b63d9ae4a54275..73058fc2e17f0b 100644
--- a/test/integration/fixtures/blocks/core__form-input.parsed.json
+++ b/test/integration/fixtures/blocks/core__form-input.parsed.json
@@ -6,9 +6,9 @@
 			"required": true
 		},
 		"innerBlocks": [],
-		"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
+		"innerHTML": "\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
 		"innerContent": [
-			"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
+			"\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
 		]
 	}
 ]
diff --git a/test/integration/fixtures/blocks/core__form-input.serialized.html b/test/integration/fixtures/blocks/core__form-input.serialized.html
index 4ce44752125c56..4e1f6b77998de9 100644
--- a/test/integration/fixtures/blocks/core__form-input.serialized.html
+++ b/test/integration/fixtures/blocks/core__form-input.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:form-input {"label":"Name","required":true} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Name</div><input class="wp-block-form-input" type="text" name="Name" required="" aria-required="true"></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Name</span><input class="wp-block-form-input" type="text" name="Name" required="" aria-required="true"></label>
 <!-- /wp:form-input -->
diff --git a/test/integration/fixtures/blocks/core__form.html b/test/integration/fixtures/blocks/core__form.html
index 9cb6242dd56e90..ab18e0e11c81a5 100644
--- a/test/integration/fixtures/blocks/core__form.html
+++ b/test/integration/fixtures/blocks/core__form.html
@@ -1,18 +1,18 @@
 <!-- wp:form -->
 <form><!-- wp:form-input {"label":"Name","required":true} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Name</div><input class="wp-block-form-input" type="text" name="Name" required aria-required="true"/></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Name</span><input class="wp-block-form-input" type="text" name="Name" required aria-required="true"/></label>
 <!-- /wp:form-input -->
 
 <!-- wp:form-input {"type":"email","label":"Email","required":true} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Email</div><input class="wp-block-form-input" type="email" name="Email" required aria-required="true"/></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Email</span><input class="wp-block-form-input" type="email" name="Email" required aria-required="true"/></label>
 <!-- /wp:form-input -->
 
 <!-- wp:form-input {"type":"url","label":"Website"} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Website</div><input class="wp-block-form-input" type="url" name="Website" aria-required="false"/></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Website</span><input class="wp-block-form-input" type="url" name="Website" aria-required="false"/></label>
 <!-- /wp:form-input -->
 
 <!-- wp:form-input {"type":"textarea","label":"Comment","required":true} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Comment</div><textarea class="wp-block-form-input" name="Comment" required aria-required="true"></textarea></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Comment</span><textarea class="wp-block-form-input" name="Comment" required aria-required="true"></textarea></label>
 <!-- /wp:form-input -->
 
 <!-- wp:form-input {"type":"submit","label":"Submit"} -->
diff --git a/test/integration/fixtures/blocks/core__form.json b/test/integration/fixtures/blocks/core__form.json
index c37c25f7a228c6..ba07b17e4d00c6 100644
--- a/test/integration/fixtures/blocks/core__form.json
+++ b/test/integration/fixtures/blocks/core__form.json
@@ -4,8 +4,8 @@
 		"isValid": true,
 		"attributes": {
 			"originalName": "core/form",
-			"originalUndelimitedContent": "<form>\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n</form>",
-			"originalContent": "<!-- wp:form -->\n<form>\n<!-- wp:form-input {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"submit\",\"label\":\"Submit\"} -->\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n<!-- /wp:form-input -->\n</form>\n<!-- /wp:form -->"
+			"originalUndelimitedContent": "<form>\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Email</span><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Website</span><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Comment</span><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n</form>",
+			"originalContent": "<!-- wp:form -->\n<form>\n<!-- wp:form-input {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Email</span><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Website</span><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Comment</span><textarea class=\"wp-block-form-input\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:form-input -->\n<!-- wp:form-input {\"type\":\"submit\",\"label\":\"Submit\"} -->\n<div class=\"wp-block-buttons\"><div class=\"wp-block-button\"><button class=\"wp-block-button__link wp-element-button\">Submit</button></div></div>\n<!-- /wp:form-input -->\n</form>\n<!-- /wp:form -->"
 		},
 		"innerBlocks": [
 			{
@@ -13,8 +13,8 @@
 				"isValid": true,
 				"attributes": {
 					"originalName": "core/form-input",
-					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
-					"originalContent": "<!-- wp:form-input {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->"
+					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>",
+					"originalContent": "<!-- wp:form-input {\"label\":\"Name\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->"
 				},
 				"innerBlocks": []
 			},
@@ -23,8 +23,8 @@
 				"isValid": true,
 				"attributes": {
 					"originalName": "core/form-input",
-					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>",
-					"originalContent": "<!-- wp:form-input {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->"
+					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Email</span><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>",
+					"originalContent": "<!-- wp:form-input {\"type\":\"email\",\"label\":\"Email\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Email</span><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required=\"\" aria-required=\"true\"></label>\n<!-- /wp:form-input -->"
 				},
 				"innerBlocks": []
 			},
@@ -33,8 +33,8 @@
 				"isValid": true,
 				"attributes": {
 					"originalName": "core/form-input",
-					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>",
-					"originalContent": "<!-- wp:form-input {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:form-input -->"
+					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Website</span><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>",
+					"originalContent": "<!-- wp:form-input {\"type\":\"url\",\"label\":\"Website\"} -->\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Website</span><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"></label>\n<!-- /wp:form-input -->"
 				},
 				"innerBlocks": []
 			},
@@ -43,8 +43,8 @@
 				"isValid": true,
 				"attributes": {
 					"originalName": "core/form-input",
-					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>",
-					"originalContent": "<!-- wp:form-input {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:form-input -->"
+					"originalUndelimitedContent": "<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Comment</span><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>",
+					"originalContent": "<!-- wp:form-input {\"type\":\"textarea\",\"label\":\"Comment\",\"required\":true} -->\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Comment</span><textarea class=\"wp-block-form-input\" name=\"Comment\" required=\"\" aria-required=\"true\"></textarea></label>\n<!-- /wp:form-input -->"
 				},
 				"innerBlocks": []
 			},
diff --git a/test/integration/fixtures/blocks/core__form.parsed.json b/test/integration/fixtures/blocks/core__form.parsed.json
index 9bb9c2adf8a8e1..379bee84c84e10 100644
--- a/test/integration/fixtures/blocks/core__form.parsed.json
+++ b/test/integration/fixtures/blocks/core__form.parsed.json
@@ -10,9 +10,9 @@
 					"required": true
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Name</div><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
+					"\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Name</span><input class=\"wp-block-form-input\" type=\"text\" name=\"Name\" required aria-required=\"true\"/></label>\n"
 				]
 			},
 			{
@@ -23,9 +23,9 @@
 					"required": true
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Email</span><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Email</div><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n"
+					"\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Email</span><input class=\"wp-block-form-input\" type=\"email\" name=\"Email\" required aria-required=\"true\"/></label>\n"
 				]
 			},
 			{
@@ -35,9 +35,9 @@
 					"label": "Website"
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Website</span><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Website</div><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n"
+					"\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Website</span><input class=\"wp-block-form-input\" type=\"url\" name=\"Website\" aria-required=\"false\"/></label>\n"
 				]
 			},
 			{
@@ -48,9 +48,9 @@
 					"required": true
 				},
 				"innerBlocks": [],
-				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n",
+				"innerHTML": "\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Comment</span><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n",
 				"innerContent": [
-					"\n<label class=\"wp-block-form-input-label\"><div class=\"wp-block-form-input-label__content\">Comment</div><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n"
+					"\n<label class=\"wp-block-form-input-label\"><span class=\"wp-block-form-input-label__content\">Comment</span><textarea class=\"wp-block-form-input\" name=\"Comment\" required aria-required=\"true\"></textarea></label>\n"
 				]
 			},
 			{
diff --git a/test/integration/fixtures/blocks/core__form.serialized.html b/test/integration/fixtures/blocks/core__form.serialized.html
index fd03e1d64bc6fe..58a2a49967eb56 100644
--- a/test/integration/fixtures/blocks/core__form.serialized.html
+++ b/test/integration/fixtures/blocks/core__form.serialized.html
@@ -1,16 +1,16 @@
 <!-- wp:form -->
 <form>
 <!-- wp:form-input {"label":"Name","required":true} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Name</div><input class="wp-block-form-input" type="text" name="Name" required="" aria-required="true"></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Name</span><input class="wp-block-form-input" type="text" name="Name" required="" aria-required="true"></label>
 <!-- /wp:form-input -->
 <!-- wp:form-input {"type":"email","label":"Email","required":true} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Email</div><input class="wp-block-form-input" type="email" name="Email" required="" aria-required="true"></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Email</span><input class="wp-block-form-input" type="email" name="Email" required="" aria-required="true"></label>
 <!-- /wp:form-input -->
 <!-- wp:form-input {"type":"url","label":"Website"} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Website</div><input class="wp-block-form-input" type="url" name="Website" aria-required="false"></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Website</span><input class="wp-block-form-input" type="url" name="Website" aria-required="false"></label>
 <!-- /wp:form-input -->
 <!-- wp:form-input {"type":"textarea","label":"Comment","required":true} -->
-<label class="wp-block-form-input-label"><div class="wp-block-form-input-label__content">Comment</div><textarea class="wp-block-form-input" name="Comment" required="" aria-required="true"></textarea></label>
+<label class="wp-block-form-input-label"><span class="wp-block-form-input-label__content">Comment</span><textarea class="wp-block-form-input" name="Comment" required="" aria-required="true"></textarea></label>
 <!-- /wp:form-input -->
 <!-- wp:form-input {"type":"submit","label":"Submit"} -->
 <div class="wp-block-buttons"><div class="wp-block-button"><button class="wp-block-button__link wp-element-button">Submit</button></div></div>

From 1c5e4378ba30ea1e5b99a1204657f794f9505ee5 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Jul 2023 12:20:28 +0300
Subject: [PATCH 095/133] Move inspector controls from advanced section to
 normal

---
 packages/block-library/src/form/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 6d6eb7ffc842fd..f1a05a968d531e 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -74,7 +74,7 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 
 	return (
 		<>
-			<InspectorControls group="advanced">
+			<InspectorControls>
 				<TextControl
 					__nextHasNoMarginBottom
 					autoComplete="off"

From b22b075a438550d187bf35881f167d8e7eabaeb2 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Jul 2023 12:46:51 +0300
Subject: [PATCH 096/133] Add visibilityPermissions attribute

---
 docs/reference-guides/core-blocks.md          |  2 +-
 lib/blocks.php                                |  1 +
 .../block-library/src/form-input/block.json   |  4 ++
 .../block-library/src/form-input/index.php    | 42 +++++++++++++++++++
 packages/block-library/src/form/variations.js |  3 ++
 5 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 packages/block-library/src/form-input/index.php

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 892ad14e4eb54e..8224a25cd8162c 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -294,7 +294,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Category:** common
 -	**Parent:** core/form
 -	**Supports:** anchor, spacing (margin), ~~reusable~~
--	**Attributes:** inlineLabel, label, name, placeholder, required, type
+-	**Attributes:** inlineLabel, label, name, placeholder, required, type, visibilityPermissions
 
 ## Form submit button
 
diff --git a/lib/blocks.php b/lib/blocks.php
index 2035f99a860cd1..b1d0677f06a5c9 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -69,6 +69,7 @@ function gutenberg_reregister_core_block_types() {
 				'footnotes.php'                    => 'core/footnotes',
 				'file.php'                         => 'core/file',
 				'form.php'                         => 'core/form',
+				'form-input.php'                   => 'core/form-input',
 				'home-link.php'                    => 'core/home-link',
 				'image.php'                        => 'core/image',
 				'gallery.php'                      => 'core/gallery',
diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index c08ebe6c6fde42..5ec76f719c3b17 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -41,6 +41,10 @@
 			"source": "attribute",
 			"attribute": "placeholder",
 			"__experimentalRole": "content"
+		},
+		"visibilityPermissions": {
+			"type": "string",
+			"default": "all"
 		}
 	},
 	"supports": {
diff --git a/packages/block-library/src/form-input/index.php b/packages/block-library/src/form-input/index.php
new file mode 100644
index 00000000000000..52121924f2b731
--- /dev/null
+++ b/packages/block-library/src/form-input/index.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Server-side rendering of the `core/form-input` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/form-input` block on server.
+ *
+ * @param array  $attributes The block attributes.
+ * @param string $content The saved content.
+ *
+ * @return string The content of the block being rendered.
+ */
+function render_block_core_form_input( $attributes, $content ) {
+	$visibility_permissions = 'all';
+	if ( isset( $attributes['visibilityPermissions'] ) ) {
+		$visibility_permissions = $attributes['visibilityPermissions'];
+	}
+
+	if ( 'logged-in' === $visibility_permissions && ! is_user_logged_in() ) {
+		return '';
+	}
+	if ( 'logged-out' === $visibility_permissions && is_user_logged_in() ) {
+		return '';
+	}
+	return $content;
+}
+
+/**
+ * Registers the `core/form-input` block on server.
+ */
+function register_block_core_form_input() {
+	register_block_type_from_metadata(
+		__DIR__ . '/form-input',
+		array(
+			'render_callback' => 'render_block_core_form_input',
+		)
+	);
+}
+add_action( 'init', 'register_block_core_form_input' );
diff --git a/packages/block-library/src/form/variations.js b/packages/block-library/src/form/variations.js
index 1b7e07b61d3230..5da31d1fec66d4 100644
--- a/packages/block-library/src/form/variations.js
+++ b/packages/block-library/src/form/variations.js
@@ -22,6 +22,7 @@ const variations = [
 					name: 'author',
 					label: __( 'Name' ),
 					required: true,
+					visibilityPermissions: 'logged-out',
 				},
 			],
 			[
@@ -31,6 +32,7 @@ const variations = [
 					name: 'email',
 					label: __( 'Email' ),
 					required: true,
+					visibilityPermissions: 'logged-out',
 				},
 			],
 			[
@@ -40,6 +42,7 @@ const variations = [
 					name: 'comment',
 					label: __( 'Comment' ),
 					required: true,
+					visibilityPermissions: 'all',
 				},
 			],
 			[ 'core/form-submit-button', {} ],

From e5f91585cf222ec55451f1c3eca328bf93b483b7 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 17 Jul 2023 12:50:26 +0300
Subject: [PATCH 097/133] Rename comment-form variation

---
 packages/block-library/src/form/variations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/variations.js b/packages/block-library/src/form/variations.js
index 5da31d1fec66d4..9f044096c869a0 100644
--- a/packages/block-library/src/form/variations.js
+++ b/packages/block-library/src/form/variations.js
@@ -6,7 +6,7 @@ import { __ } from '@wordpress/i18n';
 const variations = [
 	{
 		name: 'comment-form',
-		title: __( 'Comment form' ),
+		title: __( 'Experimental Comment form' ),
 		description: __( 'A comment form for posts and pages.' ),
 		attributes: {
 			action: '{SITE_URL}/wp-comments-post.php',

From 6de676cc3f806f08345eac6dfb6cb59213da28b7 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 31 Jul 2023 13:42:49 +0300
Subject: [PATCH 098/133] Add option to send email, and a field to define the
 address

---
 docs/reference-guides/core-blocks.md       |  2 +-
 packages/block-library/src/form/block.json |  4 ++
 packages/block-library/src/form/edit.js    | 49 +++++++++++++++-------
 packages/block-library/src/form/index.php  | 28 +++++++------
 4 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 8224a25cd8162c..7bb65de5578d9c 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -284,7 +284,7 @@ A form. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/blo
 -	**Name:** core/form
 -	**Category:** common
 -	**Supports:** anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
--	**Attributes:** action, method
+-	**Attributes:** action, email, method
 
 ## Input field
 
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index 337db9255529ff..ddd84d6314de35 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -13,6 +13,10 @@
 			"type": "string"
 		},
 		"method": {
+			"type": "string",
+			"default": "email"
+		},
+		"email": {
 			"type": "string"
 		}
 	},
diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index f1a05a968d531e..6816781aace1be 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -50,7 +50,7 @@ const TEMPLATE = [
 ];
 
 const Edit = ( { attributes, setAttributes, clientId } ) => {
-	const { action, method } = attributes;
+	const { action, method, email } = attributes;
 	const blockProps = useBlockProps();
 
 	const { hasInnerBlocks } = useSelect(
@@ -75,33 +75,50 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 	return (
 		<>
 			<InspectorControls>
-				<TextControl
-					__nextHasNoMarginBottom
-					autoComplete="off"
-					label={ __( 'Form action' ) }
-					value={ action }
-					onChange={ ( newVal ) => {
-						setAttributes( {
-							action: newVal,
-						} );
-					} }
-					help={ __(
-						'Define where the form should be submitted. Leave empty to send an email to the site admin when a form gets submitted.'
-					) }
-				/>
 				<SelectControl
 					__nextHasNoMarginBottom
 					label={ __( 'Form method' ) }
 					options={ [
+						{ label: 'Send email', value: 'email' },
 						{ label: 'Get', value: 'get' },
 						{ label: __( 'Post' ), value: 'post' },
 					] }
 					value={ method }
 					onChange={ ( value ) => setAttributes( { method: value } ) }
 					help={ __(
-						'Whether the form will submit a POST or GET request.'
+						'Whether the form will send an email, or submit a POST/GET request.'
 					) }
 				/>
+				{ method === 'email' && (
+					<TextControl
+						__nextHasNoMarginBottom
+						autoComplete="off"
+						label={ __( 'Email for form submissions' ) }
+						value={ email }
+						onChange={ ( value ) =>
+							setAttributes( { email: value } )
+						}
+						help={ __(
+							'The email address where form submissions will be sent. Leave empty to use the site admin address.'
+						) }
+					/>
+				) }
+				{ method !== 'email' && (
+					<TextControl
+						__nextHasNoMarginBottom
+						autoComplete="off"
+						label={ __( 'Form action' ) }
+						value={ action }
+						onChange={ ( newVal ) => {
+							setAttributes( {
+								action: newVal,
+							} );
+						} }
+						help={ __(
+							'The URL where the form should be submitted.'
+						) }
+					/>
+				) }
 			</InspectorControls>
 			<form { ...innerBlocksProps } />
 		</>
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 420c5f97b752d4..089e5088d5e89d 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -29,8 +29,12 @@ function render_block_core_form( $attributes, $content ) {
 	}
 
 	// Add the method attribute. If it is not set, default to `post`.
-	$attributes['method'] = empty( $attributes['method'] ) ? 'post' : $attributes['method'];
-	$processed_content->set_attribute( 'method', $attributes['method'] );
+	$method = empty( $attributes['method'] ) ? 'post' : $attributes['method'];
+	// If the user has set the method to "email", change it to "post".
+	if ( 'email' === $method ) {
+		$method = 'post';
+	}
+	$processed_content->set_attribute( 'method', $method );
 
 	$extra_fields = apply_filters( 'render_block_core_form_extra_fields', '', $attributes );
 
@@ -72,32 +76,32 @@ function gutenberg_block_core_form_extra_fields_comment_form( $extra_fields, $at
  *
  * @return string The extra fields.
  */
-function gutenberg_block_core_form_extra_fields_contact_form( $extra_fields, $attributes ) {
-	if ( empty( $attributes['action'] ) ) {
+function gutenberg_block_core_form_extra_fields_email( $extra_fields, $attributes ) {
+	if ( 'email' === $attributes['method'] ) {
 		$extra_fields .= wp_nonce_field( 'wp-block-form', 'wp_block_form', true, false );
 		$extra_fields .= '<input type="hidden" name="wp-send-email" value="1">';
+		$email_address = empty( $attributes['email'] ) ? get_option( 'admin_email' ) : $attributes['email'];
+		$extra_fields .= '<input type="hidden" name="wp-email-address" value="' . esc_attr( $email_address ) . '">';
 	}
 	return $extra_fields;
 }
-add_filter( 'render_block_core_form_extra_fields', 'gutenberg_block_core_form_extra_fields_contact_form', 10, 2 );
+add_filter( 'render_block_core_form_extra_fields', 'gutenberg_block_core_form_extra_fields_email', 10, 2 );
 
 /**
  * Sends an email if the form is a contact form.
  *
  * @return void
  */
-function gutenberg_block_core_form_email_if_action_is_empty() {
+function gutenberg_block_core_form_send_email() {
 	// Get the POST or GET data.
 	$params = wp_unslash( $_POST );
-	if ( empty( $params['wp_block_form'] ) ) {
-		$params = wp_unslash( $_GET );
-	}
 
 	// Bail early if not a form submission, or if the nonce is not valid.
 	if ( empty( $params['wp_block_form'] )
 		|| empty( $params['wp-send-email'] )
 		|| '1' !== $params['wp-send-email']
 		|| ! wp_verify_nonce( $params['wp_block_form'], 'wp-block-form' )
+		|| empty( $params['wp-email-address'] )
 	) {
 		return;
 	}
@@ -109,19 +113,19 @@ function gutenberg_block_core_form_email_if_action_is_empty() {
 		'<a href="' . esc_url( get_site_url( null, $params['_wp_http_referer'] ) ) . '">' . get_bloginfo( 'name' ) . '</a>'
 	);
 
-	$skip_fields = array( 'wp_block_form', '_wp_http_referer', 'wp-send-email' );
+	$skip_fields = array( 'wp_block_form', '_wp_http_referer', 'wp-send-email', 'wp-email-address' );
 	foreach ( $params as $key => $value ) {
 		if ( in_array( $key, $skip_fields, true ) ) {
 			continue;
 		}
 		$content .= $key . ': ' . $value . '</br>';
 	}
-	wp_mail( get_option( 'admin_email' ), __( 'Form submission', 'gutenberg' ), $content );
+	wp_mail( $params['wp-email-address'], __( 'Form submission', 'gutenberg' ), $content );
 
 	wp_safe_redirect( get_site_url( null, $params['_wp_http_referer'] ) );
 	exit;
 }
-add_action( 'wp', 'gutenberg_block_core_form_email_if_action_is_empty' );
+add_action( 'wp', 'gutenberg_block_core_form_send_email' );
 
 /**
  * Registers the `core/form` block on server.

From 6eac41a8abb28cf124ed0f699a6755f55ea38405 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 31 Jul 2023 13:43:16 +0300
Subject: [PATCH 099/133] Filter the email content to allow 3rd-party plugins
 to change things

---
 packages/block-library/src/form/index.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 089e5088d5e89d..7ac040ca4f3fec 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -120,8 +120,14 @@ function gutenberg_block_core_form_send_email() {
 		}
 		$content .= $key . ': ' . $value . '</br>';
 	}
+
+	// Filter the email content.
+	$content = apply_filters( 'render_block_core_form_email_content', $content, $params );
+
+	// Send the email.
 	wp_mail( $params['wp-email-address'], __( 'Form submission', 'gutenberg' ), $content );
 
+	// Redirect back to the form.
 	wp_safe_redirect( get_site_url( null, $params['_wp_http_referer'] ) );
 	exit;
 }

From 2ba5cc319e66af7a764f9a128829003fa85a1c45 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 31 Jul 2023 13:50:28 +0300
Subject: [PATCH 100/133] Basic sanitization for the email content

---
 packages/block-library/src/form/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 7ac040ca4f3fec..a7824383b8eb05 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -118,7 +118,7 @@ function gutenberg_block_core_form_send_email() {
 		if ( in_array( $key, $skip_fields, true ) ) {
 			continue;
 		}
-		$content .= $key . ': ' . $value . '</br>';
+		$content .= sanitize_key( $key ) . ': ' . wp_kses_post( $value ) . '</br>';
 	}
 
 	// Filter the email content.

From 474aa80b2d5d8812f4a2c895cab04d54fb88547f Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 31 Jul 2023 13:53:47 +0300
Subject: [PATCH 101/133] Code improvement

---
 packages/block-library/src/form/index.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index a7824383b8eb05..b1bc622071883d 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -28,12 +28,13 @@ function render_block_core_form( $attributes, $content ) {
 		$processed_content->set_attribute( 'action', esc_attr( $action ) );
 	}
 
-	// Add the method attribute. If it is not set, default to `post`.
-	$method = empty( $attributes['method'] ) ? 'post' : $attributes['method'];
-	// If the user has set the method to "email", change it to "post".
-	if ( 'email' === $method ) {
-		$method = 'post';
-	}
+	/*
+	 * Add the method attribute. If it is not set, default to `post`.
+	 * If the user has set the method to `email`, change it to `post`.
+	 */
+	$method = empty( $attributes['method'] ) || 'email' === $attributes['method']
+		? 'post'
+		: $attributes['method'];
 	$processed_content->set_attribute( 'method', $method );
 
 	$extra_fields = apply_filters( 'render_block_core_form_extra_fields', '', $attributes );

From e6e92e95a2590b67047105b661e7b8a73857a11c Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 1 Aug 2023 09:12:09 +0300
Subject: [PATCH 102/133] Add render_block_core_form_email_sent action

---
 packages/block-library/src/form/index.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index b1bc622071883d..6b012fd1f1cfd2 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -128,11 +128,28 @@ function gutenberg_block_core_form_send_email() {
 	// Send the email.
 	wp_mail( $params['wp-email-address'], __( 'Form submission', 'gutenberg' ), $content );
 
-	// Redirect back to the form.
+	/**
+	 * Fires after the email has been sent.
+	 *
+	 * This will allow 3rd-party plugins to redirect to a different page
+	 * by removing the default redirect, or add a success message etc.
+	 *
+	 * @param array $params The POST data.
+	 */
+	do_action( 'render_block_core_form_email_sent', $params );
+}
+add_action( 'wp', 'gutenberg_block_core_form_send_email' );
+
+/**
+ * Redirect to the same page when the form has been submitted and an email was sent.
+ *
+ * @param array $params The POST data.
+ */
+function gutenberg_block_core_form_email_sent( $params ) {
 	wp_safe_redirect( get_site_url( null, $params['_wp_http_referer'] ) );
 	exit;
 }
-add_action( 'wp', 'gutenberg_block_core_form_send_email' );
+add_action( 'render_block_core_form_email_sent', 'gutenberg_block_core_form_email_sent' );
 
 /**
  * Registers the `core/form` block on server.

From e7745d68ce02b8f84f8f9f33c91ef78254b722fd Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 1 Aug 2023 12:37:01 +0300
Subject: [PATCH 103/133] It's possible to use comma-separated values for the
 email address

---
 packages/block-library/src/form/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 6816781aace1be..dd1986335cdaf6 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -99,7 +99,7 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 							setAttributes( { email: value } )
 						}
 						help={ __(
-							'The email address where form submissions will be sent. Leave empty to use the site admin address.'
+							'The email address where form submissions will be sent. Separate multiple email addresses with a comma, or leave empty to use the site admin address.'
 						) }
 					/>
 				) }

From 55168e3b0450cab4db41d978c7818a47e3ef77b9 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 3 Aug 2023 13:08:16 +0300
Subject: [PATCH 104/133] Add a `hidden` input-type

---
 docs/reference-guides/core-blocks.md          |  2 +-
 packages/block-library/src/editor.scss        |  1 +
 .../block-library/src/form-input/block.json   |  7 ++
 packages/block-library/src/form-input/edit.js | 82 +++++++++++++------
 .../block-library/src/form-input/editor.scss  | 24 ++++++
 packages/block-library/src/form-input/save.js |  6 +-
 .../src/form-input/variations.js              | 13 +++
 7 files changed, 110 insertions(+), 25 deletions(-)
 create mode 100644 packages/block-library/src/form-input/editor.scss

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 7bb65de5578d9c..826a4b7f3129a0 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -294,7 +294,7 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Category:** common
 -	**Parent:** core/form
 -	**Supports:** anchor, spacing (margin), ~~reusable~~
--	**Attributes:** inlineLabel, label, name, placeholder, required, type, visibilityPermissions
+-	**Attributes:** inlineLabel, label, name, placeholder, required, type, value, visibilityPermissions
 
 ## Form submit button
 
diff --git a/packages/block-library/src/editor.scss b/packages/block-library/src/editor.scss
index 07c58599c50980..459e8d4f0f3b31 100644
--- a/packages/block-library/src/editor.scss
+++ b/packages/block-library/src/editor.scss
@@ -16,6 +16,7 @@
 @import "./details/editor.scss";
 @import "./embed/editor.scss";
 @import "./file/editor.scss";
+@import "./form-input/editor.scss";
 @import "./freeform/editor.scss";
 @import "./gallery/editor.scss";
 @import "./group/editor.scss";
diff --git a/packages/block-library/src/form-input/block.json b/packages/block-library/src/form-input/block.json
index 5ec76f719c3b17..dbe182f03b4992 100644
--- a/packages/block-library/src/form-input/block.json
+++ b/packages/block-library/src/form-input/block.json
@@ -42,6 +42,13 @@
 			"attribute": "placeholder",
 			"__experimentalRole": "content"
 		},
+		"value": {
+			"type": "string",
+			"default": "",
+			"selector": "input",
+			"source": "attribute",
+			"attribute": "value"
+		},
 		"visibilityPermissions": {
 			"type": "string",
 			"default": "all"
diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 276a5c1bb4314c..acd20019620a35 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -19,7 +19,7 @@ import { PanelBody, TextControl, CheckboxControl } from '@wordpress/components';
 import { useRef } from '@wordpress/element';
 
 function InputFieldBlock( { attributes, setAttributes, className } ) {
-	const { type, name, label, inlineLabel, required, placeholder } =
+	const { type, name, label, inlineLabel, required, placeholder, value } =
 		attributes;
 	const blockProps = useBlockProps();
 	const ref = useRef();
@@ -33,28 +33,30 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 
 	const controls = (
 		<>
-			<InspectorControls>
-				<PanelBody title={ __( 'Input settings' ) }>
-					<CheckboxControl
-						label={ __( 'Inline label' ) }
-						checked={ attributes.inlineLabel }
-						onChange={ ( newVal ) => {
-							setAttributes( {
-								inlineLabel: newVal,
-							} );
-						} }
-					/>
-					<CheckboxControl
-						label={ __( 'Required' ) }
-						checked={ attributes.required }
-						onChange={ ( newVal ) => {
-							setAttributes( {
-								required: newVal,
-							} );
-						} }
-					/>
-				</PanelBody>
-			</InspectorControls>
+			{ 'hidden' !== type && (
+				<InspectorControls>
+					<PanelBody title={ __( 'Input settings' ) }>
+						<CheckboxControl
+							label={ __( 'Inline label' ) }
+							checked={ attributes.inlineLabel }
+							onChange={ ( newVal ) => {
+								setAttributes( {
+									inlineLabel: newVal,
+								} );
+							} }
+						/>
+						<CheckboxControl
+							label={ __( 'Required' ) }
+							checked={ attributes.required }
+							onChange={ ( newVal ) => {
+								setAttributes( {
+									required: newVal,
+								} );
+							} }
+						/>
+					</PanelBody>
+				</InspectorControls>
+			) }
 			<InspectorControls __experimentalGroup="advanced">
 				<TextControl
 					autoComplete="off"
@@ -73,6 +75,40 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 		</>
 	);
 
+	if ( 'hidden' === type ) {
+		return (
+			<div { ...blockProps }>
+				{ controls }
+				<span className={ 'is-input-hidden' }>
+					<RichText
+						tagName="span"
+						className="wp-block-form-input__label-content"
+						value={ name }
+						onChange={ ( newValue ) =>
+							setAttributes( { name: newValue } )
+						}
+						aria-label={ __( 'Input name' ) }
+						placeholder={ __( 'Type the name for this input' ) }
+					/>
+					<input
+						type="text"
+						className={ classNames(
+							className,
+							'wp-block-form-input__input',
+							colorProps.className,
+							borderProps.className
+						) }
+						aria-label={ __( 'Value' ) }
+						value={ value }
+						onChange={ ( event ) =>
+							setAttributes( { value: event.target.value } )
+						}
+					/>
+				</span>
+			</div>
+		);
+	}
+
 	return (
 		<div { ...blockProps }>
 			{ controls }
diff --git a/packages/block-library/src/form-input/editor.scss b/packages/block-library/src/form-input/editor.scss
new file mode 100644
index 00000000000000..2ac67e6615ed4a
--- /dev/null
+++ b/packages/block-library/src/form-input/editor.scss
@@ -0,0 +1,24 @@
+.wp-block-form-input {
+	.is-input-hidden {
+		font-size: 0.85em;
+		opacity: 0.3;
+		border: 1px dashed;
+		padding: 0.5em;
+		box-sizing: border-box;
+		background: repeating-linear-gradient(45deg, transparent, transparent 5px, currentColor 5px, currentColor 6px);
+
+		input[type="text"] {
+			background: transparent;
+		}
+	}
+	&.is-selected {
+		.is-input-hidden {
+			opacity: 1;
+			background: none;
+
+			input[type="text"] {
+				background: unset;
+			}
+		}
+	}
+}
diff --git a/packages/block-library/src/form-input/save.js b/packages/block-library/src/form-input/save.js
index 09ef9725ac01a6..0cca31ca423ee6 100644
--- a/packages/block-library/src/form-input/save.js
+++ b/packages/block-library/src/form-input/save.js
@@ -36,7 +36,7 @@ const getNameFromLabel = ( content ) => {
 };
 
 export default function save( { attributes } ) {
-	const { type, name, label, inlineLabel, required, placeholder } =
+	const { type, name, label, inlineLabel, required, placeholder, value } =
 		attributes;
 
 	const borderProps = getBorderClassesAndStyles( attributes );
@@ -54,6 +54,10 @@ export default function save( { attributes } ) {
 	);
 	const TagName = type === 'textarea' ? 'textarea' : 'input';
 
+	if ( 'hidden' === type ) {
+		return <input type={ type } name={ name } value={ value } />;
+	}
+
 	/* eslint-disable jsx-a11y/label-has-associated-control */
 	return (
 		<label
diff --git a/packages/block-library/src/form-input/variations.js b/packages/block-library/src/form-input/variations.js
index 8014c2660d2927..d3172edd83dd02 100644
--- a/packages/block-library/src/form-input/variations.js
+++ b/packages/block-library/src/form-input/variations.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+import { unseen } from '@wordpress/icons';
 
 const variations = [
 	{
@@ -77,6 +78,18 @@ const variations = [
 		scope: [ 'inserter', 'transform' ],
 		isActive: ( blockAttributes ) => blockAttributes?.type === 'number',
 	},
+	{
+		name: 'hidden',
+		title: __( 'Hidden input' ),
+		icon: unseen,
+		description: __(
+			'A hidden input. Use it to add hidden data to form submissions.'
+		),
+		attributes: { type: 'hidden' },
+		isDefault: false,
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) => blockAttributes?.type === 'hidden',
+	},
 ];
 
 export default variations;

From 115de36f4b769b724969dbbb7a0469331a186ab6 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 3 Aug 2023 13:23:31 +0300
Subject: [PATCH 105/133] remove columns and groups for now

There's an issue and we can't add input fields inside columns and/or groups etc. Inputs can only be added as a direct descendant of the form block.
---
 packages/block-library/src/form/edit.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index dd1986335cdaf6..88fa00512212e5 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -17,8 +17,6 @@ const ALLOWED_BLOCKS = [
 	'core/heading',
 	'core/form-input',
 	'core/form-submit-button',
-	'core/columns',
-	'core/group',
 ];
 
 const TEMPLATE = [

From f5aba1a510d57a0affe75a49865e7a481847078a Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 3 Aug 2023 13:26:16 +0300
Subject: [PATCH 106/133] Checkbox labels should always be inline

---
 packages/block-library/src/form-input/edit.js | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index acd20019620a35..fcc163d71c5be1 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -36,15 +36,17 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 			{ 'hidden' !== type && (
 				<InspectorControls>
 					<PanelBody title={ __( 'Input settings' ) }>
-						<CheckboxControl
-							label={ __( 'Inline label' ) }
-							checked={ attributes.inlineLabel }
-							onChange={ ( newVal ) => {
-								setAttributes( {
-									inlineLabel: newVal,
-								} );
-							} }
-						/>
+						{ 'checkbox' !== type && (
+							<CheckboxControl
+								label={ __( 'Inline label' ) }
+								checked={ attributes.inlineLabel }
+								onChange={ ( newVal ) => {
+									setAttributes( {
+										inlineLabel: newVal,
+									} );
+								} }
+							/>
+						) }
 						<CheckboxControl
 							label={ __( 'Required' ) }
 							checked={ attributes.required }
@@ -114,7 +116,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 			{ controls }
 			<span
 				className={ classNames( 'wp-block-form-input__label', {
-					'is-label-inline': inlineLabel,
+					'is-label-inline': inlineLabel || 'checkbox' === type,
 				} ) }
 			>
 				<RichText

From da0d1257ef0cb9eaa5c144af52f10b8ccc86bea8 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 3 Aug 2023 13:28:42 +0300
Subject: [PATCH 107/133] Default inlineLabel to true for checkboxes

---
 packages/block-library/src/form-input/variations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form-input/variations.js b/packages/block-library/src/form-input/variations.js
index d3172edd83dd02..5172ef31cf8945 100644
--- a/packages/block-library/src/form-input/variations.js
+++ b/packages/block-library/src/form-input/variations.js
@@ -33,7 +33,7 @@ const variations = [
 		title: __( 'Checkbox input' ),
 		description: __( 'A simple checkbox input.' ),
 		icon: 'forms',
-		attributes: { type: 'checkbox' },
+		attributes: { type: 'checkbox', inlineLabel: true },
 		isDefault: true,
 		scope: [ 'inserter', 'transform' ],
 		isActive: ( blockAttributes ) => blockAttributes?.type === 'checkbox',

From 2d7562c8129594c94c20f0273aac13be6f7ac1d6 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 3 Aug 2023 13:29:14 +0300
Subject: [PATCH 108/133] coding fix

---
 packages/block-library/src/form-input/edit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index fcc163d71c5be1..3d26ec21478d91 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -39,7 +39,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 						{ 'checkbox' !== type && (
 							<CheckboxControl
 								label={ __( 'Inline label' ) }
-								checked={ attributes.inlineLabel }
+								checked={ inlineLabel }
 								onChange={ ( newVal ) => {
 									setAttributes( {
 										inlineLabel: newVal,
@@ -49,7 +49,7 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 						) }
 						<CheckboxControl
 							label={ __( 'Required' ) }
-							checked={ attributes.required }
+							checked={ required }
 							onChange={ ( newVal ) => {
 								setAttributes( {
 									required: newVal,

From c9b132c4b026298cdef8b0b6ee5945b2a309fcaf Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 4 Aug 2023 11:06:57 +0300
Subject: [PATCH 109/133] Add ADMIN_URL placeholder (facilitates ajax requests)

---
 packages/block-library/src/form/index.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 6b012fd1f1cfd2..5ae10962fcac41 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -21,7 +21,11 @@ function render_block_core_form( $attributes, $content ) {
 	// Get the action for this form.
 	$action = '';
 	if ( isset( $attributes['action'] ) ) {
-		$action = str_replace( '{SITE_URL}', site_url(), $attributes['action'] );
+		$action = str_replace(
+			array( '{SITE_URL}', '{ADMIN_URL}' ),
+			array( site_url(), admin_url() ),
+			$attributes['action']
+		);
 	}
 
 	if ( ! empty( $action ) ) {

From 237ef1077d5c67339f962a8d0263040a96a87905 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 4 Aug 2023 12:02:57 +0300
Subject: [PATCH 110/133] Add a privacy-request form

---
 packages/block-library/src/form/index.php     | 79 +++++++++++++++++++
 packages/block-library/src/form/variations.js | 72 +++++++++++++++++
 2 files changed, 151 insertions(+)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 5ae10962fcac41..386c0ef792f9b9 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -155,6 +155,85 @@ function gutenberg_block_core_form_email_sent( $params ) {
 }
 add_action( 'render_block_core_form_email_sent', 'gutenberg_block_core_form_email_sent' );
 
+/**
+ * Send the data export/remove request if the form is a privacy-request form.
+ *
+ * @return void
+ */
+function gutenberg_block_core_form_privacy_form() {
+	// Get the POST data.
+	$params = wp_unslash( $_POST );
+
+	// Bail early if not a form submission, or if the nonce is not valid.
+	if ( empty( $params['wp-action'] )
+		|| 'wp_privacy_send_request' !== $params['wp-action']
+		|| empty( $params['wp-privacy-request'] )
+		|| '1' !== $params['wp-privacy-request']
+		|| empty( $params['email'] )
+	) {
+		return;
+	}
+
+	// Get the request types.
+	$request_types  = _wp_privacy_action_request_types();
+	$requests_found = array();
+	foreach ( $request_types as $request_type ) {
+		if ( ! empty( $params[ $request_type ] ) ) {
+			$requests_found[] = $request_type;
+		}
+	}
+
+	// Bail early if no requests were found.
+	if ( empty( $requests_found ) ) {
+		return;
+	}
+
+	// Process the requests.
+	$actions_errored   = array();
+	$actions_performed = array();
+	foreach ( $requests_found as $action_name ) {
+		// Get the request ID.
+		$request_id = wp_create_user_request( $params['email'], $action_name );
+
+		// Bail early if the request ID is invalid.
+		if ( is_wp_error( $request_id ) ) {
+			$actions_errored[] = $action_name;
+			continue;
+		}
+
+		// Send the request email.
+		wp_send_user_request( $request_id );
+		$actions_performed[] = $action_name;
+	}
+
+	// Add feedback to the top of the form when the page re-renders.
+	$privacy_form_feedback = static function( $block_content ) use ( $actions_errored, $actions_performed ) {
+		// Bail early if no actions were detected.
+		if ( empty( $actions_errored ) && empty( $actions_performed ) ) {
+			return $block_content;
+		}
+
+		// Bail early if this is not a privacy form.
+		if ( false === strpos( $block_content, 'wp_privacy_send_request' ) ) {
+			return $block_content;
+		}
+
+		if ( ! empty( $actions_errored ) ) {
+			$feedback  = '<div class="wp-privacy-request-error" style="padding:1em;border:1px solid #EA8484;background:#FBEAEA;color:#9A2323;border-radius:3px;">';
+			$feedback .= '<p>' . __( 'There was a problem with your action. Please try again later.', 'gutenberg' ) . '</p>';
+			$feedback .= '</div>';
+		} else {
+			$feedback  = '<div class="wp-privacy-request-success" style="padding:1em;border:1px solid #B5E1B9;background:#ECF7ED;color:#31843F;border-radius:3px;">';
+			$feedback .= '<p>' . __( 'Confirmation request initiated successfully. Please check your email for confirmation.', 'gutenberg' ) . '</p>';
+			$feedback .= '</div>';
+		}
+
+		return $feedback . $block_content;
+	};
+	add_action( 'render_block_core/form', $privacy_form_feedback );
+}
+add_action( 'wp', 'gutenberg_block_core_form_privacy_form' );
+
 /**
  * Registers the `core/form` block on server.
  */
diff --git a/packages/block-library/src/form/variations.js b/packages/block-library/src/form/variations.js
index 9f044096c869a0..02b1dca4a5a807 100644
--- a/packages/block-library/src/form/variations.js
+++ b/packages/block-library/src/form/variations.js
@@ -51,6 +51,78 @@ const variations = [
 		isActive: ( blockAttributes ) =>
 			! blockAttributes?.type || blockAttributes?.type === 'text',
 	},
+	{
+		name: 'wp-privacy-form',
+		title: __( 'Experimental privacy request form' ),
+		keywords: [ 'GDPR' ],
+		description: __( 'A form torequest data exports and/or deletion.' ),
+		attributes: {
+			action: '',
+			method: 'post',
+			anchor: 'gdpr-form',
+		},
+		isDefault: false,
+		innerBlocks: [
+			[
+				'core/paragraph',
+				{
+					content: __(
+						'To request an export or deletion of your personal data on this site, please fill-in the form below. You can define the type of request you wish to perform, and your email address. Once the form is submitted, you will receive a confirmation email with instructions on the next steps.'
+					),
+				},
+			],
+			[
+				'core/form-input',
+				{
+					type: 'email',
+					name: 'email',
+					label: __( 'Enter your email address.' ),
+					required: true,
+					visibilityPermissions: 'all',
+				},
+			],
+			[
+				'core/form-input',
+				{
+					type: 'checkbox',
+					name: 'export_personal_data',
+					label: __( 'Request data export' ),
+					required: false,
+					visibilityPermissions: 'all',
+				},
+			],
+			[
+				'core/form-input',
+				{
+					type: 'checkbox',
+					name: 'remove_personal_data',
+					label: __( 'Request data deletion' ),
+					required: false,
+					visibilityPermissions: 'all',
+				},
+			],
+			[ 'core/form-submit-button', {} ],
+			[
+				'core/form-input',
+				{
+					type: 'hidden',
+					name: 'wp-action',
+					value: 'wp_privacy_send_request',
+				},
+			],
+			[
+				'core/form-input',
+				{
+					type: 'hidden',
+					name: 'wp-privacy-request',
+					value: '1',
+				},
+			],
+		],
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) =>
+			! blockAttributes?.type || blockAttributes?.type === 'text',
+	},
 ];
 
 export default variations;

From 00fa2ea64311981a6d34ba1a088eb09323717c0b Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 7 Aug 2023 13:07:22 +0300
Subject: [PATCH 111/133] Make methods hookable

---
 docs/reference-guides/core-blocks.md          |  2 +-
 packages/block-library/src/form/block.json    | 10 ++-
 packages/block-library/src/form/edit.js       | 73 ++++++++++++-------
 packages/block-library/src/form/index.php     | 35 +++++++--
 packages/block-library/src/form/variations.js |  2 +
 .../provider/use-block-editor-settings.js     |  1 +
 6 files changed, 84 insertions(+), 39 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 826a4b7f3129a0..624ad997f815f5 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -284,7 +284,7 @@ A form. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/blo
 -	**Name:** core/form
 -	**Category:** common
 -	**Supports:** anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight), ~~className~~
--	**Attributes:** action, email, method
+-	**Attributes:** action, email, method, submissionMethod
 
 ## Input field
 
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index ddd84d6314de35..97289910c51675 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -9,12 +9,16 @@
 	"textdomain": "default",
 	"icon": "feedback",
 	"attributes": {
-		"action": {
-			"type": "string"
+		"submissionMethod": {
+			"type": "string",
+			"default": "email"
 		},
 		"method": {
 			"type": "string",
-			"default": "email"
+			"default": "post"
+		},
+		"action": {
+			"type": "string"
 		},
 		"email": {
 			"type": "string"
diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 88fa00512212e5..66c649e4410479 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -48,15 +48,19 @@ const TEMPLATE = [
 ];
 
 const Edit = ( { attributes, setAttributes, clientId } ) => {
-	const { action, method, email } = attributes;
+	const { action, method, email, submissionMethod } = attributes;
 	const blockProps = useBlockProps();
 
-	const { hasInnerBlocks } = useSelect(
+	const { hasInnerBlocks, formMethods } = useSelect(
 		( select ) => {
+			const settings = select( blockEditorStore ).getSettings();
 			const { getBlock } = select( blockEditorStore );
 			const block = getBlock( clientId );
 			return {
 				hasInnerBlocks: !! ( block && block.innerBlocks.length ),
+				formMethods: Object.values(
+					settings.formOptions.availableMethods
+				),
 			};
 		},
 		[ clientId ]
@@ -75,19 +79,17 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 			<InspectorControls>
 				<SelectControl
 					__nextHasNoMarginBottom
-					label={ __( 'Form method' ) }
-					options={ [
-						{ label: 'Send email', value: 'email' },
-						{ label: 'Get', value: 'get' },
-						{ label: __( 'Post' ), value: 'post' },
-					] }
-					value={ method }
-					onChange={ ( value ) => setAttributes( { method: value } ) }
+					label={ __( 'Submissions method' ) }
+					options={ formMethods }
+					value={ submissionMethod }
+					onChange={ ( value ) =>
+						setAttributes( { submissionMethod: value } )
+					}
 					help={ __(
-						'Whether the form will send an email, or submit a POST/GET request.'
+						'Select the method to use for form submissions.'
 					) }
 				/>
-				{ method === 'email' && (
+				{ submissionMethod === 'email' && (
 					<TextControl
 						__nextHasNoMarginBottom
 						autoComplete="off"
@@ -101,21 +103,38 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 						) }
 					/>
 				) }
-				{ method !== 'email' && (
-					<TextControl
-						__nextHasNoMarginBottom
-						autoComplete="off"
-						label={ __( 'Form action' ) }
-						value={ action }
-						onChange={ ( newVal ) => {
-							setAttributes( {
-								action: newVal,
-							} );
-						} }
-						help={ __(
-							'The URL where the form should be submitted.'
-						) }
-					/>
+				{ submissionMethod !== 'email' && (
+					<InspectorControls group="advanced">
+						<SelectControl
+							__nextHasNoMarginBottom
+							label={ __( 'Method' ) }
+							options={ [
+								{ label: 'Get', value: 'get' },
+								{ label: 'Post', value: 'post' },
+							] }
+							value={ method }
+							onChange={ ( value ) =>
+								setAttributes( { method: value } )
+							}
+							help={ __(
+								'Select the method to use for form submissions.'
+							) }
+						/>
+						<TextControl
+							__nextHasNoMarginBottom
+							autoComplete="off"
+							label={ __( 'Form action' ) }
+							value={ action }
+							onChange={ ( newVal ) => {
+								setAttributes( {
+									action: newVal,
+								} );
+							} }
+							help={ __(
+								'The URL where the form should be submitted.'
+							) }
+						/>
+					</InspectorControls>
 				) }
 			</InspectorControls>
 			<form { ...innerBlocksProps } />
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 386c0ef792f9b9..0b6c421dd12dfd 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -32,13 +32,8 @@ function render_block_core_form( $attributes, $content ) {
 		$processed_content->set_attribute( 'action', esc_attr( $action ) );
 	}
 
-	/*
-	 * Add the method attribute. If it is not set, default to `post`.
-	 * If the user has set the method to `email`, change it to `post`.
-	 */
-	$method = empty( $attributes['method'] ) || 'email' === $attributes['method']
-		? 'post'
-		: $attributes['method'];
+	// Add the method attribute. If it is not set, default to `post`.
+	$method = empty( $attributes['method'] ) ? 'post' : $attributes['method'];
 	$processed_content->set_attribute( 'method', $method );
 
 	$extra_fields = apply_filters( 'render_block_core_form_extra_fields', '', $attributes );
@@ -50,6 +45,30 @@ function render_block_core_form( $attributes, $content ) {
 	);
 }
 
+/**
+ * Adds extra settings to the block editor, for the forms block.
+ *
+ * @param array $settings The block editor settings.
+ *
+ * @return array The block editor settings with extra settings added.
+ */
+function gutenberg_block_core_form_editor_settings( $settings ) {
+	$settings['formOptions'] = array(
+		'availableMethods' => array(
+			'email'  => array(
+				'label' => __( 'Send email', 'gutenberg' ),
+				'value' => 'email',
+			),
+			'custom' => array(
+				'label' => __( '- Custom -', 'gutenberg' ),
+				'value' => 'custom',
+			),
+		),
+	);
+	return $settings;
+}
+add_filter( 'block_editor_settings_all', 'gutenberg_block_core_form_editor_settings' );
+
 /**
  * Adds extra fields to the form.
  *
@@ -82,7 +101,7 @@ function gutenberg_block_core_form_extra_fields_comment_form( $extra_fields, $at
  * @return string The extra fields.
  */
 function gutenberg_block_core_form_extra_fields_email( $extra_fields, $attributes ) {
-	if ( 'email' === $attributes['method'] ) {
+	if ( 'email' === $attributes['submissionMethod'] ) {
 		$extra_fields .= wp_nonce_field( 'wp-block-form', 'wp_block_form', true, false );
 		$extra_fields .= '<input type="hidden" name="wp-send-email" value="1">';
 		$email_address = empty( $attributes['email'] ) ? get_option( 'admin_email' ) : $attributes['email'];
diff --git a/packages/block-library/src/form/variations.js b/packages/block-library/src/form/variations.js
index 02b1dca4a5a807..c640e8f166b565 100644
--- a/packages/block-library/src/form/variations.js
+++ b/packages/block-library/src/form/variations.js
@@ -9,6 +9,7 @@ const variations = [
 		title: __( 'Experimental Comment form' ),
 		description: __( 'A comment form for posts and pages.' ),
 		attributes: {
+			submissionMethod: 'custom',
 			action: '{SITE_URL}/wp-comments-post.php',
 			method: 'post',
 			anchor: 'comment-form',
@@ -57,6 +58,7 @@ const variations = [
 		keywords: [ 'GDPR' ],
 		description: __( 'A form torequest data exports and/or deletion.' ),
 		attributes: {
+			submissionMethod: 'custom',
 			action: '',
 			method: 'post',
 			anchor: 'gdpr-form',
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index 705374b727ea71..e77791bd7db27d 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -49,6 +49,7 @@ const BLOCK_EDITOR_SETTINGS = [
 	'focusMode',
 	'distractionFree',
 	'fontSizes',
+	'formOptions',
 	'gradients',
 	'generateAnchors',
 	'hasFixedToolbar',

From 1f87413d90e3c0dd0e633f6bd493dcbc3f110ff4 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 8 Aug 2023 14:00:21 +0300
Subject: [PATCH 112/133] Add form-submission-notification block

---
 docs/reference-guides/core-blocks.md          | 10 +++
 lib/blocks.php                                |  1 +
 .../form-submission-notification/block.json   | 18 ++++
 .../src/form-submission-notification/edit.js  | 82 +++++++++++++++++++
 .../src/form-submission-notification/index.js | 26 ++++++
 .../form-submission-notification/index.php    | 35 ++++++++
 .../src/form-submission-notification/init.js  |  6 ++
 .../src/form-submission-notification/save.js  | 28 +++++++
 .../variations.js                             | 59 +++++++++++++
 packages/block-library/src/index.js           |  2 +
 10 files changed, 267 insertions(+)
 create mode 100644 packages/block-library/src/form-submission-notification/block.json
 create mode 100644 packages/block-library/src/form-submission-notification/edit.js
 create mode 100644 packages/block-library/src/form-submission-notification/index.js
 create mode 100644 packages/block-library/src/form-submission-notification/index.php
 create mode 100644 packages/block-library/src/form-submission-notification/init.js
 create mode 100644 packages/block-library/src/form-submission-notification/save.js
 create mode 100644 packages/block-library/src/form-submission-notification/variations.js

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 624ad997f815f5..8e38632113868e 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -296,6 +296,16 @@ The basic building block for forms. ([Source](https://github.com/WordPress/guten
 -	**Supports:** anchor, spacing (margin), ~~reusable~~
 -	**Attributes:** inlineLabel, label, name, placeholder, required, type, value, visibilityPermissions
 
+## Form Submission Notification
+
+Provide a notification message after the form has been submitted. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/form-submission-notification))
+
+-	**Name:** core/form-submission-notification
+-	**Category:** common
+-	**Parent:** core/form
+-	**Supports:** 
+-	**Attributes:** type
+
 ## Form submit button
 
 A submission button for forms. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/form-submit-button))
diff --git a/lib/blocks.php b/lib/blocks.php
index b1d0677f06a5c9..1794762b010dbd 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -70,6 +70,7 @@ function gutenberg_reregister_core_block_types() {
 				'file.php'                         => 'core/file',
 				'form.php'                         => 'core/form',
 				'form-input.php'                   => 'core/form-input',
+				'form-submission-notification.php' => 'core/form-submission-notification',
 				'home-link.php'                    => 'core/home-link',
 				'image.php'                        => 'core/image',
 				'gallery.php'                      => 'core/gallery',
diff --git a/packages/block-library/src/form-submission-notification/block.json b/packages/block-library/src/form-submission-notification/block.json
new file mode 100644
index 00000000000000..62284d35ab4ddd
--- /dev/null
+++ b/packages/block-library/src/form-submission-notification/block.json
@@ -0,0 +1,18 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "core/form-submission-notification",
+	"title": "Form Submission Notification",
+	"category": "common",
+	"parent": [ "core/form" ],
+	"description": "Provide a notification message after the form has been submitted.",
+	"keywords": [ "form", "feedback", "notification", "message" ],
+	"textdomain": "default",
+	"icon": "feedback",
+	"attributes": {
+		"type": {
+			"type": "string",
+			"default": "success"
+		}
+	}
+}
diff --git a/packages/block-library/src/form-submission-notification/edit.js b/packages/block-library/src/form-submission-notification/edit.js
new file mode 100644
index 00000000000000..46566610564947
--- /dev/null
+++ b/packages/block-library/src/form-submission-notification/edit.js
@@ -0,0 +1,82 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import {
+	InnerBlocks,
+	useBlockProps,
+	useInnerBlocksProps,
+	InspectorControls,
+	store as blockEditorStore,
+} from '@wordpress/block-editor';
+import { PanelBody, SelectControl } from '@wordpress/components';
+import { useSelect } from '@wordpress/data';
+
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
+const TEMPLATE = [
+	[
+		'core/paragraph',
+		{
+			content: __(
+				"Enter the message you wish displayed for form submission error/success, and select the type of the message (success/error) from the block's options."
+			),
+		},
+	],
+];
+
+const Edit = ( { attributes, setAttributes, clientId } ) => {
+	const { type } = attributes;
+	const blockProps = useBlockProps( {
+		className: classnames( 'wp-block-form-submission-notification', {
+			[ `form-notification-type-${ type }` ]: type,
+		} ),
+	} );
+
+	const { hasInnerBlocks } = useSelect(
+		( select ) => {
+			const { getBlock } = select( blockEditorStore );
+			const block = getBlock( clientId );
+			return {
+				hasInnerBlocks: !! ( block && block.innerBlocks.length ),
+			};
+		},
+		[ clientId ]
+	);
+
+	const innerBlocksProps = useInnerBlocksProps( blockProps, {
+		template: TEMPLATE,
+		renderAppender: hasInnerBlocks
+			? undefined
+			: InnerBlocks.ButtonBlockAppender,
+	} );
+
+	return (
+		<>
+			<InspectorControls>
+				<PanelBody title={ __( 'Notification settings' ) }>
+					<SelectControl
+						__nextHasNoMarginBottom
+						label={ __( 'Notification type' ) }
+						options={ [
+							{ label: __( 'Success' ), value: 'success' },
+							{ label: __( 'Error' ), value: 'error' },
+						] }
+						value={ type }
+						onChange={ ( value ) =>
+							setAttributes( { type: value } )
+						}
+						help={ __(
+							'Select the notification type (success/error)'
+						) }
+					/>
+				</PanelBody>
+			</InspectorControls>
+			<div { ...innerBlocksProps } />
+		</>
+	);
+};
+export default Edit;
diff --git a/packages/block-library/src/form-submission-notification/index.js b/packages/block-library/src/form-submission-notification/index.js
new file mode 100644
index 00000000000000..67c359374eec1c
--- /dev/null
+++ b/packages/block-library/src/form-submission-notification/index.js
@@ -0,0 +1,26 @@
+/**
+ * WordPress dependencies
+ */
+import { group as icon } from '@wordpress/icons';
+
+/**
+ * Internal dependencies
+ */
+import initBlock from '../utils/init-block';
+import edit from './edit';
+import metadata from './block.json';
+import save from './save';
+import variations from './variations';
+
+const { name } = metadata;
+
+export { metadata, name };
+
+export const settings = {
+	icon,
+	edit,
+	save,
+	variations,
+};
+
+export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/block-library/src/form-submission-notification/index.php b/packages/block-library/src/form-submission-notification/index.php
new file mode 100644
index 00000000000000..f0fcc083b41cf2
--- /dev/null
+++ b/packages/block-library/src/form-submission-notification/index.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Server-side rendering of the `core/form-submission-notification` block.
+ *
+ * @package WordPress
+ */
+
+/**
+ * Renders the `core/form-submission-notification` block on server.
+ *
+ * @param array  $attributes The block attributes.
+ * @param string $content The saved content.
+ *
+ * @return string The content of the block being rendered.
+ */
+function render_block_core_form_submission_notification( $attributes, $content ) {
+	$show = apply_filters( 'show_form_submission_notification_block', false, $attributes, $content );
+	if ( ! $show ) {
+		return '';
+	}
+	return $content;
+}
+
+/**
+ * Registers the `core/form-submission-notification` block on server.
+ */
+function register_block_core_form_submission_notification() {
+	register_block_type_from_metadata(
+		__DIR__ . '/form-submission-notification',
+		array(
+			'render_callback' => 'render_block_core_form_submission_notification',
+		)
+	);
+}
+add_action( 'init', 'register_block_core_form_submission_notification' );
diff --git a/packages/block-library/src/form-submission-notification/init.js b/packages/block-library/src/form-submission-notification/init.js
new file mode 100644
index 00000000000000..a7f22ef02d640f
--- /dev/null
+++ b/packages/block-library/src/form-submission-notification/init.js
@@ -0,0 +1,6 @@
+/**
+ * Internal dependencies
+ */
+import { init } from '.';
+
+export default init();
diff --git a/packages/block-library/src/form-submission-notification/save.js b/packages/block-library/src/form-submission-notification/save.js
new file mode 100644
index 00000000000000..7b3c6c895c192a
--- /dev/null
+++ b/packages/block-library/src/form-submission-notification/save.js
@@ -0,0 +1,28 @@
+/**
+ * WordPress dependencies
+ */
+import { useInnerBlocksProps, useBlockProps } from '@wordpress/block-editor';
+
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
+export default function save( { attributes } ) {
+	const { type } = attributes;
+
+	return (
+		<div
+			{ ...useInnerBlocksProps.save(
+				useBlockProps.save( {
+					className: classnames(
+						'wp-block-form-submission-notification',
+						{
+							[ `form-notification-type-${ type }` ]: type,
+						}
+					),
+				} )
+			) }
+		/>
+	);
+}
diff --git a/packages/block-library/src/form-submission-notification/variations.js b/packages/block-library/src/form-submission-notification/variations.js
new file mode 100644
index 00000000000000..d19080951bb4fb
--- /dev/null
+++ b/packages/block-library/src/form-submission-notification/variations.js
@@ -0,0 +1,59 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+const variations = [
+	{
+		name: 'form-submission-success',
+		title: __( 'Form submission success' ),
+		description: __( 'Success message for form submissions' ),
+		attributes: {
+			type: 'success',
+		},
+		isDefault: false,
+		innerBlocks: [
+			[
+				'core/paragraph',
+				{
+					content: __( 'Your form has been submitted successfully.' ),
+					backgroundColor: '#00D084',
+					textColor: '#000000',
+					style: {
+						elements: { link: { color: { text: '#000000' } } },
+					},
+				},
+			],
+		],
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) =>
+			! blockAttributes?.type || blockAttributes?.type === 'success',
+	},
+	{
+		name: 'form-submission-error',
+		title: __( 'Form submission error' ),
+		description: __( 'Error/failure message for form submissions' ),
+		attributes: {
+			type: 'error',
+		},
+		isDefault: false,
+		innerBlocks: [
+			[
+				'core/paragraph',
+				{
+					content: __( 'There was an error submitting your form.' ),
+					backgroundColor: '#CF2E2E',
+					textColor: '#FFFFFF',
+					style: {
+						elements: { link: { color: { text: '#FFFFFF' } } },
+					},
+				},
+			],
+		],
+		scope: [ 'inserter', 'transform' ],
+		isActive: ( blockAttributes ) =>
+			! blockAttributes?.type || blockAttributes?.type === 'error',
+	},
+];
+
+export default variations;
diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
index 387e53f05a930e..e2e0fd9e414ef3 100644
--- a/packages/block-library/src/index.js
+++ b/packages/block-library/src/index.js
@@ -51,6 +51,7 @@ import * as file from './file';
 import * as form from './form';
 import * as formInput from './form-input';
 import * as formSubmitButton from './form-submit-button';
+import * as formSubmissionNotification from './form-submission-notification';
 import * as gallery from './gallery';
 import * as group from './group';
 import * as heading from './heading';
@@ -235,6 +236,7 @@ const getAllBlocks = () => {
 		blocks.push( form );
 		blocks.push( formInput );
 		blocks.push( formSubmitButton );
+		blocks.push( formSubmissionNotification );
 	}
 
 	// When in a WordPress context, conditionally

From 1cab06455f44baab3e512e7fe7eff65254f3532c Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Tue, 8 Aug 2023 14:02:59 +0300
Subject: [PATCH 113/133] add it to the list of allowed blocks

---
 packages/block-library/src/form/edit.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 66c649e4410479..89a3124ef5b98e 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -17,6 +17,7 @@ const ALLOWED_BLOCKS = [
 	'core/heading',
 	'core/form-input',
 	'core/form-submit-button',
+	'core/form-submission-notification',
 ];
 
 const TEMPLATE = [

From eb2cfa0535ad30d90fda8a5287e2e2da7ca762d6 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Aug 2023 09:51:53 +0300
Subject: [PATCH 114/133] add form notifications to variations

---
 packages/block-library/src/form/edit.js       | 10 ++++
 packages/block-library/src/form/index.php     | 59 +++++++++++--------
 packages/block-library/src/form/utils.js      | 45 ++++++++++++++
 packages/block-library/src/form/variations.js |  9 +++
 4 files changed, 100 insertions(+), 23 deletions(-)
 create mode 100644 packages/block-library/src/form/utils.js

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 89a3124ef5b98e..b10a86170fb590 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -12,6 +12,14 @@ import {
 import { TextControl, SelectControl } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 
+/**
+ * Internal dependencies
+ */
+import {
+	formSubmissionNotificationSuccess,
+	formSubmissionNotificationError,
+} from './utils.js';
+
 const ALLOWED_BLOCKS = [
 	'core/paragraph',
 	'core/heading',
@@ -21,6 +29,8 @@ const ALLOWED_BLOCKS = [
 ];
 
 const TEMPLATE = [
+	formSubmissionNotificationSuccess,
+	formSubmissionNotificationError,
 	[
 		'core/form-input',
 		{
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 0b6c421dd12dfd..3738669455f1e8 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -149,13 +149,28 @@ function gutenberg_block_core_form_send_email() {
 	$content = apply_filters( 'render_block_core_form_email_content', $content, $params );
 
 	// Send the email.
-	wp_mail( $params['wp-email-address'], __( 'Form submission', 'gutenberg' ), $content );
+	$result = wp_mail( $params['wp-email-address'], __( 'Form submission', 'gutenberg' ), $content );
+
+	/**
+	 * Determine whether the core/form-submission-notification block should be shown.
+	 *
+	 * @param bool   $show       Whether to show the core/form-submission-notification block.
+	 * @param array  $attributes The block attributes.
+	 *
+	 * @return bool Whether to show the core/form-submission-notification block.
+	 */
+	$show_notification = static function( $show, $attributes ) use ( $result ) {
+		return ( 'success' === $attributes['type'] && $result )
+			|| ( 'error' === $attributes['type'] && ! $result );
+	};
+	// Add filter to show the notification block.
+	add_filter( 'show_form_submission_notification_block', $show_notification, 10, 2 );
 
 	/**
 	 * Fires after the email has been sent.
 	 *
 	 * This will allow 3rd-party plugins to redirect to a different page
-	 * by removing the default redirect, or add a success message etc.
+	 * by removing the default redirect, etc.
 	 *
 	 * @param array $params The POST data.
 	 */
@@ -225,31 +240,29 @@ function gutenberg_block_core_form_privacy_form() {
 		$actions_performed[] = $action_name;
 	}
 
-	// Add feedback to the top of the form when the page re-renders.
-	$privacy_form_feedback = static function( $block_content ) use ( $actions_errored, $actions_performed ) {
-		// Bail early if no actions were detected.
-		if ( empty( $actions_errored ) && empty( $actions_performed ) ) {
-			return $block_content;
-		}
+	/**
+	 * Determine whether the core/form-submission-notification block should be shown.
+	 *
+	 * @param bool   $show       Whether to show the core/form-submission-notification block.
+	 * @param array  $attributes The block attributes.
+	 *
+	 * @return bool Whether to show the core/form-submission-notification block.
+	 */
+	$show_notification = static function( $show, $attributes ) use ( $actions_performed, $actions_errored ) {
+		switch ( $attributes['type'] ) {
+			case 'success':
+				return ! empty( $actions_performed ) && empty( $actions_errored );
 
-		// Bail early if this is not a privacy form.
-		if ( false === strpos( $block_content, 'wp_privacy_send_request' ) ) {
-			return $block_content;
-		}
+			case 'error':
+				return ! empty( $actions_errored );
 
-		if ( ! empty( $actions_errored ) ) {
-			$feedback  = '<div class="wp-privacy-request-error" style="padding:1em;border:1px solid #EA8484;background:#FBEAEA;color:#9A2323;border-radius:3px;">';
-			$feedback .= '<p>' . __( 'There was a problem with your action. Please try again later.', 'gutenberg' ) . '</p>';
-			$feedback .= '</div>';
-		} else {
-			$feedback  = '<div class="wp-privacy-request-success" style="padding:1em;border:1px solid #B5E1B9;background:#ECF7ED;color:#31843F;border-radius:3px;">';
-			$feedback .= '<p>' . __( 'Confirmation request initiated successfully. Please check your email for confirmation.', 'gutenberg' ) . '</p>';
-			$feedback .= '</div>';
+			default:
+				return $show;
 		}
-
-		return $feedback . $block_content;
 	};
-	add_action( 'render_block_core/form', $privacy_form_feedback );
+
+	// Add filter to show the core/form-submission-notification block.
+	add_filter( 'show_form_submission_notification_block', $show_notification, 10, 2 );
 }
 add_action( 'wp', 'gutenberg_block_core_form_privacy_form' );
 
diff --git a/packages/block-library/src/form/utils.js b/packages/block-library/src/form/utils.js
new file mode 100644
index 00000000000000..4405438f4c26ca
--- /dev/null
+++ b/packages/block-library/src/form/utils.js
@@ -0,0 +1,45 @@
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+
+export const formSubmissionNotificationSuccess = [
+	'core/form-submission-notification',
+	{
+		type: 'success',
+	},
+	[
+		[
+			'core/paragraph',
+			{
+				content: __( 'Your form has been submitted successfully.' ),
+				backgroundColor: '#00D084',
+				textColor: '#000000',
+				style: {
+					elements: {
+						link: { color: { text: '#000000' } },
+					},
+				},
+			},
+		],
+	],
+];
+export const formSubmissionNotificationError = [
+	'core/form-submission-notification',
+	{
+		type: 'error',
+	},
+	[
+		[
+			'core/paragraph',
+			{
+				content: __( 'There was an error submitting your form.' ),
+				backgroundColor: '#CF2E2E',
+				textColor: '#FFFFFF',
+				style: {
+					elements: { link: { color: { text: '#FFFFFF' } } },
+				},
+			},
+		],
+	],
+];
diff --git a/packages/block-library/src/form/variations.js b/packages/block-library/src/form/variations.js
index c640e8f166b565..da3fcbbf039421 100644
--- a/packages/block-library/src/form/variations.js
+++ b/packages/block-library/src/form/variations.js
@@ -2,6 +2,13 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
+/**
+ * Internal dependencies
+ */
+import {
+	formSubmissionNotificationSuccess,
+	formSubmissionNotificationError,
+} from './utils.js';
 
 const variations = [
 	{
@@ -65,6 +72,8 @@ const variations = [
 		},
 		isDefault: false,
 		innerBlocks: [
+			formSubmissionNotificationSuccess,
+			formSubmissionNotificationError,
 			[
 				'core/paragraph',
 				{

From cf2fbee46cf093ab1d2280d2053fa2b65676f953 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Aug 2023 12:46:16 +0300
Subject: [PATCH 115/133] improve default notifications

---
 packages/block-library/src/form/utils.js | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/block-library/src/form/utils.js b/packages/block-library/src/form/utils.js
index 4405438f4c26ca..e541f34bbc887f 100644
--- a/packages/block-library/src/form/utils.js
+++ b/packages/block-library/src/form/utils.js
@@ -12,14 +12,10 @@ export const formSubmissionNotificationSuccess = [
 		[
 			'core/paragraph',
 			{
-				content: __( 'Your form has been submitted successfully.' ),
-				backgroundColor: '#00D084',
-				textColor: '#000000',
-				style: {
-					elements: {
-						link: { color: { text: '#000000' } },
-					},
-				},
+				content:
+					'<mark style="background-color:rgba(0, 0, 0, 0);color:#345C00" class="has-inline-color">' +
+					__( 'Your form has been submitted successfully' ) +
+					'</mark>',
 			},
 		],
 	],
@@ -33,12 +29,10 @@ export const formSubmissionNotificationError = [
 		[
 			'core/paragraph',
 			{
-				content: __( 'There was an error submitting your form.' ),
-				backgroundColor: '#CF2E2E',
-				textColor: '#FFFFFF',
-				style: {
-					elements: { link: { color: { text: '#FFFFFF' } } },
-				},
+				content:
+					'<mark style="background-color:rgba(0, 0, 0, 0);color:#CF2E2E" class="has-inline-color">' +
+					__( 'There was an error submitting your form.' ) +
+					'</mark>',
 			},
 		],
 	],

From c37baab83fe31333a06b24a7abc882b05fdbb4eb Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Aug 2023 12:46:53 +0300
Subject: [PATCH 116/133] Now that we have variations we don't need the
 separate control

---
 .../src/form-submission-notification/edit.js  | 29 ++-----------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/packages/block-library/src/form-submission-notification/edit.js b/packages/block-library/src/form-submission-notification/edit.js
index 46566610564947..732ee5be2631ac 100644
--- a/packages/block-library/src/form-submission-notification/edit.js
+++ b/packages/block-library/src/form-submission-notification/edit.js
@@ -6,10 +6,8 @@ import {
 	InnerBlocks,
 	useBlockProps,
 	useInnerBlocksProps,
-	InspectorControls,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { PanelBody, SelectControl } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 
 /**
@@ -28,7 +26,7 @@ const TEMPLATE = [
 	],
 ];
 
-const Edit = ( { attributes, setAttributes, clientId } ) => {
+const Edit = ( { attributes, clientId } ) => {
 	const { type } = attributes;
 	const blockProps = useBlockProps( {
 		className: classnames( 'wp-block-form-submission-notification', {
@@ -54,29 +52,6 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 			: InnerBlocks.ButtonBlockAppender,
 	} );
 
-	return (
-		<>
-			<InspectorControls>
-				<PanelBody title={ __( 'Notification settings' ) }>
-					<SelectControl
-						__nextHasNoMarginBottom
-						label={ __( 'Notification type' ) }
-						options={ [
-							{ label: __( 'Success' ), value: 'success' },
-							{ label: __( 'Error' ), value: 'error' },
-						] }
-						value={ type }
-						onChange={ ( value ) =>
-							setAttributes( { type: value } )
-						}
-						help={ __(
-							'Select the notification type (success/error)'
-						) }
-					/>
-				</PanelBody>
-			</InspectorControls>
-			<div { ...innerBlocksProps } />
-		</>
-	);
+	return <div { ...innerBlocksProps } />;
 };
 export default Edit;

From 3b3bf18cacc6067d7bcecdd021f87bd55b787377 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Aug 2023 12:47:17 +0300
Subject: [PATCH 117/133] Default to success notification

---
 .../src/form-submission-notification/variations.js              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form-submission-notification/variations.js b/packages/block-library/src/form-submission-notification/variations.js
index d19080951bb4fb..b154a26e5e6a43 100644
--- a/packages/block-library/src/form-submission-notification/variations.js
+++ b/packages/block-library/src/form-submission-notification/variations.js
@@ -11,7 +11,7 @@ const variations = [
 		attributes: {
 			type: 'success',
 		},
-		isDefault: false,
+		isDefault: true,
 		innerBlocks: [
 			[
 				'core/paragraph',

From 320d4275576b3bbaac7be958b870ff337ccf7535 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Aug 2023 12:47:47 +0300
Subject: [PATCH 118/133] Add editor styles for notifications

---
 packages/block-library/src/editor.scss               |  1 +
 .../src/form-submission-notification/editor.scss     | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 packages/block-library/src/form-submission-notification/editor.scss

diff --git a/packages/block-library/src/editor.scss b/packages/block-library/src/editor.scss
index 459e8d4f0f3b31..5f3d962ae7afae 100644
--- a/packages/block-library/src/editor.scss
+++ b/packages/block-library/src/editor.scss
@@ -17,6 +17,7 @@
 @import "./embed/editor.scss";
 @import "./file/editor.scss";
 @import "./form-input/editor.scss";
+@import "./form-submission-notification/editor.scss";
 @import "./freeform/editor.scss";
 @import "./gallery/editor.scss";
 @import "./group/editor.scss";
diff --git a/packages/block-library/src/form-submission-notification/editor.scss b/packages/block-library/src/form-submission-notification/editor.scss
new file mode 100644
index 00000000000000..16e1661f2a8e93
--- /dev/null
+++ b/packages/block-library/src/form-submission-notification/editor.scss
@@ -0,0 +1,12 @@
+.wp-block-form-submission-notification {
+	opacity: 0.3;
+	border: 1px dashed;
+	box-sizing: border-box;
+	background: repeating-linear-gradient(45deg, transparent, transparent 5px, currentColor 5px, currentColor 6px);
+
+	&.is-selected,
+	&:has(.is-selected) {
+		opacity: 1;
+		background: none;
+	}
+}

From b4c93aa568a8f40910e7811968213ebc00354433 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Aug 2023 13:43:12 +0300
Subject: [PATCH 119/133] condition is not necessary

---
 packages/block-library/src/form/index.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 3738669455f1e8..960734033e68de 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -27,10 +27,7 @@ function render_block_core_form( $attributes, $content ) {
 			$attributes['action']
 		);
 	}
-
-	if ( ! empty( $action ) ) {
-		$processed_content->set_attribute( 'action', esc_attr( $action ) );
-	}
+	$processed_content->set_attribute( 'action', esc_attr( $action ) );
 
 	// Add the method attribute. If it is not set, default to `post`.
 	$method = empty( $attributes['method'] ) ? 'post' : $attributes['method'];

From ce6c9b735912a46f0b0bee1b6e5b65c7cd995a7e Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 9 Aug 2023 13:44:17 +0300
Subject: [PATCH 120/133] Remove redirect for emails forms. Still buggy, need
 to figure out smthng

---
 packages/block-library/src/form/index.php | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 960734033e68de..a5671ab1bda2f7 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -162,30 +162,9 @@ function gutenberg_block_core_form_send_email() {
 	};
 	// Add filter to show the notification block.
 	add_filter( 'show_form_submission_notification_block', $show_notification, 10, 2 );
-
-	/**
-	 * Fires after the email has been sent.
-	 *
-	 * This will allow 3rd-party plugins to redirect to a different page
-	 * by removing the default redirect, etc.
-	 *
-	 * @param array $params The POST data.
-	 */
-	do_action( 'render_block_core_form_email_sent', $params );
 }
 add_action( 'wp', 'gutenberg_block_core_form_send_email' );
 
-/**
- * Redirect to the same page when the form has been submitted and an email was sent.
- *
- * @param array $params The POST data.
- */
-function gutenberg_block_core_form_email_sent( $params ) {
-	wp_safe_redirect( get_site_url( null, $params['_wp_http_referer'] ) );
-	exit;
-}
-add_action( 'render_block_core_form_email_sent', 'gutenberg_block_core_form_email_sent' );
-
 /**
  * Send the data export/remove request if the form is a privacy-request form.
  *

From c18d3bf87bc8f099a1c0dd20435bbda32c95f738 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 11 Aug 2023 13:18:41 +0300
Subject: [PATCH 121/133] Refactor emails form & add a view script

---
 .../form-submission-notification/index.php    | 12 ++-
 packages/block-library/src/form/block.json    |  3 +-
 packages/block-library/src/form/edit.js       | 17 ++--
 packages/block-library/src/form/index.php     | 83 +++++++------------
 packages/block-library/src/form/save.js       | 10 ++-
 packages/block-library/src/form/view.js       | 41 +++++++++
 6 files changed, 105 insertions(+), 61 deletions(-)
 create mode 100644 packages/block-library/src/form/view.js

diff --git a/packages/block-library/src/form-submission-notification/index.php b/packages/block-library/src/form-submission-notification/index.php
index f0fcc083b41cf2..ba129984d9eb60 100644
--- a/packages/block-library/src/form-submission-notification/index.php
+++ b/packages/block-library/src/form-submission-notification/index.php
@@ -14,7 +14,17 @@
  * @return string The content of the block being rendered.
  */
 function render_block_core_form_submission_notification( $attributes, $content ) {
-	$show = apply_filters( 'show_form_submission_notification_block', false, $attributes, $content );
+	$show = isset( $_GET['wp-form-result'] ) && sanitize_text_field( wp_unslash( $_GET['wp-form-result'] ) ) === $attributes['type'];
+	/**
+	 * Filters whether to show the form submission notification block.
+	 *
+	 * @param bool   $show       Whether to show the form submission notification block.
+	 * @param array  $attributes The block attributes.
+	 * @param string $content    The saved content.
+	 *
+	 * @return bool Whether to show the form submission notification block.
+	 */
+	$show = apply_filters( 'show_form_submission_notification_block', $show, $attributes, $content );
 	if ( ! $show ) {
 		return '';
 	}
diff --git a/packages/block-library/src/form/block.json b/packages/block-library/src/form/block.json
index 97289910c51675..951d1dce4224eb 100644
--- a/packages/block-library/src/form/block.json
+++ b/packages/block-library/src/form/block.json
@@ -54,5 +54,6 @@
 			}
 		},
 		"__experimentalSelector": "form"
-	}
+	},
+	"viewScript": "file:./view.min.js"
 }
diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index b10a86170fb590..1c4e0b7a5a0fe6 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -106,11 +106,14 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 						autoComplete="off"
 						label={ __( 'Email for form submissions' ) }
 						value={ email }
-						onChange={ ( value ) =>
-							setAttributes( { email: value } )
-						}
+						required
+						onChange={ ( value ) => {
+							setAttributes( { email: value } );
+							setAttributes( { action: `mailto:${ value }` } );
+							setAttributes( { method: 'post' } );
+						} }
 						help={ __(
-							'The email address where form submissions will be sent. Separate multiple email addresses with a comma, or leave empty to use the site admin address.'
+							'The email address where form submissions will be sent. Separate multiple email addresses with a comma.'
 						) }
 					/>
 				) }
@@ -148,7 +151,11 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 					</InspectorControls>
 				) }
 			</InspectorControls>
-			<form { ...innerBlocksProps } />
+			<form
+				{ ...innerBlocksProps }
+				className="wp-block-form"
+				encType={ submissionMethod === 'email' ? 'text/plain' : null }
+			/>
 		</>
 	);
 };
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index a5671ab1bda2f7..3563bc52e917c5 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -42,6 +42,22 @@ function render_block_core_form( $attributes, $content ) {
 	);
 }
 
+/**
+ * Additional data to add to the view.js script for this block.
+ */
+function gutenberg_block_core_form_view_script() {
+	wp_localize_script(
+		'wp-block-form-view',
+		'wpBlockFormSettings',
+		array(
+			'nonce'   => wp_create_nonce( 'wp-block-form' ),
+			'ajaxUrl' => admin_url( 'admin-ajax.php' ),
+			'action'  => 'wp_block_form_email_submit',
+		)
+	);
+}
+add_action( 'wp_enqueue_scripts', 'gutenberg_block_core_form_view_script' );
+
 /**
  * Adds extra settings to the block editor, for the forms block.
  *
@@ -85,48 +101,16 @@ function gutenberg_block_core_form_extra_fields_comment_form( $extra_fields, $at
 }
 add_filter( 'render_block_core_form_extra_fields', 'gutenberg_block_core_form_extra_fields_comment_form', 10, 2 );
 
-/**
- * Adds extra fields to the form.
- *
- * If the form does not have an `action` defined, assume this is a contact form.
- * Adds a nonce field and a hidden input to enable sending an email
- * to the admin when the form is submitted.
- *
- * @param string $extra_fields The extra fields.
- * @param array  $attributes   The block attributes.
- *
- * @return string The extra fields.
- */
-function gutenberg_block_core_form_extra_fields_email( $extra_fields, $attributes ) {
-	if ( 'email' === $attributes['submissionMethod'] ) {
-		$extra_fields .= wp_nonce_field( 'wp-block-form', 'wp_block_form', true, false );
-		$extra_fields .= '<input type="hidden" name="wp-send-email" value="1">';
-		$email_address = empty( $attributes['email'] ) ? get_option( 'admin_email' ) : $attributes['email'];
-		$extra_fields .= '<input type="hidden" name="wp-email-address" value="' . esc_attr( $email_address ) . '">';
-	}
-	return $extra_fields;
-}
-add_filter( 'render_block_core_form_extra_fields', 'gutenberg_block_core_form_extra_fields_email', 10, 2 );
-
 /**
  * Sends an email if the form is a contact form.
  *
  * @return void
  */
 function gutenberg_block_core_form_send_email() {
-	// Get the POST or GET data.
-	$params = wp_unslash( $_POST );
-
-	// Bail early if not a form submission, or if the nonce is not valid.
-	if ( empty( $params['wp_block_form'] )
-		|| empty( $params['wp-send-email'] )
-		|| '1' !== $params['wp-send-email']
-		|| ! wp_verify_nonce( $params['wp_block_form'], 'wp-block-form' )
-		|| empty( $params['wp-email-address'] )
-	) {
-		return;
-	}
+	check_ajax_referer( 'wp-block-form' );
 
+	// Get the POST data.
+	$params = wp_unslash( $_POST );
 	// Start building the email content.
 	$content = sprintf(
 		/* translators: %s: The request URI. */
@@ -134,7 +118,7 @@ function gutenberg_block_core_form_send_email() {
 		'<a href="' . esc_url( get_site_url( null, $params['_wp_http_referer'] ) ) . '">' . get_bloginfo( 'name' ) . '</a>'
 	);
 
-	$skip_fields = array( 'wp_block_form', '_wp_http_referer', 'wp-send-email', 'wp-email-address' );
+	$skip_fields = array( 'formAction', '_ajax_nonce', 'action' );
 	foreach ( $params as $key => $value ) {
 		if ( in_array( $key, $skip_fields, true ) ) {
 			continue;
@@ -146,24 +130,19 @@ function gutenberg_block_core_form_send_email() {
 	$content = apply_filters( 'render_block_core_form_email_content', $content, $params );
 
 	// Send the email.
-	$result = wp_mail( $params['wp-email-address'], __( 'Form submission', 'gutenberg' ), $content );
+	$result = wp_mail(
+		str_replace( 'mailto:', '', $params['wp-email-address'] ),
+		__( 'Form submission', 'gutenberg' ),
+		$content
+	);
 
-	/**
-	 * Determine whether the core/form-submission-notification block should be shown.
-	 *
-	 * @param bool   $show       Whether to show the core/form-submission-notification block.
-	 * @param array  $attributes The block attributes.
-	 *
-	 * @return bool Whether to show the core/form-submission-notification block.
-	 */
-	$show_notification = static function( $show, $attributes ) use ( $result ) {
-		return ( 'success' === $attributes['type'] && $result )
-			|| ( 'error' === $attributes['type'] && ! $result );
-	};
-	// Add filter to show the notification block.
-	add_filter( 'show_form_submission_notification_block', $show_notification, 10, 2 );
+	if ( ! $result ) {
+		wp_send_json_error( $result );
+	}
+	wp_send_json_success( $result );
 }
-add_action( 'wp', 'gutenberg_block_core_form_send_email' );
+add_action( 'wp_ajax_wp_block_form_email_submit', 'gutenberg_block_core_form_send_email' );
+add_action( 'wp_ajax_nopriv_wp_block_form_email_submit', 'gutenberg_block_core_form_send_email' );
 
 /**
  * Send the data export/remove request if the form is a privacy-request form.
diff --git a/packages/block-library/src/form/save.js b/packages/block-library/src/form/save.js
index 72991db918c5e4..a824fc076d2ac3 100644
--- a/packages/block-library/src/form/save.js
+++ b/packages/block-library/src/form/save.js
@@ -3,10 +3,16 @@
  */
 import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
 
-const Save = () => {
+const Save = ( { attributes } ) => {
 	const blockProps = useBlockProps.save();
+	const { submissionMethod } = attributes;
+
 	return (
-		<form { ...blockProps }>
+		<form
+			{ ...blockProps }
+			className="wp-block-form"
+			encType={ submissionMethod === 'email' ? 'text/plain' : null }
+		>
 			<InnerBlocks.Content />
 		</form>
 	);
diff --git a/packages/block-library/src/form/view.js b/packages/block-library/src/form/view.js
new file mode 100644
index 00000000000000..05efe95da545c9
--- /dev/null
+++ b/packages/block-library/src/form/view.js
@@ -0,0 +1,41 @@
+// eslint-disable-next-line eslint-comments/disable-enable-pair
+/* eslint-disable no-undef */
+document.querySelectorAll( 'form.wp-block-form' ).forEach( function ( form ) {
+	// Bail If the form is not using the mailto: action.
+	if ( ! form.action || ! form.action.startsWith( 'mailto:' ) ) {
+		return;
+	}
+
+	const redirectNotification = ( status ) => {
+		const urlParams = new URLSearchParams( window.location.search );
+		urlParams.append( 'wp-form-result', status );
+		window.location.search = urlParams.toString();
+	};
+
+	// Add an event listener for the form submission.
+	form.addEventListener( 'submit', async function ( event ) {
+		event.preventDefault();
+		// Get the form data and merge it with the form action and nonce.
+		const formData = Object.fromEntries( new FormData( form ).entries() );
+		formData.formAction = form.action;
+		formData._ajax_nonce = wpBlockFormSettings.nonce;
+		formData.action = wpBlockFormSettings.action;
+
+		try {
+			const response = await fetch( wpBlockFormSettings.ajaxUrl, {
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/x-www-form-urlencoded',
+				},
+				body: new URLSearchParams( formData ).toString(),
+			} );
+			if ( response.ok ) {
+				redirectNotification( 'success' );
+			} else {
+				redirectNotification( 'error' );
+			}
+		} catch ( error ) {
+			redirectNotification( 'error' );
+		}
+	} );
+} );

From 50a552892d6d46579d5855536acc01fd71ed7d34 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 24 Aug 2023 11:45:02 +0300
Subject: [PATCH 122/133] Don't show `hidden` inputs in the UI

---
 packages/block-library/src/form-input/edit.js | 44 +++++++------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/packages/block-library/src/form-input/edit.js b/packages/block-library/src/form-input/edit.js
index 3d26ec21478d91..0742c22c22f429 100644
--- a/packages/block-library/src/form-input/edit.js
+++ b/packages/block-library/src/form-input/edit.js
@@ -79,35 +79,23 @@ function InputFieldBlock( { attributes, setAttributes, className } ) {
 
 	if ( 'hidden' === type ) {
 		return (
-			<div { ...blockProps }>
+			<>
 				{ controls }
-				<span className={ 'is-input-hidden' }>
-					<RichText
-						tagName="span"
-						className="wp-block-form-input__label-content"
-						value={ name }
-						onChange={ ( newValue ) =>
-							setAttributes( { name: newValue } )
-						}
-						aria-label={ __( 'Input name' ) }
-						placeholder={ __( 'Type the name for this input' ) }
-					/>
-					<input
-						type="text"
-						className={ classNames(
-							className,
-							'wp-block-form-input__input',
-							colorProps.className,
-							borderProps.className
-						) }
-						aria-label={ __( 'Value' ) }
-						value={ value }
-						onChange={ ( event ) =>
-							setAttributes( { value: event.target.value } )
-						}
-					/>
-				</span>
-			</div>
+				<input
+					type="hidden"
+					className={ classNames(
+						className,
+						'wp-block-form-input__input',
+						colorProps.className,
+						borderProps.className
+					) }
+					aria-label={ __( 'Value' ) }
+					value={ value }
+					onChange={ ( event ) =>
+						setAttributes( { value: event.target.value } )
+					}
+				/>
+			</>
 		);
 	}
 

From 45c61d89b49f6e429117ace244a7ce8b0baae19f Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 24 Aug 2023 12:12:34 +0300
Subject: [PATCH 123/133] rename functions

---
 packages/block-library/src/form/index.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 3563bc52e917c5..88fefbc29f6125 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -45,7 +45,7 @@ function render_block_core_form( $attributes, $content ) {
 /**
  * Additional data to add to the view.js script for this block.
  */
-function gutenberg_block_core_form_view_script() {
+function block_core_form_view_script() {
 	wp_localize_script(
 		'wp-block-form-view',
 		'wpBlockFormSettings',
@@ -56,7 +56,7 @@ function gutenberg_block_core_form_view_script() {
 		)
 	);
 }
-add_action( 'wp_enqueue_scripts', 'gutenberg_block_core_form_view_script' );
+add_action( 'wp_enqueue_scripts', 'block_core_form_view_script' );
 
 /**
  * Adds extra settings to the block editor, for the forms block.
@@ -65,7 +65,7 @@ function gutenberg_block_core_form_view_script() {
  *
  * @return array The block editor settings with extra settings added.
  */
-function gutenberg_block_core_form_editor_settings( $settings ) {
+function block_core_form_editor_settings( $settings ) {
 	$settings['formOptions'] = array(
 		'availableMethods' => array(
 			'email'  => array(
@@ -80,7 +80,7 @@ function gutenberg_block_core_form_editor_settings( $settings ) {
 	);
 	return $settings;
 }
-add_filter( 'block_editor_settings_all', 'gutenberg_block_core_form_editor_settings' );
+add_filter( 'block_editor_settings_all', 'block_core_form_editor_settings' );
 
 /**
  * Adds extra fields to the form.
@@ -93,20 +93,20 @@ function gutenberg_block_core_form_editor_settings( $settings ) {
  *
  * @return string The extra fields.
  */
-function gutenberg_block_core_form_extra_fields_comment_form( $extra_fields, $attributes ) {
+function block_core_form_extra_fields_comment_form( $extra_fields, $attributes ) {
 	if ( ! empty( $attributes['action'] ) && str_ends_with( $attributes['action'], '/wp-comments-post.php' ) ) {
 		$extra_fields .= '<input type="hidden" name="comment_post_ID" value="' . get_the_ID() . '" id="comment_post_ID">';
 	}
 	return $extra_fields;
 }
-add_filter( 'render_block_core_form_extra_fields', 'gutenberg_block_core_form_extra_fields_comment_form', 10, 2 );
+add_filter( 'render_block_core_form_extra_fields', 'block_core_form_extra_fields_comment_form', 10, 2 );
 
 /**
  * Sends an email if the form is a contact form.
  *
  * @return void
  */
-function gutenberg_block_core_form_send_email() {
+function block_core_form_send_email() {
 	check_ajax_referer( 'wp-block-form' );
 
 	// Get the POST data.
@@ -141,15 +141,15 @@ function gutenberg_block_core_form_send_email() {
 	}
 	wp_send_json_success( $result );
 }
-add_action( 'wp_ajax_wp_block_form_email_submit', 'gutenberg_block_core_form_send_email' );
-add_action( 'wp_ajax_nopriv_wp_block_form_email_submit', 'gutenberg_block_core_form_send_email' );
+add_action( 'wp_ajax_wp_block_form_email_submit', 'block_core_form_send_email' );
+add_action( 'wp_ajax_nopriv_wp_block_form_email_submit', 'block_core_form_send_email' );
 
 /**
  * Send the data export/remove request if the form is a privacy-request form.
  *
  * @return void
  */
-function gutenberg_block_core_form_privacy_form() {
+function block_core_form_privacy_form() {
 	// Get the POST data.
 	$params = wp_unslash( $_POST );
 
@@ -219,7 +219,7 @@ function gutenberg_block_core_form_privacy_form() {
 	// Add filter to show the core/form-submission-notification block.
 	add_filter( 'show_form_submission_notification_block', $show_notification, 10, 2 );
 }
-add_action( 'wp', 'gutenberg_block_core_form_privacy_form' );
+add_action( 'wp', 'block_core_form_privacy_form' );
 
 /**
  * Registers the `core/form` block on server.

From 1f315d61fa9cd634ad810c621c0b9339b615d156 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 24 Aug 2023 12:41:27 +0300
Subject: [PATCH 124/133] Update styles for notifications in the editor

---
 .../src/form-submission-notification/edit.js  |  8 +++-
 .../form-submission-notification/editor.scss  | 45 ++++++++++++++++---
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/packages/block-library/src/form-submission-notification/edit.js b/packages/block-library/src/form-submission-notification/edit.js
index 732ee5be2631ac..4425a4d9147dfb 100644
--- a/packages/block-library/src/form-submission-notification/edit.js
+++ b/packages/block-library/src/form-submission-notification/edit.js
@@ -52,6 +52,12 @@ const Edit = ( { attributes, clientId } ) => {
 			: InnerBlocks.ButtonBlockAppender,
 	} );
 
-	return <div { ...innerBlocksProps } />;
+	return (
+		<div
+			{ ...innerBlocksProps }
+			data-message-success={ __( 'Submission success notification' ) }
+			data-message-error={ __( 'Submission error notification' ) }
+		/>
+	);
 };
 export default Edit;
diff --git a/packages/block-library/src/form-submission-notification/editor.scss b/packages/block-library/src/form-submission-notification/editor.scss
index 16e1661f2a8e93..a8d3f4e3d92630 100644
--- a/packages/block-library/src/form-submission-notification/editor.scss
+++ b/packages/block-library/src/form-submission-notification/editor.scss
@@ -1,12 +1,45 @@
 .wp-block-form-submission-notification {
-	opacity: 0.3;
-	border: 1px dashed;
-	box-sizing: border-box;
-	background: repeating-linear-gradient(45deg, transparent, transparent 5px, currentColor 5px, currentColor 6px);
+	> * {
+		opacity: 0.25;
+		border: 1px dashed;
+		box-sizing: border-box;
+		background: repeating-linear-gradient(45deg, transparent, transparent 5px, currentColor 5px, currentColor 6px);
+	}
 
 	&.is-selected,
 	&:has(.is-selected) {
-		opacity: 1;
-		background: none;
+		> * {
+			opacity: 1;
+			background: none;
+		}
+
+		&::after {
+			display: none !important;
+		}
+	}
+
+	&::after {
+		display: flex;
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		left: 0;
+		justify-content: center;
+		align-items: center;
+		font-size: 1.1em;
+		// font-weight: bold;
+	}
+
+	&.form-notification-type-success {
+		&::after {
+			content: attr(data-message-success);
+		}
+	}
+
+	&.form-notification-type-error {
+		&::after {
+			content: attr(data-message-error);
+		}
 	}
 }

From 39be96665957c24e18477882be04bb3d9aea08a5 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 24 Aug 2023 15:08:23 +0300
Subject: [PATCH 125/133] remove hidden variation

---
 packages/block-library/src/form-input/variations.js | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/block-library/src/form-input/variations.js b/packages/block-library/src/form-input/variations.js
index 5172ef31cf8945..cc205feb895016 100644
--- a/packages/block-library/src/form-input/variations.js
+++ b/packages/block-library/src/form-input/variations.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { unseen } from '@wordpress/icons';
 
 const variations = [
 	{
@@ -78,18 +77,6 @@ const variations = [
 		scope: [ 'inserter', 'transform' ],
 		isActive: ( blockAttributes ) => blockAttributes?.type === 'number',
 	},
-	{
-		name: 'hidden',
-		title: __( 'Hidden input' ),
-		icon: unseen,
-		description: __(
-			'A hidden input. Use it to add hidden data to form submissions.'
-		),
-		attributes: { type: 'hidden' },
-		isDefault: false,
-		scope: [ 'inserter', 'transform' ],
-		isActive: ( blockAttributes ) => blockAttributes?.type === 'hidden',
-	},
 ];
 
 export default variations;

From dabde4c617371b0f298e81644e3e937437ef46ed Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Thu, 7 Sep 2023 12:00:42 +0300
Subject: [PATCH 126/133] Remove formOptions & fix controls spacing

---
 packages/block-library/src/form/edit.js       | 133 ++++++++++--------
 packages/block-library/src/form/index.php     |  24 ----
 .../provider/use-block-editor-settings.js     |   1 -
 3 files changed, 75 insertions(+), 83 deletions(-)

diff --git a/packages/block-library/src/form/edit.js b/packages/block-library/src/form/edit.js
index 1c4e0b7a5a0fe6..d8ae9ea5e75539 100644
--- a/packages/block-library/src/form/edit.js
+++ b/packages/block-library/src/form/edit.js
@@ -9,7 +9,7 @@ import {
 	InspectorControls,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { TextControl, SelectControl } from '@wordpress/components';
+import { TextControl, SelectControl, PanelBody } from '@wordpress/components';
 import { useSelect } from '@wordpress/data';
 
 /**
@@ -62,16 +62,12 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 	const { action, method, email, submissionMethod } = attributes;
 	const blockProps = useBlockProps();
 
-	const { hasInnerBlocks, formMethods } = useSelect(
+	const { hasInnerBlocks } = useSelect(
 		( select ) => {
-			const settings = select( blockEditorStore ).getSettings();
 			const { getBlock } = select( blockEditorStore );
 			const block = getBlock( clientId );
 			return {
 				hasInnerBlocks: !! ( block && block.innerBlocks.length ),
-				formMethods: Object.values(
-					settings.formOptions.availableMethods
-				),
 			};
 		},
 		[ clientId ]
@@ -88,69 +84,90 @@ const Edit = ( { attributes, setAttributes, clientId } ) => {
 	return (
 		<>
 			<InspectorControls>
-				<SelectControl
-					__nextHasNoMarginBottom
-					label={ __( 'Submissions method' ) }
-					options={ formMethods }
-					value={ submissionMethod }
-					onChange={ ( value ) =>
-						setAttributes( { submissionMethod: value } )
-					}
-					help={ __(
-						'Select the method to use for form submissions.'
-					) }
-				/>
-				{ submissionMethod === 'email' && (
-					<TextControl
-						__nextHasNoMarginBottom
-						autoComplete="off"
-						label={ __( 'Email for form submissions' ) }
-						value={ email }
-						required
-						onChange={ ( value ) => {
-							setAttributes( { email: value } );
-							setAttributes( { action: `mailto:${ value }` } );
-							setAttributes( { method: 'post' } );
-						} }
-						help={ __(
-							'The email address where form submissions will be sent. Separate multiple email addresses with a comma.'
-						) }
+				<PanelBody title={ __( 'Settings' ) }>
+					<SelectControl
+						// __nextHasNoMarginBottom
+						// size={ '__unstable-large' }
+						label={ __( 'Submissions method' ) }
+						options={ [
+							// TODO: Allow plugins to add their own submission methods.
+							{
+								label: __( 'Send email' ),
+								value: 'email',
+							},
+							{
+								label: __( '- Custom -' ),
+								value: 'custom',
+							},
+						] }
+						value={ submissionMethod }
+						onChange={ ( value ) =>
+							setAttributes( { submissionMethod: value } )
+						}
+						help={
+							submissionMethod === 'custom'
+								? __(
+										'Select the method to use for form submissions. Additional options for the "custom" mode can be found in the "Andvanced" section.'
+								  )
+								: __(
+										'Select the method to use for form submissions.'
+								  )
+						}
 					/>
-				) }
-				{ submissionMethod !== 'email' && (
-					<InspectorControls group="advanced">
-						<SelectControl
-							__nextHasNoMarginBottom
-							label={ __( 'Method' ) }
-							options={ [
-								{ label: 'Get', value: 'get' },
-								{ label: 'Post', value: 'post' },
-							] }
-							value={ method }
-							onChange={ ( value ) =>
-								setAttributes( { method: value } )
-							}
-							help={ __(
-								'Select the method to use for form submissions.'
-							) }
-						/>
+					{ submissionMethod === 'email' && (
 						<TextControl
 							__nextHasNoMarginBottom
 							autoComplete="off"
-							label={ __( 'Form action' ) }
-							value={ action }
-							onChange={ ( newVal ) => {
+							label={ __( 'Email for form submissions' ) }
+							value={ email }
+							required
+							onChange={ ( value ) => {
+								setAttributes( { email: value } );
 								setAttributes( {
-									action: newVal,
+									action: `mailto:${ value }`,
 								} );
+								setAttributes( { method: 'post' } );
 							} }
 							help={ __(
-								'The URL where the form should be submitted.'
+								'The email address where form submissions will be sent. Separate multiple email addresses with a comma.'
 							) }
 						/>
-					</InspectorControls>
-				) }
+					) }
+				</PanelBody>
 			</InspectorControls>
+			{ submissionMethod !== 'email' && (
+				<InspectorControls group="advanced">
+					<SelectControl
+						__nextHasNoMarginBottom
+						label={ __( 'Method' ) }
+						options={ [
+							{ label: 'Get', value: 'get' },
+							{ label: 'Post', value: 'post' },
+						] }
+						value={ method }
+						onChange={ ( value ) =>
+							setAttributes( { method: value } )
+						}
+						help={ __(
+							'Select the method to use for form submissions.'
+						) }
+					/>
+					<TextControl
+						__nextHasNoMarginBottom
+						autoComplete="off"
+						label={ __( 'Form action' ) }
+						value={ action }
+						onChange={ ( newVal ) => {
+							setAttributes( {
+								action: newVal,
+							} );
+						} }
+						help={ __(
+							'The URL where the form should be submitted.'
+						) }
+					/>
+				</InspectorControls>
+			) }
 			<form
 				{ ...innerBlocksProps }
 				className="wp-block-form"
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 88fefbc29f6125..0bad3079b40c09 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -58,30 +58,6 @@ function block_core_form_view_script() {
 }
 add_action( 'wp_enqueue_scripts', 'block_core_form_view_script' );
 
-/**
- * Adds extra settings to the block editor, for the forms block.
- *
- * @param array $settings The block editor settings.
- *
- * @return array The block editor settings with extra settings added.
- */
-function block_core_form_editor_settings( $settings ) {
-	$settings['formOptions'] = array(
-		'availableMethods' => array(
-			'email'  => array(
-				'label' => __( 'Send email', 'gutenberg' ),
-				'value' => 'email',
-			),
-			'custom' => array(
-				'label' => __( '- Custom -', 'gutenberg' ),
-				'value' => 'custom',
-			),
-		),
-	);
-	return $settings;
-}
-add_filter( 'block_editor_settings_all', 'block_core_form_editor_settings' );
-
 /**
  * Adds extra fields to the form.
  *
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index e77791bd7db27d..705374b727ea71 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -49,7 +49,6 @@ const BLOCK_EDITOR_SETTINGS = [
 	'focusMode',
 	'distractionFree',
 	'fontSizes',
-	'formOptions',
 	'gradients',
 	'generateAnchors',
 	'hasFixedToolbar',

From 669ee868f69ddf1d133f78efb1677a1399233802 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Fri, 8 Sep 2023 09:11:30 +0300
Subject: [PATCH 127/133] fix styles for inline labels

---
 packages/block-library/src/form-input/style.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/block-library/src/form-input/style.scss b/packages/block-library/src/form-input/style.scss
index 41a08850c5a028..d45fc8d7f1f729 100644
--- a/packages/block-library/src/form-input/style.scss
+++ b/packages/block-library/src/form-input/style.scss
@@ -9,6 +9,10 @@
 		flex-direction: row;
 		gap: 0.5em;
 		align-items: center;
+
+		.wp-block-form-input__label-content {
+			margin-bottom: 0.5em;
+		}
 	}
 
 	/*

From dda58809b6992a3f07d8e6a37d514f9324b1dd9a Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Mon, 25 Sep 2023 11:22:25 +0300
Subject: [PATCH 128/133] CS fix

---
 packages/block-library/src/form/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 0bad3079b40c09..03e048b8cf3ae9 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -179,7 +179,7 @@ function block_core_form_privacy_form() {
 	 *
 	 * @return bool Whether to show the core/form-submission-notification block.
 	 */
-	$show_notification = static function( $show, $attributes ) use ( $actions_performed, $actions_errored ) {
+	$show_notification = static function ( $show, $attributes ) use ( $actions_performed, $actions_errored ) {
 		switch ( $attributes['type'] ) {
 			case 'success':
 				return ! empty( $actions_performed ) && empty( $actions_errored );

From 0d64f857b09e181c27bd030a8ad918a626f07ea5 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 4 Oct 2023 14:14:26 +0300
Subject: [PATCH 129/133] Check if the experiment is enabled before registering
 the blocks

---
 packages/block-library/src/form-input/index.php                | 3 +++
 .../block-library/src/form-submission-notification/index.php   | 3 +++
 packages/block-library/src/form/index.php                      | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/packages/block-library/src/form-input/index.php b/packages/block-library/src/form-input/index.php
index 52121924f2b731..f905c2bc6e19ff 100644
--- a/packages/block-library/src/form-input/index.php
+++ b/packages/block-library/src/form-input/index.php
@@ -32,6 +32,9 @@ function render_block_core_form_input( $attributes, $content ) {
  * Registers the `core/form-input` block on server.
  */
 function register_block_core_form_input() {
+	if ( ! gutenberg_is_experiment_enabled( 'gutenberg-form-blocks' ) ) {
+		return;
+	}
 	register_block_type_from_metadata(
 		__DIR__ . '/form-input',
 		array(
diff --git a/packages/block-library/src/form-submission-notification/index.php b/packages/block-library/src/form-submission-notification/index.php
index ba129984d9eb60..0a57866f37edfc 100644
--- a/packages/block-library/src/form-submission-notification/index.php
+++ b/packages/block-library/src/form-submission-notification/index.php
@@ -35,6 +35,9 @@ function render_block_core_form_submission_notification( $attributes, $content )
  * Registers the `core/form-submission-notification` block on server.
  */
 function register_block_core_form_submission_notification() {
+	if ( ! gutenberg_is_experiment_enabled( 'gutenberg-form-blocks' ) ) {
+		return;
+	}
 	register_block_type_from_metadata(
 		__DIR__ . '/form-submission-notification',
 		array(
diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 03e048b8cf3ae9..5731e7ce8dd697 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -201,6 +201,9 @@ function block_core_form_privacy_form() {
  * Registers the `core/form` block on server.
  */
 function register_block_core_form() {
+	if ( ! gutenberg_is_experiment_enabled( 'gutenberg-form-blocks' ) ) {
+		return;
+	}
 	register_block_type_from_metadata(
 		__DIR__ . '/form',
 		array(

From 3e480b67b55e81a6a9080134452d810268f5b1bc Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 4 Oct 2023 14:16:27 +0300
Subject: [PATCH 130/133] Only localize the script if the experiment is enabled

---
 packages/block-library/src/form/index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/block-library/src/form/index.php b/packages/block-library/src/form/index.php
index 5731e7ce8dd697..0dbbaf68387401 100644
--- a/packages/block-library/src/form/index.php
+++ b/packages/block-library/src/form/index.php
@@ -46,6 +46,10 @@ function render_block_core_form( $attributes, $content ) {
  * Additional data to add to the view.js script for this block.
  */
 function block_core_form_view_script() {
+	if ( ! gutenberg_is_experiment_enabled( 'gutenberg-form-blocks' ) ) {
+		return;
+	}
+
 	wp_localize_script(
 		'wp-block-form-view',
 		'wpBlockFormSettings',

From 77d132aaeea6bfa01e02aa76323e7dabf8a81593 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 4 Oct 2023 14:18:02 +0300
Subject: [PATCH 131/133] Only filter  wp_kses_allowed_html if the experiment
 is active

---
 lib/experimental/kses-allowed-html.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/experimental/kses-allowed-html.php b/lib/experimental/kses-allowed-html.php
index 425101ac4ed3eb..0a4de18fd2804a 100644
--- a/lib/experimental/kses-allowed-html.php
+++ b/lib/experimental/kses-allowed-html.php
@@ -13,6 +13,10 @@
  * @return array The allowed tags.
  */
 function gutenberg_kses_allowed_html( $allowedtags ) {
+	if ( ! gutenberg_is_experiment_enabled( 'gutenberg-form-blocks' ) ) {
+		return;
+	}
+
 	$allowedtags['input'] = array(
 		'type'          => array(),
 		'name'          => array(),

From 695de74cc68b2fc0608aa12f05bf9b327defdb76 Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 4 Oct 2023 14:27:56 +0300
Subject: [PATCH 132/133] fix filter return

---
 lib/experimental/kses-allowed-html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/experimental/kses-allowed-html.php b/lib/experimental/kses-allowed-html.php
index 0a4de18fd2804a..122faef7b4ca2c 100644
--- a/lib/experimental/kses-allowed-html.php
+++ b/lib/experimental/kses-allowed-html.php
@@ -14,7 +14,7 @@
  */
 function gutenberg_kses_allowed_html( $allowedtags ) {
 	if ( ! gutenberg_is_experiment_enabled( 'gutenberg-form-blocks' ) ) {
-		return;
+		return $allowedtags;
 	}
 
 	$allowedtags['input'] = array(

From 8f7fc179d3add55e8301679b5a63debf244701ad Mon Sep 17 00:00:00 2001
From: Ari Stathopoulos <aristath@gmail.com>
Date: Wed, 4 Oct 2023 14:54:42 +0300
Subject: [PATCH 133/133] Add experiment to the tests

---
 phpunit/bootstrap.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
index 7084df68443baa..acc7cfde89dbd4 100644
--- a/phpunit/bootstrap.php
+++ b/phpunit/bootstrap.php
@@ -94,6 +94,7 @@ function fail_if_died( $message ) {
 	'gutenberg-experiments' => array(
 		'gutenberg-widget-experiments' => '1',
 		'gutenberg-full-site-editing'  => 1,
+		'gutenberg-form-blocks'        => 1,
 	),
 );