Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into pnpm
Browse files Browse the repository at this point in the history
  • Loading branch information
michaldudak committed Jan 2, 2024
2 parents 0b6c1f7 + 1d4af61 commit 3972866
Show file tree
Hide file tree
Showing 46 changed files with 225 additions and 333 deletions.
27 changes: 13 additions & 14 deletions .github/ISSUE_TEMPLATE/1.bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ body:
Please provide a searchable summary of the issue in the title above ⬆️.
Thanks for contributing by creating an issue! ❤️
- type: checkboxes
- type: input
attributes:
label: Duplicates
description: Please [search the history](https://github.com/mui/material-ui/issues) to see if an issue already exists for the same problem.
options:
- label: I have searched the existing issues
required: true
label: Search keywords
description: Your issue may have already been reported! List the keywords you've used to search the [existing issues](https://github.com/mui/material-ui/issues). This will also make your issue searchable for others.
placeholder: e.g. tooltip color
validations:
required: true
- type: checkboxes
attributes:
label: Latest version
Expand All @@ -24,34 +24,33 @@ body:
required: true
- type: textarea
attributes:
label: Steps to reproduce 🕹
label: Steps to reproduce
description: |
**⚠️ Issues that we can't reproduce will be closed.**
**⚠️ Issues that we can't reproduce can't be fixed.**
Please provide a link to a live example and an unambiguous set of steps to reproduce this bug. As a starting point, we recommend you browse our [documentation](https://mui.com/material-ui/getting-started/installation/), and [select](https://mui.com/static/docs/forking-an-example.png) the closest example to your use case. Or you can use the [official template](https://mui.com/r/issue-template) to build a reproduction case.
value: |
Link to live example:
Link to live example: (required)
Steps:
1.
2.
3.
- type: textarea
attributes:
label: Current behavior 😯
label: Current behavior
description: Describe what happens instead of the expected behavior.
- type: textarea
attributes:
label: Expected behavior 🤔
label: Expected behavior
description: Describe what should happen.
- type: textarea
attributes:
label: Context 🔦
label: Context
description: What are you trying to accomplish? How has this issue affected you? Providing context helps us come up with a solution that is more useful in the real world.
- type: textarea
attributes:
label: Your environment 🌎
label: Your environment
description: Run `npx @mui/envinfo` and post the results. If you encounter issues with TypeScript please include the used tsconfig.
value: |
<details>
Expand Down
52 changes: 52 additions & 0 deletions .github/workflows/issue-cleanup.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Cleanup issue comment

on:
issues:
types:
- opened

permissions: {}

jobs:
issue_cleanup:
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
const issue = await github.rest.issues.get({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
})
const lines = issue.data.body.split('\n')
const _ = extractInputSection(lines, 'Latest version')
const searchKeywords = extractInputSection(lines, 'Search keywords')
const orderID = extractInputSection(lines, 'Order ID or Support key')
lines.push('')
lines.push('**Search keywords**: ' + searchKeywords)
if (orderID !== '' && orderID !== '_No response_') {
lines.push('**Order ID**: ' + orderID)
}
const body = lines.join('\n')
await github.rest.issues.update({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
body,
})
function extractInputSection(lines, title) {
const index = lines.findIndex(line => line.startsWith('###') && line.includes(title))
if (index === -1) {
return ''
}
return lines.splice(index, 4)[2].trim()
}
2 changes: 1 addition & 1 deletion docs/data/joy/getting-started/overview/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: Overview

# Joy UI - Overview

<p class="description">Joy UI is an open-source React component library that implements MUI's own in-house design principles. It's comprehensive and can be used in production out of the box.</p>
<p class="description">Joy UI is an open-source React component library that implements MUI's own design principles. It's comprehensive and can be used in production out of the box.</p>

## Introduction

Expand Down
4 changes: 3 additions & 1 deletion docs/data/material/pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@ const pages: MuiPage[] = [
subheader: 'MUI X',
children: [
{ pathname: '/x/react-data-grid', title: 'Data Grid' },
{ pathname: '/x/react-date-pickers/getting-started', title: 'Date & Time Pickers' },
{ pathname: '/x/react-date-pickers', title: 'Date & Time Pickers' },
{ pathname: '/x/react-charts' },
{ pathname: '/x/react-tree-view', title: 'Tree View' },
],
},
{
Expand Down
4 changes: 3 additions & 1 deletion docs/pages/blog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,10 @@ function PostPreview(props: BlogPost) {
<Avatar
key={author}
alt=""
srcSet={`${AUTHORS[author].avatar}?s=${28 * 2} 2x`}
src={`${AUTHORS[author].avatar}?s=${28}`}
srcSet={`${AUTHORS[author].avatar}?s=${28 * 2} 2x, ${AUTHORS[author].avatar}?s=${
28 * 3
} 3x`}
/>
))}
</AvatarGroup>
Expand Down
13 changes: 2 additions & 11 deletions docs/pages/experiments/md3/buttons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -201,17 +201,8 @@ function DemoComponents() {

// custom MD3 theme
const cssVarsTheme = extendTheme({
colorSchemes: {
light: {
ref: {
palette: customPalette,
},
},
dark: {
ref: {
palette: customPalette,
},
},
ref: {
palette: customPalette,
},
});

Expand Down
30 changes: 1 addition & 29 deletions docs/public/static/branding/base-ui/headless-ui-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 1 addition & 29 deletions docs/public/static/branding/base-ui/headless-ui.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/public/static/branding/base-ui/nhost-2x.jpg
Binary file not shown.
1 change: 1 addition & 0 deletions docs/public/static/branding/base-ui/nhost-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/public/static/branding/base-ui/nhost-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/public/static/branding/base-ui/nhost.jpg
Binary file not shown.
22 changes: 1 addition & 21 deletions docs/public/static/branding/base-ui/radix-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 1 addition & 21 deletions docs/public/static/branding/base-ui/radix.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 3972866

Please sign in to comment.