Skip to content

[pull] master from layer5io:master #277

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
pull merged 2 commits into from
May 25, 2026
Merged

[pull] master from layer5io:master #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b81e4dc
Migrate deprecated InputProps, inputProps, and InputLabelProps to slo…
Rajesh-Nagarajan-11 May 23, 2026
14d691c
Merge pull request #1575 from Rajesh-Nagarajan-11/migrate/slotprops-m…
Rajesh-Nagarajan-11 May 25, 2026
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
8 changes: 5 additions & 3 deletions src/custom/DashboardWidgets/GettingStartedWidget/TeamSearchField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,11 @@ const TeamSearchField: React.FC<TeamSearchFieldProps> = ({
error={error}
helperText={error ? 'Team Already Selected' : ''}
fullWidth
InputProps={{
...params.InputProps,
endAdornment: isLoading ? <CircularProgress color="inherit" size={20} /> : null
slotProps={{
input: {
...params.slotProps?.input,
endAdornment: isLoading ? <CircularProgress color="inherit" size={20} /> : null
}
}}
/>
)}
Expand Down
24 changes: 13 additions & 11 deletions src/custom/InputSearchField/InputSearchField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,19 +127,21 @@ const InputSearchField: React.FC<InputSearchFieldProps> = ({
error={!!error}
helperText={error}
fullWidth
InputLabelProps={{
style: {
fontFamily: 'inherit'
slotProps={{
inputLabel: {
style: {
fontFamily: 'inherit'
}
},
input: {
...params.slotProps?.input,
endAdornment: (
<React.Fragment>
{isLoading ? <CircularProgress color="inherit" size={20} /> : null}
</React.Fragment>
)
}
}}
InputProps={{
...params.InputProps,
endAdornment: (
<React.Fragment>
{isLoading ? <CircularProgress color="inherit" size={20} /> : null}
</React.Fragment>
)
}}
/>
)}
renderOption={(props, option: Option) => (
Expand Down
6 changes: 4 additions & 2 deletions src/custom/TransferModal/TransferList/TransferList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,10 @@ function TransferList({
checked={checked.indexOf(item) !== -1}
tabIndex={-1}
disableRipple
inputProps={{
'aria-labelledby': labelId
slotProps={{
input: {
'aria-labelledby': labelId
}
}}
/>
</ListItem>
Expand Down
56 changes: 29 additions & 27 deletions src/custom/TypingFilter/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,33 +116,35 @@ export function TypingFilter({ filterSchema, handleFilter, autoFilter = false }:
value={filterState.context?.value}
onChange={handleFilterChange}
onFocus={handleFocus}
InputProps={{
startAdornment: (
<InputAdornment position="start">
{' '}
<ContentFilterIcon
/*
fill={(theme) => {
theme.palette.iconMain;
}}
*/
/>{' '}
</InputAdornment>
),
endAdornment: (
<InputAdornment position="end">
<IconButton onClick={handleClear}>
{filterState.state !== FilteringState.IDLE && (
<CrossCircleIcon
/*fill={(theme) => {
theme.palette.iconMain;
}}
*/
/>
)}
</IconButton>
</InputAdornment>
)
slotProps={{
input: {
startAdornment: (
<InputAdornment position="start">
{' '}
<ContentFilterIcon
/*
fill={(theme) => {
theme.palette.iconMain;
}}
*/
/>{' '}
</InputAdornment>
),
endAdornment: (
<InputAdornment position="end">
<IconButton onClick={handleClear}>
{filterState.state !== FilteringState.IDLE && (
<CrossCircleIcon
/*fill={(theme) => {
theme.palette.iconMain;
}}
*/
/>
)}
</IconButton>
</InputAdornment>
)
}
}}
/>
<Popper
Expand Down
7 changes: 4 additions & 3 deletions src/custom/UniversalFilter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,10 @@ function UniversalFilter({
width: '20rem',
marginBottom: '1rem'
}}
inputProps={{
'aria-label': 'Without label',
'data-testid': `${testId}-select-${filterColumn}`
slotProps={{
input: {
'aria-label': 'Without label'
}
}}
displayEmpty
>
Expand Down
14 changes: 9 additions & 5 deletions src/custom/UserSearchField/UserSearchField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,15 @@ const UserShareSearch: React.FC<UserSearchFieldProps> = ({
paddingBlock: '0.1rem'
}
}}
InputProps={{
...params.InputProps,
endAdornment: (
<>{searchUserLoading ? <CircularProgress color="inherit" size={20} /> : null}</>
)
slotProps={{
input: {
...params.slotProps?.input,
endAdornment: (
<>
{searchUserLoading ? <CircularProgress color="inherit" size={20} /> : null}
</>
)
}
}}
/>
)}
Expand Down
24 changes: 13 additions & 11 deletions src/custom/UserSearchField/UserSearchFieldInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,19 +182,21 @@ const UserSearchField: React.FC<UserSearchFieldProps> = ({
label={label}
error={!!error}
helperText={error}
InputLabelProps={{
style: {
fontFamily: 'inherit'
slotProps={{
inputLabel: {
style: {
fontFamily: 'inherit'
}
},
input: {
...params.slotProps?.input,
endAdornment: (
<React.Fragment>
{isUserSearchLoading ? <CircularProgress color="inherit" size={20} /> : null}
</React.Fragment>
)
}
}}
InputProps={{
...params.InputProps,
endAdornment: (
<React.Fragment>
{isUserSearchLoading ? <CircularProgress color="inherit" size={20} /> : null}
</React.Fragment>
)
}}
/>
)}
renderOption={(props, option: User) => (
Expand Down
Loading