Skip to content

Commit

Permalink
Merge branch 'master' into feat/Form
Browse files Browse the repository at this point in the history
  • Loading branch information
atomiks authored Aug 4, 2024
2 parents c36a143 + 79d3997 commit 239b31d
Show file tree
Hide file tree
Showing 203 changed files with 10,329 additions and 5,987 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ jobs:
<<: *default-job
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.45.1-focal
- image: mcr.microsoft.com/playwright:v1.45.3-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -350,7 +350,7 @@ jobs:
test_profile:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.45.1-focal
- image: mcr.microsoft.com/playwright:v1.45.3-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down Expand Up @@ -378,7 +378,7 @@ jobs:
test_regressions:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.45.1-focal
- image: mcr.microsoft.com/playwright:v1.45.3-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand All @@ -395,7 +395,7 @@ jobs:
test_e2e:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.45.1-focal
- image: mcr.microsoft.com/playwright:v1.45.3-focal
environment:
NODE_ENV: development # Needed if playwright is in `devDependencies`
steps:
Expand Down
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ module.exports = {
...baseline.rules,
// TODO move to @mui/monorepo, codebase is moving away from default exports https://github.com/mui/material-ui/issues/21862
'import/prefer-default-export': 'off',
'import/export': 'off', // Mostly handled by Typescript itself. ESLint produces false positives with declaration merging.
'no-restricted-imports': [
'error',
{
Expand All @@ -43,6 +44,7 @@ module.exports = {
],
},
],
'@typescript-eslint/no-redeclare': 'off',
},
overrides: [
...baseline.overrides,
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
os: [macos-latest, windows-latest, ubuntu-latest]
steps:
- run: echo "${{ github.actor }}"
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
# fetch all tags which are required for `pnpm release:changelog`
fetch-depth: 0
- name: Set up pnpm
uses: pnpm/action-setup@a3252b78c470c02df07e9d59298aecedc3ccdd6d # v3.0.0
- name: Use Node.js 18.x
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
with:
node-version: 18
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
with:
languages: typescript
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -30,4 +30,4 @@ jobs:
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
6 changes: 3 additions & 3 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
persist-credentials: false

- name: Run analysis
uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/vale-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
continue-on-error: true
with:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://master--material-ui.netlify.app/static/base-ui/base-ui-logo-dark.svg">
<source media="(prefers-color-scheme: light)" srcset="https://master--material-ui.netlify.app/static/base-ui/base-ui-logo-light.svg">
<img alt="Base UI" src="https://master--material-ui.netlify.app/static/base-ui/base-ui-logo-light.svg" width="257" height="70">
<img alt="Base UI" src="https://master--material-ui.netlify.app/static/base-ui/base-ui-logo-light.svg" width="257" height="70">
</picture>
</a>
</p>

<p align="center">
Base UI is an unstyled UI component library for building accessible user interfaces while maintaining complete control over styling.
Base UI is an unstyled UI component library for building accessible user interfaces while maintaining complete control over styling.
</p>

<div align="center">
Expand Down
6 changes: 6 additions & 0 deletions docs/.link-check-errors.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
Broken links found by `pnpm docs:link-check` that exist:

- https://mui.com/material-ui/customization/css-theme-variables/configuration/#advanced-configuration
- https://mui.com/material-ui/customization/css-theme-variables/configuration/#changing-variable-prefixes
- https://mui.com/material-ui/customization/theme-components/#creating-new-component-variants
- https://mui.com/material-ui/customization/theme-components/#overrides-based-on-props
- https://mui.com/material-ui/migrating-to-v6/
- https://mui.com/material-ui/react-grid2/#whats-changed
4 changes: 2 additions & 2 deletions docs/data/base/components/alert-dialog/alert-dialog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/alertdialog/

## Installation

Base UI components are all available as a single package.
Base UI components are all available as a single package.

<codeblock storageKey="package-manager">

Expand Down Expand Up @@ -131,7 +131,7 @@ If a component has a transition or animation applied to it when it closes, it wi
As this detection of exit animations requires an extra render, you may opt out of it by setting the `animated` prop on Popup and Backdrop to `false`.
We also recommend doing so in automated tests, to avoid asynchronous behavior and make testing easier.

Alternatively, you can use JS-based animations with a library like framer-motion, React Spring, or similar.
Alternatively, you can use JavaScript-based animations with a library like framer-motion, React Spring, or similar.
With this approach set the `keepMounted` to `true` and let the animation library control mounting and unmounting.

### CSS transitions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function UnstyledCheckboxIndeterminateGroup() {
{isIndeterminate ? <HorizontalRuleIcon /> : <CheckIcon />}
</Indicator>
</Checkbox>
<Label htmlFor={id} onMouseDown={(e) => e.preventDefault()}>
<Label htmlFor={id} onMouseDown={(event) => event.preventDefault()}>
Colors
</Label>
</ListRoot>
Expand All @@ -52,7 +52,7 @@ export default function UnstyledCheckboxIndeterminateGroup() {
</Checkbox>
<Label
htmlFor={`${id}-${color}`}
onMouseDown={(e) => e.preventDefault()}
onMouseDown={(event) => event.preventDefault()}
>
{color}
</Label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function UnstyledCheckboxIndeterminateGroup() {
{isIndeterminate ? <HorizontalRuleIcon /> : <CheckIcon />}
</Indicator>
</Checkbox>
<Label htmlFor={id} onMouseDown={(e) => e.preventDefault()}>
<Label htmlFor={id} onMouseDown={(event) => event.preventDefault()}>
Colors
</Label>
</ListRoot>
Expand All @@ -52,7 +52,7 @@ export default function UnstyledCheckboxIndeterminateGroup() {
</Checkbox>
<Label
htmlFor={`${id}-${color}`}
onMouseDown={(e) => e.preventDefault()}
onMouseDown={(event) => event.preventDefault()}
>
{color}
</Label>
Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/checkbox/checkbox.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ packageName: '@base_ui/react'

## Installation

Base UI components are all available as a single package.
Base UI components are all available as a single package.

<codeblock storageKey="package-manager">

Expand Down
4 changes: 2 additions & 2 deletions docs/data/base/components/dialog/dialog.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/dialog-modal/

## Installation

Base UI components are all available as a single package.
Base UI components are all available as a single package.

<codeblock storageKey="package-manager">

Expand Down Expand Up @@ -153,7 +153,7 @@ If a component has a transition or animation applied to it when it closes, it wi
As this detection of exit animations requires an extra render, you may opt out of it by setting the `animated` prop on Root to `false`.
We also recommend doing so in automated tests, to avoid asynchronous behavior and make testing easier.

Alternatively, you can use JS-based animations with a library like framer-motion, React Spring, or similar.
Alternatively, you can use JavaScript-based animations with a library like framer-motion, React Spring, or similar.
With this approach set the `keepMounted` to `true` and let the animation library control mounting and unmounting.

### CSS transitions
Expand Down
Loading

0 comments on commit 239b31d

Please sign in to comment.