Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into renovate/react-18.x
Browse files Browse the repository at this point in the history
  • Loading branch information
michaldudak committed Jun 27, 2023
2 parents 4ada0bf + e80ddfc commit 8371917
Show file tree
Hide file tree
Showing 57 changed files with 534 additions and 256 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/priority-support-validation-prompt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ jobs:

steps:
- name: Find Comment
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
uses: peter-evans/find-comment@v2 # v2.4.0
id: findComment
with:
issue-number: ${{ github.event.pull_request.number }}
issue-number: ${{ github.event.issue.number }}
comment-author: 'github-actions[bot]'
body-includes: You have created a priority support request

- name: Create comment
if: ${{ steps.findComment.outputs.comment-id == '' && contains(github.event.label.name, 'unknown') }}
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
uses: peter-evans/create-or-update-comment@5f728c3dae25f329afbe34ee4d08eef25569d79f # v3.0.2
with:
issue-number: ${{ github.event.issue.number }}
body: |
Expand All @@ -39,8 +39,9 @@ jobs:
- name: Update comment
if: ${{ steps.findComment.outputs.comment-id != '' && contains(github.event.label.name, 'priority') }}
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3.0.2
uses: peter-evans/create-or-update-comment@5f728c3dae25f329afbe34ee4d08eef25569d79f # v3.0.2
with:
comment-id: ${{ steps.findComment.outputs.comment-id }}
body: |
Thank you for verifying your support key 🔑, your SLA starts now.
edit-mode: replace
4 changes: 2 additions & 2 deletions benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"react-dom": "^18.2.0",
"react-is": "^18.2.0",
"react-jss": "^10.10.0",
"react-redux": "^8.1.0",
"react-redux": "^8.1.1",
"redux": "^4.2.1",
"serve-handler": "^6.1.5",
"styled-components": "^5.3.11",
"theme-ui": "^0.16.0",
"webpack": "^5.85.0",
"webpack": "^5.88.0",
"webpack-cli": "^4.10.0"
}
}
85 changes: 85 additions & 0 deletions docs/data/base/components/input/UnstyledInputBasic/css/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import * as React from 'react';
import Input from '@mui/base/Input';
import { useTheme } from '@mui/system';

export default function UnstyledInputBasic() {
return (
<React.Fragment>
<Input
slotProps={{ input: { className: 'CustomInput' } }}
aria-label="Demo input"
placeholder="Type something…"
/>
<Styles />
</React.Fragment>
);
}

const cyan = {
50: '#E9F8FC',
100: '#BDEBF4',
200: '#99D8E5',
300: '#66BACC',
400: '#1F94AD',
500: '#0D5463',
600: '#094855',
700: '#063C47',
800: '#043039',
900: '#022127',
};

const grey = {
50: '#F3F6F9',
100: '#E7EBF0',
200: '#E0E3E7',
300: '#CDD2D7',
400: '#B2BAC2',
500: '#A0AAB4',
600: '#6F7E8C',
700: '#3E5060',
800: '#2D3843',
900: '#1A2027',
};

function useIsDarkMode() {
const theme = useTheme();
return theme.palette.mode === 'dark';
}

function Styles() {
// Replace this with your app logic for determining dark mode
const isDarkMode = useIsDarkMode();

return (
<style>
{`
.CustomInput {
width: 320px;
font-family: IBM Plex Sans, sans-serif;
font-size: 0.875rem;
font-weight: 400;
line-height: 1.5;
padding: 12px;
border-radius: 12px;
color: ${isDarkMode ? grey[300] : grey[900]};
background: ${isDarkMode ? grey[900] : '#fff'};
border: 1px solid ${isDarkMode ? grey[700] : grey[200]};
box-shadow: 0px 2px 2px ${isDarkMode ? grey[900] : grey[50]};
&:hover {
border-color: ${cyan[400]};
}
&:focus {
border-color: ${cyan[400]};
box-shadow: 0 0 0 3px ${isDarkMode ? cyan[500] : cyan[200]};
}
&:focus-visible {
outline: 0;
}
}
`}
</style>
);
}
85 changes: 85 additions & 0 deletions docs/data/base/components/input/UnstyledInputBasic/css/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import * as React from 'react';
import Input from '@mui/base/Input';
import { useTheme } from '@mui/system';

export default function UnstyledInputBasic() {
return (
<React.Fragment>
<Input
slotProps={{ input: { className: 'CustomInput' } }}
aria-label="Demo input"
placeholder="Type something…"
/>
<Styles />
</React.Fragment>
);
}

const cyan = {
50: '#E9F8FC',
100: '#BDEBF4',
200: '#99D8E5',
300: '#66BACC',
400: '#1F94AD',
500: '#0D5463',
600: '#094855',
700: '#063C47',
800: '#043039',
900: '#022127',
};

