Merge remote-tracking branch 'origin/6.x' into fix-site-switch-field-sync

# Conflicts:
#	resources/js/components/globals/PublishForm.vue

Author: jasonvarga

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Release Notes
 
+## 6.29.0 (2026-08-25)
+
+### What's new
+- Add a way to opt out of popper z-index control [#15227](https://github.com/statamic/cms/issues/15227) by @jaygeorge
+- Add a "compact mode" for the array fieldtype [#15219](https://github.com/statamic/cms/issues/15219) by @jaygeorge
+- Let sites check in from CLI, scheduler, and front-end requests [#15208](https://github.com/statamic/cms/issues/15208) by @jackmcdade
+- Add safe option to to_json modifier [#15260](https://github.com/statamic/cms/issues/15260) by @edalzell
+
+### What's fixed
+- Fix Antlers identifiers erroring before the parser has been resolved [#15221](https://github.com/statamic/cms/issues/15221) by @lazerg
+- Support taggable comboboxes when `multiple` is false [#15064](https://github.com/statamic/cms/issues/15064) by @duncanmcclean
+- Improve tooltips [#15211](https://github.com/statamic/cms/issues/15211) by @jaygeorge
+- For links in tooltips, open them in a new tab if external [#15213](https://github.com/statamic/cms/issues/15213) by @jaygeorge
+- Fix nocache TypeError when rendered outside a matched route [#15215](https://github.com/statamic/cms/issues/15215) by @lazerg
+- Fix localized dates leaking into later template usages [#15224](https://github.com/statamic/cms/issues/15224) by @duncanmcclean
+- Add missing tooltips to global header [#15234](https://github.com/statamic/cms/issues/15234) by @heidkaemper
+- Augment nav blueprint fields onto manual-URL nav items [#15235](https://github.com/statamic/cms/issues/15235) by @lazerg
+- Fix reordering a paginated orderable collection corrupting the tree [#15238](https://github.com/statamic/cms/issues/15238) by @marcorieser
+- Fix nav entry links across sites losing their domain [#15239](https://github.com/statamic/cms/issues/15239) by @lazerg
+- Ensure REST API authentication errors return consistent JSON [#15077](https://github.com/statamic/cms/issues/15077) by @daun
+- Fix Link field's Asset mode height [#15242](https://github.com/statamic/cms/issues/15242) by @jackmcdade
+- Encode asset URLs [#15146](https://github.com/statamic/cms/issues/15146) by @duncanmcclean
+- Improve Asset fieldtype UI in smaller spaces [#15243](https://github.com/statamic/cms/issues/15243) by @jackmcdade
+- Fix is_external for anchor, mailto and tel links in navs [#15082](https://github.com/statamic/cms/issues/15082) by @duncanmcclean
+- Reduce publish form and Live Preview overhead [#15251](https://github.com/statamic/cms/issues/15251) by @jasonvarga
+- Dedupe concurrent Control Panel asset requests [#15252](https://github.com/statamic/cms/issues/15252) by @jasonvarga
+- Small PHP CP performance improvements and UTF-8 fix [#15254](https://github.com/statamic/cms/issues/15254) by @jasonvarga
+- Bard server-side performance improvements [#15258](https://github.com/statamic/cms/issues/15258) by @jasonvarga
+- Memoize the Replicator flattened sets config Blink key [#15259](https://github.com/statamic/cms/issues/15259) by @jasonvarga
+- Resolve NoCache session via app() in StaticCaching hydrated callback [#15256](https://github.com/statamic/cms/issues/15256) by @petemolinero
+- Memoize resolved field conditions [#15262](https://github.com/statamic/cms/issues/15262) by @jasonvarga
+- Only generate Bard's HTML when reading time is enabled [#15263](https://github.com/statamic/cms/issues/15263) by @jasonvarga
+- Avoid layout thrashing from Reka's aria-label fallback [#15264](https://github.com/statamic/cms/issues/15264) by @jasonvarga
+
+
+
 ## 6.28.0 (2026-08-19)
 
 ### What's new

lang/en/fieldtypes.php

@@ -114,7 +114,8 @@
     'html.config.html_instruct' => 'Manage the HTML to be displayed in the publish form. This is for display purposes only, the HTML will not be saved.',
     'html.config.sanitize_instruct' => 'Whether the HTML should be sanitized before being displayed. Only disable this if you have a good reason.',
     'html.title' => 'HTML',
-    'icon.config.set' => 'The name of a custom icon set.',
+    'icon.config.mode' => 'Choose a dropdown or compact picker.',
+    'icon.config.set' => 'Default CP icons, or a set registered with `Icons::register()`.',
     'icon.title' => 'Icon',
     'integer.config.max' => 'The maximum allowed value.',
     'integer.config.min' => 'The minimum allowed value.',

resources/js/components/entries/PublishForm.vue

@@ -662,10 +662,6 @@ export default {
             } else {
                 this.createLocalization(localization);
             }
-
-            if (this.isBase) {
-                window.history.replaceState({}, '', localization.url + window.location.hash);
-            }
         },
 
         editLocalization(localization) {
@@ -694,6 +690,10 @@ export default {
                 this.initialPublished = data.values.published;
                 this.readOnly = data.readOnly;
 
+                if (this.isBase && localization.url) {
+                    window.history.replaceState({}, '', localization.url + window.location.hash);
+                }
+
                 this.trackDirtyStateTimeout = setTimeout(() => (this.trackDirtyState = true), 500); // after any fieldtypes do a debounced update
             });
         },

resources/js/components/entries/calendar/Calendar.vue

@@ -7,7 +7,7 @@ import Month from './Month.vue';
 import Week from './Week.vue';
 import { Listing, StatusIndicator } from '@/components/ui';
 import DateFormatter from '@/components/DateFormatter.js';
-import { getWeekDates, getCurrentDateRange } from './calendar.js';
+import { getWeekDates, getCurrentDateRange, getEntryDate } from './calendar.js';
 import { Link } from '@inertiajs/vue3';
 import { ToggleGroup, ToggleItem, Button, Popover, Label, Select, Heading } from '@ui';
 import { preferences } from '@api';
@@ -122,8 +122,7 @@ const selectedDateEntries = computed(() => {
     const dateStr = selectedDate.value.toString();
 
     return entries.value.filter(entry => {
-        const entryDate = new Date(entry.date?.date || entry.date);
-        return entryDate.toISOString().split('T')[0] === dateStr;
+        return getEntryDate(entry).toString().split('T')[0] === dateStr;
     });
 });
 

resources/js/components/entries/calendar/Month.vue

@@ -3,9 +3,8 @@ import { CalendarCell, CalendarCellTrigger, CalendarGrid, CalendarGridBody, Cale
 import CalendarEntry from './MonthEntry.vue';
 import CreateEntryButton from '../CreateEntryButton.vue';
 import { Button } from '@ui';
-import { isToday, getCreateUrlDateParam } from './calendar.js';
+import { isToday, getCreateUrlDateParam, getEntryDate } from './calendar.js';
 import DateFormatter from '@/components/DateFormatter.js';
-import { parseAbsoluteToLocal } from '@internationalized/date';
 
 const props = defineProps({
     weekDays: { type: Array, required: true },
@@ -32,8 +31,7 @@ const isCurrentDay = (dayIndex) => {
 const getEntriesForDate = (date) => {
     const dateStr = date.toString();
     return props.entries.filter(entry => {
-        const entryDate = parseAbsoluteToLocal(entry.date?.date || entry.date);
-        return entryDate.toString().split('T')[0] === dateStr;
+        return getEntryDate(entry).toString().split('T')[0] === dateStr;
     });
 };
 

resources/js/components/entries/calendar/MonthEntry.vue

@@ -13,7 +13,11 @@ const entryClasses = computed(() => ({
     'border-purple-500 hover:bg-purple-50 dark:hover:bg-purple-900': props.entry.status === 'scheduled'
 }));
 
-const time = computed(() => DateFormatter.format(props.entry.date?.date || props.entry.date, 'time'))
+const time = computed(() => {
+    if (props.entry.date?.format_has_time === false) return null;
+
+    return DateFormatter.format(props.entry.date?.date || props.entry.date, 'time');
+});
 </script>
 
 <template>
@@ -25,6 +29,7 @@ const time = computed(() => DateFormatter.format(props.entry.date?.date || props
     >
         <span class="line-clamp-2" v-text="entry.title" />
         <span
+            v-if="time"
             class="hidden @4xl:block text-2xs text-gray-400 dark:text-gray-400 group-hover/entry:dark:text-gray-300"
             v-text="time"
         />

resources/js/components/entries/calendar/Week.vue

@@ -6,9 +6,9 @@ import { Button } from '@ui';
 import {
     isToday,
     getCreateUrlDateParam,
+    getEntryDate,
 } from './calendar.js';
 import DateFormatter from '@/components/DateFormatter.js';
-import { parseAbsoluteToLocal } from '@internationalized/date';
 
 const props = defineProps({
     weekDates: { type: Array, required: true },
@@ -27,12 +27,11 @@ const visibleHours = Array.from({ length: 24 }, (_, i) => i);
 function getEntriesForHour(date, hour) {
     const dateStr = date.toString();
     return props.entries.filter(entry => {
-        const entryDate = parseAbsoluteToLocal(entry.date?.date || entry.date);
+        const entryDate = getEntryDate(entry);
         const entryDateStr = entryDate.toString().split('T')[0];
         if (entryDateStr !== dateStr) return false;
 
-        const entryHour = entryDate.hour;
-        return entryHour === hour;
+        return (entryDate.hour ?? 0) === hour;
     });
 }
 

resources/js/components/entries/calendar/calendar.js

@@ -1,6 +1,13 @@
-import { CalendarDate, CalendarDateTime, fromDate, getLocalTimeZone, startOfWeek, endOfWeek } from '@internationalized/date';
+import { CalendarDate, CalendarDateTime, fromDate, getLocalTimeZone, parseAbsoluteToLocal, parseDate, startOfWeek, endOfWeek } from '@internationalized/date';
 import DateFormatter from '@/components/DateFormatter.js';
 
+export function getEntryDate(entry) {
+    const date = entry.date?.date || entry.date;
+
+    // Fields using a format without a time save a plain date string, which can't be parsed as an absolute datetime.
+    return date.includes('T') ? parseAbsoluteToLocal(date) : parseDate(date);
+}
+
 export function getWeekDates(currentDate) {
     if (!currentDate) {
         throw new Error('getWeekDates called with undefined currentDate');

resources/js/components/field-conditions/Validator.js

@@ -11,6 +11,9 @@ const ROOT_PREFIX_RE = /^\$?root\./;
 const isEmpty = (value) => {
     if (value === null || value === undefined) return true;
 
+    // Object.keys() would consider numbers empty.
+    if (typeof value === 'number') return false;
+
     return Array.isArray(value) ? value.length === 0 : Object.keys(value).length === 0;
 };
 

resources/js/components/fieldtypes/IconFieldtype.vue

@@ -1,8 +1,9 @@
 <script setup>
 import axios from 'axios';
+import fuzzysort from 'fuzzysort';
 import Fieldtype from '@/components/fieldtypes/fieldtype.js';
 import { computed, ref, watch } from 'vue';
-import { Combobox, Icon } from '@/components/ui';
+import { Button, Combobox, Icon, Input, Modal } from '@/components/ui';
 
 const emit = defineEmits(Fieldtype.emits);
 const props = defineProps(Fieldtype.props);
@@ -13,11 +14,14 @@ const loading = ref(true);
 const loaders = ref({});
 const iconsCache = ref({});
 const cacheKey = computed(() => props.config.set ?? '__default__');
+const isCompact = computed(() => props.config.mode === 'compact');
+const isOpen = ref(false);
+const search = ref('');
 
 const options = computed(() => {
     let options = [];
 
-    for (let [name, html] of Object.entries(icons.value)) {
+    for (let [name, html] of Object.entries(icons.value || {})) {
         options.push({
             value: name,
             label: name,
@@ -28,6 +32,23 @@ const options = computed(() => {
     return options;
 });
 
+const selectedOption = computed(() => {
+    return options.value.find((option) => option.value === props.value) ?? null;
+});
+
+const noneOption = { value: null, label: 'No Icon', none: true };
+
+const filteredOptions = computed(() => {
+    const matches = fuzzysort
+        .go(search.value, options.value, {
+            all: true,
+            key: 'label',
+        })
+        .map((result) => result.obj);
+
+    return search.value ? matches : [noneOption, ...matches];
+});
+
 function request() {
     if (loaders.value[cacheKey.value]) return;
 
@@ -50,6 +71,20 @@ function comboboxUpdated(value) {
     update(value || null);
 }
 
+function openPicker() {
+    if (isReadOnly.value || props.config.disabled) return;
+
+    isOpen.value = true;
+}
+
+function selectIcon(name) {
+    if (isReadOnly.value || props.config.disabled) return;
+
+    update(name);
+    isOpen.value = false;
+    search.value = '';
+}
+
 watch(
     () => loaders.value[cacheKey.value],
     (loadingState) => {
@@ -58,12 +93,16 @@ watch(
     }
 );
 
+watch(isOpen, (open) => {
+    if (!open) search.value = '';
+});
+
 request();
 </script>
 
 <template>
     <Combobox
-        v-if="!loading"
+        v-if="!loading && !isCompact"
         clearable
         :disabled="config.disabled"
         :model-value="value"
@@ -95,4 +134,65 @@ request();
             </div>
         </template>
     </Combobox>
+
+    <div v-else-if="!loading" class="flex items-center">
+        <Button
+            icon-only
+            size="base"
+            :aria-label="value || __('Select Icon')"
+            :disabled="config.disabled"
+            :read-only="isReadOnly"
+            :title="value || undefined"
+            @click="openPicker"
+        >
+            <Icon v-if="selectedOption && !selectedOption.html" :name="selectedOption.label" />
+            <div
+                v-else-if="selectedOption?.html"
+                v-html="selectedOption.html"
+                class="flex items-center justify-center [&>svg]:size-4.5"
+            />
+            <Icon v-else name="plus" class="opacity-40" />
+        </Button>
+
+        <Modal
+            v-model:open="isOpen"
+            :blur="false"
+            :title="__('Select Icon')"
+            class="xl:max-w-3xl 2xl:max-w-page"
+        >
+            <Input
+                v-model="search"
+                :placeholder="__('Search...')"
+                icon-prepend="magnifying-glass"
+                size="sm"
+                type="text"
+            />
+
+            <div class="st-custom-scrollbar max-h-[40vh] overflow-auto">
+                <div class="grid grid-cols-6 gap-1 sm:grid-cols-8 md:grid-cols-10 lg:grid-cols-12">
+                    <button
+                        v-for="option in filteredOptions"
+                        :key="option.none ? '__none__' : option.value"
+                        type="button"
+                        class="flex size-9 items-center justify-center rounded-lg"
+                        :aria-label="__(option.label)"
+                        :aria-pressed="option.value === value"
+                        :class="{
+                            'bg-gray-100 dark:bg-gray-900': option.value === value,
+                            'hover:bg-gray-100 dark:hover:bg-gray-900': option.value !== value,
+                        }"
+                        :title="__(option.label)"
+                        @click="selectIcon(option.value)"
+                    >
+                        <Icon v-if="option.none" name="x" class="size-3.5 opacity-40" />
+                        <Icon v-else-if="!option.html" :name="option.label" class="size-5" />
+                        <div v-else v-html="option.html" class="[&>svg]:size-5" />
+                    </button>
+                </div>
+                <div v-if="filteredOptions.length === 0" class="p-3 text-center text-xs text-gray-600">
+                    {{ search ? __('No results') : __('No icons available') }}
+                </div>
+            </div>
+        </Modal>
+    </div>
 </template>