[6.x] Forms 2: Extract star rating, ranking and image choice into UI components#15068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackmcdade merged 8 commits into from
Aug 14, 2026
Merged

[6.x] Forms 2: Extract star rating, ranking and image choice into UI components #15068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
78b5984
extract `StarRating` into a ui component
duncanmcclean Jul 23, 2026
25cf7e4
extract `RankList` into a ui component
duncanmcclean Jul 23, 2026
c5b8b2d
extract `ChoiceList` into a ui component
duncanmcclean Jul 23, 2026
fe54a63
they don't need folders
duncanmcclean Jul 23, 2026
5376a0f
use inline images in `ChoiceGrid` stories
duncanmcclean Jul 23, 2026
e0ad4a9
Merge branch 'forms-2' into forms-2-extract-fieldtypes
duncanmcclean Aug 12, 2026
deea6d9
Just make the whole item grabbable since there's no other interactive…
jackmcdade Aug 14, 2026
abdc889
Fix half-star fill so ratings line up with the actual stars.
jackmcdade Aug 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/cms/src/ui.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export const {
CharacterCounter,
Checkbox,
CheckboxGroup,
ChoiceGrid,
CodeEditor,
Combobox,
CommandPaletteItem,
Expand DownExpand Up@@ -91,13 +92,15 @@ export const {
PublishTabs,
Radio,
RadioGroup,
RankList,
Select,
Separator,
Slider,
Skeleton,
SplitterGroup,
SplitterPanel,
SplitterResizeHandle,
StarRating,
StatusIndicator,
Subheading,
Switch,
Expand Down
1 change: 0 additions & 1 deletion resources/css/cp.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,5 @@
@import './components/fieldtypes/partial.css';
@import './components/fieldtypes/relationship.css';
@import './components/fieldtypes/section.css';
@import './components/fieldtypes/star-rating.css';
@import './components/fieldtypes/table.css';
@import './components/fieldtypes/width.css';
3 changes: 3 additions & 0 deletions resources/js/bootstrap/cms/ui.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export {
CharacterCounter,
Checkbox,
CheckboxGroup,
ChoiceGrid,
CodeEditor,
Combobox,
CommandPaletteItem,
Expand DownExpand Up@@ -89,13 +90,15 @@ export {
PublishTabs,
Radio,
RadioGroup,
RankList,
Select,
Separator,
Slider,
Skeleton,
SplitterGroup,
SplitterPanel,
SplitterResizeHandle,
StarRating,
StatusIndicator,
Subheading,
Switch,
Expand Down
138 changes: 37 additions & 101 deletions resources/js/components/fieldtypes/ImageChoiceFieldtype.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,51 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { Icon } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { ChoiceGrid } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const multiple = computed(() => Boolean(props.config.multiple));
const isDisabled = computed(() => props.config.disabled || isReadOnly.value);
const options = computed(() => props.meta?.options ?? []);
const columns = computed(() => props.config.columns ?? 3);
const aspectRatio = computed(() => props.config.aspect_ratio ?? '16/9');
const gap = computed(() => props.config.gap ?? 3);

const selectedValues = ref(props.value);

const cardClasses = [
'flex flex-col gap-2 h-full p-1 pb-2 rounded-lg border shadow-ui-xs',
'border-gray-300 bg-white',
'dark:border-gray-700 dark:bg-gray-900',
'hover:border-gray-400 dark:hover:border-gray-700',
'peer-checked:border-primary peer-checked:ring-[1px] peer-checked:ring-primary',
'peer-focus-visible:focus-outline peer-focus-visible:transition-none',
];
const gaps = {
2: 'sm',
3: 'base',
4: 'lg',
};

const gridClass = computed(() => ({
1: 'grid-cols-1',
2: 'grid-cols-2',
3: 'grid-cols-3',
4: 'grid-cols-4',
})[columns.value] ?? 'grid-cols-3');

const gapClass = computed(() => ({
2: 'gap-2',
3: 'gap-3',
4: 'gap-4',
})[gap.value] ?? 'gap-3');

function isSelected(key) {
return selectedValues.value.includes(key);
}

function toggleOption(key) {
if (isDisabled.value) return;

if (isSelected(key)) {
selectedValues.value = selectedValues.value.filter((v) => v !== key);
} else if (multiple.value) {
selectedValues.value = [...selectedValues.value, key];
} else {
selectedValues.value = [key];
}

update(selectedValues.value);
const multiple = computed(() => Boolean(props.config.multiple));
const label = computed(() => (props.config.display ? __(props.config.display) : null));
const gap = computed(() => gaps[props.config.gap] ?? 'base');

const options = computed(() =>
(props.meta?.options ?? []).map((option) => ({
value: option.key,
label: option.label ? __(option.label) : null,
image: option.image,
badge: option.letter,
})),
);

const selected = computed(() => (multiple.value ? props.value : (props.value?.[0] ?? null)));

function updateSelected(value) {
update(multiple.value ? value : [value]);
}

watch(() => props.value, (value) => selectedValues.value = value);
</script>

<template>
<div
class="grid"
:class="[gapClass, gridClass]"
:role="multiple ? 'group' : 'radiogroup'"
>
<label
v-for="option in options"
:key="option.key"
class="group cursor-pointer has-disabled:cursor-not-allowed has-disabled:opacity-60"
>
<input
class="peer sr-only"
:type="multiple ? 'checkbox' : 'radio'"
:name="multiple ? `${name}[]` : name"
:value="option.key"
:checked="isSelected(option.key)"
:disabled="isDisabled"
@change="toggleOption(option.key)"
>
<span :class="cardClasses">
<span
class="flex items-center justify-center overflow-hidden rounded-md bg-gray-100 dark:bg-gray-800"
:style="{ aspectRatio }"
>
<img
v-if="option.image"
class="block size-full object-cover"
:src="option.image"
:alt="option.label"
>
<span v-else class="flex size-full items-center justify-center" aria-hidden="true">
<Icon name="image" class="size-6 text-gray-400" />
</span>
</span>
<span
v-if="option.label"
class="flex items-center justify-center gap-2"
>
<span
v-if="option.letter"
class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 bg-white text-xs font-bold text-gray-800 dark:border-gray-600 dark:bg-gray-900 dark:text-gray-200"
>
{{ option.letter }}
</span>
<span class="text-xs text-gray-800 dark:text-gray-200" style="text-box-trim: trim-start;">
{{ __(option.label) }}
</span>
</span>
</span>
</label>
</div>
<ChoiceGrid
:model-value="selected"
:options
:multiple
:name
:label
:gap
:columns="config.columns ?? 3"
:aspect-ratio="config.aspect_ratio ?? '16/9'"
:disabled="config.disabled || isReadOnly"
@update:model-value="updateSelected"
/>
</template>
156 changes: 15 additions & 141 deletions resources/js/components/fieldtypes/RankingFieldtype.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,154 +1,28 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { SortableList } from '@/components/sortable/Sortable.js';
import { DragHandle } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { RankList } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const sortableItemClass = 'ranking-item';
const sortableHandleClass = 'ranking-handle';

const rankedValues = ref([]);

const options = computed(() => {
const raw = props.config.options ?? {};
return Object.entries(raw).map(([value, label]) => ({ value, label: label || value }));
});

const isDisabled = computed(() => props.config.disabled || isReadOnly.value);

const orderedRows = computed(() => rankedValues.value.map((value, index) => ({
value,
label: options.value.find((option) => option.value === value)?.label ?? value,
index,
})));

function defaultOrder() {
return options.value.map((option) => option.value);
}

function buildRankedValues(value) {
const order = Array.isArray(value) && value.length ? [...value] : defaultOrder();
const valid = new Set(options.value.map((option) => option.value));

const ranked = order.filter((item) => valid.has(item));

options.value.forEach((option) => {
if (! ranked.includes(option.value)) {
ranked.push(option.value);
}
});

return ranked;
}

const hasCustomOrder = computed(() => {
return JSON.stringify(rankedValues.value) !== JSON.stringify(defaultOrder());
});

function moveToRank(itemValue, event) {
const fromIndex = rankedValues.value.indexOf(itemValue);
const parsed = Number(event.target.value);

if (! isDisabled.value && fromIndex !== -1 && Number.isFinite(parsed)) {
const toIndex = Math.max(0, Math.min(rankedValues.value.length - 1, Math.round(parsed) - 1));

if (toIndex !== fromIndex) {
const next = [...rankedValues.value];
next.splice(fromIndex, 1);
next.splice(toIndex, 0, itemValue);
rankedValues.value = next;
}
}

// Reset the input to the item's canonical rank. When the requested rank is
// clamped to the item's current position, no reorder happens, so the binding
// wouldn't otherwise overwrite the invalid value left in the input.
event.target.value = rankedValues.value.indexOf(itemValue) + 1;
}

watch(
[() => props.value, options],
() => rankedValues.value = buildRankedValues(props.value),
{ deep: true, immediate: true },
);

watch(
rankedValues,
(value) => {
const current = Array.isArray(props.value) ? props.value : [];

if (JSON.stringify(value) === JSON.stringify(current)) {
return;
}

update([...value]);
},
{ deep: true },
const options = computed(() =>
Object.entries(props.config.options ?? {}).map(([value, label]) => ({
value,
label: label ? __(label) : value,
})),
);
</script>

<template>
<SortableList
v-if="orderedRows.length"
v-model="rankedValues"
:vertical="true"
:item-class="sortableItemClass"
:handle-class="sortableHandleClass"
:mirror="false"
:disabled="isDisabled"
>
<ul class="flex flex-col gap-2" role="list">
<li
v-for="row in orderedRows"
:key="row.value"
:class="sortableItemClass"
class="flex items-center gap-2 rounded-lg border border-gray-300 bg-white p-2 dark:border-gray-700 dark:bg-gray-900"
>
<DragHandle
v-if="!isDisabled"
:class="[
sortableHandleClass,
hasCustomOrder
? 'text-primary! [&_svg]:opacity-100'
: '[&_svg]:opacity-75 dark:[&_svg]:opacity-50',
]"
class="cursor-grab"
/>
<input
v-if="!isDisabled"
type="number"
class="size-6 shrink-0 rounded-md border border-gray-300 bg-white px-0 text-center text-xs font-semibold text-gray-800 shadow-ui-xs focus:focus-outline dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
:min="1"
:max="orderedRows.length"
step="1"
:value="row.index + 1"
:aria-label="`${__('Rank')} ${__(row.label)}`"
@change="moveToRank(row.value, $event)"
>
<span
v-else
class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 shadow-ui-xs bg-white text-xs font-semibold text-gray-800 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200"
aria-hidden="true"
>
{{ row.index + 1 }}
</span>
<span class="min-w-0 flex-1 text-sm text-gray-800 dark:text-gray-200">
{{ __(row.label) }}
</span>
<input type="hidden" :name="`${name}[]`" :value="row.value">
</li>
</ul>
</SortableList>
<RankList
:model-value="value ?? []"
:options
:name
:disabled="config.disabled || isReadOnly"
@update:model-value="update"
/>
</template>

<style scoped>
.ranking-item.draggable-source--is-dragging {
/* Make the item slightly transparent than the default dragging opacity */
opacity: 0.65;
}
</style>
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[6.x] Forms 2: Extract star rating, ranking and image choice into UI components#15068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackmcdade
merged 8 commits into

from

Aug 14, 2026
 Merged


[6.x] Forms 2: Extract star rating, ranking and image choice into UI components
#15068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78b5984

extract `StarRating` into a ui component


duncanmcclean Jul 23, 2026
25cf7e4

extract `RankList` into a ui component


duncanmcclean Jul 23, 2026
c5b8b2d

extract `ChoiceList` into a ui component


duncanmcclean Jul 23, 2026
fe54a63

they don't need folders


duncanmcclean Jul 23, 2026
5376a0f

use inline images in `ChoiceGrid` stories


duncanmcclean Jul 23, 2026
e0ad4a9

Merge branch 'forms-2' into forms-2-extract-fieldtypes


duncanmcclean Aug 12, 2026
deea6d9

Just make the whole item grabbable since there's no other interactive…


jackmcdade Aug 14, 2026
abdc889

Fix half-star fill so ratings line up with the actual stars.


jackmcdade Aug 14, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
packages/cms/src/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export const {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -91,13 +92,15 @@ export const {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

1 change: 0 additions & 1 deletion
resources/css/cp.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,5 @@
@import './components/fieldtypes/partial.css';
@import './components/fieldtypes/relationship.css';
@import './components/fieldtypes/section.css';
@import './components/fieldtypes/star-rating.css';
@import './components/fieldtypes/table.css';
@import './components/fieldtypes/width.css';

3 changes: 3 additions & 0 deletions
resources/js/bootstrap/cms/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -89,13 +90,15 @@ export {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

138 changes: 37 additions & 101 deletions
resources/js/components/fieldtypes/ImageChoiceFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,115 +1,51 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { Icon } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { ChoiceGrid } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const multiple = computed(() => Boolean(props.config.multiple));
const isDisabled = computed(() => props.config.disabled || isReadOnly.value);
const options = computed(() => props.meta?.options ?? []);
const columns = computed(() => props.config.columns ?? 3);
const aspectRatio = computed(() => props.config.aspect_ratio ?? '16/9');
const gap = computed(() => props.config.gap ?? 3);

const selectedValues = ref(props.value);

const cardClasses = [
 'flex flex-col gap-2 h-full p-1 pb-2 rounded-lg border shadow-ui-xs',
 'border-gray-300 bg-white',
 'dark:border-gray-700 dark:bg-gray-900',
 'hover:border-gray-400 dark:hover:border-gray-700',
 'peer-checked:border-primary peer-checked:ring-[1px] peer-checked:ring-primary',
 'peer-focus-visible:focus-outline peer-focus-visible:transition-none',
];
const gaps = {
 2: 'sm',
 3: 'base',
 4: 'lg',
};

const gridClass = computed(() => ({
 1: 'grid-cols-1',
 2: 'grid-cols-2',
 3: 'grid-cols-3',
 4: 'grid-cols-4',
})[columns.value] ?? 'grid-cols-3');

const gapClass = computed(() => ({
 2: 'gap-2',
 3: 'gap-3',
 4: 'gap-4',
})[gap.value] ?? 'gap-3');

function isSelected(key) {
 return selectedValues.value.includes(key);
}

function toggleOption(key) {
 if (isDisabled.value) return;

 if (isSelected(key)) {
 selectedValues.value = selectedValues.value.filter((v) => v !== key);
 } else if (multiple.value) {
 selectedValues.value = [...selectedValues.value, key];
 } else {
 selectedValues.value = [key];
 }

 update(selectedValues.value);
const multiple = computed(() => Boolean(props.config.multiple));
const label = computed(() => (props.config.display ? __(props.config.display) : null));
const gap = computed(() => gaps[props.config.gap] ?? 'base');

const options = computed(() =>
 (props.meta?.options ?? []).map((option) => ({
 value: option.key,
 label: option.label ? __(option.label) : null,
 image: option.image,
 badge: option.letter,
 })),
);

const selected = computed(() => (multiple.value ? props.value : (props.value?.[0] ?? null)));

function updateSelected(value) {
 update(multiple.value ? value : [value]);
}

watch(() => props.value, (value) => selectedValues.value = value);
</script>

<template>
 <div
 class="grid"
 :class="[gapClass, gridClass]"
 :role="multiple ? 'group' : 'radiogroup'"
 >
 <label
 v-for="option in options"
 :key="option.key"
 class="group cursor-pointer has-disabled:cursor-not-allowed has-disabled:opacity-60"
 >
 <input
 class="peer sr-only"
 :type="multiple ? 'checkbox' : 'radio'"
 :name="multiple ? `${name}[]` : name"
 :value="option.key"
 :checked="isSelected(option.key)"
 :disabled="isDisabled"
 @change="toggleOption(option.key)"
 >
 <span :class="cardClasses">
 <span
 class="flex items-center justify-center overflow-hidden rounded-md bg-gray-100 dark:bg-gray-800"
 :style="{ aspectRatio }"
 >
 <img
 v-if="option.image"
 class="block size-full object-cover"
 :src="option.image"
 :alt="option.label"
 >
 <span v-else class="flex size-full items-center justify-center" aria-hidden="true">
 <Icon name="image" class="size-6 text-gray-400" />
 </span>
 </span>
 <span
 v-if="option.label"
 class="flex items-center justify-center gap-2"
 >
 <span
 v-if="option.letter"
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 bg-white text-xs font-bold text-gray-800 dark:border-gray-600 dark:bg-gray-900 dark:text-gray-200"
 >
 {{ option.letter }}
 </span>
 <span class="text-xs text-gray-800 dark:text-gray-200" style="text-box-trim: trim-start;">
 {{ __(option.label) }}
 </span>
 </span>
 </span>
 </label>
 </div>
 <ChoiceGrid
 :model-value="selected"
 :options
 :multiple
 :name
 :label
 :gap
 :columns="config.columns ?? 3"
 :aspect-ratio="config.aspect_ratio ?? '16/9'"
 :disabled="config.disabled || isReadOnly"
 @update:model-value="updateSelected"
 />
</template>

156 changes: 15 additions & 141 deletions
resources/js/components/fieldtypes/RankingFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,154 +1,28 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { SortableList } from '@/components/sortable/Sortable.js';
import { DragHandle } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { RankList } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const sortableItemClass = 'ranking-item';
const sortableHandleClass = 'ranking-handle';

const rankedValues = ref([]);

const options = computed(() => {
 const raw = props.config.options ?? {};
 return Object.entries(raw).map(([value, label]) => ({ value, label: label || value }));
});

const isDisabled = computed(() => props.config.disabled || isReadOnly.value);

const orderedRows = computed(() => rankedValues.value.map((value, index) => ({
 value,
 label: options.value.find((option) => option.value === value)?.label ?? value,
 index,
})));

function defaultOrder() {
 return options.value.map((option) => option.value);
}

function buildRankedValues(value) {
 const order = Array.isArray(value) && value.length ? [...value] : defaultOrder();
 const valid = new Set(options.value.map((option) => option.value));

 const ranked = order.filter((item) => valid.has(item));

 options.value.forEach((option) => {
 if (! ranked.includes(option.value)) {
 ranked.push(option.value);
 }
 });

 return ranked;
}

const hasCustomOrder = computed(() => {
 return JSON.stringify(rankedValues.value) !== JSON.stringify(defaultOrder());
});

function moveToRank(itemValue, event) {
 const fromIndex = rankedValues.value.indexOf(itemValue);
 const parsed = Number(event.target.value);

 if (! isDisabled.value && fromIndex !== -1 && Number.isFinite(parsed)) {
 const toIndex = Math.max(0, Math.min(rankedValues.value.length - 1, Math.round(parsed) - 1));

 if (toIndex !== fromIndex) {
 const next = [...rankedValues.value];
 next.splice(fromIndex, 1);
 next.splice(toIndex, 0, itemValue);
 rankedValues.value = next;
 }
 }

 // Reset the input to the item's canonical rank. When the requested rank is
 // clamped to the item's current position, no reorder happens, so the binding
 // wouldn't otherwise overwrite the invalid value left in the input.
 event.target.value = rankedValues.value.indexOf(itemValue) + 1;
}

watch(
 [() => props.value, options],
 () => rankedValues.value = buildRankedValues(props.value),
 { deep: true, immediate: true },
);

watch(
 rankedValues,
 (value) => {
 const current = Array.isArray(props.value) ? props.value : [];

 if (JSON.stringify(value) === JSON.stringify(current)) {
 return;
 }

 update([...value]);
 },
 { deep: true },
const options = computed(() =>
 Object.entries(props.config.options ?? {}).map(([value, label]) => ({
 value,
 label: label ? __(label) : value,
 })),
);
</script>

<template>
 <SortableList
 v-if="orderedRows.length"
 v-model="rankedValues"
 :vertical="true"
 :item-class="sortableItemClass"
 :handle-class="sortableHandleClass"
 :mirror="false"
 :disabled="isDisabled"
 >
 <ul class="flex flex-col gap-2" role="list">
 <li
 v-for="row in orderedRows"
 :key="row.value"
 :class="sortableItemClass"
 class="flex items-center gap-2 rounded-lg border border-gray-300 bg-white p-2 dark:border-gray-700 dark:bg-gray-900"
 >
 <DragHandle
 v-if="!isDisabled"
 :class="[
 sortableHandleClass,
 hasCustomOrder
 ? 'text-primary! [&_svg]:opacity-100'
 : '[&_svg]:opacity-75 dark:[&_svg]:opacity-50',
 ]"
 class="cursor-grab"
 />
 <input
 v-if="!isDisabled"
 type="number"
 class="size-6 shrink-0 rounded-md border border-gray-300 bg-white px-0 text-center text-xs font-semibold text-gray-800 shadow-ui-xs focus:focus-outline dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
 :min="1"
 :max="orderedRows.length"
 step="1"
 :value="row.index + 1"
 :aria-label="`${__('Rank')} ${__(row.label)}`"
 @change="moveToRank(row.value, $event)"
 >
 <span
 v-else
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 shadow-ui-xs bg-white text-xs font-semibold text-gray-800 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200"
 aria-hidden="true"
 >
 {{ row.index + 1 }}
 </span>
 <span class="min-w-0 flex-1 text-sm text-gray-800 dark:text-gray-200">
 {{ __(row.label) }}
 </span>
 <input type="hidden" :name="`${name}[]`" :value="row.value">
 </li>
 </ul>
 </SortableList>
 <RankList
 :model-value="value ?? []"
 :options
 :name
 :disabled="config.disabled || isReadOnly"
 @update:model-value="update"
 />
</template>

<style scoped>
.ranking-item.draggable-source--is-dragging {
 /* Make the item slightly transparent than the default dragging opacity */
 opacity: 0.65;
}
</style>
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Forms 2: Extract star rating, ranking and image choice into UI components#15068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackmcdade
merged 8 commits into

from

Aug 14, 2026
 Merged


[6.x] Forms 2: Extract star rating, ranking and image choice into UI components
#15068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78b5984

extract `StarRating` into a ui component


duncanmcclean Jul 23, 2026
25cf7e4

extract `RankList` into a ui component


duncanmcclean Jul 23, 2026
c5b8b2d

extract `ChoiceList` into a ui component


duncanmcclean Jul 23, 2026
fe54a63

they don't need folders


duncanmcclean Jul 23, 2026
5376a0f

use inline images in `ChoiceGrid` stories


duncanmcclean Jul 23, 2026
e0ad4a9

Merge branch 'forms-2' into forms-2-extract-fieldtypes


duncanmcclean Aug 12, 2026
deea6d9

Just make the whole item grabbable since there's no other interactive…


jackmcdade Aug 14, 2026
abdc889

Fix half-star fill so ratings line up with the actual stars.


jackmcdade Aug 14, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
packages/cms/src/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export const {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -91,13 +92,15 @@ export const {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

1 change: 0 additions & 1 deletion
resources/css/cp.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,5 @@
@import './components/fieldtypes/partial.css';
@import './components/fieldtypes/relationship.css';
@import './components/fieldtypes/section.css';
@import './components/fieldtypes/star-rating.css';
@import './components/fieldtypes/table.css';
@import './components/fieldtypes/width.css';

3 changes: 3 additions & 0 deletions
resources/js/bootstrap/cms/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -89,13 +90,15 @@ export {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

138 changes: 37 additions & 101 deletions
resources/js/components/fieldtypes/ImageChoiceFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,115 +1,51 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { Icon } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { ChoiceGrid } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const multiple = computed(() => Boolean(props.config.multiple));
const isDisabled = computed(() => props.config.disabled || isReadOnly.value);
const options = computed(() => props.meta?.options ?? []);
const columns = computed(() => props.config.columns ?? 3);
const aspectRatio = computed(() => props.config.aspect_ratio ?? '16/9');
const gap = computed(() => props.config.gap ?? 3);

const selectedValues = ref(props.value);

const cardClasses = [
 'flex flex-col gap-2 h-full p-1 pb-2 rounded-lg border shadow-ui-xs',
 'border-gray-300 bg-white',
 'dark:border-gray-700 dark:bg-gray-900',
 'hover:border-gray-400 dark:hover:border-gray-700',
 'peer-checked:border-primary peer-checked:ring-[1px] peer-checked:ring-primary',
 'peer-focus-visible:focus-outline peer-focus-visible:transition-none',
];
const gaps = {
 2: 'sm',
 3: 'base',
 4: 'lg',
};

const gridClass = computed(() => ({
 1: 'grid-cols-1',
 2: 'grid-cols-2',
 3: 'grid-cols-3',
 4: 'grid-cols-4',
})[columns.value] ?? 'grid-cols-3');

const gapClass = computed(() => ({
 2: 'gap-2',
 3: 'gap-3',
 4: 'gap-4',
})[gap.value] ?? 'gap-3');

function isSelected(key) {
 return selectedValues.value.includes(key);
}

function toggleOption(key) {
 if (isDisabled.value) return;

 if (isSelected(key)) {
 selectedValues.value = selectedValues.value.filter((v) => v !== key);
 } else if (multiple.value) {
 selectedValues.value = [...selectedValues.value, key];
 } else {
 selectedValues.value = [key];
 }

 update(selectedValues.value);
const multiple = computed(() => Boolean(props.config.multiple));
const label = computed(() => (props.config.display ? __(props.config.display) : null));
const gap = computed(() => gaps[props.config.gap] ?? 'base');

const options = computed(() =>
 (props.meta?.options ?? []).map((option) => ({
 value: option.key,
 label: option.label ? __(option.label) : null,
 image: option.image,
 badge: option.letter,
 })),
);

const selected = computed(() => (multiple.value ? props.value : (props.value?.[0] ?? null)));

function updateSelected(value) {
 update(multiple.value ? value : [value]);
}

watch(() => props.value, (value) => selectedValues.value = value);
</script>

<template>
 <div
 class="grid"
 :class="[gapClass, gridClass]"
 :role="multiple ? 'group' : 'radiogroup'"
 >
 <label
 v-for="option in options"
 :key="option.key"
 class="group cursor-pointer has-disabled:cursor-not-allowed has-disabled:opacity-60"
 >
 <input
 class="peer sr-only"
 :type="multiple ? 'checkbox' : 'radio'"
 :name="multiple ? `${name}[]` : name"
 :value="option.key"
 :checked="isSelected(option.key)"
 :disabled="isDisabled"
 @change="toggleOption(option.key)"
 >
 <span :class="cardClasses">
 <span
 class="flex items-center justify-center overflow-hidden rounded-md bg-gray-100 dark:bg-gray-800"
 :style="{ aspectRatio }"
 >
 <img
 v-if="option.image"
 class="block size-full object-cover"
 :src="option.image"
 :alt="option.label"
 >
 <span v-else class="flex size-full items-center justify-center" aria-hidden="true">
 <Icon name="image" class="size-6 text-gray-400" />
 </span>
 </span>
 <span
 v-if="option.label"
 class="flex items-center justify-center gap-2"
 >
 <span
 v-if="option.letter"
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 bg-white text-xs font-bold text-gray-800 dark:border-gray-600 dark:bg-gray-900 dark:text-gray-200"
 >
 {{ option.letter }}
 </span>
 <span class="text-xs text-gray-800 dark:text-gray-200" style="text-box-trim: trim-start;">
 {{ __(option.label) }}
 </span>
 </span>
 </span>
 </label>
 </div>
 <ChoiceGrid
 :model-value="selected"
 :options
 :multiple
 :name
 :label
 :gap
 :columns="config.columns ?? 3"
 :aspect-ratio="config.aspect_ratio ?? '16/9'"
 :disabled="config.disabled || isReadOnly"
 @update:model-value="updateSelected"
 />
</template>

156 changes: 15 additions & 141 deletions
resources/js/components/fieldtypes/RankingFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,154 +1,28 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { SortableList } from '@/components/sortable/Sortable.js';
import { DragHandle } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { RankList } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const sortableItemClass = 'ranking-item';
const sortableHandleClass = 'ranking-handle';

const rankedValues = ref([]);

const options = computed(() => {
 const raw = props.config.options ?? {};
 return Object.entries(raw).map(([value, label]) => ({ value, label: label || value }));
});

const isDisabled = computed(() => props.config.disabled || isReadOnly.value);

const orderedRows = computed(() => rankedValues.value.map((value, index) => ({
 value,
 label: options.value.find((option) => option.value === value)?.label ?? value,
 index,
})));

function defaultOrder() {
 return options.value.map((option) => option.value);
}

function buildRankedValues(value) {
 const order = Array.isArray(value) && value.length ? [...value] : defaultOrder();
 const valid = new Set(options.value.map((option) => option.value));

 const ranked = order.filter((item) => valid.has(item));

 options.value.forEach((option) => {
 if (! ranked.includes(option.value)) {
 ranked.push(option.value);
 }
 });

 return ranked;
}

const hasCustomOrder = computed(() => {
 return JSON.stringify(rankedValues.value) !== JSON.stringify(defaultOrder());
});

function moveToRank(itemValue, event) {
 const fromIndex = rankedValues.value.indexOf(itemValue);
 const parsed = Number(event.target.value);

 if (! isDisabled.value && fromIndex !== -1 && Number.isFinite(parsed)) {
 const toIndex = Math.max(0, Math.min(rankedValues.value.length - 1, Math.round(parsed) - 1));

 if (toIndex !== fromIndex) {
 const next = [...rankedValues.value];
 next.splice(fromIndex, 1);
 next.splice(toIndex, 0, itemValue);
 rankedValues.value = next;
 }
 }

 // Reset the input to the item's canonical rank. When the requested rank is
 // clamped to the item's current position, no reorder happens, so the binding
 // wouldn't otherwise overwrite the invalid value left in the input.
 event.target.value = rankedValues.value.indexOf(itemValue) + 1;
}

watch(
 [() => props.value, options],
 () => rankedValues.value = buildRankedValues(props.value),
 { deep: true, immediate: true },
);

watch(
 rankedValues,
 (value) => {
 const current = Array.isArray(props.value) ? props.value : [];

 if (JSON.stringify(value) === JSON.stringify(current)) {
 return;
 }

 update([...value]);
 },
 { deep: true },
const options = computed(() =>
 Object.entries(props.config.options ?? {}).map(([value, label]) => ({
 value,
 label: label ? __(label) : value,
 })),
);
</script>

<template>
 <SortableList
 v-if="orderedRows.length"
 v-model="rankedValues"
 :vertical="true"
 :item-class="sortableItemClass"
 :handle-class="sortableHandleClass"
 :mirror="false"
 :disabled="isDisabled"
 >
 <ul class="flex flex-col gap-2" role="list">
 <li
 v-for="row in orderedRows"
 :key="row.value"
 :class="sortableItemClass"
 class="flex items-center gap-2 rounded-lg border border-gray-300 bg-white p-2 dark:border-gray-700 dark:bg-gray-900"
 >
 <DragHandle
 v-if="!isDisabled"
 :class="[
 sortableHandleClass,
 hasCustomOrder
 ? 'text-primary! [&_svg]:opacity-100'
 : '[&_svg]:opacity-75 dark:[&_svg]:opacity-50',
 ]"
 class="cursor-grab"
 />
 <input
 v-if="!isDisabled"
 type="number"
 class="size-6 shrink-0 rounded-md border border-gray-300 bg-white px-0 text-center text-xs font-semibold text-gray-800 shadow-ui-xs focus:focus-outline dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
 :min="1"
 :max="orderedRows.length"
 step="1"
 :value="row.index + 1"
 :aria-label="`${__('Rank')} ${__(row.label)}`"
 @change="moveToRank(row.value, $event)"
 >
 <span
 v-else
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 shadow-ui-xs bg-white text-xs font-semibold text-gray-800 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200"
 aria-hidden="true"
 >
 {{ row.index + 1 }}
 </span>
 <span class="min-w-0 flex-1 text-sm text-gray-800 dark:text-gray-200">
 {{ __(row.label) }}
 </span>
 <input type="hidden" :name="`${name}[]`" :value="row.value">
 </li>
 </ul>
 </SortableList>
 <RankList
 :model-value="value ?? []"
 :options
 :name
 :disabled="config.disabled || isReadOnly"
 @update:model-value="update"
 />
</template>

<style scoped>
.ranking-item.draggable-source--is-dragging {
 /* Make the item slightly transparent than the default dragging opacity */
 opacity: 0.65;
}
</style>
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Forms 2: Extract star rating, ranking and image choice into UI components#15068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackmcdade
merged 8 commits into

from

Aug 14, 2026
 Merged


[6.x] Forms 2: Extract star rating, ranking and image choice into UI components
#15068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78b5984

extract `StarRating` into a ui component


duncanmcclean Jul 23, 2026
25cf7e4

extract `RankList` into a ui component


duncanmcclean Jul 23, 2026
c5b8b2d

extract `ChoiceList` into a ui component


duncanmcclean Jul 23, 2026
fe54a63

they don't need folders


duncanmcclean Jul 23, 2026
5376a0f

use inline images in `ChoiceGrid` stories


duncanmcclean Jul 23, 2026
e0ad4a9

Merge branch 'forms-2' into forms-2-extract-fieldtypes


duncanmcclean Aug 12, 2026
deea6d9

Just make the whole item grabbable since there's no other interactive…


jackmcdade Aug 14, 2026
abdc889

Fix half-star fill so ratings line up with the actual stars.


jackmcdade Aug 14, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
packages/cms/src/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export const {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -91,13 +92,15 @@ export const {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

1 change: 0 additions & 1 deletion
resources/css/cp.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,5 @@
@import './components/fieldtypes/partial.css';
@import './components/fieldtypes/relationship.css';
@import './components/fieldtypes/section.css';
@import './components/fieldtypes/star-rating.css';
@import './components/fieldtypes/table.css';
@import './components/fieldtypes/width.css';

3 changes: 3 additions & 0 deletions
resources/js/bootstrap/cms/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -89,13 +90,15 @@ export {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

138 changes: 37 additions & 101 deletions
resources/js/components/fieldtypes/ImageChoiceFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,115 +1,51 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { Icon } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { ChoiceGrid } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const multiple = computed(() => Boolean(props.config.multiple));
const isDisabled = computed(() => props.config.disabled || isReadOnly.value);
const options = computed(() => props.meta?.options ?? []);
const columns = computed(() => props.config.columns ?? 3);
const aspectRatio = computed(() => props.config.aspect_ratio ?? '16/9');
const gap = computed(() => props.config.gap ?? 3);

const selectedValues = ref(props.value);

const cardClasses = [
 'flex flex-col gap-2 h-full p-1 pb-2 rounded-lg border shadow-ui-xs',
 'border-gray-300 bg-white',
 'dark:border-gray-700 dark:bg-gray-900',
 'hover:border-gray-400 dark:hover:border-gray-700',
 'peer-checked:border-primary peer-checked:ring-[1px] peer-checked:ring-primary',
 'peer-focus-visible:focus-outline peer-focus-visible:transition-none',
];
const gaps = {
 2: 'sm',
 3: 'base',
 4: 'lg',
};

const gridClass = computed(() => ({
 1: 'grid-cols-1',
 2: 'grid-cols-2',
 3: 'grid-cols-3',
 4: 'grid-cols-4',
})[columns.value] ?? 'grid-cols-3');

const gapClass = computed(() => ({
 2: 'gap-2',
 3: 'gap-3',
 4: 'gap-4',
})[gap.value] ?? 'gap-3');

function isSelected(key) {
 return selectedValues.value.includes(key);
}

function toggleOption(key) {
 if (isDisabled.value) return;

 if (isSelected(key)) {
 selectedValues.value = selectedValues.value.filter((v) => v !== key);
 } else if (multiple.value) {
 selectedValues.value = [...selectedValues.value, key];
 } else {
 selectedValues.value = [key];
 }

 update(selectedValues.value);
const multiple = computed(() => Boolean(props.config.multiple));
const label = computed(() => (props.config.display ? __(props.config.display) : null));
const gap = computed(() => gaps[props.config.gap] ?? 'base');

const options = computed(() =>
 (props.meta?.options ?? []).map((option) => ({
 value: option.key,
 label: option.label ? __(option.label) : null,
 image: option.image,
 badge: option.letter,
 })),
);

const selected = computed(() => (multiple.value ? props.value : (props.value?.[0] ?? null)));

function updateSelected(value) {
 update(multiple.value ? value : [value]);
}

watch(() => props.value, (value) => selectedValues.value = value);
</script>

<template>
 <div
 class="grid"
 :class="[gapClass, gridClass]"
 :role="multiple ? 'group' : 'radiogroup'"
 >
 <label
 v-for="option in options"
 :key="option.key"
 class="group cursor-pointer has-disabled:cursor-not-allowed has-disabled:opacity-60"
 >
 <input
 class="peer sr-only"
 :type="multiple ? 'checkbox' : 'radio'"
 :name="multiple ? `${name}[]` : name"
 :value="option.key"
 :checked="isSelected(option.key)"
 :disabled="isDisabled"
 @change="toggleOption(option.key)"
 >
 <span :class="cardClasses">
 <span
 class="flex items-center justify-center overflow-hidden rounded-md bg-gray-100 dark:bg-gray-800"
 :style="{ aspectRatio }"
 >
 <img
 v-if="option.image"
 class="block size-full object-cover"
 :src="option.image"
 :alt="option.label"
 >
 <span v-else class="flex size-full items-center justify-center" aria-hidden="true">
 <Icon name="image" class="size-6 text-gray-400" />
 </span>
 </span>
 <span
 v-if="option.label"
 class="flex items-center justify-center gap-2"
 >
 <span
 v-if="option.letter"
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 bg-white text-xs font-bold text-gray-800 dark:border-gray-600 dark:bg-gray-900 dark:text-gray-200"
 >
 {{ option.letter }}
 </span>
 <span class="text-xs text-gray-800 dark:text-gray-200" style="text-box-trim: trim-start;">
 {{ __(option.label) }}
 </span>
 </span>
 </span>
 </label>
 </div>
 <ChoiceGrid
 :model-value="selected"
 :options
 :multiple
 :name
 :label
 :gap
 :columns="config.columns ?? 3"
 :aspect-ratio="config.aspect_ratio ?? '16/9'"
 :disabled="config.disabled || isReadOnly"
 @update:model-value="updateSelected"
 />
</template>

156 changes: 15 additions & 141 deletions
resources/js/components/fieldtypes/RankingFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,154 +1,28 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { SortableList } from '@/components/sortable/Sortable.js';
import { DragHandle } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { RankList } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const sortableItemClass = 'ranking-item';
const sortableHandleClass = 'ranking-handle';

const rankedValues = ref([]);

const options = computed(() => {
 const raw = props.config.options ?? {};
 return Object.entries(raw).map(([value, label]) => ({ value, label: label || value }));
});

const isDisabled = computed(() => props.config.disabled || isReadOnly.value);

const orderedRows = computed(() => rankedValues.value.map((value, index) => ({
 value,
 label: options.value.find((option) => option.value === value)?.label ?? value,
 index,
})));

function defaultOrder() {
 return options.value.map((option) => option.value);
}

function buildRankedValues(value) {
 const order = Array.isArray(value) && value.length ? [...value] : defaultOrder();
 const valid = new Set(options.value.map((option) => option.value));

 const ranked = order.filter((item) => valid.has(item));

 options.value.forEach((option) => {
 if (! ranked.includes(option.value)) {
 ranked.push(option.value);
 }
 });

 return ranked;
}

const hasCustomOrder = computed(() => {
 return JSON.stringify(rankedValues.value) !== JSON.stringify(defaultOrder());
});

function moveToRank(itemValue, event) {
 const fromIndex = rankedValues.value.indexOf(itemValue);
 const parsed = Number(event.target.value);

 if (! isDisabled.value && fromIndex !== -1 && Number.isFinite(parsed)) {
 const toIndex = Math.max(0, Math.min(rankedValues.value.length - 1, Math.round(parsed) - 1));

 if (toIndex !== fromIndex) {
 const next = [...rankedValues.value];
 next.splice(fromIndex, 1);
 next.splice(toIndex, 0, itemValue);
 rankedValues.value = next;
 }
 }

 // Reset the input to the item's canonical rank. When the requested rank is
 // clamped to the item's current position, no reorder happens, so the binding
 // wouldn't otherwise overwrite the invalid value left in the input.
 event.target.value = rankedValues.value.indexOf(itemValue) + 1;
}

watch(
 [() => props.value, options],
 () => rankedValues.value = buildRankedValues(props.value),
 { deep: true, immediate: true },
);

watch(
 rankedValues,
 (value) => {
 const current = Array.isArray(props.value) ? props.value : [];

 if (JSON.stringify(value) === JSON.stringify(current)) {
 return;
 }

 update([...value]);
 },
 { deep: true },
const options = computed(() =>
 Object.entries(props.config.options ?? {}).map(([value, label]) => ({
 value,
 label: label ? __(label) : value,
 })),
);
</script>

<template>
 <SortableList
 v-if="orderedRows.length"
 v-model="rankedValues"
 :vertical="true"
 :item-class="sortableItemClass"
 :handle-class="sortableHandleClass"
 :mirror="false"
 :disabled="isDisabled"
 >
 <ul class="flex flex-col gap-2" role="list">
 <li
 v-for="row in orderedRows"
 :key="row.value"
 :class="sortableItemClass"
 class="flex items-center gap-2 rounded-lg border border-gray-300 bg-white p-2 dark:border-gray-700 dark:bg-gray-900"
 >
 <DragHandle
 v-if="!isDisabled"
 :class="[
 sortableHandleClass,
 hasCustomOrder
 ? 'text-primary! [&_svg]:opacity-100'
 : '[&_svg]:opacity-75 dark:[&_svg]:opacity-50',
 ]"
 class="cursor-grab"
 />
 <input
 v-if="!isDisabled"
 type="number"
 class="size-6 shrink-0 rounded-md border border-gray-300 bg-white px-0 text-center text-xs font-semibold text-gray-800 shadow-ui-xs focus:focus-outline dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
 :min="1"
 :max="orderedRows.length"
 step="1"
 :value="row.index + 1"
 :aria-label="`${__('Rank')} ${__(row.label)}`"
 @change="moveToRank(row.value, $event)"
 >
 <span
 v-else
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 shadow-ui-xs bg-white text-xs font-semibold text-gray-800 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200"
 aria-hidden="true"
 >
 {{ row.index + 1 }}
 </span>
 <span class="min-w-0 flex-1 text-sm text-gray-800 dark:text-gray-200">
 {{ __(row.label) }}
 </span>
 <input type="hidden" :name="`${name}[]`" :value="row.value">
 </li>
 </ul>
 </SortableList>
 <RankList
 :model-value="value ?? []"
 :options
 :name
 :disabled="config.disabled || isReadOnly"
 @update:model-value="update"
 />
</template>

<style scoped>
.ranking-item.draggable-source--is-dragging {
 /* Make the item slightly transparent than the default dragging opacity */
 opacity: 0.65;
}
</style>
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[6.x] Forms 2: Extract star rating, ranking and image choice into UI components#15068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackmcdade
merged 8 commits into

from

Aug 14, 2026
 Merged


[6.x] Forms 2: Extract star rating, ranking and image choice into UI components
#15068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78b5984

extract `StarRating` into a ui component


duncanmcclean Jul 23, 2026
25cf7e4

extract `RankList` into a ui component


duncanmcclean Jul 23, 2026
c5b8b2d

extract `ChoiceList` into a ui component


duncanmcclean Jul 23, 2026
fe54a63

they don't need folders


duncanmcclean Jul 23, 2026
5376a0f

use inline images in `ChoiceGrid` stories


duncanmcclean Jul 23, 2026
e0ad4a9

Merge branch 'forms-2' into forms-2-extract-fieldtypes


duncanmcclean Aug 12, 2026
deea6d9

Just make the whole item grabbable since there's no other interactive…


jackmcdade Aug 14, 2026
abdc889

Fix half-star fill so ratings line up with the actual stars.


jackmcdade Aug 14, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
packages/cms/src/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export const {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -91,13 +92,15 @@ export const {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

1 change: 0 additions & 1 deletion
resources/css/cp.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,5 @@
@import './components/fieldtypes/partial.css';
@import './components/fieldtypes/relationship.css';
@import './components/fieldtypes/section.css';
@import './components/fieldtypes/star-rating.css';
@import './components/fieldtypes/table.css';
@import './components/fieldtypes/width.css';

3 changes: 3 additions & 0 deletions
resources/js/bootstrap/cms/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -89,13 +90,15 @@ export {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

138 changes: 37 additions & 101 deletions
resources/js/components/fieldtypes/ImageChoiceFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,115 +1,51 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { Icon } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { ChoiceGrid } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const multiple = computed(() => Boolean(props.config.multiple));
const isDisabled = computed(() => props.config.disabled || isReadOnly.value);
const options = computed(() => props.meta?.options ?? []);
const columns = computed(() => props.config.columns ?? 3);
const aspectRatio = computed(() => props.config.aspect_ratio ?? '16/9');
const gap = computed(() => props.config.gap ?? 3);

const selectedValues = ref(props.value);

const cardClasses = [
 'flex flex-col gap-2 h-full p-1 pb-2 rounded-lg border shadow-ui-xs',
 'border-gray-300 bg-white',
 'dark:border-gray-700 dark:bg-gray-900',
 'hover:border-gray-400 dark:hover:border-gray-700',
 'peer-checked:border-primary peer-checked:ring-[1px] peer-checked:ring-primary',
 'peer-focus-visible:focus-outline peer-focus-visible:transition-none',
];
const gaps = {
 2: 'sm',
 3: 'base',
 4: 'lg',
};

const gridClass = computed(() => ({
 1: 'grid-cols-1',
 2: 'grid-cols-2',
 3: 'grid-cols-3',
 4: 'grid-cols-4',
})[columns.value] ?? 'grid-cols-3');

const gapClass = computed(() => ({
 2: 'gap-2',
 3: 'gap-3',
 4: 'gap-4',
})[gap.value] ?? 'gap-3');

function isSelected(key) {
 return selectedValues.value.includes(key);
}

function toggleOption(key) {
 if (isDisabled.value) return;

 if (isSelected(key)) {
 selectedValues.value = selectedValues.value.filter((v) => v !== key);
 } else if (multiple.value) {
 selectedValues.value = [...selectedValues.value, key];
 } else {
 selectedValues.value = [key];
 }

 update(selectedValues.value);
const multiple = computed(() => Boolean(props.config.multiple));
const label = computed(() => (props.config.display ? __(props.config.display) : null));
const gap = computed(() => gaps[props.config.gap] ?? 'base');

const options = computed(() =>
 (props.meta?.options ?? []).map((option) => ({
 value: option.key,
 label: option.label ? __(option.label) : null,
 image: option.image,
 badge: option.letter,
 })),
);

const selected = computed(() => (multiple.value ? props.value : (props.value?.[0] ?? null)));

function updateSelected(value) {
 update(multiple.value ? value : [value]);
}

watch(() => props.value, (value) => selectedValues.value = value);
</script>

<template>
 <div
 class="grid"
 :class="[gapClass, gridClass]"
 :role="multiple ? 'group' : 'radiogroup'"
 >
 <label
 v-for="option in options"
 :key="option.key"
 class="group cursor-pointer has-disabled:cursor-not-allowed has-disabled:opacity-60"
 >
 <input
 class="peer sr-only"
 :type="multiple ? 'checkbox' : 'radio'"
 :name="multiple ? `${name}[]` : name"
 :value="option.key"
 :checked="isSelected(option.key)"
 :disabled="isDisabled"
 @change="toggleOption(option.key)"
 >
 <span :class="cardClasses">
 <span
 class="flex items-center justify-center overflow-hidden rounded-md bg-gray-100 dark:bg-gray-800"
 :style="{ aspectRatio }"
 >
 <img
 v-if="option.image"
 class="block size-full object-cover"
 :src="option.image"
 :alt="option.label"
 >
 <span v-else class="flex size-full items-center justify-center" aria-hidden="true">
 <Icon name="image" class="size-6 text-gray-400" />
 </span>
 </span>
 <span
 v-if="option.label"
 class="flex items-center justify-center gap-2"
 >
 <span
 v-if="option.letter"
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 bg-white text-xs font-bold text-gray-800 dark:border-gray-600 dark:bg-gray-900 dark:text-gray-200"
 >
 {{ option.letter }}
 </span>
 <span class="text-xs text-gray-800 dark:text-gray-200" style="text-box-trim: trim-start;">
 {{ __(option.label) }}
 </span>
 </span>
 </span>
 </label>
 </div>
 <ChoiceGrid
 :model-value="selected"
 :options
 :multiple
 :name
 :label
 :gap
 :columns="config.columns ?? 3"
 :aspect-ratio="config.aspect_ratio ?? '16/9'"
 :disabled="config.disabled || isReadOnly"
 @update:model-value="updateSelected"
 />
</template>

156 changes: 15 additions & 141 deletions
resources/js/components/fieldtypes/RankingFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,154 +1,28 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { SortableList } from '@/components/sortable/Sortable.js';
import { DragHandle } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { RankList } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const sortableItemClass = 'ranking-item';
const sortableHandleClass = 'ranking-handle';

const rankedValues = ref([]);

const options = computed(() => {
 const raw = props.config.options ?? {};
 return Object.entries(raw).map(([value, label]) => ({ value, label: label || value }));
});

const isDisabled = computed(() => props.config.disabled || isReadOnly.value);

const orderedRows = computed(() => rankedValues.value.map((value, index) => ({
 value,
 label: options.value.find((option) => option.value === value)?.label ?? value,
 index,
})));

function defaultOrder() {
 return options.value.map((option) => option.value);
}

function buildRankedValues(value) {
 const order = Array.isArray(value) && value.length ? [...value] : defaultOrder();
 const valid = new Set(options.value.map((option) => option.value));

 const ranked = order.filter((item) => valid.has(item));

 options.value.forEach((option) => {
 if (! ranked.includes(option.value)) {
 ranked.push(option.value);
 }
 });

 return ranked;
}

const hasCustomOrder = computed(() => {
 return JSON.stringify(rankedValues.value) !== JSON.stringify(defaultOrder());
});

function moveToRank(itemValue, event) {
 const fromIndex = rankedValues.value.indexOf(itemValue);
 const parsed = Number(event.target.value);

 if (! isDisabled.value && fromIndex !== -1 && Number.isFinite(parsed)) {
 const toIndex = Math.max(0, Math.min(rankedValues.value.length - 1, Math.round(parsed) - 1));

 if (toIndex !== fromIndex) {
 const next = [...rankedValues.value];
 next.splice(fromIndex, 1);
 next.splice(toIndex, 0, itemValue);
 rankedValues.value = next;
 }
 }

 // Reset the input to the item's canonical rank. When the requested rank is
 // clamped to the item's current position, no reorder happens, so the binding
 // wouldn't otherwise overwrite the invalid value left in the input.
 event.target.value = rankedValues.value.indexOf(itemValue) + 1;
}

watch(
 [() => props.value, options],
 () => rankedValues.value = buildRankedValues(props.value),
 { deep: true, immediate: true },
);

watch(
 rankedValues,
 (value) => {
 const current = Array.isArray(props.value) ? props.value : [];

 if (JSON.stringify(value) === JSON.stringify(current)) {
 return;
 }

 update([...value]);
 },
 { deep: true },
const options = computed(() =>
 Object.entries(props.config.options ?? {}).map(([value, label]) => ({
 value,
 label: label ? __(label) : value,
 })),
);
</script>

<template>
 <SortableList
 v-if="orderedRows.length"
 v-model="rankedValues"
 :vertical="true"
 :item-class="sortableItemClass"
 :handle-class="sortableHandleClass"
 :mirror="false"
 :disabled="isDisabled"
 >
 <ul class="flex flex-col gap-2" role="list">
 <li
 v-for="row in orderedRows"
 :key="row.value"
 :class="sortableItemClass"
 class="flex items-center gap-2 rounded-lg border border-gray-300 bg-white p-2 dark:border-gray-700 dark:bg-gray-900"
 >
 <DragHandle
 v-if="!isDisabled"
 :class="[
 sortableHandleClass,
 hasCustomOrder
 ? 'text-primary! [&_svg]:opacity-100'
 : '[&_svg]:opacity-75 dark:[&_svg]:opacity-50',
 ]"
 class="cursor-grab"
 />
 <input
 v-if="!isDisabled"
 type="number"
 class="size-6 shrink-0 rounded-md border border-gray-300 bg-white px-0 text-center text-xs font-semibold text-gray-800 shadow-ui-xs focus:focus-outline dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
 :min="1"
 :max="orderedRows.length"
 step="1"
 :value="row.index + 1"
 :aria-label="`${__('Rank')} ${__(row.label)}`"
 @change="moveToRank(row.value, $event)"
 >
 <span
 v-else
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 shadow-ui-xs bg-white text-xs font-semibold text-gray-800 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200"
 aria-hidden="true"
 >
 {{ row.index + 1 }}
 </span>
 <span class="min-w-0 flex-1 text-sm text-gray-800 dark:text-gray-200">
 {{ __(row.label) }}
 </span>
 <input type="hidden" :name="`${name}[]`" :value="row.value">
 </li>
 </ul>
 </SortableList>
 <RankList
 :model-value="value ?? []"
 :options
 :name
 :disabled="config.disabled || isReadOnly"
 @update:model-value="update"
 />
</template>

<style scoped>
.ranking-item.draggable-source--is-dragging {
 /* Make the item slightly transparent than the default dragging opacity */
 opacity: 0.65;
}
</style>
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Forms 2: Extract star rating, ranking and image choice into UI components#15068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackmcdade
merged 8 commits into

from

Aug 14, 2026
 Merged


[6.x] Forms 2: Extract star rating, ranking and image choice into UI components
#15068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78b5984

extract `StarRating` into a ui component


duncanmcclean Jul 23, 2026
25cf7e4

extract `RankList` into a ui component


duncanmcclean Jul 23, 2026
c5b8b2d

extract `ChoiceList` into a ui component


duncanmcclean Jul 23, 2026
fe54a63

they don't need folders


duncanmcclean Jul 23, 2026
5376a0f

use inline images in `ChoiceGrid` stories


duncanmcclean Jul 23, 2026
e0ad4a9

Merge branch 'forms-2' into forms-2-extract-fieldtypes


duncanmcclean Aug 12, 2026
deea6d9

Just make the whole item grabbable since there's no other interactive…


jackmcdade Aug 14, 2026
abdc889

Fix half-star fill so ratings line up with the actual stars.


jackmcdade Aug 14, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
packages/cms/src/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export const {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -91,13 +92,15 @@ export const {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

1 change: 0 additions & 1 deletion
resources/css/cp.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,5 @@
@import './components/fieldtypes/partial.css';
@import './components/fieldtypes/relationship.css';
@import './components/fieldtypes/section.css';
@import './components/fieldtypes/star-rating.css';
@import './components/fieldtypes/table.css';
@import './components/fieldtypes/width.css';

3 changes: 3 additions & 0 deletions
resources/js/bootstrap/cms/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -89,13 +90,15 @@ export {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

138 changes: 37 additions & 101 deletions
resources/js/components/fieldtypes/ImageChoiceFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,115 +1,51 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { Icon } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { ChoiceGrid } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const multiple = computed(() => Boolean(props.config.multiple));
const isDisabled = computed(() => props.config.disabled || isReadOnly.value);
const options = computed(() => props.meta?.options ?? []);
const columns = computed(() => props.config.columns ?? 3);
const aspectRatio = computed(() => props.config.aspect_ratio ?? '16/9');
const gap = computed(() => props.config.gap ?? 3);

const selectedValues = ref(props.value);

const cardClasses = [
 'flex flex-col gap-2 h-full p-1 pb-2 rounded-lg border shadow-ui-xs',
 'border-gray-300 bg-white',
 'dark:border-gray-700 dark:bg-gray-900',
 'hover:border-gray-400 dark:hover:border-gray-700',
 'peer-checked:border-primary peer-checked:ring-[1px] peer-checked:ring-primary',
 'peer-focus-visible:focus-outline peer-focus-visible:transition-none',
];
const gaps = {
 2: 'sm',
 3: 'base',
 4: 'lg',
};

const gridClass = computed(() => ({
 1: 'grid-cols-1',
 2: 'grid-cols-2',
 3: 'grid-cols-3',
 4: 'grid-cols-4',
})[columns.value] ?? 'grid-cols-3');

const gapClass = computed(() => ({
 2: 'gap-2',
 3: 'gap-3',
 4: 'gap-4',
})[gap.value] ?? 'gap-3');

function isSelected(key) {
 return selectedValues.value.includes(key);
}

function toggleOption(key) {
 if (isDisabled.value) return;

 if (isSelected(key)) {
 selectedValues.value = selectedValues.value.filter((v) => v !== key);
 } else if (multiple.value) {
 selectedValues.value = [...selectedValues.value, key];
 } else {
 selectedValues.value = [key];
 }

 update(selectedValues.value);
const multiple = computed(() => Boolean(props.config.multiple));
const label = computed(() => (props.config.display ? __(props.config.display) : null));
const gap = computed(() => gaps[props.config.gap] ?? 'base');

const options = computed(() =>
 (props.meta?.options ?? []).map((option) => ({
 value: option.key,
 label: option.label ? __(option.label) : null,
 image: option.image,
 badge: option.letter,
 })),
);

const selected = computed(() => (multiple.value ? props.value : (props.value?.[0] ?? null)));

function updateSelected(value) {
 update(multiple.value ? value : [value]);
}

watch(() => props.value, (value) => selectedValues.value = value);
</script>

<template>
 <div
 class="grid"
 :class="[gapClass, gridClass]"
 :role="multiple ? 'group' : 'radiogroup'"
 >
 <label
 v-for="option in options"
 :key="option.key"
 class="group cursor-pointer has-disabled:cursor-not-allowed has-disabled:opacity-60"
 >
 <input
 class="peer sr-only"
 :type="multiple ? 'checkbox' : 'radio'"
 :name="multiple ? `${name}[]` : name"
 :value="option.key"
 :checked="isSelected(option.key)"
 :disabled="isDisabled"
 @change="toggleOption(option.key)"
 >
 <span :class="cardClasses">
 <span
 class="flex items-center justify-center overflow-hidden rounded-md bg-gray-100 dark:bg-gray-800"
 :style="{ aspectRatio }"
 >
 <img
 v-if="option.image"
 class="block size-full object-cover"
 :src="option.image"
 :alt="option.label"
 >
 <span v-else class="flex size-full items-center justify-center" aria-hidden="true">
 <Icon name="image" class="size-6 text-gray-400" />
 </span>
 </span>
 <span
 v-if="option.label"
 class="flex items-center justify-center gap-2"
 >
 <span
 v-if="option.letter"
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 bg-white text-xs font-bold text-gray-800 dark:border-gray-600 dark:bg-gray-900 dark:text-gray-200"
 >
 {{ option.letter }}
 </span>
 <span class="text-xs text-gray-800 dark:text-gray-200" style="text-box-trim: trim-start;">
 {{ __(option.label) }}
 </span>
 </span>
 </span>
 </label>
 </div>
 <ChoiceGrid
 :model-value="selected"
 :options
 :multiple
 :name
 :label
 :gap
 :columns="config.columns ?? 3"
 :aspect-ratio="config.aspect_ratio ?? '16/9'"
 :disabled="config.disabled || isReadOnly"
 @update:model-value="updateSelected"
 />
</template>

156 changes: 15 additions & 141 deletions
resources/js/components/fieldtypes/RankingFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,154 +1,28 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { SortableList } from '@/components/sortable/Sortable.js';
import { DragHandle } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { RankList } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const sortableItemClass = 'ranking-item';
const sortableHandleClass = 'ranking-handle';

const rankedValues = ref([]);

const options = computed(() => {
 const raw = props.config.options ?? {};
 return Object.entries(raw).map(([value, label]) => ({ value, label: label || value }));
});

const isDisabled = computed(() => props.config.disabled || isReadOnly.value);

const orderedRows = computed(() => rankedValues.value.map((value, index) => ({
 value,
 label: options.value.find((option) => option.value === value)?.label ?? value,
 index,
})));

function defaultOrder() {
 return options.value.map((option) => option.value);
}

function buildRankedValues(value) {
 const order = Array.isArray(value) && value.length ? [...value] : defaultOrder();
 const valid = new Set(options.value.map((option) => option.value));

 const ranked = order.filter((item) => valid.has(item));

 options.value.forEach((option) => {
 if (! ranked.includes(option.value)) {
 ranked.push(option.value);
 }
 });

 return ranked;
}

const hasCustomOrder = computed(() => {
 return JSON.stringify(rankedValues.value) !== JSON.stringify(defaultOrder());
});

function moveToRank(itemValue, event) {
 const fromIndex = rankedValues.value.indexOf(itemValue);
 const parsed = Number(event.target.value);

 if (! isDisabled.value && fromIndex !== -1 && Number.isFinite(parsed)) {
 const toIndex = Math.max(0, Math.min(rankedValues.value.length - 1, Math.round(parsed) - 1));

 if (toIndex !== fromIndex) {
 const next = [...rankedValues.value];
 next.splice(fromIndex, 1);
 next.splice(toIndex, 0, itemValue);
 rankedValues.value = next;
 }
 }

 // Reset the input to the item's canonical rank. When the requested rank is
 // clamped to the item's current position, no reorder happens, so the binding
 // wouldn't otherwise overwrite the invalid value left in the input.
 event.target.value = rankedValues.value.indexOf(itemValue) + 1;
}

watch(
 [() => props.value, options],
 () => rankedValues.value = buildRankedValues(props.value),
 { deep: true, immediate: true },
);

watch(
 rankedValues,
 (value) => {
 const current = Array.isArray(props.value) ? props.value : [];

 if (JSON.stringify(value) === JSON.stringify(current)) {
 return;
 }

 update([...value]);
 },
 { deep: true },
const options = computed(() =>
 Object.entries(props.config.options ?? {}).map(([value, label]) => ({
 value,
 label: label ? __(label) : value,
 })),
);
</script>

<template>
 <SortableList
 v-if="orderedRows.length"
 v-model="rankedValues"
 :vertical="true"
 :item-class="sortableItemClass"
 :handle-class="sortableHandleClass"
 :mirror="false"
 :disabled="isDisabled"
 >
 <ul class="flex flex-col gap-2" role="list">
 <li
 v-for="row in orderedRows"
 :key="row.value"
 :class="sortableItemClass"
 class="flex items-center gap-2 rounded-lg border border-gray-300 bg-white p-2 dark:border-gray-700 dark:bg-gray-900"
 >
 <DragHandle
 v-if="!isDisabled"
 :class="[
 sortableHandleClass,
 hasCustomOrder
 ? 'text-primary! [&_svg]:opacity-100'
 : '[&_svg]:opacity-75 dark:[&_svg]:opacity-50',
 ]"
 class="cursor-grab"
 />
 <input
 v-if="!isDisabled"
 type="number"
 class="size-6 shrink-0 rounded-md border border-gray-300 bg-white px-0 text-center text-xs font-semibold text-gray-800 shadow-ui-xs focus:focus-outline dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
 :min="1"
 :max="orderedRows.length"
 step="1"
 :value="row.index + 1"
 :aria-label="`${__('Rank')} ${__(row.label)}`"
 @change="moveToRank(row.value, $event)"
 >
 <span
 v-else
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 shadow-ui-xs bg-white text-xs font-semibold text-gray-800 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200"
 aria-hidden="true"
 >
 {{ row.index + 1 }}
 </span>
 <span class="min-w-0 flex-1 text-sm text-gray-800 dark:text-gray-200">
 {{ __(row.label) }}
 </span>
 <input type="hidden" :name="`${name}[]`" :value="row.value">
 </li>
 </ul>
 </SortableList>
 <RankList
 :model-value="value ?? []"
 :options
 :name
 :disabled="config.disabled || isReadOnly"
 @update:model-value="update"
 />
</template>

<style scoped>
.ranking-item.draggable-source--is-dragging {
 /* Make the item slightly transparent than the default dragging opacity */
 opacity: 0.65;
}
</style>
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[6.x] Forms 2: Extract star rating, ranking and image choice into UI components#15068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackmcdade
merged 8 commits into

from

Aug 14, 2026
 Merged


[6.x] Forms 2: Extract star rating, ranking and image choice into UI components
#15068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78b5984

extract `StarRating` into a ui component


duncanmcclean Jul 23, 2026
25cf7e4

extract `RankList` into a ui component


duncanmcclean Jul 23, 2026
c5b8b2d

extract `ChoiceList` into a ui component


duncanmcclean Jul 23, 2026
fe54a63

they don't need folders


duncanmcclean Jul 23, 2026
5376a0f

use inline images in `ChoiceGrid` stories


duncanmcclean Jul 23, 2026
e0ad4a9

Merge branch 'forms-2' into forms-2-extract-fieldtypes


duncanmcclean Aug 12, 2026
deea6d9

Just make the whole item grabbable since there's no other interactive…


jackmcdade Aug 14, 2026
abdc889

Fix half-star fill so ratings line up with the actual stars.


jackmcdade Aug 14, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
packages/cms/src/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export const {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -91,13 +92,15 @@ export const {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

1 change: 0 additions & 1 deletion
resources/css/cp.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,5 @@
@import './components/fieldtypes/partial.css';
@import './components/fieldtypes/relationship.css';
@import './components/fieldtypes/section.css';
@import './components/fieldtypes/star-rating.css';
@import './components/fieldtypes/table.css';
@import './components/fieldtypes/width.css';

3 changes: 3 additions & 0 deletions
resources/js/bootstrap/cms/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -89,13 +90,15 @@ export {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

138 changes: 37 additions & 101 deletions
resources/js/components/fieldtypes/ImageChoiceFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,115 +1,51 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { Icon } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { ChoiceGrid } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const multiple = computed(() => Boolean(props.config.multiple));
const isDisabled = computed(() => props.config.disabled || isReadOnly.value);
const options = computed(() => props.meta?.options ?? []);
const columns = computed(() => props.config.columns ?? 3);
const aspectRatio = computed(() => props.config.aspect_ratio ?? '16/9');
const gap = computed(() => props.config.gap ?? 3);

const selectedValues = ref(props.value);

const cardClasses = [
 'flex flex-col gap-2 h-full p-1 pb-2 rounded-lg border shadow-ui-xs',
 'border-gray-300 bg-white',
 'dark:border-gray-700 dark:bg-gray-900',
 'hover:border-gray-400 dark:hover:border-gray-700',
 'peer-checked:border-primary peer-checked:ring-[1px] peer-checked:ring-primary',
 'peer-focus-visible:focus-outline peer-focus-visible:transition-none',
];
const gaps = {
 2: 'sm',
 3: 'base',
 4: 'lg',
};

const gridClass = computed(() => ({
 1: 'grid-cols-1',
 2: 'grid-cols-2',
 3: 'grid-cols-3',
 4: 'grid-cols-4',
})[columns.value] ?? 'grid-cols-3');

const gapClass = computed(() => ({
 2: 'gap-2',
 3: 'gap-3',
 4: 'gap-4',
})[gap.value] ?? 'gap-3');

function isSelected(key) {
 return selectedValues.value.includes(key);
}

function toggleOption(key) {
 if (isDisabled.value) return;

 if (isSelected(key)) {
 selectedValues.value = selectedValues.value.filter((v) => v !== key);
 } else if (multiple.value) {
 selectedValues.value = [...selectedValues.value, key];
 } else {
 selectedValues.value = [key];
 }

 update(selectedValues.value);
const multiple = computed(() => Boolean(props.config.multiple));
const label = computed(() => (props.config.display ? __(props.config.display) : null));
const gap = computed(() => gaps[props.config.gap] ?? 'base');

const options = computed(() =>
 (props.meta?.options ?? []).map((option) => ({
 value: option.key,
 label: option.label ? __(option.label) : null,
 image: option.image,
 badge: option.letter,
 })),
);

const selected = computed(() => (multiple.value ? props.value : (props.value?.[0] ?? null)));

function updateSelected(value) {
 update(multiple.value ? value : [value]);
}

watch(() => props.value, (value) => selectedValues.value = value);
</script>

<template>
 <div
 class="grid"
 :class="[gapClass, gridClass]"
 :role="multiple ? 'group' : 'radiogroup'"
 >
 <label
 v-for="option in options"
 :key="option.key"
 class="group cursor-pointer has-disabled:cursor-not-allowed has-disabled:opacity-60"
 >
 <input
 class="peer sr-only"
 :type="multiple ? 'checkbox' : 'radio'"
 :name="multiple ? `${name}[]` : name"
 :value="option.key"
 :checked="isSelected(option.key)"
 :disabled="isDisabled"
 @change="toggleOption(option.key)"
 >
 <span :class="cardClasses">
 <span
 class="flex items-center justify-center overflow-hidden rounded-md bg-gray-100 dark:bg-gray-800"
 :style="{ aspectRatio }"
 >
 <img
 v-if="option.image"
 class="block size-full object-cover"
 :src="option.image"
 :alt="option.label"
 >
 <span v-else class="flex size-full items-center justify-center" aria-hidden="true">
 <Icon name="image" class="size-6 text-gray-400" />
 </span>
 </span>
 <span
 v-if="option.label"
 class="flex items-center justify-center gap-2"
 >
 <span
 v-if="option.letter"
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 bg-white text-xs font-bold text-gray-800 dark:border-gray-600 dark:bg-gray-900 dark:text-gray-200"
 >
 {{ option.letter }}
 </span>
 <span class="text-xs text-gray-800 dark:text-gray-200" style="text-box-trim: trim-start;">
 {{ __(option.label) }}
 </span>
 </span>
 </span>
 </label>
 </div>
 <ChoiceGrid
 :model-value="selected"
 :options
 :multiple
 :name
 :label
 :gap
 :columns="config.columns ?? 3"
 :aspect-ratio="config.aspect_ratio ?? '16/9'"
 :disabled="config.disabled || isReadOnly"
 @update:model-value="updateSelected"
 />
</template>

156 changes: 15 additions & 141 deletions
resources/js/components/fieldtypes/RankingFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,154 +1,28 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { SortableList } from '@/components/sortable/Sortable.js';
import { DragHandle } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { RankList } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const sortableItemClass = 'ranking-item';
const sortableHandleClass = 'ranking-handle';

const rankedValues = ref([]);

const options = computed(() => {
 const raw = props.config.options ?? {};
 return Object.entries(raw).map(([value, label]) => ({ value, label: label || value }));
});

const isDisabled = computed(() => props.config.disabled || isReadOnly.value);

const orderedRows = computed(() => rankedValues.value.map((value, index) => ({
 value,
 label: options.value.find((option) => option.value === value)?.label ?? value,
 index,
})));

function defaultOrder() {
 return options.value.map((option) => option.value);
}

function buildRankedValues(value) {
 const order = Array.isArray(value) && value.length ? [...value] : defaultOrder();
 const valid = new Set(options.value.map((option) => option.value));

 const ranked = order.filter((item) => valid.has(item));

 options.value.forEach((option) => {
 if (! ranked.includes(option.value)) {
 ranked.push(option.value);
 }
 });

 return ranked;
}

const hasCustomOrder = computed(() => {
 return JSON.stringify(rankedValues.value) !== JSON.stringify(defaultOrder());
});

function moveToRank(itemValue, event) {
 const fromIndex = rankedValues.value.indexOf(itemValue);
 const parsed = Number(event.target.value);

 if (! isDisabled.value && fromIndex !== -1 && Number.isFinite(parsed)) {
 const toIndex = Math.max(0, Math.min(rankedValues.value.length - 1, Math.round(parsed) - 1));

 if (toIndex !== fromIndex) {
 const next = [...rankedValues.value];
 next.splice(fromIndex, 1);
 next.splice(toIndex, 0, itemValue);
 rankedValues.value = next;
 }
 }

 // Reset the input to the item's canonical rank. When the requested rank is
 // clamped to the item's current position, no reorder happens, so the binding
 // wouldn't otherwise overwrite the invalid value left in the input.
 event.target.value = rankedValues.value.indexOf(itemValue) + 1;
}

watch(
 [() => props.value, options],
 () => rankedValues.value = buildRankedValues(props.value),
 { deep: true, immediate: true },
);

watch(
 rankedValues,
 (value) => {
 const current = Array.isArray(props.value) ? props.value : [];

 if (JSON.stringify(value) === JSON.stringify(current)) {
 return;
 }

 update([...value]);
 },
 { deep: true },
const options = computed(() =>
 Object.entries(props.config.options ?? {}).map(([value, label]) => ({
 value,
 label: label ? __(label) : value,
 })),
);
</script>

<template>
 <SortableList
 v-if="orderedRows.length"
 v-model="rankedValues"
 :vertical="true"
 :item-class="sortableItemClass"
 :handle-class="sortableHandleClass"
 :mirror="false"
 :disabled="isDisabled"
 >
 <ul class="flex flex-col gap-2" role="list">
 <li
 v-for="row in orderedRows"
 :key="row.value"
 :class="sortableItemClass"
 class="flex items-center gap-2 rounded-lg border border-gray-300 bg-white p-2 dark:border-gray-700 dark:bg-gray-900"
 >
 <DragHandle
 v-if="!isDisabled"
 :class="[
 sortableHandleClass,
 hasCustomOrder
 ? 'text-primary! [&_svg]:opacity-100'
 : '[&_svg]:opacity-75 dark:[&_svg]:opacity-50',
 ]"
 class="cursor-grab"
 />
 <input
 v-if="!isDisabled"
 type="number"
 class="size-6 shrink-0 rounded-md border border-gray-300 bg-white px-0 text-center text-xs font-semibold text-gray-800 shadow-ui-xs focus:focus-outline dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
 :min="1"
 :max="orderedRows.length"
 step="1"
 :value="row.index + 1"
 :aria-label="`${__('Rank')} ${__(row.label)}`"
 @change="moveToRank(row.value, $event)"
 >
 <span
 v-else
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 shadow-ui-xs bg-white text-xs font-semibold text-gray-800 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200"
 aria-hidden="true"
 >
 {{ row.index + 1 }}
 </span>
 <span class="min-w-0 flex-1 text-sm text-gray-800 dark:text-gray-200">
 {{ __(row.label) }}
 </span>
 <input type="hidden" :name="`${name}[]`" :value="row.value">
 </li>
 </ul>
 </SortableList>
 <RankList
 :model-value="value ?? []"
 :options
 :name
 :disabled="config.disabled || isReadOnly"
 @update:model-value="update"
 />
</template>

<style scoped>
.ranking-item.draggable-source--is-dragging {
 /* Make the item slightly transparent than the default dragging opacity */
 opacity: 0.65;
}
</style>
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[6.x] Forms 2: Extract star rating, ranking and image choice into UI components#15068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackmcdade
merged 8 commits into

from

Aug 14, 2026
 Merged


[6.x] Forms 2: Extract star rating, ranking and image choice into UI components
#15068
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
78b5984

extract `StarRating` into a ui component


duncanmcclean Jul 23, 2026
25cf7e4

extract `RankList` into a ui component


duncanmcclean Jul 23, 2026
c5b8b2d

extract `ChoiceList` into a ui component


duncanmcclean Jul 23, 2026
fe54a63

they don't need folders


duncanmcclean Jul 23, 2026
5376a0f

use inline images in `ChoiceGrid` stories


duncanmcclean Jul 23, 2026
e0ad4a9

Merge branch 'forms-2' into forms-2-extract-fieldtypes


duncanmcclean Aug 12, 2026
deea6d9

Just make the whole item grabbable since there's no other interactive…


jackmcdade Aug 14, 2026
abdc889

Fix half-star fill so ratings line up with the actual stars.


jackmcdade Aug 14, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 3 additions & 0 deletions
packages/cms/src/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export const {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -91,13 +92,15 @@ export const {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

1 change: 0 additions & 1 deletion
resources/css/cp.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,5 @@
@import './components/fieldtypes/partial.css';
@import './components/fieldtypes/relationship.css';
@import './components/fieldtypes/section.css';
@import './components/fieldtypes/star-rating.css';
@import './components/fieldtypes/table.css';
@import './components/fieldtypes/width.css';

3 changes: 3 additions & 0 deletions
resources/js/bootstrap/cms/ui.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ export {
 CharacterCounter,
 Checkbox,
 CheckboxGroup,
 ChoiceGrid,
 CodeEditor,
 Combobox,
 CommandPaletteItem,
Expand DownExpand Up@@ -89,13 +90,15 @@ export {
 PublishTabs,
 Radio,
 RadioGroup,
 RankList,
 Select,
 Separator,
 Slider,
 Skeleton,
 SplitterGroup,
 SplitterPanel,
 SplitterResizeHandle,
 StarRating,
 StatusIndicator,
 Subheading,
 Switch,
Expand Down

138 changes: 37 additions & 101 deletions
resources/js/components/fieldtypes/ImageChoiceFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,115 +1,51 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { Icon } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { ChoiceGrid } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const multiple = computed(() => Boolean(props.config.multiple));
const isDisabled = computed(() => props.config.disabled || isReadOnly.value);
const options = computed(() => props.meta?.options ?? []);
const columns = computed(() => props.config.columns ?? 3);
const aspectRatio = computed(() => props.config.aspect_ratio ?? '16/9');
const gap = computed(() => props.config.gap ?? 3);

const selectedValues = ref(props.value);

const cardClasses = [
 'flex flex-col gap-2 h-full p-1 pb-2 rounded-lg border shadow-ui-xs',
 'border-gray-300 bg-white',
 'dark:border-gray-700 dark:bg-gray-900',
 'hover:border-gray-400 dark:hover:border-gray-700',
 'peer-checked:border-primary peer-checked:ring-[1px] peer-checked:ring-primary',
 'peer-focus-visible:focus-outline peer-focus-visible:transition-none',
];
const gaps = {
 2: 'sm',
 3: 'base',
 4: 'lg',
};

const gridClass = computed(() => ({
 1: 'grid-cols-1',
 2: 'grid-cols-2',
 3: 'grid-cols-3',
 4: 'grid-cols-4',
})[columns.value] ?? 'grid-cols-3');

const gapClass = computed(() => ({
 2: 'gap-2',
 3: 'gap-3',
 4: 'gap-4',
})[gap.value] ?? 'gap-3');

function isSelected(key) {
 return selectedValues.value.includes(key);
}

function toggleOption(key) {
 if (isDisabled.value) return;

 if (isSelected(key)) {
 selectedValues.value = selectedValues.value.filter((v) => v !== key);
 } else if (multiple.value) {
 selectedValues.value = [...selectedValues.value, key];
 } else {
 selectedValues.value = [key];
 }

 update(selectedValues.value);
const multiple = computed(() => Boolean(props.config.multiple));
const label = computed(() => (props.config.display ? __(props.config.display) : null));
const gap = computed(() => gaps[props.config.gap] ?? 'base');

const options = computed(() =>
 (props.meta?.options ?? []).map((option) => ({
 value: option.key,
 label: option.label ? __(option.label) : null,
 image: option.image,
 badge: option.letter,
 })),
);

const selected = computed(() => (multiple.value ? props.value : (props.value?.[0] ?? null)));

function updateSelected(value) {
 update(multiple.value ? value : [value]);
}

watch(() => props.value, (value) => selectedValues.value = value);
</script>

<template>
 <div
 class="grid"
 :class="[gapClass, gridClass]"
 :role="multiple ? 'group' : 'radiogroup'"
 >
 <label
 v-for="option in options"
 :key="option.key"
 class="group cursor-pointer has-disabled:cursor-not-allowed has-disabled:opacity-60"
 >
 <input
 class="peer sr-only"
 :type="multiple ? 'checkbox' : 'radio'"
 :name="multiple ? `${name}[]` : name"
 :value="option.key"
 :checked="isSelected(option.key)"
 :disabled="isDisabled"
 @change="toggleOption(option.key)"
 >
 <span :class="cardClasses">
 <span
 class="flex items-center justify-center overflow-hidden rounded-md bg-gray-100 dark:bg-gray-800"
 :style="{ aspectRatio }"
 >
 <img
 v-if="option.image"
 class="block size-full object-cover"
 :src="option.image"
 :alt="option.label"
 >
 <span v-else class="flex size-full items-center justify-center" aria-hidden="true">
 <Icon name="image" class="size-6 text-gray-400" />
 </span>
 </span>
 <span
 v-if="option.label"
 class="flex items-center justify-center gap-2"
 >
 <span
 v-if="option.letter"
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 bg-white text-xs font-bold text-gray-800 dark:border-gray-600 dark:bg-gray-900 dark:text-gray-200"
 >
 {{ option.letter }}
 </span>
 <span class="text-xs text-gray-800 dark:text-gray-200" style="text-box-trim: trim-start;">
 {{ __(option.label) }}
 </span>
 </span>
 </span>
 </label>
 </div>
 <ChoiceGrid
 :model-value="selected"
 :options
 :multiple
 :name
 :label
 :gap
 :columns="config.columns ?? 3"
 :aspect-ratio="config.aspect_ratio ?? '16/9'"
 :disabled="config.disabled || isReadOnly"
 @update:model-value="updateSelected"
 />
</template>

156 changes: 15 additions & 141 deletions
resources/js/components/fieldtypes/RankingFieldtype.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,154 +1,28 @@
<script setup>
import Fieldtype from '@/components/fieldtypes/fieldtype.js';
import { SortableList } from '@/components/sortable/Sortable.js';
import { DragHandle } from '@/components/ui';
import { computed, ref, watch } from 'vue';
import { RankList } from '@/components/ui';
import { __ } from '@/bootstrap/globals';
import { computed } from 'vue';

const emit = defineEmits(Fieldtype.emits);
const props = defineProps(Fieldtype.props);
const { expose, update, isReadOnly, name } = Fieldtype.use(emit, props);
defineExpose(expose);

const sortableItemClass = 'ranking-item';
const sortableHandleClass = 'ranking-handle';

const rankedValues = ref([]);

const options = computed(() => {
 const raw = props.config.options ?? {};
 return Object.entries(raw).map(([value, label]) => ({ value, label: label || value }));
});

const isDisabled = computed(() => props.config.disabled || isReadOnly.value);

const orderedRows = computed(() => rankedValues.value.map((value, index) => ({
 value,
 label: options.value.find((option) => option.value === value)?.label ?? value,
 index,
})));

function defaultOrder() {
 return options.value.map((option) => option.value);
}

function buildRankedValues(value) {
 const order = Array.isArray(value) && value.length ? [...value] : defaultOrder();
 const valid = new Set(options.value.map((option) => option.value));

 const ranked = order.filter((item) => valid.has(item));

 options.value.forEach((option) => {
 if (! ranked.includes(option.value)) {
 ranked.push(option.value);
 }
 });

 return ranked;
}

const hasCustomOrder = computed(() => {
 return JSON.stringify(rankedValues.value) !== JSON.stringify(defaultOrder());
});

function moveToRank(itemValue, event) {
 const fromIndex = rankedValues.value.indexOf(itemValue);
 const parsed = Number(event.target.value);

 if (! isDisabled.value && fromIndex !== -1 && Number.isFinite(parsed)) {
 const toIndex = Math.max(0, Math.min(rankedValues.value.length - 1, Math.round(parsed) - 1));

 if (toIndex !== fromIndex) {
 const next = [...rankedValues.value];
 next.splice(fromIndex, 1);
 next.splice(toIndex, 0, itemValue);
 rankedValues.value = next;
 }
 }

 // Reset the input to the item's canonical rank. When the requested rank is
 // clamped to the item's current position, no reorder happens, so the binding
 // wouldn't otherwise overwrite the invalid value left in the input.
 event.target.value = rankedValues.value.indexOf(itemValue) + 1;
}

watch(
 [() => props.value, options],
 () => rankedValues.value = buildRankedValues(props.value),
 { deep: true, immediate: true },
);

watch(
 rankedValues,
 (value) => {
 const current = Array.isArray(props.value) ? props.value : [];

 if (JSON.stringify(value) === JSON.stringify(current)) {
 return;
 }

 update([...value]);
 },
 { deep: true },
const options = computed(() =>
 Object.entries(props.config.options ?? {}).map(([value, label]) => ({
 value,
 label: label ? __(label) : value,
 })),
);
</script>

<template>
 <SortableList
 v-if="orderedRows.length"
 v-model="rankedValues"
 :vertical="true"
 :item-class="sortableItemClass"
 :handle-class="sortableHandleClass"
 :mirror="false"
 :disabled="isDisabled"
 >
 <ul class="flex flex-col gap-2" role="list">
 <li
 v-for="row in orderedRows"
 :key="row.value"
 :class="sortableItemClass"
 class="flex items-center gap-2 rounded-lg border border-gray-300 bg-white p-2 dark:border-gray-700 dark:bg-gray-900"
 >
 <DragHandle
 v-if="!isDisabled"
 :class="[
 sortableHandleClass,
 hasCustomOrder
 ? 'text-primary! [&_svg]:opacity-100'
 : '[&_svg]:opacity-75 dark:[&_svg]:opacity-50',
 ]"
 class="cursor-grab"
 />
 <input
 v-if="!isDisabled"
 type="number"
 class="size-6 shrink-0 rounded-md border border-gray-300 bg-white px-0 text-center text-xs font-semibold text-gray-800 shadow-ui-xs focus:focus-outline dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200 [appearance:textfield] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
 :min="1"
 :max="orderedRows.length"
 step="1"
 :value="row.index + 1"
 :aria-label="`${__('Rank')} ${__(row.label)}`"
 @change="moveToRank(row.value, $event)"
 >
 <span
 v-else
 class="flex size-6 shrink-0 items-center justify-center rounded-md border border-gray-300 shadow-ui-xs bg-white text-xs font-semibold text-gray-800 dark:border-gray-700 dark:bg-gray-925 dark:text-gray-200"
 aria-hidden="true"
 >
 {{ row.index + 1 }}
 </span>
 <span class="min-w-0 flex-1 text-sm text-gray-800 dark:text-gray-200">
 {{ __(row.label) }}
 </span>
 <input type="hidden" :name="`${name}[]`" :value="row.value">
 </li>
 </ul>
 </SortableList>
 <RankList
 :model-value="value ?? []"
 :options
 :name
 :disabled="config.disabled || isReadOnly"
 @update:model-value="update"
 />
</template>

<style scoped>
.ranking-item.draggable-source--is-dragging {
 /* Make the item slightly transparent than the default dragging opacity */
 opacity: 0.65;
}
</style>
Loading
Loading