Skip to content

Commit 0a8266e

Browse files
authored
Merge branch 'master' into 985-textfield-focus
2 parents 679c5bc + 9dd2ce4 commit 0a8266e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

UNRELEASED.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
1515
### Bug fixes
1616

1717
- Fixed the `focused` prop on `TextField` so it sets the focus state ([#990](https://github.com/Shopify/polaris-react/pull/990))
18+
- Resolved an unsupported `React.Fragment` syntax ([#1080](https://github.com/Shopify/polaris-react/pull/1080))
1819
- Constrained `DropZone` height based on inherited wrapper height [#908](https://github.com/Shopify/polaris-react/pull/908)
1920

2021
### Documentation

src/components/TopBar/components/UserMenu/components/UserMenu/UserMenu.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function UserMenu({
3737
const showIndicator = Boolean(message);
3838

3939
const activatorContentMarkup = (
40-
<>
40+
<React.Fragment>
4141
<MessageIndicator active={showIndicator}>
4242
<Avatar
4343
size="small"
@@ -49,7 +49,7 @@ function UserMenu({
4949
<p className={styles.Name}>{name}</p>
5050
<p className={styles.Detail}>{detail}</p>
5151
</span>
52-
</>
52+
</React.Fragment>
5353
);
5454

5555
return (

0 commit comments

Comments
 (0)