diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/cuesheetColsFactory.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/cuesheetColsFactory.tsx index c5deb2dff..839b52891 100644 --- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/cuesheetColsFactory.tsx +++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/cuesheetColsFactory.tsx @@ -209,25 +209,8 @@ function MakeCustomField({ row, column, table }: CellContext[] { const columnsDef: ColumnDef[] = []; - const customFieldKeys = Object.keys(customFields); const modeAllowsWrite = cuesheetMode === AppMode.Edit; - for (let i = 0; i < customFieldKeys.length; i++) { - const key = customFieldKeys[i]; - columnsDef.push({ - accessorKey: key, - id: key, - header: customFields[key].label, - cell: customFields[key].type === 'text' ? MakeCustomField : LazyImage, - size: 250, - minSize: 75, - meta: { - colour: customFields[key].colour, - canWrite: true, - }, - }); - } - columnsDef.push({ accessorKey: 'flag', id: 'flag', @@ -298,5 +281,24 @@ export function makeCuesheetColumns(customFields: CustomFields, cuesheetMode: Ap meta: { canWrite: modeAllowsWrite }, }); + // custom fields at the end + const customFieldKeys = Object.keys(customFields); + + for (let i = 0; i < customFieldKeys.length; i++) { + const key = customFieldKeys[i]; + columnsDef.push({ + accessorKey: key, + id: key, + header: customFields[key].label, + cell: customFields[key].type === 'text' ? MakeCustomField : LazyImage, + size: 250, + minSize: 75, + meta: { + colour: customFields[key].colour, + canWrite: true, + }, + }); + } + return columnsDef; }