const grey = {
50: '#F3F6F9',
100: '#E7EBF0',
200: '#E0E3E7',
300: '#CDD2D7',
400: '#B2BAC2',
500: '#A0AAB4',
600: '#6F7E8C',
700: '#3E5060',
800: '#2D3843',
900: '#1A2027',
};

function useIsDarkMode() {
const theme = useTheme();
return theme.palette.mode === 'dark';
}

function Styles() {
// Replace this with your app logic for determining dark mode
const isDarkMode = useIsDarkMode();

return (
<style>
{`
.CustomInput {
width: 320px;
font-family: IBM Plex Sans, sans-serif;
font-size: 0.875rem;
font-weight: 400;
line-height: 1.5;
padding: 12px;
border-radius: 12px;
color: ${isDarkMode ? grey[300] : grey[900]};
background: ${isDarkMode ? grey[900] : '#fff'};
border: 1px solid ${isDarkMode ? grey[700] : grey[200]};
box-shadow: 0px 2px 2px ${isDarkMode ? grey[900] : grey[50]};
&:hover {
border-color: ${cyan[400]};
}
&:focus {
border-color: ${cyan[400]};
box-shadow: 0 0 0 3px ${isDarkMode ? cyan[500] : cyan[200]};
}
&:focus-visible {
outline: 0;
}
}
`}
</style>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<React.Fragment>
<Input
slotProps={{ input: { className: 'CustomInput' } }}
aria-label="Demo input"
placeholder="Type something…"
/>
<Styles />
</React.Fragment>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import * as React from 'react';
import Input from '@mui/base/Input';
import { useTheme } from '@mui/system';

function useIsDarkMode() {
const theme = useTheme();
return theme.palette.mode === 'dark';
}

export default function UnstyledInputBasic() {
// Replace this with your app logic for determining dark modes
const isDarkMode = useIsDarkMode();

return (
<Input
className={isDarkMode ? 'dark' : ''}
slotProps={{
input: {
className:
'w-80 text-sm font-normal leading-5 p-3 rounded-xl shadow-md shadow-slate-100 dark:shadow-slate-900 focus:shadow-outline-purple dark:focus:shadow-outline-purple focus:shadow-lg border border-solid border-slate-300 hover:border-purple-500 dark:hover:border-purple-500 focus:border-purple-500 dark:focus:border-purple-500 dark:border-slate-600 bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-300 focus-visible:outline-0',
},
}}
aria-label="Demo input"
placeholder="Type something…"
/>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import * as React from 'react';
import Input from '@mui/base/Input';
import { useTheme } from '@mui/system';

function useIsDarkMode() {
const theme = useTheme();
return theme.palette.mode === 'dark';
}

export default function UnstyledInputBasic() {
// Replace this with your app logic for determining dark modes
const isDarkMode = useIsDarkMode();

return (
<Input
className={isDarkMode ? 'dark' : ''}
slotProps={{
input: {
className:
'w-80 text-sm font-normal leading-5 p-3 rounded-xl shadow-md shadow-slate-100 dark:shadow-slate-900 focus:shadow-outline-purple dark:focus:shadow-outline-purple focus:shadow-lg border border-solid border-slate-300 hover:border-purple-500 dark:hover:border-purple-500 focus:border-purple-500 dark:focus:border-purple-500 dark:border-slate-600 bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-300 focus-visible:outline-0',
},
}}
aria-label="Demo input"
placeholder="Type something…"
/>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<Input
className={isDarkMode ? 'dark' : ''}
slotProps={{
input: {
className:
'w-80 text-sm font-normal leading-5 p-3 rounded-xl shadow-md shadow-slate-100 dark:shadow-slate-900 focus:shadow-outline-purple dark:focus:shadow-outline-purple focus:shadow-lg border border-solid border-slate-300 hover:border-purple-500 dark:hover:border-purple-500 focus:border-purple-500 dark:focus:border-purple-500 dark:border-slate-600 bg-white dark:bg-slate-900 text-slate-900 dark:text-slate-300 focus-visible:outline-0',
},
}}
aria-label="Demo input"
placeholder="Type something…"
/>
2 changes: 1 addition & 1 deletion docs/data/base/components/input/input.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Input behaves similarly to the native HTML `<input>`, except that it's nested in

The following demo shows how to create and style an input component, including `placeholder` text:

{{"demo": "UnstyledInputBasic.js", "defaultCodeOpen": false}}
{{"demo": "UnstyledInputBasic", "defaultCodeOpen": false}}

### Anatomy

Expand Down
2 changes: 1 addition & 1 deletion docs/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ module.exports = withDocsInfra({
: null,
LIB_VERSION: pkg.version,
FEEDBACK_URL: process.env.FEEDBACK_URL,
SOURCE_CODE_ROOT_URL: 'https://github.com/mui/material-ui/blob/master', // #default-branch-switch
SOURCE_GITHUB_BRANCH: 'master', // #default-branch-switch
SOURCE_CODE_REPO: 'https://github.com/mui/material-ui',
GITHUB_TEMPLATE_DOCS_FEEDBACK: '4.docs-feedback.yml',
BUILD_ONLY_ENGLISH_LOCALE: buildOnlyEnglishLocale,
Expand Down
18 changes: 9 additions & 9 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
"@mui/styles": "^5.13.2",
"@mui/system": "^5.13.6",
"@mui/types": "^7.2.4",
"@mui/x-data-grid": "6.8.0",
"@mui/x-data-grid-generator": "6.8.0",
"@mui/x-data-grid-pro": "6.8.0",
"@mui/x-date-pickers": "6.8.0",
"@mui/x-date-pickers-pro": "6.8.0",
"@mui/x-license-pro": "6.6.0",
"@mui/x-data-grid": "6.9.0",
"@mui/x-data-grid-generator": "6.9.0",
"@mui/x-data-grid-pro": "6.9.0",
"@mui/x-date-pickers": "6.9.0",
"@mui/x-date-pickers-pro": "6.9.0",
"@mui/x-license-pro": "6.9.0",
"@react-spring/web": "^9.7.2",
"@trendmicro/react-interpolate": "^0.5.5",
"@types/autosuggest-highlight": "^3.2.0",
Expand Down Expand Up @@ -103,14 +103,14 @@
"react-intersection-observer": "^9.5.1",
"react-is": "^18.2.0",
"react-number-format": "^5.2.2",
"react-router-dom": "^6.13.0",
"react-router-dom": "^6.14.0",
"react-runner": "^1.0.3",
"react-simple-code-editor": "^0.13.1",
"react-swipeable-views": "^0.14.0",
"react-transition-group": "^4.4.5",
"react-virtuoso": "^4.3.10",
"react-virtuoso": "^4.3.11",
"react-window": "^1.8.9",
"recharts": "2.7.1",
"recharts": "2.7.2",
"rimraf": "^3.0.2",
"styled-components": "^5.3.11",
"stylis": "^4.2.0",
Expand Down
7 changes: 7 additions & 0 deletions docs/pages/base-ui/api/use-slider.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,13 @@
},
"required": true
},
"getThumbStyle": {
"type": {
"name": "(index: number) =&gt; object",
"description": "(index: number) =&gt; object"
},
"required": true
},
"marks": { "type": { "name": "Mark[]", "description": "Mark[]" }, "required": true },
"open": { "type": { "name": "number", "description": "number" }, "required": true },
"range": { "type": { "name": "boolean", "description": "boolean" }, "required": true },
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/blog/mui-x-v6.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ tags: ['MUI X', 'News']
- [Data Grid - feature highlights ✨](#data-grid-features-highlights-✨)
- [ApiRef moved to the MIT (Community) version](#apiref-moved-to-the-mit-community-version)
- [Improved column menu](#improved-column-menu)
- [Row pinning is now stable](#row-pinning-is-now-stable) [<span class="plan-pro"></span>](/x/introduction/licensing/#premium-plan)
- [Row pinning is now stable](#row-pinning-is-now-stable) [<span class="plan-pro"></span>](/x/introduction/licensing/#pro-plan)
- [Aggregation is now stable](#aggregation-is-now-stable) [<span class="plan-premium"></span>](/x/introduction/licensing/#premium-plan)
- [Cell selection](#cell-selection) [<span class="plan-premium"></span>](/x/introduction/licensing/#premium-plan)
- [Use web workers to export data to excel files](#use-web-workers-to-export-data-to-excel-files) [<span class="plan-premium"></span>](/x/introduction/licensing/#premium-plan)
Expand Down
2 changes: 1 addition & 1 deletion docs/scripts/generateRSSFeed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function generateRssFeed(allBlogPosts: Array<BlogPost>) {
language: 'en',
image: `${siteUrl}/static/logo.svg`,
favicon: `${siteUrl}/favicon.ico`,
copyright: `Copyright © ${new Date().getFullYear()} Material UI SAS.`,
copyright: `Copyright © ${new Date().getFullYear()} Material UI SAS, trading as MUI.`,
feedLinks: {
rss2: `${siteUrl}/public${ROUTES.rssFeed}`,
},
Expand Down
Loading

0 comments on commit 8371917

Please sign in to comment.