Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(in-app-messaging): merge main in to in-app-messaging/main from latest release commit #2485

Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
84f2f8f
chore: Update yarn.lock (#2440)
joebuono Aug 12, 2022
ed41e28
Fix location search bug (#2450)
thaddmt Aug 12, 2022
322bc2c
fix(react): hide svg icon images in a11y tree in Rating component (#2…
hbuchel Aug 16, 2022
ffba713
Version Packages (#2461)
github-actions[bot] Aug 16, 2022
78eb36f
fix(docs): type error on fragment (#2477)
0618 Aug 18, 2022
a632995
chore(in-app-messaging): merge main in to in-app-messaging/main from …
calebpollman Aug 18, 2022
05544c9
add @types/react to resolutions field
calebpollman Aug 18, 2022
665c426
chore(ui): Set `predictableActionArguments` to true (#2468)
wlee221 Aug 19, 2022
a6307c8
Delete the auth-with-username environment (#2489)
slaymance Aug 19, 2022
b065153
Revert "chore(ui): Set `predictableActionArguments` to true (#2468)" …
wlee221 Aug 19, 2022
e75fa24
fix(ci): Change e2e environments to auth-with-username-no-attributes …
slaymance Aug 22, 2022
cf62a4e
chore: remove stale chmod line in package.json (#2497)
wlee221 Aug 22, 2022
4d64479
chore(hosting): Skip cypress binary installation (#2508)
wlee221 Aug 24, 2022
4044c7d
chore(environments): move environments to their own folder (#2501)
wlee221 Aug 24, 2022
8350d36
Dial code (#2459)
jacoblogan Aug 24, 2022
d28ac1f
Add troubleshooting steps for CRA and geo components (#2511)
slaymance Aug 24, 2022
e527932
fix(environments): fix environments pull on CI (#2512)
wlee221 Aug 24, 2022
9872c44
update changeset (#2515)
jacoblogan Aug 25, 2022
65600f4
Merge branch 'main' into in-app-messaging/merge-from-latest-release
calebpollman Aug 25, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test": "$_ run build"
},
"dependencies": {
"@aws-amplify/ui-react": "3.4.0",
"@aws-amplify/ui-react": "3.4.1",
"@cucumber/gherkin": "^19.0.3",
"@cucumber/messages": "^16.0.1",
"@docsearch/react": "3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ import { Rating, Icon } from '@aws-amplify/ui-react';

const IconStarBorder = () => {
return (
<Icon
ariaLabel="No rating"
pathData="M22 9.24L14.81 8.62L12 2L9.19 8.63L2 9.24L7.46 13.97L5.82 21L12 17.27L18.18 21L16.55 13.97L22 9.24ZM12 15.4L8.24 17.67L9.24 13.39L5.92 10.51L10.3 10.13L12 6.1L13.71 10.14L18.09 10.52L14.77 13.4L15.77 17.68L12 15.4Z"
/>
<Icon pathData="M22 9.24L14.81 8.62L12 2L9.19 8.63L2 9.24L7.46 13.97L5.82 21L12 17.27L18.18 21L16.55 13.97L22 9.24ZM12 15.4L8.24 17.67L9.24 13.39L5.92 10.51L10.3 10.13L12 6.1L13.71 10.14L18.09 10.52L14.77 13.4L15.77 17.68L12 15.4Z" />
);
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
import { Rating, Icon } from '@aws-amplify/ui-react';

const IconAdd = () => {
return (
<Icon
ariaLabel="No rating"
pathData="M19 13H13V19H11V13H5V11H11V5H13V11H19V13Z"
/>
);
return <Icon pathData="M19 13H13V19H11V13H5V11H11V5H13V11H19V13Z" />;
};

export const RatingIconExample = () => {
Expand Down
2 changes: 1 addition & 1 deletion examples/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lint": "next lint"
},
"dependencies": {
"@aws-amplify/ui-react": "^3.4.0",
"@aws-amplify/ui-react": "^3.4.1",
"next": "^11.1.3",
"next-global-css": "^1.1.1",
"react": "17",
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
]
},
"resolutions": {
"@types/react": "17.0.47",
"ansi-regex": "5.0.1",
"ansi-html": "0.0.8",
"async": "^3.2.2",
Expand Down
8 changes: 8 additions & 0 deletions packages/react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @aws-amplify/ui-react

## 3.4.1

### Patch Changes

- [#2450](https://github.com/aws-amplify/amplify-ui/pull/2450) [`ed41e28d1`](https://github.com/aws-amplify/amplify-ui/commit/ed41e28d1abb689f7c74d9f13b9da96a21806973) Thanks [@thaddmt](https://github.com/thaddmt)! - Fix location search bug

* [#2469](https://github.com/aws-amplify/amplify-ui/pull/2469) [`322bc2ce7`](https://github.com/aws-amplify/amplify-ui/commit/322bc2ce7e8edd92b098c8f2dd65af3c99184c35) Thanks [@hbuchel](https://github.com/hbuchel)! - fix(react): hide svg icon images in a11y tree in Rating component so redundant text is not announced

## 3.4.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@aws-amplify/ui-react",
"version": "3.4.0",
"version": "3.4.1",
"main": "dist/index.js",
"module": "dist/esm/index.js",
"exports": {
Expand Down Expand Up @@ -68,7 +68,7 @@
"lodash": "4.17.21",
"mapbox-gl": "1.13.1",
"maplibre-gl": "2.1.9",
"maplibre-gl-js-amplify": "2.0.2",
"maplibre-gl-js-amplify": "2.0.4",
"qrcode": "1.5.0",
"react-generate-context": "1.0.1",
"react-map-gl": "7.0.15",
Expand Down
6 changes: 5 additions & 1 deletion packages/react/src/primitives/Rating/RatingIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ export const RatingIcon: React.FC<RatingIconProps> = ({
className,
}) => {
return (
<View as="span" className="amplify-rating-icon-container">
<View
as="span"
className="amplify-rating-icon-container"
aria-hidden="true"
>
<View as="span" className={classNames(className)} color={fill}>
{icon}
</View>
Expand Down
6 changes: 5 additions & 1 deletion packages/react/src/primitives/Rating/RatingMixedIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ export const RatingMixedIcon: React.FC<RatingMixedIconProps> = ({
}) => {
const widthPercentage = `${(value % 1) * 100}%`;
return (
<View as="span" className="amplify-rating-icon-container">
<View
as="span"
className="amplify-rating-icon-container"
aria-hidden="true"
>
<View as="span" className="amplify-rating-label">
<View
as="span"
Expand Down
4,612 changes: 1,617 additions & 2,995 deletions yarn.lock

Large diffs are not rendered by default.