From 091026ffa1f91e72b03b7ef8895182c27360be7a Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Apr 2026 15:03:14 -0400
Subject: [PATCH 1/9] Add export modal with filtered submissions support

Replace the export dropdown with a modal that lets users choose
the format (CSV/JSON) and scope (all vs currently filtered).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .../js/components/forms/SubmissionListing.vue |   9 ++
 .../js/components/ui/Listing/Listing.vue      |   1 +
 resources/js/pages/forms/Show.vue             | 103 ++++++++++++++----
 src/Forms/Exporters/CsvExporter.php           |   9 +-
 src/Forms/Exporters/Exporter.php              |  19 ++++
 src/Forms/Exporters/JsonExporter.php          |   2 +-
 .../Concerns/QueriesFormSubmissionSearch.php  |  30 +++++
 .../CP/Forms/FormExportController.php         |  35 +++++-
 .../CP/Forms/FormSubmissionsController.php    |  18 +--
 .../Controllers/CP/Forms/FormsController.php  |   1 +
 10 files changed, 186 insertions(+), 41 deletions(-)
 create mode 100644 src/Http/Controllers/CP/Forms/Concerns/QueriesFormSubmissionSearch.php

diff --git a/resources/js/components/forms/SubmissionListing.vue b/resources/js/components/forms/SubmissionListing.vue
index 27c9b1bd3b3..b4a6c0917b0 100644
--- a/resources/js/components/forms/SubmissionListing.vue
+++ b/resources/js/components/forms/SubmissionListing.vue
@@ -1,5 +1,6 @@
 <template>
     <Listing
+        ref="listing"
         :url="requestUrl"
         :columns="columns"
         :action-url="actionUrl"
@@ -42,5 +43,13 @@ export default {
             requestUrl: cp_url(`forms/${this.form}/submissions`),
         };
     },
+
+    methods: {
+        getParameters() {
+            return this.$refs.listing?.getParameters();
+        },
+    },
+
+    expose: ['getParameters'],
 };
 </script>
