Skip to content

fix: numeric sorting of tool macros in spoolman card #1763

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
pedrolamas merged 5 commits into from
Dec 16, 2025
Merged

fix: numeric sorting of tool macros in spoolman card #1763

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7dc5d1f
fix: numeric sorting of tool macros in spoolman card
wasikuss Dec 15, 2025
74a1bbb
Merge branch 'develop' into spoolman-numeric-sort
pedrolamas Dec 16, 2025
6640c21
refactor: use "accent" sensitivity locale compare
pedrolamas Dec 16, 2025
ee0bc77
refactor: numeric sort does case-insensitive
pedrolamas Dec 16, 2025
6b791aa
Merge branch 'develop' into spoolman-numeric-sort
pedrolamas Dec 16, 2025
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
2 changes: 1 addition & 1 deletion src/components/widgets/spoolman/SpoolmanCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ export default class SpoolmanCard extends Mixins(StateMixin) {
return macros
.filter((macro): macro is MacroWithSpoolId => macro.variables != null && 'spool_id' in macro.variables)
.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()))
.sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true }))
}
get remainingFilamentUnit (): SpoolmanRemainingFilamentUnit {
Expand Down