Skip to content

refactor(material-renderers): remove deprecated prop #2437

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
merged 3 commits into from
Apr 14, 2025
Merged

refactor(material-renderers): remove deprecated prop #2437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b911064
refactor(material-renderers): remove deprecated prop
johannesss Apr 14, 2025
b3aefb0
test(material-renderers): fix failing tests
johannesss Apr 14, 2025
44ddfc7
style(material-renderers): fix linting
johannesss Apr 14, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/material-renderers/src/additional/ListWithDetailMasterItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { withJsonFormsMasterListItemProps } from '@jsonforms/react';
import {
Avatar,
IconButton,
ListItem,
ListItemButton,
ListItemAvatar,
ListItemSecondaryAction,
ListItemText,
Expand All @@ -48,7 +48,7 @@ export const ListWithDetailMasterItem = ({
disableRemove,
}: StatePropsOfMasterItem) => {
return (
<ListItem button selected={selected} onClick={handleSelect(index)}>
<ListItemButton selected={selected} onClick={handleSelect(index)}>
<ListItemAvatar>
<Avatar aria-label='Index'>{index + 1}</Avatar>
</ListItemAvatar>
Expand All @@ -70,7 +70,7 @@ export const ListWithDetailMasterItem = ({
</Tooltip>
</ListItemSecondaryAction>
)}
</ListItem>
</ListItemButton>
);
};

Expand Down
32 changes: 17 additions & 15 deletions packages/material-renderers/test/renderers/MaterialListWithDetailRenderer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import MaterialListWithDetailRenderer, {
import Enzyme, { mount, ReactWrapper } from 'enzyme';
import Adapter from '@wojtekmaj/enzyme-adapter-react-17';
import { JsonFormsStateProvider } from '@jsonforms/react';
import { ListItem, Typography } from '@mui/material';
import { ListItemButton, Typography } from '@mui/material';
import { initCore, testTranslator } from './util';
import { checkTooltip, checkTooltipTranslation } from './tooltipChecker';

Expand Down Expand Up @@ -179,8 +179,8 @@ describe('Material list with detail renderer', () => {
</JsonFormsStateProvider>
);

const lis = wrapper.find('li');
expect(lis).toHaveLength(2);
const listItemButtons = wrapper.find('div[role="button"]');
expect(listItemButtons).toHaveLength(2);
});
it('should render empty entries', () => {
const core = initCore(schema, uischema, []);
Expand Down Expand Up @@ -364,8 +364,8 @@ describe('Material list with detail renderer', () => {

wrapper.update();

const lis = wrapper.find('li');
expect(lis).toHaveLength(3);
const listItemButtons = wrapper.find('div[role="button"]');
expect(listItemButtons).toHaveLength(3);
});

it('remove data from the array', () => {
Expand All @@ -378,14 +378,14 @@ describe('Material list with detail renderer', () => {
</JsonFormsStateProvider>
);

expect(wrapper.find(ListItem)).toHaveLength(2);
expect(wrapper.find(ListItemButton)).toHaveLength(2);

const removeButton = wrapper.find('button').at(1);
removeButton.simulate('click');
wrapper.update();

const lis = wrapper.find(ListItem);
expect(lis).toHaveLength(1);
const listItemButtons = wrapper.find(ListItemButton);
expect(listItemButtons).toHaveLength(1);
});

it('should render first simple property', () => {
Expand All @@ -398,12 +398,14 @@ describe('Material list with detail renderer', () => {
</JsonFormsStateProvider>
);

expect(wrapper.find(ListItem)).toHaveLength(2);
expect(wrapper.find(ListItemButton)).toHaveLength(2);

expect(wrapper.find(ListItem).find(Typography).at(0).text()).toBe(
expect(wrapper.find(ListItemButton).find(Typography).at(0).text()).toBe(
'El Barto was here'
);
expect(wrapper.find(ListItem).find(Typography).at(1).text()).toBe('Yolo');
expect(wrapper.find(ListItemButton).find(Typography).at(1).text()).toBe(
'Yolo'
);
});

it('should render first simple enum property as translated child label', () => {
Expand All @@ -419,15 +421,15 @@ describe('Material list with detail renderer', () => {
</JsonFormsStateProvider>
);

expect(wrapper.find(ListItem)).toHaveLength(3);
expect(wrapper.find(ListItemButton)).toHaveLength(3);

expect(wrapper.find(ListItem).find(Typography).at(0).text()).toBe(
expect(wrapper.find(ListItemButton).find(Typography).at(0).text()).toBe(
'MSG_TYPE_1'
);
expect(wrapper.find(ListItem).find(Typography).at(1).text()).toBe(
expect(wrapper.find(ListItemButton).find(Typography).at(1).text()).toBe(
'MSG_TYPE_2'
);
expect(wrapper.find(ListItem).find(Typography).at(2).text()).toBe('');
expect(wrapper.find(ListItemButton).find(Typography).at(2).text()).toBe('');
});

it('should have no data message when no translator set', () => {
Expand Down