Skip to content

Commit 6107154

Browse files
authored
Merge branch 'main' into mp/validation-styles
2 parents ccdb2e5 + fad43d6 commit 6107154

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+29572
-738
lines changed

.changeset/big-lions-mix.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/happy-books-attack.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/long-students-breathe.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/menus-initial-focus.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

.changeset/quick-falcons-beg.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@primer/react": patch
3+
---
4+
5+
PageLayout: Prevent content region from wrapping on wide viewports

.changeset/sharp-cats-return.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@primer/react': minor
3+
---
4+
5+
Introduces FormControl component. The FormControl component combines the functionality of InputField and ChoiceInputField, and will replace FormGroup, InputField, and ChoiceInputField.

.changeset/silly-humans-float.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@primer/react': patch
3+
---
4+
5+
FormControl:
6+
* Add `sx` prop
7+
* Rename `appearance` prop to `variant`

.storybook/preview.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {addons} from '@storybook/addons'
2-
import {ThemeProvider, themeGet, theme} from '../src'
2+
import {ThemeProvider, themeGet, theme, BaseStyles} from '../src'
33
import styled, {createGlobalStyle} from 'styled-components'
44
import {addDecorator} from '@storybook/react'
55
import {withPerformance} from 'storybook-addon-performance'
@@ -86,9 +86,11 @@ const withThemeProvider = (Story, context) => {
8686
nightScheme={context.globals.nightScheme}
8787
>
8888
<ThemedSectionStyle>
89-
<div id="html-addon-root">
90-
<Story {...context} />
91-
</div>
89+
<BaseStyles>
90+
<div id="html-addon-root">
91+
<Story {...context} />
92+
</div>
93+
</BaseStyles>
9294
</ThemedSectionStyle>
9395
</ThemeProvider>
9496
</Wrapper>
@@ -102,9 +104,11 @@ const withThemeProvider = (Story, context) => {
102104
nightScheme={context.globals.nightScheme}
103105
>
104106
<GlobalStyle />
105-
<div id="html-addon-root">
106-
<Story {...context} />
107-
</div>
107+
<BaseStyles>
108+
<div id="html-addon-root">
109+
<Story {...context} />
110+
</div>
111+
</BaseStyles>
108112
</ThemeProvider>
109113
)
110114
}

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
11
# @primer/components
22

3+
## 34.4.0
4+
5+
### Minor Changes
6+
7+
- [#1812](https://github.com/primer/react/pull/1812) [`97bf7c62`](https://github.com/primer/react/commit/97bf7c627bb10cdd18406557e6f1e79a39ed5b48) Thanks [@rezrah](https://github.com/rezrah)! - Add new Textarea component
8+
9+
### Patch Changes
10+
11+
- [#1824](https://github.com/primer/react/pull/1824) [`4eab65e5`](https://github.com/primer/react/commit/4eab65e57571d64a0f8a4fcb4aafbf47d3e98a2d) Thanks [@siddharthkp](https://github.com/siddharthkp)! - Overlay: Attach escape handler to overlay container instead of document to fix stopPropagation
12+
13+
* [#1840](https://github.com/primer/react/pull/1840) [`1c4786c7`](https://github.com/primer/react/commit/1c4786c7d99fe083b47902acff5326c44a7c8288) Thanks [@jclem](https://github.com/jclem)! - Set Node.js and npm versions to ">=12" and ">=7", respectively, in package.json manifests, and update package-lock.json files accordingly.
14+
15+
- [#1828](https://github.com/primer/react/pull/1828) [`6a695bdc`](https://github.com/primer/react/commit/6a695bdcea356821390f42c575d78a2f5ded6e86) Thanks [@siddharthkp](https://github.com/siddharthkp)! - ActionMenu2 + DropdownMenu2: A keyboard user will be able to wrap through options
16+
17+
* [#1810](https://github.com/primer/react/pull/1810) [`35ad7084`](https://github.com/primer/react/commit/35ad7084bca048748479301e286ca305faada5b2) Thanks [@siddharthkp](https://github.com/siddharthkp)! - ActionMenu2 + DropdownMenu2: Focus the correct element when Menu is opened with keyboard. [See detailed spec.](https://github.com/github/primer/issues/518#issuecomment-999104848)
18+
19+
- ArrowDown | Space | Enter: first element
20+
- ArrowUp: last element
21+
22+
- [#1842](https://github.com/primer/react/pull/1842) [`11011f55`](https://github.com/primer/react/commit/11011f5598a2c97f2dbb5928962dfa12b7437be0) Thanks [@jclem](https://github.com/jclem)! - Allow `KeyPaths` type to accept any type in order to remove need for `// @ts-ignore` internally.
23+
24+
* [#1820](https://github.com/primer/react/pull/1820) [`50c7bfaa`](https://github.com/primer/react/commit/50c7bfaa283154e28d1905e3eb01f7f01901c806) Thanks [@colebemis](https://github.com/colebemis)! - Add draft `PageLayout` component
25+
326
## 34.3.0
427

528
### Minor Changes

0 commit comments

Comments
 (0)