🐛 Fix radio buttons with identical name

Closes #29
epiphyt · Sep 13, 2023 · 8ad1b79 · 8ad1b79
1 parent 305c268
commit 8ad1b79
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/inc/form-data/class-data.php b/inc/form-data/class-data.php
@@ -523,7 +523,12 @@ public function set_static_value_output( string $output, string $name, $value, a
 			return sprintf( __( 'Checked: %s', 'form-block' ), $label );
 		}
 		else if ( $field_data['type'] === 'radio' ) {
-			/* translators: form field title */
+			if ( $value !== 'on' ) {
+				/* translators: form field title or value */
+				return sprintf( __( 'Selected: %s', 'form-block' ), $value );
+			}
+
+			/* translators: form field title or value */
 			return sprintf( __( 'Selected: %s', 'form-block' ), $label );
 		}
 

diff --git a/src/input/controls.js b/src/input/controls.js
@@ -57,7 +57,12 @@ export default function Controls( props ) {
 		},
 	];
 
-	if ( type === 'reset' || type === 'submit' ) {
+	if (
+		type === 'checkbox'
+		|| type === 'radio'
+		|| type === 'reset'
+		|| type === 'submit'
+	) {
 		defaultControlTypes.push( {
 			attributeName: 'value',
 			attributes: {},

diff --git a/src/input/edit.js b/src/input/edit.js
@@ -99,7 +99,15 @@ export default function InputEdit( props ) {
 						? <FlexBlock>
 							<RichText
 								className="form-block__label"
-								onChange={ ( label ) => setAttributes( { label } ) }
+								onChange={ ( newLabel ) => {
+									const oldLabel = label;
+
+									setAttributes( { label: newLabel } );
+
+									if ( ! value || value === oldLabel ) {
+										setAttributes( { value: newLabel } );
+									}
+								} }
 								placeholder={ __( 'Label', 'form-block' ) }
 								tagName="label"
 								value={ label || '' }

diff --git a/src/input/html-data.js b/src/input/html-data.js
@@ -23,6 +23,7 @@ const types = applyFilters(
 				'disabled',
 				'label',
 				'required',
+				'value',
 			],
 		},
 		email: {
@@ -72,6 +73,7 @@ const types = applyFilters(
 				'disabled',
 				'label',
 				'required',
+				'value',
 			],
 		},
 		reset: {