Skip to content

Fix sort auto evaluation #4716

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
calebporzio merged 1 commit into from
Dec 22, 2025
Merged

Fix sort auto evaluation #4716

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 12 additions & 21 deletions packages/sort/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Sortable from 'sortablejs'
import { walk } from '../../alpinejs/src/utils/walk'

export default function (Alpine) {
Alpine.directive('sort', (el, { value, modifiers, expression }, { effect, evaluate, evaluateLater, cleanup }) => {
Alpine.directive('sort', (el, { value, modifiers, expression }, { effect, evaluate, cleanup }) => {
if (value === 'config') {
return // This will get handled by the main directive...
}
Expand Down Expand Up @@ -30,7 +30,7 @@ export default function (Alpine) {
group: getGroupName(el, modifiers),
}

let handleSort = generateSortHandler(expression, evaluateLater)
let handleSort = generateSortHandler(expression, evaluate)

let config = getConfigurationOverrides(el, modifiers, evaluate)

Expand All @@ -42,29 +42,20 @@ export default function (Alpine) {
})
}

function generateSortHandler(expression, evaluateLater) {
function generateSortHandler(expression, evaluate) {
// No handler was passed to x-sort...
if ([undefined, null, ''].includes(expression)) return () => {}

let handle = evaluateLater(expression)

return (key, position) => {
// In the case of `x-sort="handleSort"`, let us call it manually...
Alpine.dontAutoEvaluateFunctions(() => {
handle(
// If a function is returned, call it with the key/position params...
received => {
if (typeof received === 'function') received(key, position)
},
// Provide $key and $position to the scope in case they want to call their own function...
{ scope: {
// Supporting both `$item` AND `$key` ($key for BC)...
$key: key,
$item: key,
$position: position,
} },
)
})
evaluate(expression, { scope: {
// Supporting both `$item` AND `$key` ($key for BC)...
$key: key,
$item: key,
$position: position,
}, params: [
key,
position
] })
}
}

Expand Down