From 434940881d465e8e60a9ec8698cc5091ed31a584 Mon Sep 17 00:00:00 2001
From: lazerg <lazerg2@gmail.com>
Date: Thu, 6 Aug 2026 17:39:36 +0500
Subject: [PATCH] Omit hidden fieldtype values when their conditions fail

---
 resources/js/components/ui/Publish/Field.vue  | 11 ++-
 resources/js/components/ui/Publish/Fields.vue | 11 +--
 resources/js/tests/components/Fields.test.js  | 85 +++++++++++++++++++
 3 files changed, 97 insertions(+), 10 deletions(-)
 create mode 100644 resources/js/tests/components/Fields.test.js

diff --git a/resources/js/components/ui/Publish/Field.vue b/resources/js/components/ui/Publish/Field.vue
index 7e46c3a8657..aa918a8d86b 100644
--- a/resources/js/components/ui/Publish/Field.vue
+++ b/resources/js/components/ui/Publish/Field.vue
@@ -57,6 +57,7 @@ const {
 } = injectFieldsContext();
 
 const { direction } = useUiDirection();
+const isFormSubmission = inject('isFormSubmission', false);
 
 const asConfig = computed(() => fieldsAsConfig.value ?? containerAsConfig.value ?? false);
 const fieldPathPrefix = computed(() => props.fieldPathPrefix || injectedFieldPathPrefix.value);
@@ -155,6 +156,12 @@ const shouldShowField = computed(() => {
     ).showField(props.config, fullPath.value);
 });
 
+// Hidden fieldtypes are mounted like any other field so they take part in field
+// conditions, but they only become visible on a form submission.
+const isHiddenFieldtype = computed(() => props.config.type === 'hidden' && !isFormSubmission);
+
+const shouldRenderField = computed(() => shouldShowField.value && !isHiddenFieldtype.value);
+
 const shouldShowLabelText = computed(() => !props.config.hide_display);
 
 // Whether the label renders anything visible. When it doesn't, we avoid rendering
@@ -169,6 +176,8 @@ const shouldShowLabel = computed(
 );
 
 const shouldShowFieldPreviews = computed(() => {
+    if (isHiddenFieldtype.value) return false;
+
     if (! props.config.replicator_preview) return false;
 
     return inject('showReplicatorFieldPreviews', false);
@@ -238,7 +247,7 @@ const fieldtypeComponentEvents = computed(() => ({
         :shouldShowField="shouldShowField"
     >
         <Field
-            v-show="shouldShowField"
+            v-show="shouldRenderField"
             :class="`${config.type}-fieldtype`"
             :id="fieldId"
             :dir="direction"
diff --git a/resources/js/components/ui/Publish/Fields.vue b/resources/js/components/ui/Publish/Fields.vue
index 993531c814c..ef6cc47796c 100644
--- a/resources/js/components/ui/Publish/Fields.vue
+++ b/resources/js/components/ui/Publish/Fields.vue
@@ -2,19 +2,12 @@
 import { injectContainerContext } from './Container.vue';
 import { injectFieldsContext } from './FieldsProvider.vue';
 import Field from './Field.vue';
-import { computed, inject } from 'vue';
+import { computed } from 'vue';
 
 const { asConfig: containerAsConfig } = injectContainerContext();
-const { fields: injectedFields, asConfig: fieldsAsConfig } = injectFieldsContext();
-const isFormSubmission = inject('isFormSubmission', false);
+const { fields, asConfig: fieldsAsConfig } = injectFieldsContext();
 
 const asConfig = computed(() => fieldsAsConfig.value !== undefined ? fieldsAsConfig.value : containerAsConfig.value);
-
-const fields = computed(() => {
-    let fields = injectedFields.value;
-    if (!isFormSubmission) fields = fields.filter(field => field.type !== 'hidden');
-    return fields;
-});
 </script>
 
 <template>
diff --git a/resources/js/tests/components/Fields.test.js b/resources/js/tests/components/Fields.test.js
new file mode 100644
index 00000000000..188653c09b4
--- /dev/null
+++ b/resources/js/tests/components/Fields.test.js
@@ -0,0 +1,85 @@
+import { mount } from '@vue/test-utils';
+import { expect, test } from 'vitest';
+import { defineComponent, h, nextTick } from 'vue';
+import * as Globals from '@/bootstrap/globals';
+import HiddenFieldtype from '@/components/fieldtypes/HiddenFieldtype.vue';
+import Container, { injectContainerContext } from '@/components/ui/Publish/Container.vue';
+import Fields from '@/components/ui/Publish/Fields.vue';
+import FieldsProvider from '@/components/ui/Publish/FieldsProvider.vue';
+
+Object.keys(Globals).forEach((fn) => (window[fn] = Globals[fn]));
+window.__ = (key) => key;
+
+window.Statamic = {
+    $app: { component: (name) => (name === 'hidden-fieldtype' ? HiddenFieldtype : undefined) },
+    $config: {
+        get: (key) => (key === 'sites' ? [{ handle: 'default', direction: 'ltr' }] : undefined),
+    },
+    $dirty: { has: () => false, add: () => {}, remove: () => {} },
+    $events: { $emit: () => {} },
+};
+
+const fields = [
+    { handle: 'protected', type: 'toggle' },
+    { handle: 'scheme', type: 'hidden', replicator_preview: true, if: { protected: 'equals true' } },
+];
+
+let previews;
+
+const Probe = defineComponent({
+    setup() {
+        previews = injectContainerContext().previews;
+        return () => h('div');
+    },
+});
+
+async function mountFields(values, provide = {}) {
+    const wrapper = mount(Container, {
+        props: {
+            blueprint: { tabs: [] },
+            modelValue: values,
+            site: 'default',
+        },
+        global: {
+            components: { 'hidden-fieldtype': HiddenFieldtype },
+            provide,
+        },
+        slots: {
+            default: () => [h(Probe), h(FieldsProvider, { fields }, () => h(Fields))],
+        },
+    });
+
+    await nextTick();
+
+    return wrapper;
+}
+
+test('a hidden fieldtype is not visible', async () => {
+    const wrapper = await mountFields({ protected: true, scheme: 'password' });
+
+    expect(wrapper.find('.hidden-fieldtype').attributes('style')).toBe('display: none;');
+});
+
+test('a hidden fieldtype is visible on a form submission', async () => {
+    const wrapper = await mountFields({ protected: true, scheme: 'password' }, { isFormSubmission: true });
+
+    expect(wrapper.find('.hidden-fieldtype').attributes('style')).toBeUndefined();
+});
+
+test('the value of a hidden fieldtype is omitted when its conditions fail', async () => {
+    const wrapper = await mountFields({ protected: false, scheme: 'password' });
+
+    expect(wrapper.vm.visibleValues).toEqual({ protected: false });
+});
+
+test('the value of a hidden fieldtype is kept when its conditions pass', async () => {
+    const wrapper = await mountFields({ protected: true, scheme: 'password' });
+
+    expect(wrapper.vm.visibleValues).toEqual({ protected: true, scheme: 'password' });
+});
+
+test('a hidden fieldtype does not get a replicator preview', async () => {
+    await mountFields({ protected: true, scheme: 'password' }, { showReplicatorFieldPreviews: true });
+
+    expect(previews.value).toEqual({});
+});