fix: (regression beta) admin/plugins: misplaced theme icon
Massimo Melina committed
Jul 19, 2024 at 15:56 UTC
5d792a594561829997d8ebc258b2179cc77cea22
2 files changed
+6
-5
admin/src/DataTable.ts
+4
-4
@@ -16,6 +16,7 @@ export type DataTableColumn<R extends GridValidRowModel=any> = GridColDef<R> & {
16
dialogHidden?: boolean
17
sx?: SxProps
18
mergeRender?: { [other: string]: false | { override?: Partial<GridColDef<R>> } & BoxProps }
19
+ mergeRenderSx?: SxProps
20
}
21
interface DataTableProps<R extends GridValidRowModel=any> extends Omit<DataGridProps<R>, 'columns'> {
22
columns: Array<DataTableColumn<R>>
@@ -63,12 +64,11 @@ export function DataTable({ columns, initialState={}, actions, actionsProps, ini
64
const { columns } = params.api.store.getSnapshot()
65
return h(Box, { maxHeight: '100%', sx: { textWrap: 'wrap', ...sx } }, // wrap if necessary, but stay within the row
66
col.renderCell ? col.renderCell(params) : params.formattedValue,
66
- h(Flex, { fontSize: 'smaller', flexWrap: 'wrap', mt: '2px' }, // wrap, normally causing overflow/hiding, if it doesn't fit
67
+ h(Flex, { fontSize: 'smaller', flexWrap: 'wrap', mt: '2px', ...col.mergeRenderSx }, // wrap, normally causing overflow/hiding, if it doesn't fit
68
...onlyTruthy(_.map(col.mergeRender, (props, other) => {
69
if (!props || columns.columnVisibilityModel[other] !== false) return null
69
- const { override, ...rest } = props
70
- const rendered = renderCell({ ...columns.lookup[other], ...override }, params.row)
71
- return rendered && h(Box, { ...rest, ...compact && { lineHeight: '1em' } }, rendered)
70
+ const rendered = renderCell({ ...columns.lookup[other], ...props.override }, params.row)
71
+ return rendered && h(Box, { ...props, ...{ override: undefined }, ...compact && { lineHeight: '1em' } }, rendered)
72
}))
73
)
74
)
admin/src/InstalledPlugins.ts
+2
-1
@@ -202,7 +202,8 @@ function UsernameField({ value, onChange, multiple, ...rest }: FieldProps<string
202
203
export const descriptionField: DataTableColumn = {
204
field: 'description',
205
- mergeRender: { isTheme: { sx: { float: 'left' } }} ,
205
+ mergeRender: { isTheme: {} } ,
206
+ mergeRenderSx: { float: 'left' },
207
}
208
209
export const themeField: DataTableColumn = {