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

Upgrade trussworks/react-uswds v9 and uswds v3.8 #7650

Merged
merged 6 commits into from
May 7, 2024

Conversation

emyl3
Copy link
Collaborator

@emyl3 emyl3 commented May 3, 2024

FRONTEND PULL REQUEST

Changes Proposed

  • Upgrades @trussworks/react-uswds to 9.0.0 and @uswds/uswds to 3.8.0
  • Added a dev dependency focus-trap-react that is now required by @trussworks/react-uswds.

Additional Information

As discussed here, the disabled state styling has changed.

Before

Screenshot 2024-05-02 at 13 12 03

After

Screenshot 2024-05-02 at 13 01 29

Testing

  • Smoke test parts of the app that are using components from @trussworks/react-uswds
  • Deployed on dev2

Screenshots / Demos

@emyl3 emyl3 marked this pull request as ready for review May 3, 2024 19:54
fzhao99
fzhao99 previously approved these changes May 3, 2024
Copy link
Contributor

@fzhao99 fzhao99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💪

mpbrown
mpbrown previously approved these changes May 6, 2024
Copy link
Collaborator

@mpbrown mpbrown left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Nice work on resolving this upgrade!

@emyl3
Copy link
Collaborator Author

emyl3 commented May 6, 2024

@fzhao99 @mpbrown Just noticed a change in the button styles causing some buttons with icons to look different 😓 Sorry about that! Will fix that up and re-request review!

@emyl3 emyl3 dismissed stale reviews from mpbrown and fzhao99 via 8bef6bb May 6, 2024 16:28
@emyl3 emyl3 force-pushed the elisa/7537-upgrade-trussworks-v9 branch from 8bef6bb to c0959a8 Compare May 6, 2024 16:59
bobbywells52
bobbywells52 previously approved these changes May 6, 2024
@emyl3 emyl3 force-pushed the elisa/7537-upgrade-trussworks-v9 branch from e16602e to 164b112 Compare May 6, 2024 17:57
@emyl3 emyl3 force-pushed the elisa/7537-upgrade-trussworks-v9 branch from 164b112 to fd8fb32 Compare May 6, 2024 18:21
@emyl3 emyl3 force-pushed the elisa/7537-upgrade-trussworks-v9 branch from fd8fb32 to fd4c9c1 Compare May 6, 2024 18:29
@emyl3 emyl3 force-pushed the elisa/7537-upgrade-trussworks-v9 branch from 0e69efd to 89ce6d4 Compare May 7, 2024 11:48
@emyl3 emyl3 force-pushed the elisa/7537-upgrade-trussworks-v9 branch from 89ce6d4 to 484ba44 Compare May 7, 2024 12:16
@emyl3
Copy link
Collaborator Author

emyl3 commented May 7, 2024

@fzhao99 @mpbrown @bobbywells52 Ready for re-review (Sorry for making you review it twice) and is being deployed on dev6!

@emyl3
Copy link
Collaborator Author

emyl3 commented May 7, 2024

As requested by @fzhao99, (the "after" images are after the fix went in place to set the column-gap prop to 0).

Before - tool tipicon
Screenshot 2024-05-07 at 10 12 49

After - tooltip icon
Screenshot 2024-05-07 at 10 12 40

Before - language toggle
Screenshot 2024-05-07 at 10 14 27

After - language toggle
Screenshot 2024-05-07 at 10 14 50

Before - add another button
Screenshot 2024-05-07 at 10 18 16

After - add another button
Screenshot 2024-05-07 at 10 16 53

Copy link
Collaborator

@mpbrown mpbrown left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed the disabled state for the checkboxes on the facility access component don't necessarily seem like they make it clear that these mean they are selected (comparing these two screenshots below) Are we good on the new design for this or should be override this Trussworks/USWDS change?

image

image

@mpbrown
Copy link
Collaborator

mpbrown commented May 7, 2024

As requested by @fzhao99, (the "after" images are after the fix went in place to set the column-gap prop to 0).

@emyl3 not sure if I'm just noticing it but could you highlight what you mean by the differences in those screenshots?

@emyl3
Copy link
Collaborator Author

emyl3 commented May 7, 2024

I noticed the disabled state for the checkboxes on the facility access component don't necessarily seem like they make it clear that these mean they are selected (comparing these two screenshots below) Are we good on the new design for this or should be override this Trussworks/USWDS change?

image

image

OOO nice catch -- will investigate this!

@emyl3
Copy link
Collaborator Author

emyl3 commented May 7, 2024

As requested by @fzhao99, (the "after" images are after the fix went in place to set the column-gap prop to 0).

@emyl3 not sure if I'm just noticing it but could you highlight what you mean by the differences in those screenshots?

There shouldn't be much of a difference the "after" images. They should look nearly the same since I had to add a class to buttons with icons since the buttons for the upgraded version introduced a new css property of column-gap set to .5rem. With the css class, I set that column-gap to 0 to remove the extra spacing between the icon and button text. Hope this makes sense 😅

Copy link

sonarqubecloud bot commented May 7, 2024

@@ -1133,13 +1133,6 @@ $results-dropdown-spacing: #{units(4)} - #{units(2)} - 22px - #{units(4)}; // he
border: 2px solid #dfe1e2;
}

.usa-checkbox__input:disabled + .usa-checkbox__label::before,
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mpbrown Removing this should have fixed it! Thank you for catching that!
screenshot of dev6
Screenshot 2024-05-07 at 11 25 20

Copy link
Contributor

@fzhao99 fzhao99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm! Thanks for your work on this :)

@emyl3 emyl3 added this pull request to the merge queue May 7, 2024
Merged via the queue into main with commit 9714147 May 7, 2024
40 of 41 checks passed
@emyl3 emyl3 deleted the elisa/7537-upgrade-trussworks-v9 branch May 7, 2024 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade Trussworks to version 9
4 participants