diff --git a/resources/js/components/ui/Listing/Listing.vue b/resources/js/components/ui/Listing/Listing.vue
index 4cc9d434dae..011598058a9 100644
--- a/resources/js/components/ui/Listing/Listing.vue
+++ b/resources/js/components/ui/Listing/Listing.vue
@@ -670,6 +670,7 @@ provideListingContext({
 defineExpose({
     refresh,
     setFilter,
+    getParameters: () => ({ ...parameters.value }),
 });
 
 watch(parameters, (newParams, oldParams) => {
diff --git a/resources/js/pages/forms/Show.vue b/resources/js/pages/forms/Show.vue
index 5ecdb12f782..727487a89ad 100644
--- a/resources/js/pages/forms/Show.vue
+++ b/resources/js/pages/forms/Show.vue
@@ -1,7 +1,7 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import Head from '@/pages/layout/Head.vue';
-import { Header, Dropdown, DropdownMenu, DropdownItem, Button, CommandPaletteItem } from '@ui';
+import { Header, Dropdown, DropdownMenu, DropdownItem, Button, Modal, RadioGroup, Radio, CommandPaletteItem } from '@ui';
 import ResourceDeleter from '@/components/ResourceDeleter.vue';
 import FormSubmissionListing from '@/components/forms/SubmissionListing.vue';
 
@@ -15,6 +15,55 @@ const props = defineProps([
 ]);
 
 const deleter = ref(null);
+const submissionListing = ref(null);
+const exportModalOpen = ref(false);
+const exportFormat = ref(null);
+const exportScope = ref('all');
+const listingParameters = ref({});
+
+const exportFormats = computed(() => {
+    const seen = new Set();
+    return props.exporters.filter((e) => {
+        const handle = e.handle.toLowerCase();
+        if (seen.has(handle)) return false;
+        seen.add(handle);
+        return true;
+    });
+});
+
+const hasFilteredScope = computed(() => {
+    const params = listingParameters.value;
+    return !!(params.search || params.filters);
+});
+
+function openExportModal() {
+    listingParameters.value = submissionListing.value?.getParameters() ?? {};
+    exportFormat.value = exportFormats.value[0]?.handle ?? null;
+    exportScope.value = 'all';
+    exportModalOpen.value = true;
+}
+
+function exportSubmissions() {
+    const exporter = props.exporters.find((e) => e.handle === exportFormat.value);
+    if (!exporter) return;
+
+    let url = exporter.downloadUrl;
+
+    if (exportScope.value === 'filtered') {
+        const params = listingParameters.value;
+        const query = new URLSearchParams();
+        if (params.search) query.set('search', params.search);
+        if (params.sort) query.set('sort', params.sort);
+        if (params.order) query.set('order', params.order);
+        if (params.filters) query.set('filters', params.filters);
+
+        const separator = url.includes('?') ? '&' : '?';
+        url += separator + query.toString();
+    }
+
+    window.open(url, '_blank');
+    exportModalOpen.value = false;
+}
 </script>
 
 <template>
@@ -70,39 +119,51 @@ const deleter = ref(null);
                 :redirect="redirectUrl"
             />
 
-            <Dropdown v-if="exporters.length">
-                <template #trigger>
-                    <Button :text="__('Export Submissions')" />
-                </template>
-                <DropdownMenu>
-                    <DropdownItem
-                        v-for="exporter in exporters"
-                        :key="exporter.downloadUrl"
-                        :text="exporter.title"
-                        :href="exporter.downloadUrl"
-                        target="_blank"
-                    />
-                </DropdownMenu>
-            </Dropdown>
+            <Button v-if="exporters.length" :text="__('Export Submissions')" @click="openExportModal" />
 
             <CommandPaletteItem
-                v-for="exporter in exporters"
-                :key="exporter.downloadUrl"
+                v-if="exporters.length"
                 category="Actions"
-                :text="[__('Export Submissions'), exporter.title]"
+                :text="__('Export Submissions')"
                 icon="save"
-                :url="exporter.downloadUrl"
+                :action="openExportModal"
                 prioritize
             />
         </Header>
 
         <FormSubmissionListing
+            ref="submissionListing"
             :form="form.handle"
             :action-url="actionUrl"
             sort-column="datestamp"
             sort-direction="desc"
             :columns="columns"
-                :filters="filters"
+            :filters="filters"
         />
+
+        <Modal :open="exportModalOpen" @update:open="exportModalOpen = $event" :title="__('Export Submissions')">
+            <div class="space-y-4">
+                <div>
+                    <label class="text-sm font-medium mb-1.5 block">{{ __('Format') }}</label>
+                    <RadioGroup v-model="exportFormat" inline>
+                        <Radio v-for="format in exportFormats" :key="format.handle" :value="format.handle" :label="format.title" />
+                    </RadioGroup>
+                </div>
+
+                <div>
+                    <label class="text-sm font-medium mb-1.5 block">{{ __('Submissions') }}</label>
+                    <RadioGroup v-model="exportScope">
+                        <Radio value="all" :label="__('All Submissions')" />
+                        <Radio value="filtered" :label="__('Filtered Submissions')" :disabled="!hasFilteredScope" />
+                    </RadioGroup>
+                </div>
+            </div>
+
+            <template #footer>
+                <div class="flex justify-end p-2">
+                    <Button variant="primary" :text="__('Export')" @click="exportSubmissions" />
+                </div>
+            </template>
+        </Modal>
     </div>
 </template>
diff --git a/src/Forms/Exporters/CsvExporter.php b/src/Forms/Exporters/CsvExporter.php
index 202139874ce..2b0cec239d1 100644
--- a/src/Forms/Exporters/CsvExporter.php
+++ b/src/Forms/Exporters/CsvExporter.php
@@ -29,15 +29,20 @@ private function insertHeaders()
 
         $headers = $this->form->fields()
             ->map(fn ($field) => $key === 'display' ? $field->display() : $field->handle())
-            ->push($key === 'display' ? __('Date') : 'date')
             ->values()->all();
 
+        $dateHeader = $key === 'display' ? __('Date') : 'date';
+
+        if (! in_array($dateHeader, $headers)) {
+            $headers[] = $dateHeader;
+        }
+
         $this->writer->insertOne($headers);
     }
 
     private function insertData()
     {
-        $data = $this->form->submissions()->map(function ($submission) {
+        $data = $this->submissions()->map(function ($submission) {
             $submission = $submission->toArray();
 
             $submission['date'] = (string) $submission['date'];
diff --git a/src/Forms/Exporters/Exporter.php b/src/Forms/Exporters/Exporter.php
index 518cafca6d3..dd8d459d4e4 100644
--- a/src/Forms/Exporters/Exporter.php
+++ b/src/Forms/Exporters/Exporter.php
@@ -3,6 +3,7 @@
 namespace Statamic\Forms\Exporters;
 
 use Illuminate\Http\Response;
+use Illuminate\Support\Collection;
 use Statamic\Contracts\Forms\Form;
 use Statamic\Facades\File;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -15,6 +16,7 @@ abstract class Exporter
     protected array $config;
     protected string $handle;
     protected Form $form;
+    protected ?Collection $submissions = null;
 
     abstract public function export(): string;
 
@@ -39,6 +41,23 @@ public function setForm(Form $form)
         return $this;
     }
 
+    public function setSubmissions(Collection $submissions)
+    {
+        $this->submissions = $submissions;
+
+        return $this;
+    }
+
+    public function handle(): string
+    {
+        return $this->handle;
+    }
+
+    protected function submissions(): Collection
+    {
+        return $this->submissions ?? $this->form->submissions();
+    }
+
     public function contentType(): string
     {
         return 'text/plain';
diff --git a/src/Forms/Exporters/JsonExporter.php b/src/Forms/Exporters/JsonExporter.php
index b91ef490fc1..c9fc34b8ea3 100644
--- a/src/Forms/Exporters/JsonExporter.php
+++ b/src/Forms/Exporters/JsonExporter.php
@@ -8,7 +8,7 @@ class JsonExporter extends Exporter
 
     public function export(): string
     {
-        $submissions = $this->form->submissions()->toArray();
+        $submissions = $this->submissions()->toArray();
 
         return json_encode($submissions);
     }
diff --git a/src/Http/Controllers/CP/Forms/Concerns/QueriesFormSubmissionSearch.php b/src/Http/Controllers/CP/Forms/Concerns/QueriesFormSubmissionSearch.php
new file mode 100644
index 00000000000..0ef739a66ac
--- /dev/null
+++ b/src/Http/Controllers/CP/Forms/Concerns/QueriesFormSubmissionSearch.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Forms\Concerns;
+
+use Statamic\Contracts\Forms\Form;
+use Statamic\Fields\Field;
+
+trait QueriesFormSubmissionSearch
+{
+    protected function applySubmissionSearch($query, Form $form, ?string $search)
+    {
+        if (! $search) {
+            return $query;
+        }
+
+        $query->where(function ($query) use ($form, $search) {
+            $query->where('date', 'like', '%'.$search.'%');
+
+            $form->blueprint()->fields()->all()
+                ->filter(function (Field $field): bool {
+                    return in_array($field->type(), ['text', 'textarea', 'integer']);
+                })
+                ->each(function (Field $field) use ($query, $search): void {
+                    $query->orWhere($field->handle(), 'like', '%'.$search.'%');
+                });
+        });
+
+        return $query;
+    }
+}
diff --git a/src/Http/Controllers/CP/Forms/FormExportController.php b/src/Http/Controllers/CP/Forms/FormExportController.php
index 116968d603a..d7ea721db66 100644
--- a/src/Http/Controllers/CP/Forms/FormExportController.php
+++ b/src/Http/Controllers/CP/Forms/FormExportController.php
@@ -4,10 +4,15 @@
 
 use Statamic\Exceptions\NotFoundHttpException;
 use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Forms\Concerns\QueriesFormSubmissionSearch;
+use Statamic\Http\Requests\FilteredRequest;
+use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
 
 class FormExportController extends CpController
 {
-    public function export($form, $type)
+    use QueriesFilters, QueriesFormSubmissionSearch;
+
+    public function export(FilteredRequest $request, $form, $type)
     {
         $this->authorize('view', $form);
 
@@ -15,6 +20,32 @@ public function export($form, $type)
             throw new NotFoundHttpException;
         }
 
-        return $this->request->has('download') ? $exporter->download() : $exporter->response();
+        if ($this->shouldApplyFilteredScope($request)) {
+            $exporter->setSubmissions($this->getScopedSubmissions($request, $form));
+        }
+
+        return $request->has('download') ? $exporter->download() : $exporter->response();
+    }
+
+    protected function shouldApplyFilteredScope(FilteredRequest $request)
+    {
+        return $request->has('filters') || $request->has('search') || $request->has('sort') || $request->has('order');
+    }
+
+    protected function getScopedSubmissions(FilteredRequest $request, $form)
+    {
+        $query = $form->querySubmissions();
+
+        $this->queryFilters($query, $request->filters, [
+            'form' => $form->handle(),
+        ]);
+
+        $this->applySubmissionSearch($query, $form, $request->input('search'));
+
+        if ($sort = $request->input('sort')) {
+            $query->orderBy($sort, $request->input('order', 'asc'));
+        }
+
+        return $query->get();
     }
 }
diff --git a/src/Http/Controllers/CP/Forms/FormSubmissionsController.php b/src/Http/Controllers/CP/Forms/FormSubmissionsController.php
index 7e7c7d69e9a..1042ffb6b5e 100644
--- a/src/Http/Controllers/CP/Forms/FormSubmissionsController.php
+++ b/src/Http/Controllers/CP/Forms/FormSubmissionsController.php
@@ -3,8 +3,8 @@
 namespace Statamic\Http\Controllers\CP\Forms;
 
 use Inertia\Inertia;
-use Statamic\Fields\Field;
 use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Forms\Concerns\QueriesFormSubmissionSearch;
 use Statamic\Http\Requests\FilteredRequest;
 use Statamic\Http\Resources\CP\Submissions\Submissions;
 use Statamic\Query\OrderBy;
@@ -12,7 +12,7 @@
 
 class FormSubmissionsController extends CpController
 {
-    use QueriesFilters;
+    use QueriesFilters, QueriesFormSubmissionSearch;
 
     public function index(FilteredRequest $request, $form)
     {
@@ -49,19 +49,7 @@ protected function indexQuery($form)
     {
         $query = $form->querySubmissions();
 
-        if ($search = request('search')) {
-            $query->where(function ($query) use ($form, $search) {
-                $query->where('date', 'like', '%'.$search.'%');
-
-                $form->blueprint()->fields()->all()
-                    ->filter(function (Field $field): bool {
-                        return in_array($field->type(), ['text', 'textarea', 'integer']);
-                    })
-                    ->each(function (Field $field) use ($query, $search): void {
-                        $query->orWhere($field->handle(), 'like', '%'.$search.'%');
-                    });
-            });
-        }
+        $this->applySubmissionSearch($query, $form, request('search'));
 
         return $query;
     }
diff --git a/src/Http/Controllers/CP/Forms/FormsController.php b/src/Http/Controllers/CP/Forms/FormsController.php
index 42a5fd0b454..0b3457afc7a 100644
--- a/src/Http/Controllers/CP/Forms/FormsController.php
+++ b/src/Http/Controllers/CP/Forms/FormsController.php
@@ -85,6 +85,7 @@ public function show($form)
             ]),
             'actionUrl' => cp_route('forms.submissions.actions.run', $form->handle()),
             'exporters' => $form->exporters()->map(fn ($exporter) => [
+                'handle' => $exporter->handle(),
                 'title' => $exporter->title(),
                 'downloadUrl' => $exporter->downloadUrl(),
             ])->values(),

From 01ac1561140bb587b2183b5f0fe3014801d6cd5c Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Apr 2026 15:22:13 -0400
Subject: [PATCH 2/9] Remove unnecessary exportFormats deduplication

Exporter handles are already unique (keyed by handle in config),
so the deduplication computed was unnecessary.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 resources/js/pages/forms/Show.vue | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/resources/js/pages/forms/Show.vue b/resources/js/pages/forms/Show.vue
index 727487a89ad..05dc0910386 100644
--- a/resources/js/pages/forms/Show.vue
+++ b/resources/js/pages/forms/Show.vue
@@ -21,16 +21,6 @@ const exportFormat = ref(null);
 const exportScope = ref('all');
 const listingParameters = ref({});
 
-const exportFormats = computed(() => {
-    const seen = new Set();
-    return props.exporters.filter((e) => {
-        const handle = e.handle.toLowerCase();
-        if (seen.has(handle)) return false;
-        seen.add(handle);
-        return true;
-    });
-});
-
 const hasFilteredScope = computed(() => {
     const params = listingParameters.value;
     return !!(params.search || params.filters);
@@ -38,7 +28,7 @@ const hasFilteredScope = computed(() => {
 
 function openExportModal() {
     listingParameters.value = submissionListing.value?.getParameters() ?? {};
-    exportFormat.value = exportFormats.value[0]?.handle ?? null;
+    exportFormat.value = props.exporters[0]?.handle ?? null;
     exportScope.value = 'all';
     exportModalOpen.value = true;
 }
@@ -146,7 +136,7 @@ function exportSubmissions() {
                 <div>
                     <label class="text-sm font-medium mb-1.5 block">{{ __('Format') }}</label>
                     <RadioGroup v-model="exportFormat" inline>
-                        <Radio v-for="format in exportFormats" :key="format.handle" :value="format.handle" :label="format.title" />
+                        <Radio v-for="format in exporters" :key="format.handle" :value="format.handle" :label="format.title" />
                     </RadioGroup>
                 </div>
 

From 1084c916769c09777d507f468bb615cf6688e342 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Apr 2026 15:27:03 -0400
Subject: [PATCH 3/9] Enable filtered export when sort deviates from default

Make the "Filtered Submissions" radio selectable when the listing
is sorted by a non-default column or direction, aligning the
frontend check with the backend's shouldApplyFilteredScope.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 resources/js/pages/forms/Show.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/pages/forms/Show.vue b/resources/js/pages/forms/Show.vue
index 05dc0910386..acf1ba30558 100644
--- a/resources/js/pages/forms/Show.vue
+++ b/resources/js/pages/forms/Show.vue
@@ -23,7 +23,8 @@ const listingParameters = ref({});
 
 const hasFilteredScope = computed(() => {
     const params = listingParameters.value;
-    return !!(params.search || params.filters);
+    const hasSortOverride = (params.sort && params.sort !== 'datestamp') || (params.order && params.order !== 'desc');
+    return !!(params.search || params.filters || hasSortOverride);
 });
 
 function openExportModal() {

From cdff38028164d5b049d1d505a86eabfcb64b2ca1 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Apr 2026 15:29:08 -0400
Subject: [PATCH 4/9] Revert out-of-scope CSV date header deduplication

This fix belongs in its own PR.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Forms/Exporters/CsvExporter.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Forms/Exporters/CsvExporter.php b/src/Forms/Exporters/CsvExporter.php
index 2b0cec239d1..806277f8e58 100644
--- a/src/Forms/Exporters/CsvExporter.php
+++ b/src/Forms/Exporters/CsvExporter.php
@@ -29,14 +29,9 @@ private function insertHeaders()
 
         $headers = $this->form->fields()
             ->map(fn ($field) => $key === 'display' ? $field->display() : $field->handle())
+            ->push($key === 'display' ? __('Date') : 'date')
             ->values()->all();
 
-        $dateHeader = $key === 'display' ? __('Date') : 'date';
-
-        if (! in_array($dateHeader, $headers)) {
-            $headers[] = $dateHeader;
-        }
-
         $this->writer->insertOne($headers);
     }
 

From a01ad2d42d5dd84ecb8ea916fe30754f7bf2691e Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Apr 2026 15:34:24 -0400
Subject: [PATCH 5/9] Validate sort column in export controller

Use OrderBy::column() to validate the sort parameter, matching
how FormSubmissionsController handles it.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Http/Controllers/CP/Forms/FormExportController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Forms/FormExportController.php b/src/Http/Controllers/CP/Forms/FormExportController.php
index d7ea721db66..59d4b499218 100644
--- a/src/Http/Controllers/CP/Forms/FormExportController.php
+++ b/src/Http/Controllers/CP/Forms/FormExportController.php
@@ -6,6 +6,7 @@
 use Statamic\Http\Controllers\CP\CpController;
 use Statamic\Http\Controllers\CP\Forms\Concerns\QueriesFormSubmissionSearch;
 use Statamic\Http\Requests\FilteredRequest;
+use Statamic\Query\OrderBy;
 use Statamic\Query\Scopes\Filters\Concerns\QueriesFilters;
 
 class FormExportController extends CpController
@@ -42,7 +43,7 @@ protected function getScopedSubmissions(FilteredRequest $request, $form)
 
         $this->applySubmissionSearch($query, $form, $request->input('search'));
 
-        if ($sort = $request->input('sort')) {
+        if ($sort = OrderBy::column($request->input('sort'))) {
             $query->orderBy($sort, $request->input('order', 'asc'));
         }
 

From b3b384d87258ca48ba05977c0e5dbf88494cd375 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Apr 2026 15:36:18 -0400
Subject: [PATCH 6/9] Match default sort direction with submissions controller

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Http/Controllers/CP/Forms/FormExportController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Http/Controllers/CP/Forms/FormExportController.php b/src/Http/Controllers/CP/Forms/FormExportController.php
index 59d4b499218..fc398bfb8db 100644
--- a/src/Http/Controllers/CP/Forms/FormExportController.php
+++ b/src/Http/Controllers/CP/Forms/FormExportController.php
@@ -44,7 +44,7 @@ protected function getScopedSubmissions(FilteredRequest $request, $form)
         $this->applySubmissionSearch($query, $form, $request->input('search'));
 
         if ($sort = OrderBy::column($request->input('sort'))) {
-            $query->orderBy($sort, $request->input('order', 'asc'));
+            $query->orderBy($sort, $request->input('order', $sort === 'date' ? 'desc' : 'asc'));
         }
 
         return $query->get();

From d3bb8940801d40969806343c1eb581073f0172eb Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Apr 2026 15:49:44 -0400
Subject: [PATCH 7/9] Add help text to filtered submissions export option

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 lang/en/messages.php              | 1 +
 resources/js/pages/forms/Show.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lang/en/messages.php b/lang/en/messages.php
index ae79894ece6..0c706919f21 100644
--- a/lang/en/messages.php
+++ b/lang/en/messages.php
@@ -135,6 +135,7 @@
     'form_configure_mailer_instructions' => 'Choose the mailer for sending this email. Leave blank to fall back to the default mailer.',
     'form_configure_store_instructions' => 'Disable to stop storing submissions. Events and email notifications will still be sent.',
     'form_configure_title_instructions' => 'Use a call to action, such as \'Contact Us\'.',
+    'form_export_filtered_description' => 'Exports submissions with current filters and visible columns.',
     'form_create_description' => 'Get started by creating your first form.',
     'getting_started_widget_collections' => 'Collections hold the different content types that make up your site, helping you stay organized.',
     'getting_started_widget_docs' => 'Discover everything Statamic can do, and learn how to use its powerful features the right way.',
diff --git a/resources/js/pages/forms/Show.vue b/resources/js/pages/forms/Show.vue
index acf1ba30558..7f1188e5b95 100644
--- a/resources/js/pages/forms/Show.vue
+++ b/resources/js/pages/forms/Show.vue
@@ -145,7 +145,7 @@ function exportSubmissions() {
                     <label class="text-sm font-medium mb-1.5 block">{{ __('Submissions') }}</label>
                     <RadioGroup v-model="exportScope">
                         <Radio value="all" :label="__('All Submissions')" />
-                        <Radio value="filtered" :label="__('Filtered Submissions')" :disabled="!hasFilteredScope" />
+                        <Radio value="filtered" :label="__('Filtered Submissions')" :description="__('statamic::messages.form_export_filtered_description')" :disabled="!hasFilteredScope" />
                     </RadioGroup>
                 </div>
             </div>

From 4e92dac85f9e5408cd4901aa9f2c1a5272317b33 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Apr 2026 15:55:14 -0400
Subject: [PATCH 8/9] Expose listing parameters as computed instead of method

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 resources/js/components/forms/SubmissionListing.vue | 8 ++++----
 resources/js/components/ui/Listing/Listing.vue      | 2 +-
 resources/js/pages/forms/Show.vue                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/forms/SubmissionListing.vue b/resources/js/components/forms/SubmissionListing.vue
index b4a6c0917b0..0ea2125cc01 100644
--- a/resources/js/components/forms/SubmissionListing.vue
+++ b/resources/js/components/forms/SubmissionListing.vue
@@ -44,12 +44,12 @@ export default {
         };
     },
 
-    methods: {
-        getParameters() {
-            return this.$refs.listing?.getParameters();
+    computed: {
+        parameters() {
+            return this.$refs.listing?.parameters;
         },
     },
 
-    expose: ['getParameters'],
+    expose: ['parameters'],
 };
 </script>
diff --git a/resources/js/components/ui/Listing/Listing.vue b/resources/js/components/ui/Listing/Listing.vue
index 011598058a9..10d02f967eb 100644
--- a/resources/js/components/ui/Listing/Listing.vue
+++ b/resources/js/components/ui/Listing/Listing.vue
@@ -670,7 +670,7 @@ provideListingContext({
 defineExpose({
     refresh,
     setFilter,
-    getParameters: () => ({ ...parameters.value }),
+    parameters,
 });
 
 watch(parameters, (newParams, oldParams) => {
diff --git a/resources/js/pages/forms/Show.vue b/resources/js/pages/forms/Show.vue
index 7f1188e5b95..08bd8cf63b7 100644
--- a/resources/js/pages/forms/Show.vue
+++ b/resources/js/pages/forms/Show.vue
@@ -28,7 +28,7 @@ const hasFilteredScope = computed(() => {
 });
 
 function openExportModal() {
-    listingParameters.value = submissionListing.value?.getParameters() ?? {};
+    listingParameters.value = submissionListing.value?.parameters ?? {};
     exportFormat.value = props.exporters[0]?.handle ?? null;
     exportScope.value = 'all';
     exportModalOpen.value = true;

From 209c20a90d670aa108829fe334e182fbf4ee9690 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Fri, 3 Apr 2026 16:14:40 -0400
Subject: [PATCH 9/9] Move handle() next to setHandle() in Exporter

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 src/Forms/Exporters/Exporter.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Forms/Exporters/Exporter.php b/src/Forms/Exporters/Exporter.php
index dd8d459d4e4..1675bc4bd27 100644
--- a/src/Forms/Exporters/Exporter.php
+++ b/src/Forms/Exporters/Exporter.php
@@ -27,6 +27,11 @@ public function setHandle(string $handle)
         return $this;
     }
 
+    public function handle(): string
+    {
+        return $this->handle;
+    }
+
     public function setConfig(array $config)
     {
         $this->config = $config;
@@ -48,11 +53,6 @@ public function setSubmissions(Collection $submissions)
         return $this;
     }
 
-    public function handle(): string
-    {
-        return $this->handle;
-    }
-
     protected function submissions(): Collection
     {
         return $this->submissions ?? $this->form->submissions();