From 9fcd89d5139ea0bcff99d007c1650fec65c28b7f Mon Sep 17 00:00:00 2001
From: Marty Friedel <marty.dev@mity.com.au>
Date: Mon, 11 May 2026 08:33:27 +0930
Subject: [PATCH 01/16] Add Blade form fields to publish command

---
 .../forms/{ => antlers}/fields.antlers.html   |  0
 .../{ => antlers}/fields/assets.antlers.html  |  0
 .../fields/checkboxes.antlers.html            |  0
 .../{ => antlers}/fields/default.antlers.html |  0
 .../fields/dictionary.antlers.html            |  0
 .../{ => antlers}/fields/files.antlers.html   |  0
 .../{ => antlers}/fields/group.antlers.html   |  0
 .../{ => antlers}/fields/hidden.antlers.html  |  0
 .../{ => antlers}/fields/integer.antlers.html |  0
 .../{ => antlers}/fields/radio.antlers.html   |  0
 .../{ => antlers}/fields/select.antlers.html  |  0
 .../{ => antlers}/fields/spacer.antlers.html  |  0
 .../{ => antlers}/fields/text.antlers.html    |  0
 .../fields/textarea.antlers.html              |  0
 .../{ => antlers}/fields/toggle.antlers.html  |  0
 .../views/extend/forms/blade/fields.blade.php | 25 +++++++++++
 .../forms/blade/fields/assets.blade.php       | 22 ++++++++++
 .../forms/blade/fields/checkboxes.blade.php   | 25 +++++++++++
 .../forms/blade/fields/default.blade.php      | 15 +++++++
 .../forms/blade/fields/dictionary.blade.php   | 42 +++++++++++++++++++
 .../extend/forms/blade/fields/files.blade.php | 23 ++++++++++
 .../extend/forms/blade/fields/group.blade.php |  7 ++++
 .../forms/blade/fields/hidden.blade.php       |  6 +++
 .../forms/blade/fields/integer.blade.php      | 19 +++++++++
 .../extend/forms/blade/fields/radio.blade.php | 24 +++++++++++
 .../forms/blade/fields/select.blade.php       | 42 +++++++++++++++++++
 .../forms/blade/fields/spacer.blade.php       |  1 +
 .../extend/forms/blade/fields/text.blade.php  | 16 +++++++
 .../forms/blade/fields/textarea.blade.php     | 14 +++++++
 .../forms/blade/fields/toggle.blade.php       | 17 ++++++++
 src/Providers/AppServiceProvider.php          |  4 +-
 31 files changed, 301 insertions(+), 1 deletion(-)
 rename resources/views/extend/forms/{ => antlers}/fields.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/assets.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/checkboxes.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/default.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/dictionary.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/files.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/group.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/hidden.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/integer.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/radio.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/select.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/spacer.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/text.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/textarea.antlers.html (100%)
 rename resources/views/extend/forms/{ => antlers}/fields/toggle.antlers.html (100%)
 create mode 100644 resources/views/extend/forms/blade/fields.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/assets.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/checkboxes.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/default.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/dictionary.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/files.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/group.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/hidden.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/integer.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/radio.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/select.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/spacer.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/text.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/textarea.blade.php
 create mode 100644 resources/views/extend/forms/blade/fields/toggle.blade.php

