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.

Sign up for GitHub

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

fix:(file-uploader): Swap Upload and Clear all Buttons #3350

Merged
merged 1 commit into from
Jan 26, 2023
Merged

fix:(file-uploader): Swap Upload and Clear all Buttons #3350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions .changeset/thirty-kangaroos-develop.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/ui-react': patch
---

fix: Swap the upload button with the clear all button.
12 changes: 6 additions & 6 deletions ...torage/FileUploader/UploadPreviewer/__tests__/__snapshots__/UploadPreviewer.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@ exports[`UploadPreviewer renders as expected 1`] = `
class="amplify-fileuploader__previewer__footer__actions"
>
<button
class="amplify-button amplify-field-group__control amplify-button--primary amplify-button--small"
class="amplify-button amplify-field-group__control amplify-button--link amplify-button--small"
data-fullwidth="false"
data-size="small"
data-variation="primary"
data-variation="link"
type="button"
>
Upload 1 file
Clear all
</button>
<button
class="amplify-button amplify-field-group__control amplify-button--link amplify-button--small"
class="amplify-button amplify-field-group__control amplify-button--primary amplify-button--small"
data-fullwidth="false"
data-size="small"
data-variation="link"
data-variation="primary"
type="button"
>
Clear all
Upload 1 file
</button>
</div>
</div>
Expand Down
7 changes: 3 additions & 4 deletions packages/react/src/components/Storage/FileUploader/UploadPreviewer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ export function UploadPreviewer({
<View className={ComponentClassName.FileUploaderPreviewerFooterActions}>
{!isLoading && !isSuccessful && (
<>
<Button size="small" variation="link" onClick={onClear}>
{translate('Clear all')}
</Button>
<Button
disabled={isDisabled}
size="small"
Expand All @@ -86,10 +89,6 @@ export function UploadPreviewer({
>
{`${translate('Upload')} ${remainingFilesText}`}
</Button>

<Button size="small" variation="link" onClick={onClear}>
{translate('Clear all')}
</Button>
</>
)}
{isSuccessful && (
Expand Down