Mark a required heading, and say "Settings saved." once

The kit marks a required field in the label it draws; this class draws
the label in the header cell, so the mark never appeared. Under the
Settings menu core prints the settings notices itself -- admin.php pulls
in options-head.php for every child of options-general.php -- and
printing them here as well said "Settings saved." twice.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_015Kwx2STJ4EaVaJofEJJ9Zo

Author: arraypress

src/SettingFields.php

@@ -21,9 +21,10 @@
 use ArrayPress\FieldKit\Field;
 use ArrayPress\FieldKit\FieldSet;
 use ArrayPress\FieldKit\Support\Badge;
+use ArrayPress\FieldKit\Support\Markup;
+use ArrayPress\FieldKit\Support\PageHeader;
 use ArrayPress\FieldKit\Support\Sections;
 use ArrayPress\FieldKit\Support\Tooltip;
-use ArrayPress\FieldKit\Support\PageHeader;
 
 /**
  * Registers a tabbed settings page backed by a single option.
@@ -661,8 +662,13 @@ public function render_page(): void {
 		// No argument: core adds its own "Settings saved." under the `general`
 		// slug, and asking for this page's slug alone would hide it. A field
 		// the last save refused is printed here as well, and again under the
-		// field itself.
-		settings_errors();
+		// field itself. Not under the Settings menu, though: admin.php pulls
+		// in options-head.php for every child of options-general.php, and
+		// that prints them already -- so a page there said "Settings saved."
+		// twice.
+		if ( 'options-general.php' !== (string) $this->config['parent_slug'] ) {
+			settings_errors();
+		}
 
 		printf( '<form method="post" action="%s">', esc_url( admin_url( 'options.php' ) ) );
 
@@ -846,16 +852,22 @@ private function render_rows( FieldSet $set, array $fields, array $errors ): voi
 			// Beside the heading, which this class draws rather than the kit.
 			$tooltip = Tooltip::for_field( $field );
 
+			// The kit marks a required field in the label it draws; this class
+			// draws the label, so it marks it here.
+			$required = Markup::required_marker( $field->is_required() );
+
 			$header = $type->is_self_labelling() || $type->is_grouped()
 				? sprintf(
-					'<span class="field-kit__row-label">%s%s</span>',
+					'<span class="field-kit__row-label">%s%s%s</span>',
 					esc_html( $field->label() ),
+					$required, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- the kit escapes as it builds.
 					$badge . $tooltip // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- escaped as it is built.
 				)
 				: sprintf(
-					'<label for="%s">%s</label>%s',
+					'<label for="%s">%s%s</label>%s',
 					esc_attr( $field->input_id() ),
 					esc_html( $field->label() ),
+					$required, // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- the kit escapes as it builds.
 					$badge . $tooltip // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- escaped as it is built.
 				);
 

tests/SettingFieldsTest.php

@@ -1366,4 +1366,47 @@ public function test_the_type_helpers_delegate(): void {
 		$this->assertFalse( is_setting_on( $page->get_id(), 'flag' ) );
 	}
 
+	/**
+	 * A required field says so in the heading this class draws.
+	 */
+	public function test_a_required_field_is_marked_in_its_heading(): void {
+		$page = $this->page(
+			[
+				'fields' => [
+					'store_name' => [ 'type' => 'text', 'label' => 'Store name', 'required' => true ],
+					'tagline'    => [ 'type' => 'text', 'label' => 'Tagline' ],
+				],
+			]
+		);
+
+		ob_start();
+		$page->render_page();
+		$html = (string) ob_get_clean();
+
+		$this->assertMatchesRegularExpression( '/<label for="[^"]*store_name[^"]*">Store name<span class="field-kit__required" aria-hidden="true">\*<\/span>/', $html );
+		$this->assertDoesNotMatchRegularExpression( '/Tagline<span class="field-kit__required"/', $html );
+	}
+
+	/**
+	 * Under the Settings menu core prints the notices; printing them here as
+	 * well said "Settings saved." twice.
+	 */
+	public function test_notices_are_not_printed_twice_under_the_settings_menu(): void {
+		$GLOBALS['sf_settings_errors_calls'] = 0;
+
+		$page = $this->page( [ 'parent_slug' => 'options-general.php' ] );
+		ob_start();
+		$page->render_page();
+		ob_end_clean();
+
+		$this->assertSame( 0, $GLOBALS['sf_settings_errors_calls'] );
+
+		$page = $this->page( [ 'parent_slug' => '' ] );
+		ob_start();
+		$page->render_page();
+		ob_end_clean();
+
+		$this->assertSame( 1, $GLOBALS['sf_settings_errors_calls'] );
+	}
+
 }

tests/stubs.php

@@ -147,6 +147,7 @@ function get_settings_errors( $setting = '', $sanitize = false ) {
 
 if ( ! function_exists( 'settings_errors' ) ) {
 	function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) {
+		$GLOBALS['sf_settings_errors_calls'] = ( $GLOBALS['sf_settings_errors_calls'] ?? 0 ) + 1;
 		foreach ( get_settings_errors( $setting ) as $error ) {
 			printf( '<div class="notice notice-%s"><p>%s</p></div>', esc_attr( $error['type'] ), esc_html( $error['message'] ) );
 		}