Skip to content

Commit

Permalink
Merge branch 'master' into smileek/fix-button-disabled-prop
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeeshanTamboli committed Feb 12, 2024
2 parents e9d460d + 6ab4972 commit 4bf7f03
Show file tree
Hide file tree
Showing 24 changed files with 90 additions and 89 deletions.
2 changes: 0 additions & 2 deletions .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
"@mui-internal/typescript-to-proptypes": "packages/typescript-to-proptypes"
},
"sandboxes": [
"material-ui-issue-latest-s2dsx",
"/examples/material-ui-cra",
"/examples/material-ui-cra-ts",
"/examples/joy-ui-cra-ts",
"/examples/base-ui-cra-ts"
Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/getting-started/support/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ You have a few possible options to provide it:
</span>
</a>

- You can use a starter React template to build a reproduction case with [JavaScript](https://stackblitz.com/fork/github/stackblitz/starters/tree/main/react) or [TypeScript](https://stackblitz.com/fork/github/stackblitz/starters/tree/main/react-ts).
- You can use a starter React template to build a reproduction case with [JavaScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react) or [TypeScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react-ts).

## Stack Overflow

Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/getting-started/support/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ You have a few possible options to provide it:
</span>
</a>

- You can use a starter React template to build a reproduction case with [JavaScript](https://stackblitz.com/fork/github/stackblitz/starters/tree/main/react) or [TypeScript](https://stackblitz.com/fork/github/stackblitz/starters/tree/main/react-ts).
- You can use a starter React template to build a reproduction case with [JavaScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react) or [TypeScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react-ts).

## Stack Overflow

Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/getting-started/templates/email/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export default function EmailExample() {
}}
>
<Box sx={{ alignItems: 'center', gap: 1 }}>
<Typography level="title-lg" textColor="text.secondary">
<Typography level="title-lg" textColor="text.secondary" component="h1">
My inbox
</Typography>
<Typography level="title-sm" textColor="text.tertiary">
Expand Down
4 changes: 3 additions & 1 deletion docs/data/joy/getting-started/templates/sign-in-side/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,9 @@ export default function JoySignInSideTemplate() {
>
<Stack gap={4} sx={{ mb: 2 }}>
<Stack gap={1}>
<Typography level="h3">Sign in</Typography>
<Typography component="h1" level="h3">
Sign in
</Typography>
<Typography level="body-sm">
New to company?{' '}
<Link href="#replace-with-a-link" level="title-sm">
Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/getting-started/templates/team/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export default function TeamExample() {
justifyContent: 'space-between',
}}
>
<Typography level="title-lg" textColor="text.secondary">
<Typography level="title-lg" textColor="text.secondary" component="h1">
People
</Typography>
<Button startDecorator={<PersonRoundedIcon />} size="sm">
Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/integrations/material-ui/material-ui.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export default function App() {
}
```

<iframe src="https://codesandbox.io/embed/using-joy-ui-and-material-ui-together-tx58w5?module=%2Fdemo.tsx&fontsize=14&hidenavigation=1&theme=dark&view=preview"
<iframe src="https://codesandbox.io/embed/using-joy-ui-and-material-ui-together-qrsz2h?module=%2Fdemo.tsx&fontsize=14&hidenavigation=1&theme=dark&view=preview"
style="width:100%; height:400px; border:0; border-radius: 4px; overflow:hidden;"
title="Joy UI - Human Interface Guidelines Typography System"
allow="accelerometer; ambient-light-sensor; camera; encrypted-media; geolocation; gyroscope; hid; microphone; midi; payment; usb; vr; xr-spatial-tracking"
Expand Down
8 changes: 7 additions & 1 deletion docs/data/material/components/buttons/InputFileUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ const VisuallyHiddenInput = styled('input')({

export default function InputFileUpload() {
return (
<Button component="label" variant="contained" startIcon={<CloudUploadIcon />}>
<Button
component="label"
role={undefined}
variant="contained"
tabIndex={-1}
startIcon={<CloudUploadIcon />}
>
Upload file
<VisuallyHiddenInput type="file" />
</Button>
Expand Down
8 changes: 7 additions & 1 deletion docs/data/material/components/buttons/InputFileUpload.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,13 @@ const VisuallyHiddenInput = styled('input')({

export default function InputFileUpload() {
return (
<Button component="label" variant="contained" startIcon={<CloudUploadIcon />}>
<Button
component="label"
role={undefined}
variant="contained"
tabIndex={-1}
startIcon={<CloudUploadIcon />}
>
Upload file
<VisuallyHiddenInput type="file" />
</Button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
<Button component="label" variant="contained" startIcon={<CloudUploadIcon />}>
<Button
component="label"
role={undefined}
variant="contained"
tabIndex={-1}
startIcon={<CloudUploadIcon />}
>
Upload file
<VisuallyHiddenInput type="file" />
</Button>
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Example projects

<p class="description">A collection of example, boilerplates, and scaffolds to jumpstart your next Material UI project.</p>
<p class="description">A collection of examples, boilerplates, and scaffolds to jumpstart your next Material UI project.</p>

## Official examples

The following starter projects are all available in the MUI Core [`/examples`](https://github.com/mui/material-ui/tree/master/examples) folder.
The following starter projects are all available in the [`/examples`](https://github.com/mui/material-ui/tree/master/examples) folder of the Material UI repository.
These examples feature Material UI paired with other popular React libraries and frameworks, so you can skip the initial setup steps and jump straight into building.

Not sure which to pick?
We recommend Next.js for a comprehensive solution, or Vite if you're looking for a leaner development experience.
We recommend Next.js for server-side rendering, or Vite if you're looking to build a SPA.
See [Start a New React Project](https://react.dev/learn/start-a-new-react-project) from the official React docs to learn more about the options available.

<!-- #default-branch-switch -->
Expand All @@ -25,27 +25,18 @@ For more complex prebuilt UIs, check out our [premium themes and templates](http

## Community projects

The following projects are maintained by the community and curated by MUI.
The following projects are maintained by the community and curated by Material UI's team.
They're great resources for learning more about real-world usage of Material UI alongside other popular libraries and tools.

### Free

- [GraphQL API and Relay Starter Kit](https://github.com/kriasoft/relay-starter-kit):

- ![stars](https://img.shields.io/github/stars/kriasoft/graphql-starter.svg?style=social&label=Star)
- GraphQL API project using code-first design (TypeScript, OAuth, GraphQL.js, Knex, Cloud SQL).
- Web application project pre-configured with Webpack v5, TypeScript, React, Relay, Material UI.
- Serverless deployment: `api` -> Cloud Functions, `web` -> Cloudflare Workers.
- Client-side page routing/rendering at CDN edge locations, lazy loading.
- Optimized for fast CI/CD builds and deployments using Yarn v2 monorepo design.

- [React Admin](https://github.com/marmelab/react-admin)

- ![stars](https://img.shields.io/github/stars/marmelab/react-admin.svg?style=social&label=Star)
- A frontend framework for building B2B applications running in the browser.
- On top of REST/GraphQL APIs, using ES6, React and Material Design.

- [refine](https://github.com/refinedev/refine):
- [refine](https://refine.dev/docs/ui-integrations/material-ui/introduction/#installation):

- ![stars](https://img.shields.io/github/stars/refinedev/refine.svg?style=social&label=Star)
- An open-source, headless, React-based framework for the rapid development of web applications that supports Vite, Next.js and Remix.
Expand All @@ -55,28 +46,9 @@ They're great resources for learning more about real-world usage of Material UI
- Out-of-the-box support for live/real-time applications, audit logs, authentication, access control flows and i18n.
- Advanced routing with any router library.

- [React Most Wanted](https://github.com/TarikHuber/react-most-wanted):

- ![stars](https://img.shields.io/github/stars/TarikHuber/react-most-wanted.svg?style=social&label=Star)
- Created with Create React App.
- Custom Create React App script to start a new project with just a single CLI command.
- Build for Firebase including Authentication using the official Firebase Web Auth UI.
- Routing with React Router including error handling (404) and lazy loading.
- All PWA features included (SW, Notifications, deferred installation prompt, and more).
- Optimized and scalable performance (all ~100 points on Lighthouse).

- [React SaaS Template](https://github.com/dunky11/react-saas-template):

- ![stars](https://img.shields.io/github/stars/dunky11/react-saas-template.svg?style=social&label=Star)
- Created with Create React App.
- Features a landing page, a blog, an area to login/register and an admin-dashboard.
- Fully routed using react-router.
- Lazy loads components to boost performance.
- Components for statistics, text with emoji support, image upload, and more.

### Paid

- [ScaffoldHub](https://www.scaffoldhub.io/?partner=1):
- [ScaffoldHub](https://v2.scaffoldhub.io/scaffolds/react-material-ui):

- Tool for building web applications.
- Choose your framework and library (React with Material UI).
Expand Down
2 changes: 1 addition & 1 deletion docs/data/material/getting-started/support/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ You have a few possible options to provide it:
</span>
</a>

- You can use a starter React template to build a reproduction case with [JavaScript](https://stackblitz.com/fork/github/stackblitz/starters/tree/main/react) or [TypeScript](https://stackblitz.com/fork/github/stackblitz/starters/tree/main/react-ts).
- You can use a starter React template to build a reproduction case with [JavaScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react) or [TypeScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react-ts).

## Stack Overflow

Expand Down
2 changes: 1 addition & 1 deletion docs/data/system/getting-started/support/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ You have a few possible options to provide it:
</span>
</a>

- You can use a starter React template to build a reproduction case with [JavaScript](https://stackblitz.com/fork/github/stackblitz/starters/tree/main/react) or [TypeScript](https://stackblitz.com/fork/github/stackblitz/starters/tree/main/react-ts).
- You can use a starter React template to build a reproduction case with [JavaScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react) or [TypeScript](https://stackblitz.com/github/stackblitz/starters/tree/main/react-ts).

## Stack Overflow

Expand Down
12 changes: 6 additions & 6 deletions docs/notifications.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"title": "<b>Check out Base UI today</b> 💥",
"text": "Love Material UI, but don't need Material Design? Try Base UI, the new \"unstyled\" alternative. <a style=\"color: inherit;\" data-ga-event-category=\"Blog\" data-ga-event-action=\"notification\" data-ga-event-label=\"introducing-base-ui\" href=\"/blog/introducing-base-ui/\">Read more in this announcement</a>."
},
{
"id": 76,
"title": "<b>Unveiling Charts: Alpha release is live</b>",
"text": "We're starting with bars, lines, and scatter charts. <a style=\"color: inherit;\" data-ga-event-category=\"Announcement\" data-ga-event-action=\"notification\" data-ga-event-label=\"mui-x-introduce-charts\" href=\"https://mui.com/x/react-charts/\">Try X Charts now</a>, and let us know what you need."
},
{
"id": 78,
"title": "<b>MUI X v6.18.x and the latest improvements before the next major</b>",
"text": "New stable components, polished features, better performance and more. Check out the details in our <a style=\"color: inherit;\" data-ga-event-category=\"Announcement\" data-ga-event-action=\"notification\" data-ga-event-label=\"mui-x-end-v6\" href=\"https://mui.com/blog/mui-x-end-v6-features/\">recent blog post</a>."
},
{
"id": 79,
"title": "<b>Influence the roadmap for 2024</b>",
"title": "<b>A new Developer Survey is open</b>",
"text": "Take a few minutes to share your feedback and expectations in the <a style=\"color: inherit;\" data-ga-event-category=\"Announcement\" data-ga-event-action=\"notification\" data-ga-event-label=\"mui-survey\" href=\"https://tally.so/r/3Ex4PN?source=docs-notification\">Developer Survey</a>."
},
{
"id": 80,
"title": "<b>MUI X v7.0.0-beta.0</b>",
"text": "Featuring new components and multiple enhancements for both developers and end-users. Discover all the specifics in the <a style=\"color: inherit;\" data-ga-event-category=\"Announcement\" data-ga-event-action=\"notification\" data-ga-event-label=\"mui-x-v7-beta\" href=\"https://mui.com/blog/mui-x-v7-beta/\">announcement blog post</a>."
}
]
Loading

0 comments on commit 4bf7f03

Please sign in to comment.