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: Updated mergeStyles to accept grid styleprops #2759

Merged

Conversation

josh-bagwell
Copy link
Contributor

@josh-bagwell josh-bagwell commented May 28, 2024

Summary

Fixes: #2758

mergeStyles utility now merges grid styles that were used as styleprops and overwrites existing styles as intended.

Release Category

Components


Where Should the Reviewer Start?

/modules/react/layout/lib/utils/mergeStyles.ts

Grid

@josh-bagwell josh-bagwell marked this pull request as ready for review May 28, 2024 05:38
Copy link

cypress bot commented May 28, 2024

Passing run #7354 ↗︎

0 970 3 0 Flakiness 0

Details:

Merge 604f71c into ba8fa39...
Project: canvas-kit Commit: 0abddce76c ℹ️
Status: Passed Duration: 05:09 💡
Started: May 28, 2024 7:58 PM Ended: May 28, 2024 8:03 PM

Review all test suite changes for PR #2759 ↗︎

@josh-bagwell josh-bagwell mentioned this pull request May 28, 2024
10 tasks
@josh-bagwell josh-bagwell changed the title chore: Updated mergeStyles to accept grid styles chore: Updated mergeStyles utility to accept style props from GridStyleProps May 28, 2024
@josh-bagwell josh-bagwell changed the title chore: Updated mergeStyles utility to accept style props from GridStyleProps chore: Updated mergeStyles to accept grid styleprops May 28, 2024
@josh-bagwell josh-bagwell added 11.x enhancement New feature or request automerge and removed enhancement New feature or request labels May 28, 2024
@alanbsmith alanbsmith merged commit e593ad1 into Workday:master May 28, 2024
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MergeStyles does not accept grid styles
3 participants