diff --git a/resources/views/extend/forms/fields.antlers.html b/resources/views/extend/forms/antlers/fields.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields.antlers.html
rename to resources/views/extend/forms/antlers/fields.antlers.html
diff --git a/resources/views/extend/forms/fields/assets.antlers.html b/resources/views/extend/forms/antlers/fields/assets.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/assets.antlers.html
rename to resources/views/extend/forms/antlers/fields/assets.antlers.html
diff --git a/resources/views/extend/forms/fields/checkboxes.antlers.html b/resources/views/extend/forms/antlers/fields/checkboxes.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/checkboxes.antlers.html
rename to resources/views/extend/forms/antlers/fields/checkboxes.antlers.html
diff --git a/resources/views/extend/forms/fields/default.antlers.html b/resources/views/extend/forms/antlers/fields/default.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/default.antlers.html
rename to resources/views/extend/forms/antlers/fields/default.antlers.html
diff --git a/resources/views/extend/forms/fields/dictionary.antlers.html b/resources/views/extend/forms/antlers/fields/dictionary.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/dictionary.antlers.html
rename to resources/views/extend/forms/antlers/fields/dictionary.antlers.html
diff --git a/resources/views/extend/forms/fields/files.antlers.html b/resources/views/extend/forms/antlers/fields/files.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/files.antlers.html
rename to resources/views/extend/forms/antlers/fields/files.antlers.html
diff --git a/resources/views/extend/forms/fields/group.antlers.html b/resources/views/extend/forms/antlers/fields/group.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/group.antlers.html
rename to resources/views/extend/forms/antlers/fields/group.antlers.html
diff --git a/resources/views/extend/forms/fields/hidden.antlers.html b/resources/views/extend/forms/antlers/fields/hidden.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/hidden.antlers.html
rename to resources/views/extend/forms/antlers/fields/hidden.antlers.html
diff --git a/resources/views/extend/forms/fields/integer.antlers.html b/resources/views/extend/forms/antlers/fields/integer.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/integer.antlers.html
rename to resources/views/extend/forms/antlers/fields/integer.antlers.html
diff --git a/resources/views/extend/forms/fields/radio.antlers.html b/resources/views/extend/forms/antlers/fields/radio.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/radio.antlers.html
rename to resources/views/extend/forms/antlers/fields/radio.antlers.html
diff --git a/resources/views/extend/forms/fields/select.antlers.html b/resources/views/extend/forms/antlers/fields/select.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/select.antlers.html
rename to resources/views/extend/forms/antlers/fields/select.antlers.html
diff --git a/resources/views/extend/forms/fields/spacer.antlers.html b/resources/views/extend/forms/antlers/fields/spacer.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/spacer.antlers.html
rename to resources/views/extend/forms/antlers/fields/spacer.antlers.html
diff --git a/resources/views/extend/forms/fields/text.antlers.html b/resources/views/extend/forms/antlers/fields/text.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/text.antlers.html
rename to resources/views/extend/forms/antlers/fields/text.antlers.html
diff --git a/resources/views/extend/forms/fields/textarea.antlers.html b/resources/views/extend/forms/antlers/fields/textarea.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/textarea.antlers.html
rename to resources/views/extend/forms/antlers/fields/textarea.antlers.html
diff --git a/resources/views/extend/forms/fields/toggle.antlers.html b/resources/views/extend/forms/antlers/fields/toggle.antlers.html
similarity index 100%
rename from resources/views/extend/forms/fields/toggle.antlers.html
rename to resources/views/extend/forms/antlers/fields/toggle.antlers.html
diff --git a/resources/views/extend/forms/blade/fields.blade.php b/resources/views/extend/forms/blade/fields.blade.php
new file mode 100644
index 00000000000..450237b54f8
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields.blade.php
@@ -0,0 +1,25 @@
+@foreach ($fields as $field)
+    <div class="p-4">
+        <label for="{{ $field['id'] }}">
+            {{ $field['display'] }}
+
+            @if (collect($field['validate'] ?? [])->contains('required'))
+                <sup aria-label="{{ __('Required') }}">*</sup>
+            @endif
+        </label>
+
+        <div class="p-2">{!! $field['field'] !!}</div>
+
+        @if ($field['instructions'] ?? false)
+            <p class="text-gray-500" id="{{ $field['id'] }}-instructions">
+                {{ $field['instructions'] }}
+            </p>
+        @endif
+
+        @if ($field['error'] ?? false)
+            <p class="text-red-600" id="{{ $field['id'] }}-error">
+                {{ $field['error'] }}
+            </p>
+        @endif
+    </div>
+@endforeach
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/assets.blade.php b/resources/views/extend/forms/blade/fields/assets.blade.php
new file mode 100644
index 00000000000..a0245ae621f
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/assets.blade.php
@@ -0,0 +1,22 @@
+@php
+    $isMultiple = ! isset($max_files) || $max_files !== 1;
+    $fieldName = $handle;
+
+    if ($isMultiple) {
+        $fieldName .= '[]';
+    }
+@endphp
+
+<input
+    id="{{ $id }}"
+    type="file"
+    name="{{ $fieldName }}"
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @if ($isMultiple) multiple @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/checkboxes.blade.php b/resources/views/extend/forms/blade/fields/checkboxes.blade.php
new file mode 100644
index 00000000000..97b64e9fe85
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/checkboxes.blade.php
@@ -0,0 +1,25 @@
+@php
+    $inline = isset($inline) && $inline === true;
+@endphp
+
+<input type="hidden" name="{{ $handle }}[]">
+@foreach ($options as $option => $label)
+    <label>
+        <input
+            id="{{ $id }}-{{ \Illuminate\Support\Str::slug($option) }}-option"
+            type="checkbox"
+            name="{{ $handle }}[]"
+            value="{{ $option }}"
+            @if (isset($js_driver)) {!! $js_attributes !!} @endif
+            @checked(in_array($option, $value ?? []))
+            @required(in_array('required', $validate ?? []))
+            @if ($error)
+                aria-invalid="true" aria-describedby="{{ $id }}-error"
+            @elseif ($instructions)
+                aria-describedby="{{ $id }}-instructions"
+            @endif
+        >
+        {{ $label === null ? $option : $label }}
+    </label>
+    @unless ($inline) <br> @endunless
+@endforeach
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/default.blade.php b/resources/views/extend/forms/blade/fields/default.blade.php
new file mode 100644
index 00000000000..0cbb4e84a60
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/default.blade.php
@@ -0,0 +1,15 @@
+<input
+    id="{{ $id }}"
+    type="{{ $input_type ?? 'text' }}"
+    name="{{ $handle }}"
+    value="{{ $value ?? '' }}"
+    @if (isset($placeholder)) placeholder="{{ $placeholder }}" @endif
+    @if (isset($character_limit)) maxlength="{{ $character_limit }}" @endif
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/dictionary.blade.php b/resources/views/extend/forms/blade/fields/dictionary.blade.php
new file mode 100644
index 00000000000..68338141a6f
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/dictionary.blade.php
@@ -0,0 +1,42 @@
+@php
+    $isMultiple = ! isset($max_items) || $max_items !== 1;
+    $inline = isset($inline) && $inline === true;
+    $placeholderText = $placeholder ?? __('Please select...');
+
+    $fieldName = $handle;
+
+    if ($isMultiple) {
+        $fieldName .= '[]';
+    }
+@endphp
+
+<select
+    id="{{ $id }}"
+    name="{{ $fieldName }}"
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @if ($isMultiple) multiple @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
+    @unless ($isMultiple)
+        <option value>{{ $placeholderText }}</option>
+    @endunless
+    @foreach ($options as $option => $label)
+        @php
+            $selected = false;
+            if ($isMultiple) {
+                $selected = in_array($option, $value ?? []);
+            } else {
+                $selected = $option == $value;
+            }
+        @endphp
+        <option
+            value="{{ $option }}"
+            @selected($selected)
+        >{{ $label === null ? $option : $label }}</option>
+    @endforeach
+</select>
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/files.blade.php b/resources/views/extend/forms/blade/fields/files.blade.php
new file mode 100644
index 00000000000..bb9bc9526ef
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/files.blade.php
@@ -0,0 +1,23 @@
+@php
+    $isMultiple = ! isset($max_files) || $max_files !== 1;
+
+    $fieldName = $handle;
+
+    if ($isMultiple) {
+        $fieldName .= '[]';
+    }
+@endphp
+
+<input
+    id="{{ $id }}"
+    type="file"
+    name="{{ $fieldName }}"
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @if ($isMultiple) multiple @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/group.blade.php b/resources/views/extend/forms/blade/fields/group.blade.php
new file mode 100644
index 00000000000..872b6378c28
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/group.blade.php
@@ -0,0 +1,7 @@
+<div
+@if (isset($js_driver)) {!! $js_attributes !!} @endif
+>
+    @foreach ($fields as $__field)
+        {!! $slot?->addContext($__field) !!}
+    @endforeach
+</div>
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/hidden.blade.php b/resources/views/extend/forms/blade/fields/hidden.blade.php
new file mode 100644
index 00000000000..8eac9f5fc0c
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/hidden.blade.php
@@ -0,0 +1,6 @@
+<input
+    id="{{ $id }}"
+    type="hidden"
+    name="{{ $name }}"
+    value="{{ $value }}"
+>
diff --git a/resources/views/extend/forms/blade/fields/integer.blade.php b/resources/views/extend/forms/blade/fields/integer.blade.php
new file mode 100644
index 00000000000..220f8edacb1
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/integer.blade.php
@@ -0,0 +1,19 @@
+<input
+    id="{{ $id }}"
+    type="number"
+    name="{{ $name }}"
+    value="{{ $value }}"
+    @if ($placeholder ?? false) placeholder="{{ $placeholder }}" @endif
+    @if ($min ?? false) min="{{ $min }}" @endif
+    @if ($max ?? false) max="{{ $max }}" @endif
+    @if ($step ?? false) step="{{ $step }}" @endif
+    @if ($character_limit ?? false) maxlength="{{ $character_limit }}" @endif
+    @if ($autocomplete ?? false) autocomplete="{{ $autocomplete }}" @endif
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/radio.blade.php b/resources/views/extend/forms/blade/fields/radio.blade.php
new file mode 100644
index 00000000000..004ae617fa9
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/radio.blade.php
@@ -0,0 +1,24 @@
+@php
+    $inline = isset($inline) && $inline === true;
+@endphp
+
+@foreach ($options as $option => $label)
+    <label>
+        <input
+            id="{{ $id }}-{{ \Illuminate\Support\Str::slug($option) }}-option"
+            type="radio"
+            name="{{ $handle }}"
+            value="{{ $option }}"
+            @if (isset($js_driver)) {!! $js_attributes !!} @endif
+            @checked($value == $option)
+            @required(in_array('required', $validate ?? []))
+            @if ($error)
+                aria-invalid="true" aria-describedby="{{ $id }}-error"
+            @elseif ($instructions)
+                aria-describedby="{{ $id }}-instructions"
+            @endif
+        >
+        {{ $label === null ? $option : $label }}
+    </label>
+    @unless ($inline) <br> @endunless
+@endforeach
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/select.blade.php b/resources/views/extend/forms/blade/fields/select.blade.php
new file mode 100644
index 00000000000..397a8beb45f
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/select.blade.php
@@ -0,0 +1,42 @@
+@php
+    $isMultiple = isset($multiple) && $multiple == true;
+    $inline = isset($inline) && $inline === true;
+    $placeholderText = $placeholder ?? __('Please select...');
+
+    $fieldName = $handle;
+
+    if ($isMultiple) {
+        $fieldName .= '[]';
+    }
+@endphp
+
+<select
+    id="{{ $id }}"
+    name="{{ $fieldName }}"
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @if ($isMultiple) multiple @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
+    @unless ($isMultiple)
+        <option value>{{ $placeholderText  }}</option>
+    @endunless
+    @foreach ($options as $option => $label)
+        @php
+            $selected = false;
+            if ($isMultiple) {
+                $selected = in_array($option, $value ?? []);
+            } else {
+                $selected = $option == $value;
+            }
+        @endphp
+        <option
+            value="{{ $option }}"
+            @selected($selected)
+        >{{ $label === null ? $option : $label }}</option>
+    @endforeach
+</select>
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/spacer.blade.php b/resources/views/extend/forms/blade/fields/spacer.blade.php
new file mode 100644
index 00000000000..b3d9bbc7f37
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/spacer.blade.php
@@ -0,0 +1 @@
+<?php
diff --git a/resources/views/extend/forms/blade/fields/text.blade.php b/resources/views/extend/forms/blade/fields/text.blade.php
new file mode 100644
index 00000000000..b4042ce4016
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/text.blade.php
@@ -0,0 +1,16 @@
+<input
+    id="{{ $id }}"
+    type="{{ $input_type ?? 'text' }}"
+    name="{{ $handle }}"
+    value="{{ $value ?? '' }}"
+    @if (isset($placeholder)) placeholder="{{ $placeholder }}" @endif
+    @if (isset($character_limit)) maxlength="{{ $character_limit }}" @endif
+    @if (isset($autocomplete)) autocomplete="{{ $autocomplete }}" @endif
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/textarea.blade.php b/resources/views/extend/forms/blade/fields/textarea.blade.php
new file mode 100644
index 00000000000..a70a1fbdbe8
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/textarea.blade.php
@@ -0,0 +1,14 @@
+<textarea
+    id="{{ $id }}"
+    name="{{ $handle }}"
+    rows="5"
+    @if (isset($placeholder)) placeholder="{{ $placeholder }}" @endif
+    @if (isset($character_limit)) maxlength="{{ $character_limit }}" @endif
+    @if (isset($js_driver)) {!! $js_attributes !!} @endif
+    @required(in_array('required', $validate ?? []))
+    @if ($error)
+        aria-invalid="true" aria-describedby="{{ $id }}-error"
+    @elseif ($instructions)
+        aria-describedby="{{ $id }}-instructions"
+    @endif
+>{{ $value }}</textarea>
\ No newline at end of file
diff --git a/resources/views/extend/forms/blade/fields/toggle.blade.php b/resources/views/extend/forms/blade/fields/toggle.blade.php
new file mode 100644
index 00000000000..734af02dfa1
--- /dev/null
+++ b/resources/views/extend/forms/blade/fields/toggle.blade.php
@@ -0,0 +1,17 @@
+<label>
+    <input type="hidden" name="{{ $handle }}" value="0">
+    <input
+        type="checkbox"
+        name="{{ $handle }}"
+        value="1"
+        @if (isset($js_driver)) {!! $js_attributes !!} @endif
+        @checked($value && $value !== '0')
+        @required(in_array('required', $validate ?? []))
+        @if ($error)
+            aria-invalid="true" aria-describedby="{{ $id }}-error"
+        @elseif ($instructions)
+            aria-describedby="{{ $id }}-instructions"
+        @endif
+    >
+    @if (isset($inline_label)) {{ $inline_label }} @endif
+</label>
\ No newline at end of file
diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index 2b0fc4938fc..988a4a34118 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -85,7 +85,9 @@ public function boot()
         $this->loadViewsFrom("{$this->root}/resources/views/extend", 'statamic');
 
         $this->publishes([
-            "{$this->root}/resources/views/extend/forms" => resource_path('views/vendor/statamic/forms'),
+            config('statamic.templates.language', 'antlers') === 'blade'
+                ? "{$this->root}/resources/views/extend/forms/blade"
+                : "{$this->root}/resources/views/extend/forms/antlers" => resource_path('views/vendor/statamic/forms'),
         ], 'statamic-forms');
 
         $this->publishes([

From 8ebe0d8e079010b4279cde7092e0924e6c94bc0f Mon Sep 17 00:00:00 2001
From: Marty Friedel <marty.dev@mity.com.au>
Date: Mon, 11 May 2026 08:44:23 +0930
Subject: [PATCH 02/16] Switch to `trans`

---
 resources/views/extend/forms/blade/fields/dictionary.blade.php | 2 +-
 resources/views/extend/forms/blade/fields/select.blade.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/extend/forms/blade/fields/dictionary.blade.php b/resources/views/extend/forms/blade/fields/dictionary.blade.php
index 68338141a6f..efae1d1fcfa 100644
--- a/resources/views/extend/forms/blade/fields/dictionary.blade.php
+++ b/resources/views/extend/forms/blade/fields/dictionary.blade.php
@@ -1,7 +1,7 @@
 @php
     $isMultiple = ! isset($max_items) || $max_items !== 1;
     $inline = isset($inline) && $inline === true;
-    $placeholderText = $placeholder ?? __('Please select...');
+    $placeholderText = $placeholder ?? trans('Please select...');
 
     $fieldName = $handle;
 
diff --git a/resources/views/extend/forms/blade/fields/select.blade.php b/resources/views/extend/forms/blade/fields/select.blade.php
index 397a8beb45f..dacb437774c 100644
--- a/resources/views/extend/forms/blade/fields/select.blade.php
+++ b/resources/views/extend/forms/blade/fields/select.blade.php
@@ -1,7 +1,7 @@
 @php
     $isMultiple = isset($multiple) && $multiple == true;
     $inline = isset($inline) && $inline === true;
-    $placeholderText = $placeholder ?? __('Please select...');
+    $placeholderText = $placeholder ?? trans('Please select...');
 
     $fieldName = $handle;
 

From ef1d50b2a688c79a1fb6dc328d26150b69c510ba Mon Sep 17 00:00:00 2001
From: Marty Friedel <marty.dev@mity.com.au>
Date: Mon, 11 May 2026 08:51:14 +0930
Subject: [PATCH 03/16] use `trans`

---
 .../views/extend/forms/blade/fields/dictionary.blade.php      | 4 +++-
 resources/views/extend/forms/blade/fields/select.blade.php    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/resources/views/extend/forms/blade/fields/dictionary.blade.php b/resources/views/extend/forms/blade/fields/dictionary.blade.php
index efae1d1fcfa..accb2f9f5b7 100644
--- a/resources/views/extend/forms/blade/fields/dictionary.blade.php
+++ b/resources/views/extend/forms/blade/fields/dictionary.blade.php
@@ -1,7 +1,9 @@
 @php
+    use function Statamic\trans as __;
+
     $isMultiple = ! isset($max_items) || $max_items !== 1;
     $inline = isset($inline) && $inline === true;
-    $placeholderText = $placeholder ?? trans('Please select...');
+    $placeholderText = $placeholder ?? __('Please select...');
 
     $fieldName = $handle;
 
diff --git a/resources/views/extend/forms/blade/fields/select.blade.php b/resources/views/extend/forms/blade/fields/select.blade.php
index dacb437774c..6f48fa71cd8 100644
--- a/resources/views/extend/forms/blade/fields/select.blade.php
+++ b/resources/views/extend/forms/blade/fields/select.blade.php
@@ -1,7 +1,9 @@
 @php
+    use function Statamic\trans as __;
+
     $isMultiple = isset($multiple) && $multiple == true;
     $inline = isset($inline) && $inline === true;
-    $placeholderText = $placeholder ?? trans('Please select...');
+    $placeholderText = $placeholder ?? __('Please select...');
 
     $fieldName = $handle;
 

From baf58ae6604c9d9a6cde0f964ef88d08434ee973 Mon Sep 17 00:00:00 2001
From: Marty Friedel <marty.dev@mity.com.au>
Date: Mon, 11 May 2026 08:54:47 +0930
Subject: [PATCH 04/16] Add `trans` to fields

---
 resources/views/extend/forms/blade/fields.blade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/views/extend/forms/blade/fields.blade.php b/resources/views/extend/forms/blade/fields.blade.php
index 450237b54f8..3f62e578721 100644
--- a/resources/views/extend/forms/blade/fields.blade.php
+++ b/resources/views/extend/forms/blade/fields.blade.php
@@ -1,3 +1,6 @@
+@php
+    use function Statamic\trans as __;
+@endphp
 @foreach ($fields as $field)
     <div class="p-4">
         <label for="{{ $field['id'] }}">

From 66116c9b7fed7f3c8a3ec7e402b64563a849cbb7 Mon Sep 17 00:00:00 2001
From: Marty Friedel <marty.dev@mity.com.au>
Date: Mon, 11 May 2026 09:32:57 +0930
Subject: [PATCH 05/16] Adjust Fieldtype `view` for project level and fallback

---
 src/Fields/Fieldtype.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Fields/Fieldtype.php b/src/Fields/Fieldtype.php
index 836cb4a6bc7..8a0e9c3293e 100644
--- a/src/Fields/Fieldtype.php
+++ b/src/Fields/Fieldtype.php
@@ -337,11 +337,19 @@ public function preProcessIndex($data)
 
     public function view()
     {
-        $default = 'statamic::forms.fields.'.$this->handle();
+        $language = config('statamic.templates.language', 'antlers');
+        $handle = $this->handle();
 
-        return view()->exists($default)
-            ? $default
-            : 'statamic::forms.fields.default';
+        $views = [
+            "statamic::forms.fields.{$handle}",
+            "statamic::forms.{$language}.fields.{$handle}",
+            "statamic::forms.{$language}.fields.default"
+        ];
+
+        $view = collect($views)->first(fn ($view) => view()->exists($view));
+
+        return $view
+            ?: 'statamic::forms.fields.default';
     }
 
     public function config(?string $key = null, $fallback = null)

From f0a8f60e59056ab61f043c58dfda848cc65de9c8 Mon Sep 17 00:00:00 2001
From: Marty Friedel <marty.dev@mity.com.au>
Date: Mon, 11 May 2026 09:37:31 +0930
Subject: [PATCH 06/16] Correct codestyle

---
 src/Fields/Fieldtype.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Fields/Fieldtype.php b/src/Fields/Fieldtype.php
index 8a0e9c3293e..463c7a261da 100644
--- a/src/Fields/Fieldtype.php
+++ b/src/Fields/Fieldtype.php
@@ -343,7 +343,7 @@ public function view()
         $views = [
             "statamic::forms.fields.{$handle}",
             "statamic::forms.{$language}.fields.{$handle}",
-            "statamic::forms.{$language}.fields.default"
+            "statamic::forms.{$language}.fields.default",
         ];
 
         $view = collect($views)->first(fn ($view) => view()->exists($view));

From 42ff7f8763aa652b889797a83816efac987ca209 Mon Sep 17 00:00:00 2001
From: Marty Friedel <marty.dev@mity.com.au>
Date: Mon, 11 May 2026 09:54:57 +0930
Subject: [PATCH 07/16] Remove old default

---
 src/Fields/Fieldtype.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Fields/Fieldtype.php b/src/Fields/Fieldtype.php
index 463c7a261da..682886fe903 100644
--- a/src/Fields/Fieldtype.php
+++ b/src/Fields/Fieldtype.php
@@ -343,13 +343,12 @@ public function view()
         $views = [
             "statamic::forms.fields.{$handle}",
             "statamic::forms.{$language}.fields.{$handle}",
-            "statamic::forms.{$language}.fields.default",
         ];
 
         $view = collect($views)->first(fn ($view) => view()->exists($view));
 
         return $view
-            ?: 'statamic::forms.fields.default';
+            ?: "statamic::forms.{$language}.fields.default";
     }
 
     public function config(?string $key = null, $fallback = null)

From 41955068d823778c2a824b49cfc9819fe6852fb7 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 12 May 2026 14:55:27 -0400
Subject: [PATCH 08/16] Use bracket-notation input name in Blade field
 templates

So nested handles inside `group` fields submit as arrays, matching the Antlers templates.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 resources/views/extend/forms/blade/fields/assets.blade.php    | 2 +-
 .../views/extend/forms/blade/fields/checkboxes.blade.php      | 4 ++--
 resources/views/extend/forms/blade/fields/default.blade.php   | 2 +-
 .../views/extend/forms/blade/fields/dictionary.blade.php      | 2 +-
 resources/views/extend/forms/blade/fields/files.blade.php     | 2 +-
 resources/views/extend/forms/blade/fields/radio.blade.php     | 2 +-
 resources/views/extend/forms/blade/fields/select.blade.php    | 2 +-
 resources/views/extend/forms/blade/fields/text.blade.php      | 2 +-
 resources/views/extend/forms/blade/fields/textarea.blade.php  | 2 +-
 resources/views/extend/forms/blade/fields/toggle.blade.php    | 4 ++--
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/resources/views/extend/forms/blade/fields/assets.blade.php b/resources/views/extend/forms/blade/fields/assets.blade.php
index a0245ae621f..b6adae266af 100644
--- a/resources/views/extend/forms/blade/fields/assets.blade.php
+++ b/resources/views/extend/forms/blade/fields/assets.blade.php
@@ -1,6 +1,6 @@
 @php
     $isMultiple = ! isset($max_files) || $max_files !== 1;
-    $fieldName = $handle;
+    $fieldName = $name;
 
     if ($isMultiple) {
         $fieldName .= '[]';
diff --git a/resources/views/extend/forms/blade/fields/checkboxes.blade.php b/resources/views/extend/forms/blade/fields/checkboxes.blade.php
index 97b64e9fe85..3404344c2ed 100644
--- a/resources/views/extend/forms/blade/fields/checkboxes.blade.php
+++ b/resources/views/extend/forms/blade/fields/checkboxes.blade.php
@@ -2,13 +2,13 @@
     $inline = isset($inline) && $inline === true;
 @endphp
 
-<input type="hidden" name="{{ $handle }}[]">
+<input type="hidden" name="{{ $name }}[]">
 @foreach ($options as $option => $label)
     <label>
         <input
             id="{{ $id }}-{{ \Illuminate\Support\Str::slug($option) }}-option"
             type="checkbox"
-            name="{{ $handle }}[]"
+            name="{{ $name }}[]"
             value="{{ $option }}"
             @if (isset($js_driver)) {!! $js_attributes !!} @endif
             @checked(in_array($option, $value ?? []))
diff --git a/resources/views/extend/forms/blade/fields/default.blade.php b/resources/views/extend/forms/blade/fields/default.blade.php
index 0cbb4e84a60..79c771ac9e8 100644
--- a/resources/views/extend/forms/blade/fields/default.blade.php
+++ b/resources/views/extend/forms/blade/fields/default.blade.php
@@ -1,7 +1,7 @@
 <input
     id="{{ $id }}"
     type="{{ $input_type ?? 'text' }}"
-    name="{{ $handle }}"
+    name="{{ $name }}"
     value="{{ $value ?? '' }}"
     @if (isset($placeholder)) placeholder="{{ $placeholder }}" @endif
     @if (isset($character_limit)) maxlength="{{ $character_limit }}" @endif
diff --git a/resources/views/extend/forms/blade/fields/dictionary.blade.php b/resources/views/extend/forms/blade/fields/dictionary.blade.php
index accb2f9f5b7..745fa726e5e 100644
--- a/resources/views/extend/forms/blade/fields/dictionary.blade.php
+++ b/resources/views/extend/forms/blade/fields/dictionary.blade.php
@@ -5,7 +5,7 @@
     $inline = isset($inline) && $inline === true;
     $placeholderText = $placeholder ?? __('Please select...');
 
-    $fieldName = $handle;
+    $fieldName = $name;
 
     if ($isMultiple) {
         $fieldName .= '[]';
diff --git a/resources/views/extend/forms/blade/fields/files.blade.php b/resources/views/extend/forms/blade/fields/files.blade.php
index bb9bc9526ef..7b8fba712a0 100644
--- a/resources/views/extend/forms/blade/fields/files.blade.php
+++ b/resources/views/extend/forms/blade/fields/files.blade.php
@@ -1,7 +1,7 @@
 @php
     $isMultiple = ! isset($max_files) || $max_files !== 1;
 
-    $fieldName = $handle;
+    $fieldName = $name;
 
     if ($isMultiple) {
         $fieldName .= '[]';
diff --git a/resources/views/extend/forms/blade/fields/radio.blade.php b/resources/views/extend/forms/blade/fields/radio.blade.php
index 004ae617fa9..78abb2a01be 100644
--- a/resources/views/extend/forms/blade/fields/radio.blade.php
+++ b/resources/views/extend/forms/blade/fields/radio.blade.php
@@ -7,7 +7,7 @@
         <input
             id="{{ $id }}-{{ \Illuminate\Support\Str::slug($option) }}-option"
             type="radio"
-            name="{{ $handle }}"
+            name="{{ $name }}"
             value="{{ $option }}"
             @if (isset($js_driver)) {!! $js_attributes !!} @endif
             @checked($value == $option)
diff --git a/resources/views/extend/forms/blade/fields/select.blade.php b/resources/views/extend/forms/blade/fields/select.blade.php
index 6f48fa71cd8..49684421893 100644
--- a/resources/views/extend/forms/blade/fields/select.blade.php
+++ b/resources/views/extend/forms/blade/fields/select.blade.php
@@ -5,7 +5,7 @@
     $inline = isset($inline) && $inline === true;
     $placeholderText = $placeholder ?? __('Please select...');
 
-    $fieldName = $handle;
+    $fieldName = $name;
 
     if ($isMultiple) {
         $fieldName .= '[]';
diff --git a/resources/views/extend/forms/blade/fields/text.blade.php b/resources/views/extend/forms/blade/fields/text.blade.php
index b4042ce4016..e3b82e10ca7 100644
--- a/resources/views/extend/forms/blade/fields/text.blade.php
+++ b/resources/views/extend/forms/blade/fields/text.blade.php
@@ -1,7 +1,7 @@
 <input
     id="{{ $id }}"
     type="{{ $input_type ?? 'text' }}"
-    name="{{ $handle }}"
+    name="{{ $name }}"
     value="{{ $value ?? '' }}"
     @if (isset($placeholder)) placeholder="{{ $placeholder }}" @endif
     @if (isset($character_limit)) maxlength="{{ $character_limit }}" @endif
diff --git a/resources/views/extend/forms/blade/fields/textarea.blade.php b/resources/views/extend/forms/blade/fields/textarea.blade.php
index a70a1fbdbe8..48ecdbf9d87 100644
--- a/resources/views/extend/forms/blade/fields/textarea.blade.php
+++ b/resources/views/extend/forms/blade/fields/textarea.blade.php
@@ -1,6 +1,6 @@
 <textarea
     id="{{ $id }}"
-    name="{{ $handle }}"
+    name="{{ $name }}"
     rows="5"
     @if (isset($placeholder)) placeholder="{{ $placeholder }}" @endif
     @if (isset($character_limit)) maxlength="{{ $character_limit }}" @endif
diff --git a/resources/views/extend/forms/blade/fields/toggle.blade.php b/resources/views/extend/forms/blade/fields/toggle.blade.php
index 734af02dfa1..90ee25108b7 100644
--- a/resources/views/extend/forms/blade/fields/toggle.blade.php
+++ b/resources/views/extend/forms/blade/fields/toggle.blade.php
@@ -1,8 +1,8 @@
 <label>
-    <input type="hidden" name="{{ $handle }}" value="0">
+    <input type="hidden" name="{{ $name }}" value="0">
     <input
         type="checkbox"
-        name="{{ $handle }}"
+        name="{{ $name }}"
         value="1"
         @if (isset($js_driver)) {!! $js_attributes !!} @endif
         @checked($value && $value !== '0')

From c2c9079f4a701ef5ae90e6c7806b19caaf0814ad Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 12 May 2026 17:06:22 -0400
Subject: [PATCH 09/16] Add test coverage for Fieldtype `view` resolution
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Documents the candidate order, language-aware fallback, and the legacy
published `default` override behavior. The last two assertions are
currently red — they pin the legacy `default` fallback that the new
language-specific fallback regresses.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 tests/Fields/FieldtypeTest.php | 117 +++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)

diff --git a/tests/Fields/FieldtypeTest.php b/tests/Fields/FieldtypeTest.php
index b0519eed407..0f8732ca734 100644
--- a/tests/Fields/FieldtypeTest.php
+++ b/tests/Fields/FieldtypeTest.php
@@ -12,10 +12,13 @@
 use Statamic\Fields\Field;
 use Statamic\Fields\Fields;
 use Statamic\Fields\Fieldtype;
+use Tests\FakesViews;
 use Tests\TestCase;
 
 class FieldtypeTest extends TestCase
 {
+    use FakesViews;
+
     #[Test]
     public function it_gets_the_field()
     {
@@ -568,6 +571,120 @@ public function it_can_make_a_fieldtype_selectable_in_forms()
         $this->assertTrue(FieldtypeRepository::selectableInFormIsOverriden('test-selectable'));
     }
 
+    #[Test]
+    public function form_view_returns_the_package_view_for_the_handle()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.antlers.fields.text', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'text';
+        };
+
+        $this->assertEquals('statamic::forms.antlers.fields.text', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_returns_the_blade_package_view_when_language_is_blade()
+    {
+        config(['statamic.templates.language' => 'blade']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.blade.fields.text', '', 'blade.php');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'text';
+        };
+
+        $this->assertEquals('statamic::forms.blade.fields.text', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_prefers_a_legacy_published_view_over_the_package_view()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.fields.text', '');
+        $this->viewShouldReturnRaw('statamic::forms.antlers.fields.text', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'text';
+        };
+
+        $this->assertEquals('statamic::forms.fields.text', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_falls_back_to_the_package_default_when_no_handle_view_exists()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.antlers.fields.default', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'unknown';
+        };
+
+        $this->assertEquals('statamic::forms.antlers.fields.default', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_falls_back_to_the_blade_default_when_no_handle_view_exists_and_language_is_blade()
+    {
+        config(['statamic.templates.language' => 'blade']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.blade.fields.default', '', 'blade.php');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'unknown';
+        };
+
+        $this->assertEquals('statamic::forms.blade.fields.default', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_uses_a_legacy_published_default_view_when_no_handle_view_exists()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.fields.default', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'unknown';
+        };
+
+        $this->assertEquals('statamic::forms.fields.default', $fieldtype->view());
+    }
+
+    #[Test]
+    public function form_view_prefers_a_legacy_published_default_over_the_package_default()
+    {
+        config(['statamic.templates.language' => 'antlers']);
+
+        $this->withFakeViews();
+        $this->viewShouldReturnRaw('statamic::forms.fields.default', '');
+        $this->viewShouldReturnRaw('statamic::forms.antlers.fields.default', '');
+
+        $fieldtype = new class extends Fieldtype
+        {
+            protected static $handle = 'unknown';
+        };
+
+        $this->assertEquals('statamic::forms.fields.default', $fieldtype->view());
+    }
+
     #[Test]
     public function it_can_make_a_fieldtype_unselectable_in_forms()
     {

From dba658dc4e296b0f8f0df45122dfa029b477a8e6 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Tue, 12 May 2026 17:31:57 -0400
Subject: [PATCH 10/16] Restore legacy `default` form field view fallback

Without this, a user who published only a custom `default.antlers.html`
to the legacy flat path would silently lose their override after the
language subdirectory split.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/Fields/Fieldtype.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Fields/Fieldtype.php b/src/Fields/Fieldtype.php
index 682886fe903..d8145301e45 100644
--- a/src/Fields/Fieldtype.php
+++ b/src/Fields/Fieldtype.php
@@ -343,12 +343,11 @@ public function view()
         $views = [
             "statamic::forms.fields.{$handle}",
             "statamic::forms.{$language}.fields.{$handle}",
+            'statamic::forms.fields.default',
+            "statamic::forms.{$language}.fields.default",
         ];
 
-        $view = collect($views)->first(fn ($view) => view()->exists($view));
-
-        return $view
-            ?: "statamic::forms.{$language}.fields.default";
+        return collect($views)->first(fn ($view) => view()->exists($view));
     }
 
     public function config(?string $key = null, $fallback = null)

From 3b1e84a7e1da8a4e9a71cf731de181febb478f0c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 13 May 2026 10:31:56 -0400
Subject: [PATCH 11/16] Use `multiple` data key in Blade dictionary field

Matches the Antlers `dictionary.antlers.html` template and the Blade
`select.blade.php` sibling. The `multiple` key is the one
`Dictionary::extraRenderableFieldData()` explicitly exposes for views.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 resources/views/extend/forms/blade/fields/dictionary.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/extend/forms/blade/fields/dictionary.blade.php b/resources/views/extend/forms/blade/fields/dictionary.blade.php
index 745fa726e5e..f0cb15ab8fc 100644
--- a/resources/views/extend/forms/blade/fields/dictionary.blade.php
+++ b/resources/views/extend/forms/blade/fields/dictionary.blade.php
@@ -1,7 +1,7 @@
 @php
     use function Statamic\trans as __;
 
-    $isMultiple = ! isset($max_items) || $max_items !== 1;
+    $isMultiple = isset($multiple) && $multiple == true;
     $inline = isset($inline) && $inline === true;
     $placeholderText = $placeholder ?? __('Please select...');
 

From cc866b46a2a3027ddcf1d8006372a8aa13a6657e Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 13 May 2026 10:32:15 -0400
Subject: [PATCH 12/16] Add id and aria attrs to Antlers integer field

The Antlers integer template was missing the `id` attribute and the
`aria-invalid`/`aria-describedby` block that the other field templates
have. Without `id`, the aria-describedby references in `fields.antlers.html`
pointed at nothing. Brings it to parity with `integer.blade.php`.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../views/extend/forms/antlers/fields/integer.antlers.html  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/resources/views/extend/forms/antlers/fields/integer.antlers.html b/resources/views/extend/forms/antlers/fields/integer.antlers.html
index 988791d65d2..cc4d2b7e1e1 100644
--- a/resources/views/extend/forms/antlers/fields/integer.antlers.html
+++ b/resources/views/extend/forms/antlers/fields/integer.antlers.html
@@ -1,4 +1,5 @@
 <input
+    id="{{ id }}"
     type="number"
     name="{{ name }}"
     value="{{ value }}"
@@ -10,4 +11,9 @@
     {{ if autocomplete }}autocomplete="{{ autocomplete }}"{{ /if }}
     {{ if js_driver }}{{ js_attributes }}{{ /if }}
     {{ if validate|contains:required }}required{{ /if }}
+    {{ if error }}
+        aria-invalid="true" aria-describedby="{{ id }}-error"
+    {{ elseif instructions }}
+        aria-describedby="{{ id }}-instructions"
+    {{ /if }}
 >

From 773e03afdcfacaa54d1d4e7169807ca8041f5900 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 13 May 2026 10:32:29 -0400
Subject: [PATCH 13/16] Replace `<?php` placeholder in Blade spacer with a
 comment

Same rendered output (nothing), but more self-documenting than a bare
PHP open tag.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 resources/views/extend/forms/blade/fields/spacer.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/extend/forms/blade/fields/spacer.blade.php b/resources/views/extend/forms/blade/fields/spacer.blade.php
index b3d9bbc7f37..9d7b871217c 100644
--- a/resources/views/extend/forms/blade/fields/spacer.blade.php
+++ b/resources/views/extend/forms/blade/fields/spacer.blade.php
@@ -1 +1 @@
-<?php
+{{-- spacer --}}

From 0b7c2d2ce0935009972c114c93580b3539efa59b Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 13 May 2026 10:32:53 -0400
Subject: [PATCH 14/16] Add trailing newlines to Blade field templates

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 resources/views/extend/forms/blade/fields.blade.php            | 2 +-
 resources/views/extend/forms/blade/fields/assets.blade.php     | 2 +-
 resources/views/extend/forms/blade/fields/checkboxes.blade.php | 2 +-
 resources/views/extend/forms/blade/fields/default.blade.php    | 2 +-
 resources/views/extend/forms/blade/fields/dictionary.blade.php | 2 +-
 resources/views/extend/forms/blade/fields/files.blade.php      | 2 +-
 resources/views/extend/forms/blade/fields/group.blade.php      | 2 +-
 resources/views/extend/forms/blade/fields/integer.blade.php    | 2 +-
 resources/views/extend/forms/blade/fields/radio.blade.php      | 2 +-
 resources/views/extend/forms/blade/fields/select.blade.php     | 2 +-
 resources/views/extend/forms/blade/fields/text.blade.php       | 2 +-
 resources/views/extend/forms/blade/fields/textarea.blade.php   | 2 +-
 resources/views/extend/forms/blade/fields/toggle.blade.php     | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/views/extend/forms/blade/fields.blade.php b/resources/views/extend/forms/blade/fields.blade.php
index 3f62e578721..6c457637923 100644
--- a/resources/views/extend/forms/blade/fields.blade.php
+++ b/resources/views/extend/forms/blade/fields.blade.php
@@ -25,4 +25,4 @@
             </p>
         @endif
     </div>
-@endforeach
\ No newline at end of file
+@endforeach
diff --git a/resources/views/extend/forms/blade/fields/assets.blade.php b/resources/views/extend/forms/blade/fields/assets.blade.php
index b6adae266af..b42537f0860 100644
--- a/resources/views/extend/forms/blade/fields/assets.blade.php
+++ b/resources/views/extend/forms/blade/fields/assets.blade.php
@@ -19,4 +19,4 @@
     @elseif ($instructions)
         aria-describedby="{{ $id }}-instructions"
     @endif
->
\ No newline at end of file
+>
diff --git a/resources/views/extend/forms/blade/fields/checkboxes.blade.php b/resources/views/extend/forms/blade/fields/checkboxes.blade.php
index 3404344c2ed..ce24cf3cd60 100644
--- a/resources/views/extend/forms/blade/fields/checkboxes.blade.php
+++ b/resources/views/extend/forms/blade/fields/checkboxes.blade.php
@@ -22,4 +22,4 @@
         {{ $label === null ? $option : $label }}
     </label>
     @unless ($inline) <br> @endunless
-@endforeach
\ No newline at end of file
+@endforeach
diff --git a/resources/views/extend/forms/blade/fields/default.blade.php b/resources/views/extend/forms/blade/fields/default.blade.php
index 79c771ac9e8..db78b8b94c9 100644
--- a/resources/views/extend/forms/blade/fields/default.blade.php
+++ b/resources/views/extend/forms/blade/fields/default.blade.php
@@ -12,4 +12,4 @@
     @elseif ($instructions)
         aria-describedby="{{ $id }}-instructions"
     @endif
->
\ No newline at end of file
+>
diff --git a/resources/views/extend/forms/blade/fields/dictionary.blade.php b/resources/views/extend/forms/blade/fields/dictionary.blade.php
index f0cb15ab8fc..2d04fb3e826 100644
--- a/resources/views/extend/forms/blade/fields/dictionary.blade.php
+++ b/resources/views/extend/forms/blade/fields/dictionary.blade.php
@@ -41,4 +41,4 @@
             @selected($selected)
         >{{ $label === null ? $option : $label }}</option>
     @endforeach
-</select>
\ No newline at end of file
+</select>
diff --git a/resources/views/extend/forms/blade/fields/files.blade.php b/resources/views/extend/forms/blade/fields/files.blade.php
index 7b8fba712a0..68b69a3f385 100644
--- a/resources/views/extend/forms/blade/fields/files.blade.php
+++ b/resources/views/extend/forms/blade/fields/files.blade.php
@@ -20,4 +20,4 @@
     @elseif ($instructions)
         aria-describedby="{{ $id }}-instructions"
     @endif
->
\ No newline at end of file
+>
diff --git a/resources/views/extend/forms/blade/fields/group.blade.php b/resources/views/extend/forms/blade/fields/group.blade.php
index 872b6378c28..e70ce5992c8 100644
--- a/resources/views/extend/forms/blade/fields/group.blade.php
+++ b/resources/views/extend/forms/blade/fields/group.blade.php
@@ -4,4 +4,4 @@
     @foreach ($fields as $__field)
         {!! $slot?->addContext($__field) !!}
     @endforeach
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/extend/forms/blade/fields/integer.blade.php b/resources/views/extend/forms/blade/fields/integer.blade.php
index 220f8edacb1..394a60234d3 100644
--- a/resources/views/extend/forms/blade/fields/integer.blade.php
+++ b/resources/views/extend/forms/blade/fields/integer.blade.php
@@ -16,4 +16,4 @@
     @elseif ($instructions)
         aria-describedby="{{ $id }}-instructions"
     @endif
->
\ No newline at end of file
+>
diff --git a/resources/views/extend/forms/blade/fields/radio.blade.php b/resources/views/extend/forms/blade/fields/radio.blade.php
index 78abb2a01be..16fa854f873 100644
--- a/resources/views/extend/forms/blade/fields/radio.blade.php
+++ b/resources/views/extend/forms/blade/fields/radio.blade.php
@@ -21,4 +21,4 @@
         {{ $label === null ? $option : $label }}
     </label>
     @unless ($inline) <br> @endunless
-@endforeach
\ No newline at end of file
+@endforeach
diff --git a/resources/views/extend/forms/blade/fields/select.blade.php b/resources/views/extend/forms/blade/fields/select.blade.php
index 49684421893..f28376fe856 100644
--- a/resources/views/extend/forms/blade/fields/select.blade.php
+++ b/resources/views/extend/forms/blade/fields/select.blade.php
@@ -41,4 +41,4 @@
             @selected($selected)
         >{{ $label === null ? $option : $label }}</option>
     @endforeach
-</select>
\ No newline at end of file
+</select>
diff --git a/resources/views/extend/forms/blade/fields/text.blade.php b/resources/views/extend/forms/blade/fields/text.blade.php
index e3b82e10ca7..75567e3db18 100644
--- a/resources/views/extend/forms/blade/fields/text.blade.php
+++ b/resources/views/extend/forms/blade/fields/text.blade.php
@@ -13,4 +13,4 @@
     @elseif ($instructions)
         aria-describedby="{{ $id }}-instructions"
     @endif
->
\ No newline at end of file
+>
diff --git a/resources/views/extend/forms/blade/fields/textarea.blade.php b/resources/views/extend/forms/blade/fields/textarea.blade.php
index 48ecdbf9d87..3c848068011 100644
--- a/resources/views/extend/forms/blade/fields/textarea.blade.php
+++ b/resources/views/extend/forms/blade/fields/textarea.blade.php
@@ -11,4 +11,4 @@
     @elseif ($instructions)
         aria-describedby="{{ $id }}-instructions"
     @endif
->{{ $value }}</textarea>
\ No newline at end of file
+>{{ $value }}</textarea>
diff --git a/resources/views/extend/forms/blade/fields/toggle.blade.php b/resources/views/extend/forms/blade/fields/toggle.blade.php
index 90ee25108b7..fed395a24a3 100644
--- a/resources/views/extend/forms/blade/fields/toggle.blade.php
+++ b/resources/views/extend/forms/blade/fields/toggle.blade.php
@@ -14,4 +14,4 @@
         @endif
     >
     @if (isset($inline_label)) {{ $inline_label }} @endif
-</label>
\ No newline at end of file
+</label>

From 7cac76cd2099a3ba8f228fee378dc20d66197007 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 13 May 2026 10:33:06 -0400
Subject: [PATCH 15/16] Remove stray double space in Blade select placeholder

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 resources/views/extend/forms/blade/fields/select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/extend/forms/blade/fields/select.blade.php b/resources/views/extend/forms/blade/fields/select.blade.php
index f28376fe856..2d04fb3e826 100644
--- a/resources/views/extend/forms/blade/fields/select.blade.php
+++ b/resources/views/extend/forms/blade/fields/select.blade.php
@@ -25,7 +25,7 @@
     @endif
 >
     @unless ($isMultiple)
-        <option value>{{ $placeholderText  }}</option>
+        <option value>{{ $placeholderText }}</option>
     @endunless
     @foreach ($options as $option => $label)
         @php

From c5390c75232dc369bbb0950e0521e759ee5c9264 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 13 May 2026 10:33:37 -0400
Subject: [PATCH 16/16] Extract form publish source into a variable

The inline ternary as an array key was hard to parse at a glance.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 src/Providers/AppServiceProvider.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index 988a4a34118..eb86a32e02a 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -84,10 +84,12 @@ public function boot()
 
         $this->loadViewsFrom("{$this->root}/resources/views/extend", 'statamic');
 
+        $formsSource = config('statamic.templates.language', 'antlers') === 'blade'
+            ? "{$this->root}/resources/views/extend/forms/blade"
+            : "{$this->root}/resources/views/extend/forms/antlers";
+
         $this->publishes([
-            config('statamic.templates.language', 'antlers') === 'blade'
-                ? "{$this->root}/resources/views/extend/forms/blade"
-                : "{$this->root}/resources/views/extend/forms/antlers" => resource_path('views/vendor/statamic/forms'),
+            $formsSource => resource_path('views/vendor/statamic/forms'),
         ], 'statamic-forms');
 
         $this->publishes([