Skip to content

Commit

Permalink
Merge branch 'main' into rna/remove-copy-button
Browse files Browse the repository at this point in the history
  • Loading branch information
@ioanabrooks
ioanabrooks authored Nov 20, 2022
2 parents 477bd95 + 33b2651 commit 8ea6966
Show file tree
Hide file tree
Showing 35 changed files with 1,658 additions and 1,560 deletions.
3 changes: 1 addition & 2 deletions packages/react-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
},
"peerDependencies": {
"aws-amplify": ">= 5.0.1",
"react": ">= 16.14.0",
"react-dom": ">= 16.14.0"
"react": ">= 16.14.0"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^22.0.1",
Expand Down
94 changes: 60 additions & 34 deletions .../Defaults/ConfirmResetPassword/__tests__/__snapshots__/ConfirmResetPassword.spec.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ Array [
style={
Array [
Object {
"fontSize": 16,
"fontSize": 14,
"fontWeight": "400",
"lineHeight": 21,
},
Object {
"color": "hsl(210, 50%, 10%)",
},
Array [
Object {
"color": "hsl(210, 25%, 25%)",
"fontSize": 16,
"lineHeight": 21,
"paddingVertical": 12,
"paddingVertical": 8,
},
undefined,
],
Expand All @@ -72,8 +72,8 @@ Array [
"borderWidth": 1,
"flexDirection": "row",
"lineHeight": 24,
"padding": 16,
"width": "100%",
"paddingHorizontal": 8,
"paddingVertical": 12,
}
}
testID="amplify__text-field__input-container"
Expand All @@ -85,9 +85,12 @@ Array [
onBlur={[Function]}
onChangeText={[Function]}
placeholder="Code"
placeholderTextColor="hsl(210, 10%, 40%)"
selectionColor="hsl(210, 50%, 10%)"
style={
Array [
Object {
"color": "hsl(210, 50%, 10%)",
"flexGrow": 1,
"fontSize": 16,
},
Expand Down Expand Up @@ -122,18 +125,18 @@ Array [
style={
Array [
Object {
"fontSize": 16,
"fontSize": 14,
"fontWeight": "400",
"lineHeight": 21,
},
Object {
"color": "hsl(210, 50%, 10%)",
},
Array [
Object {
"color": "hsl(210, 25%, 25%)",
"fontSize": 16,
"lineHeight": 21,
"paddingVertical": 12,
"paddingVertical": 8,
},
undefined,
],
Expand All @@ -151,8 +154,8 @@ Array [
"borderWidth": 1,
"flexDirection": "row",
"lineHeight": 24,
"padding": 16,
"width": "100%",
"paddingHorizontal": 8,
"paddingVertical": 12,
}
}
testID="amplify__text-field__input-container"
Expand All @@ -164,10 +167,13 @@ Array [
onBlur={[Function]}
onChangeText={[Function]}
placeholder="New Password"
placeholderTextColor="hsl(210, 10%, 40%)"
secureTextEntry={true}
selectionColor="hsl(210, 50%, 10%)"
style={
Array [
Object {
"color": "hsl(210, 50%, 10%)",
"flexGrow": 1,
"fontSize": 16,
},
Expand Down Expand Up @@ -219,7 +225,9 @@ Array [
"width": 16,
},
Array [
Object {},
Object {
"tintColor": "hsl(210, 10%, 40%)",
},
undefined,
],
]
Expand Down Expand Up @@ -253,18 +261,18 @@ Array [
style={
Array [
Object {
"fontSize": 16,
"fontSize": 14,
"fontWeight": "400",
"lineHeight": 21,
},
Object {
"color": "hsl(210, 50%, 10%)",
},
Array [
Object {
"color": "hsl(210, 25%, 25%)",
"fontSize": 16,
"lineHeight": 21,
"paddingVertical": 12,
"paddingVertical": 8,
},
undefined,
],
Expand All @@ -282,8 +290,8 @@ Array [
"borderWidth": 1,
"flexDirection": "row",
"lineHeight": 24,
"padding": 16,
"width": "100%",
"paddingHorizontal": 8,
"paddingVertical": 12,
}
}
testID="amplify__text-field__input-container"
Expand All @@ -295,10 +303,13 @@ Array [
onBlur={[Function]}
onChangeText={[Function]}
placeholder="Confirm Password"
placeholderTextColor="hsl(210, 10%, 40%)"
secureTextEntry={true}
selectionColor="hsl(210, 50%, 10%)"
style={
Array [
Object {
"color": "hsl(210, 50%, 10%)",
"flexGrow": 1,
"fontSize": 16,
},
Expand Down Expand Up @@ -350,7 +361,9 @@ Array [
"width": 16,
},
Array [
Object {},
Object {
"tintColor": "hsl(210, 10%, 40%)",
},
undefined,
],
]
Expand Down Expand Up @@ -560,18 +573,18 @@ Array [
style={
Array [
Object {
"fontSize": 16,
"fontSize": 14,
"fontWeight": "400",
"lineHeight": 21,
},
Object {
"color": "hsl(210, 50%, 10%)",
},
Array [
Object {
"color": "hsl(210, 25%, 25%)",
"fontSize": 16,
"lineHeight": 21,
"paddingVertical": 12,
"paddingVertical": 8,
},
undefined,
],
Expand All @@ -589,8 +602,8 @@ Array [
"borderWidth": 1,
"flexDirection": "row",
"lineHeight": 24,
"padding": 16,
"width": "100%",
"paddingHorizontal": 8,
"paddingVertical": 12,
}
}
testID="amplify__text-field__input-container"
Expand All @@ -602,9 +615,12 @@ Array [
onBlur={[Function]}
onChangeText={[Function]}
placeholder="Code"
placeholderTextColor="hsl(210, 10%, 40%)"
selectionColor="hsl(210, 50%, 10%)"
style={
Array [
Object {
"color": "hsl(210, 50%, 10%)",
"flexGrow": 1,
"fontSize": 16,
},
Expand Down Expand Up @@ -639,18 +655,18 @@ Array [
style={
Array [
Object {
"fontSize": 16,
"fontSize": 14,
"fontWeight": "400",
"lineHeight": 21,
},
Object {
"color": "hsl(210, 50%, 10%)",
},
Array [
Object {
"color": "hsl(210, 25%, 25%)",
"fontSize": 16,
"lineHeight": 21,
"paddingVertical": 12,
"paddingVertical": 8,
},
undefined,
],
Expand All @@ -668,8 +684,8 @@ Array [
"borderWidth": 1,
"flexDirection": "row",
"lineHeight": 24,
"padding": 16,
"width": "100%",
"paddingHorizontal": 8,
"paddingVertical": 12,
}
}
testID="amplify__text-field__input-container"
Expand All @@ -681,10 +697,13 @@ Array [
onBlur={[Function]}
onChangeText={[Function]}
placeholder="New Password"
placeholderTextColor="hsl(210, 10%, 40%)"
secureTextEntry={true}
selectionColor="hsl(210, 50%, 10%)"
style={
Array [
Object {
"color": "hsl(210, 50%, 10%)",
"flexGrow": 1,
"fontSize": 16,
},
Expand Down Expand Up @@ -736,7 +755,9 @@ Array [
"width": 16,
},
Array [
Object {},
Object {
"tintColor": "hsl(210, 10%, 40%)",
},
undefined,
],
]
Expand Down Expand Up @@ -770,18 +791,18 @@ Array [
style={
Array [
Object {
"fontSize": 16,
"fontSize": 14,
"fontWeight": "400",
"lineHeight": 21,
},
Object {
"color": "hsl(210, 50%, 10%)",
},
Array [
Object {
"color": "hsl(210, 25%, 25%)",
"fontSize": 16,
"lineHeight": 21,
"paddingVertical": 12,
"paddingVertical": 8,
},
undefined,
],
Expand All @@ -799,8 +820,8 @@ Array [
"borderWidth": 1,
"flexDirection": "row",
"lineHeight": 24,
"padding": 16,
"width": "100%",
"paddingHorizontal": 8,
"paddingVertical": 12,
}
}
testID="amplify__text-field__input-container"
Expand All @@ -812,10 +833,13 @@ Array [
onBlur={[Function]}
onChangeText={[Function]}
placeholder="Confirm Password"
placeholderTextColor="hsl(210, 10%, 40%)"
secureTextEntry={true}
selectionColor="hsl(210, 50%, 10%)"
style={
Array [
Object {
"color": "hsl(210, 50%, 10%)",
"flexGrow": 1,
"fontSize": 16,
},
Expand Down Expand Up @@ -867,7 +891,9 @@ Array [
"width": 16,
},
Array [
Object {},
Object {
"tintColor": "hsl(210, 10%, 40%)",
},
undefined,
],
]
Expand Down
Loading

0 comments on commit 8ea6966

Please sign in to comment.