Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into stabilize-virtual…
Browse files Browse the repository at this point in the history
…ized
  • Loading branch information
Janpot committed Sep 18, 2024
2 parents 876453f + a7cd830 commit e8325ca
Show file tree
Hide file tree
Showing 21 changed files with 246 additions and 75 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ via [Open Collective](https://opencollective.com/mui-org) or via [Patreon](http
<a href="https://www.dialmycalls.com/?utm_source=MUI&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://images.opencollective.com/dialmycalls/f5ae9ab/avatar/288.png" alt="dialmycalls.com" title="DialMyCalls: Send text messages, calls, and emails." loading="lazy" /></a>
<a href="https://goread.io/?utm_source=MUI&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://images.opencollective.com/goread_io/eb6337d/logo/288.png" alt="goread.io" title="Goread.io: Instagram followers, likes, views, and comments." loading="lazy" /></a>
<a href="https://copycopter.ai/?utm_source=MUI&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://images.opencollective.com/copycopterai/e167216/logo/288.png" alt="copycopter.ai" title="CopyCopter: Turn prompts into videos at ultra speed." loading="lazy" /></a>
<a href="https://route4me.com/?utm_source=MUI&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://images.opencollective.com/route4me/71fb6fa/avatar/288.png" alt="Route4Me" title="Route4Me: Trusted last mile route planning and route optimization." loading="lazy" /></a>
</p>

<p>
Expand Down
2 changes: 1 addition & 1 deletion apps/pigment-css-next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"react-dom": "^18.3.1"
},
"devDependencies": {
"@pigment-css/nextjs-plugin": "0.0.22",
"@pigment-css/nextjs-plugin": "0.0.23",
"@types/node": "^20.16.5",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
Expand Down
4 changes: 2 additions & 2 deletions apps/pigment-css-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
"devDependencies": {
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@pigment-css/vite-plugin": "0.0.22",
"@pigment-css/vite-plugin": "0.0.23",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
"@types/webfontloader": "^1.6.38",
"@vitejs/plugin-react": "^4.3.1",
"postcss": "^8.4.47",
"postcss-combine-media-query": "^1.0.1",
"vite": "5.4.5",
"vite": "5.4.6",
"vite-plugin-node-polyfills": "0.22.0",
"vite-plugin-pages": "^0.32.3"
},
Expand Down
1 change: 1 addition & 0 deletions docs/data/material/discover-more/backers/backers.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ via [Open Collective](https://opencollective.com/mui-org) or via [the for-profi
<a data-ga-event-category="sponsor" data-ga-event-action="docs-backers" data-ga-event-label="dialmycalls.com" href="https://www.dialmycalls.com/?utm_source=MUI&utm_medium=referral&utm_content=backers" rel="noopener sponsored" target="_blank" class="remove-link-arrow" style="margin-right: 16px;"><img height="96" width="96" src="https://images.opencollective.com/dialmycalls/f5ae9ab/avatar/96.png" srcset="https://images.opencollective.com/dialmycalls/f5ae9ab/avatar/288.png 3x" alt="dialmycalls.com" title="DialMyCalls: Send text messages, calls, and emails." loading="lazy" /></a>
<a data-ga-event-category="sponsor" data-ga-event-action="docs-backers" data-ga-event-label="goread.io" href="https://goread.io/?utm_source=MUI&utm_medium=referral&utm_content=backers" rel="noopener sponsored" target="_blank" class="remove-link-arrow" style="margin-right: 16px; display:flex;"><img height="110" width="96" src="https://images.opencollective.com/goread_io/eb6337d/logo/96.png" srcset="https://images.opencollective.com/goread_io/eb6337d/logo/288.png 3x" alt="goread.io" title="Goread.io: Instagram followers, likes, views, and comments." loading="lazy" /></a>
<a data-ga-event-category="sponsor" data-ga-event-action="docs-backers" data-ga-event-label="copycopter.ai" href="https://copycopter.ai/?utm_source=MUI&utm_medium=referral&utm_content=backers" rel="noopener sponsored" target="_blank" class="remove-link-arrow" style="margin-right: 16px; display:flex;"><img height="96" width="96" src="https://images.opencollective.com/copycopterai/e167216/logo/96.png" srcset="https://images.opencollective.com/copycopterai/e167216/logo/288.png 3x" alt="copycopter.ai" title="CopyCopter: Turn prompts into videos at ultra speed." loading="lazy" /></a>
<a data-ga-event-category="sponsor" data-ga-event-action="docs-backers" data-ga-event-label="route4me.com" href="https://route4me.com/?utm_source=MUI&utm_medium=referral&utm_content=backers" rel="noopener sponsored" target="_blank" class="remove-link-arrow" style="margin-right: 16px; display:flex;"><img height="96" width="96" src="https://images.opencollective.com/route4me/71fb6fa/avatar/96.png" srcset="https://images.opencollective.com/route4me/71fb6fa/avatar/288.png 3x" alt="route4me.com" title="Route4Me: Trusted last mile route planning and route optimization." loading="lazy" /></a>
</p>

<!--
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/blog/2023-toolpad-beta-announcement.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ You can learn more about Toolpad by visiting the [home page](https://mui.com/too
We plan to continue to iterate on our vision of helping you as a developer to increase the speed and efficiency of your workflow. We want to optimize for the biggest pains that you face when building admin apps.
Your input is crucial to helping us shape the roadmap from here.

The best places to stay up-to-date about what we're currently working on are [GitHub issues](https://github.com/mui/mui-toolpad) and our [public roadmap](https://github.com/orgs/mui/projects/9/views/1).
The best places to stay up-to-date about what the team is currently working on are [GitHub issues](https://github.com/mui/toolpad) and the [public roadmap](https://github.com/orgs/mui/projects/9/views/1).

If you have any questions or would like to share feedback, you can directly contact the team at [email protected] or reach us on [X/Twitter](https://x.com/MUI_Toolpad).
You can also engage in conversation on our [Discord](https://mui.com/r/discord/) server.
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/blog/toolpad-use-cases.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,5 @@ Internal apps are often very specific to the needs of the organization, but hope
- Do you wish you didn't have to do any maintenance on the front ends of your internal tools?

Toolpad handles state management, data fetching, routing, and UI creation, and it can be imported directly into your code base to save you time.
I encourage you to check out more [examples](https://mui.com/toolpad/studio/examples/) and visit our [GitHub repository](https://github.com/mui/mui-toolpad/) to evaluate the product.
I encourage you to check out more [examples](https://mui.com/toolpad/studio/examples/) and visit the [GitHub repository](https://github.com/mui/toolpad/) to evaluate the product.
In case you need any further information, feel free to reach out to the team at [email protected].
2 changes: 1 addition & 1 deletion docs/pages/careers/engineering-manager.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Our mission is to empower as many people as possible to build great UIs, faster.
The faster and simpler it is, and the broader the audience that can create custom UIs, the better.
We believe that the best way to improve on these dimensions is to eliminate [80%](https://www.youtube.com/watch?v=GnO7D5UaDig&t=2451s) of the code that has to be written.

A few months back we started to work on [Toolpad](https://github.com/mui/mui-toolpad), an ambitious project to deliver on this objective.
A few months back work started on [Toolpad](https://github.com/mui/toolpad), an ambitious project to deliver on this objective.
We have found the beginning of a market fit in this low-code segment.
We need help to structure & grow the engineering team.

Expand Down
7 changes: 7 additions & 0 deletions docs/src/components/home/GoldSponsors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,13 @@ const GOLDs = [
description: 'Turn prompts into videos at ultra speed.',
href: 'https://copycopter.ai/?utm_source=MUI&utm_medium=referral&utm_content=homepage',
},
{
src: 'https://images.opencollective.com/route4me/71fb6fa/avatar/40.png',
srcSet: 'https://images.opencollective.com/route4me/71fb6fa/avatar/120.png 3x',
name: 'Route4Me',
description: 'Trusted last mile route planning and optimization.',
href: 'https://route4me.com/?utm_source=MUI&utm_medium=referral&utm_content=homepage',
},
];
const BACKLINKs = [
{
Expand Down
7 changes: 2 additions & 5 deletions docs/src/components/home/XGridGlobalStyles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ export default function XGridGlobalStyles({
},
'& .MuiDataGrid-columnSeparator': {
color: (theme.vars || theme).palette.grey[200],
'&:hover': {
color: (theme.vars || theme).palette.grey[800],
'&.MuiDataGrid-columnSeparator--resizable:hover': {
color: (theme.vars || theme).palette.primary.main,
},
...(!pro && { display: 'none' }),
},
Expand Down Expand Up @@ -126,9 +126,6 @@ export default function XGridGlobalStyles({
},
'& .MuiDataGrid-columnSeparator': {
color: (theme.vars || theme).palette.primaryDark[400],
'&:hover': {
color: (theme.vars || theme).palette.primaryDark[100],
},
},
// -------------------------------
// table body elements
Expand Down
2 changes: 1 addition & 1 deletion docs/src/modules/components/AppLayoutDocsFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ export default function AppLayoutDocsFooter(props) {
processFeedback();
};

// See https://github.com/mui/mui-toolpad/issues/1164 for context.
// See https://github.com/mui/toolpad/issues/1164 for context.
const handleKeyDownForm = (event) => {
const modifierKey = (event.metaKey || event.ctrlKey) && !event.shiftKey;

Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"@mui/utils": "workspace:^",
"@next/eslint-plugin-next": "^14.2.11",
"@octokit/rest": "^21.0.2",
"@pigment-css/react": "0.0.22",
"@pigment-css/react": "0.0.23",
"@playwright/test": "1.47.1",
"@types/babel__core": "^7.20.5",
"@types/fs-extra": "^11.0.4",
Expand Down Expand Up @@ -219,10 +219,10 @@
"@types/react": "^18.3.4",
"@types/react-dom": "18.3.0",
"cross-fetch": "^4.0.0",
"@pigment-css/react": "0.0.22",
"@pigment-css/unplugin": "0.0.22",
"@pigment-css/nextjs-plugin": "0.0.22",
"@pigment-css/vite-plugin": "0.0.22"
"@pigment-css/react": "0.0.23",
"@pigment-css/unplugin": "0.0.23",
"@pigment-css/nextjs-plugin": "0.0.23",
"@pigment-css/vite-plugin": "0.0.23"
},
"nyc": {
"include": [
Expand Down
10 changes: 10 additions & 0 deletions packages/mui-codemod/src/v6.0.0/grid-v2-props/grid-v2-props.js
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,16 @@ export default function gridV2Props(file, api, options) {
el.node.openingElement.attributes = el.node.openingElement.attributes.filter(
(attr) => !attributesToPrune.includes(attr),
);

const itemProp = el.node.openingElement.attributes.find(
(attr) => attr.type === 'JSXAttribute' && attr.name.name === 'item',
);

if (itemProp) {
el.node.openingElement.attributes = el.node.openingElement.attributes.filter(
(attr) => attr.type === 'JSXAttribute' && attr.name.name !== 'item',
);
}
});

return root.toSource(printOptions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ import { Grid as GridF } from '@mui/joy';
<GridE xs={2} />;
<GridF xs={2} />;

<GridA item />;
<GridA item={true} />;
<GridA item={false} />;

// Transforms responsive sizes
<GridA xs={2} sm={4} md={6} lg={8} xl={10} />;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ import { Grid as GridF } from '@mui/joy';
<GridE size={2} />;
<GridF size={2} />;

<GridA />;
<GridA />;
<GridA />;

// Transforms responsive sizes
<GridA
size={{
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material-pigment-css/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"dependencies": {
"@babel/runtime": "^7.25.6",
"@mui/system": "workspace:*",
"@pigment-css/react": "0.0.22"
"@pigment-css/react": "0.0.23"
},
"sideEffects": false,
"publishConfig": {
Expand Down
3 changes: 2 additions & 1 deletion packages/mui-material/src/Modal/Modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ const Modal = React.forwardRef(function Modal(inProps, ref) {
}

const externalForwardedProps = {
...other,
slots: {
root: components.Root,
backdrop: components.Backdrop,
Expand Down Expand Up @@ -218,7 +219,7 @@ const Modal = React.forwardRef(function Modal(inProps, ref) {
* is not meant for humans to interact with directly.
* https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/no-static-element-interactions.md
*/}
<RootSlot {...rootProps} {...other}>
<RootSlot {...rootProps}>
{!hideBackdrop && BackdropComponent ? (
<BackdropSlot {...backdropProps} ref={backdropRef} />
) : null}
Expand Down
16 changes: 16 additions & 0 deletions packages/mui-material/src/Modal/Modal.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -880,4 +880,20 @@ describe('<Modal />', () => {
);
}).not.toErrorDev();
});

it('should not override default onKeyDown', async () => {
const handleKeyDown = spy();
const handleClose = spy();

const { user } = render(
<Modal open onKeyDown={handleKeyDown} onClose={handleClose}>
<div tabIndex={-1} />
</Modal>,
);

await user.keyboard('{Escape}');

expect(handleKeyDown).to.have.property('callCount', 1);
expect(handleClose).to.have.property('callCount', 1);
});
});
1 change: 0 additions & 1 deletion packages/rsc-builder/buildRsc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ const PROJECTS: Project[] = [
'packages/mui-material/src/PigmentContainer/PigmentContainer.tsx', // RSC compatible
'packages/mui-material/src/PigmentGrid/PigmentGrid.tsx', // RSC compatible
'packages/mui-material/src/PigmentStack/PigmentStack.tsx', // RSC compatible
'packages/mui-material/src/useAutocomplete/useAutocomplete.js', // RSC compatible
],
},
{
Expand Down
Loading

0 comments on commit e8325ca

Please sign in to comment.