fix: admin/fs: bad layout at some width (1560) when icon is not default
Massimo Melina committed
Jan 23, 2025 at 17:59 UTC
9e1639c0237686c7e16a2f3fd3b6ef75eece750b
1 file changed
+4
-3
mui-grid-form/index.ts
+4
-3
@@ -4,11 +4,12 @@ import {
4
createElement as h, FC, Fragment, isValidElement, ReactElement, ReactNode, useEffect, useState, useRef,
5
MutableRefObject
6
} from 'react'
7
-import { Box, BoxProps, Button, Grid, Tooltip } from '@mui/material'
7
+import { Box, BoxProps, Button, Tooltip } from '@mui/material'
8
import { Save } from '@mui/icons-material'
9
import { LoadingButton } from '@mui/lab'
10
import _ from 'lodash'
11
import { StringField } from './StringField'
12
+import Grid from '@mui/material/Unstable_Grid2'
13
import { GridProps } from '@mui/material/Grid/Grid'
14
import { useDebounce } from 'usehooks-ts'
15
export * from './SelectField'
@@ -121,7 +122,7 @@ export function Form<Values extends Dict>({
122
if (!row)
123
return null
124
if (isValidElement(row))
124
- return h(Grid, { key: idx, item: true, xs: 12 }, row)
125
+ return h(Grid, { key: idx, xs: 12 }, row)
126
const { k, fromField=_.identity, toField=_.identity, getError, error, ...field } = row
127
let errMsg = errors[k] || error || fieldExceptions[k]
128
if (errMsg === true)
@@ -169,7 +170,7 @@ export function Form<Values extends Dict>({
170
...rest } = field
171
Object.assign(rest, { name: k })
172
const n = (keyMet[k] = (keyMet[k] || 0) + 1)
172
- return h(Grid, { key: k ? k + n : idx, item: true, xs, sm, md, lg, xl, ...parentProps },
173
+ return h(Grid, { key: k ? k + n : idx, xs, sm, md, lg, xl, ...parentProps },
174
before,
175
isValidElement(comp) ? comp : h(comp, rest),
176
after