diff --git a/packages/mui-material/src/FilledInput/FilledInput.js b/packages/mui-material/src/FilledInput/FilledInput.js index 349252d64c3d5e..6849bedd11e544 100644 --- a/packages/mui-material/src/FilledInput/FilledInput.js +++ b/packages/mui-material/src/FilledInput/FilledInput.js @@ -166,34 +166,6 @@ const FilledInputRoot = styled(InputBaseRoot, { paddingRight: 12, }, }, - { - props: ({ ownerState }) => ownerState.multiline, - style: { - padding: '25px 12px 8px', - }, - }, - { - props: ({ ownerState, size }) => ownerState.multiline && size === 'small', - style: { - paddingTop: 21, - paddingBottom: 4, - }, - }, - { - props: ({ ownerState }) => ownerState.multiline && ownerState.hiddenLabel, - style: { - paddingTop: 16, - paddingBottom: 17, - }, - }, - { - props: ({ ownerState }) => - ownerState.multiline && ownerState.hiddenLabel && ownerState.size === 'small', - style: { - paddingTop: 8, - paddingBottom: 9, - }, - }, ], }; }), @@ -260,15 +232,6 @@ const FilledInputInput = styled(InputBaseInput, { paddingBottom: 9, }, }, - { - props: ({ ownerState }) => ownerState.multiline, - style: { - paddingTop: 0, - paddingBottom: 0, - paddingLeft: 0, - paddingRight: 0, - }, - }, ], })), ); diff --git a/packages/mui-material/src/InputBase/InputBase.js b/packages/mui-material/src/InputBase/InputBase.js index 8c2e357a330bcc..5c511b619d533a 100644 --- a/packages/mui-material/src/InputBase/InputBase.js +++ b/packages/mui-material/src/InputBase/InputBase.js @@ -110,18 +110,6 @@ export const InputBaseRoot = styled('div', { cursor: 'default', }, variants: [ - { - props: ({ ownerState }) => ownerState.multiline, - style: { - padding: '4px 0 5px', - }, - }, - { - props: ({ ownerState, size }) => ownerState.multiline && size === 'small', - style: { - paddingTop: 1, - }, - }, { props: ({ ownerState }) => ownerState.fullWidth, style: { @@ -230,8 +218,6 @@ export const InputBaseInput = styled('input', { style: { height: 'auto', resize: 'none', - padding: 0, - paddingTop: 0, }, }, { diff --git a/packages/mui-material/src/OutlinedInput/OutlinedInput.js b/packages/mui-material/src/OutlinedInput/OutlinedInput.js index bb851995a8224d..6ec912eefbe2a5 100644 --- a/packages/mui-material/src/OutlinedInput/OutlinedInput.js +++ b/packages/mui-material/src/OutlinedInput/OutlinedInput.js @@ -96,18 +96,6 @@ const OutlinedInputRoot = styled(InputBaseRoot, { paddingRight: 14, }, }, - { - props: ({ ownerState }) => ownerState.multiline, - style: { - padding: '16.5px 14px', - }, - }, - { - props: ({ ownerState, size }) => ownerState.multiline && size === 'small', - style: { - padding: '8.5px 14px', - }, - }, ], }; }), @@ -158,12 +146,6 @@ const OutlinedInputInput = styled(InputBaseInput, { padding: '8.5px 14px', }, }, - { - props: ({ ownerState }) => ownerState.multiline, - style: { - padding: 0, - }, - }, { props: ({ ownerState }) => ownerState.startAdornment, style: { diff --git a/test/regressions/fixtures/Textarea/Textarea.js b/test/regressions/fixtures/Textarea/Textarea.js index 1e5d71615afa4e..6c2cb17ddf910d 100644 --- a/test/regressions/fixtures/Textarea/Textarea.js +++ b/test/regressions/fixtures/Textarea/Textarea.js @@ -19,6 +19,10 @@ function Textarea() { fontSize: 13, boxSizing: 'border-box', border: '10px solid black', + padding: 0, + }, + '&.MuiInput-root': { + padding: '4px 0 5px', }, }} multiline @@ -29,6 +33,9 @@ function Textarea() { sx={{ width: 200, '& .MuiInput-input': { fontSize: 13, boxSizing: 'content-box', padding: '10px' }, + '&.MuiInput-root': { + padding: '4px 0 5px', + }, }} multiline value={value}