Skip to content

fix: Export components with formStyles correctly #683

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

Merged
merged 1 commit into from
Apr 10, 2021

Conversation

cynthi8
Copy link
Contributor

@cynthi8 cynthi8 commented Apr 7, 2021

  • Problem
    The Oscilloscope ChannelParameters and the Waveform SineWaveParameters have
    both a global style, and a local style they need to be exported with. The use
    of the withStyles function was previously incorrect, and as a result, neither
    style was getting applied.

  • Please check if the PR fulfills these requirements

  • The commit message follows our guidelines
  • Tests for the changes have been added (for bug fixes / features)
  • Docs have been added / updated (for bug fixes / features)
  • What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
  • Bug fix
  • Feature implementation
  • Doc updates
  • What changes have you introduced?
    I reworked the way withStyles was called to function correctly. Before we were trying to create an object containing the spread of two functions. Trying to spread a function will result in an error and the resulting object will be null. The changes fix this issue while maintaining the desired behavior of both styles applying.

fixes #682

  • Does this PR introduce a breaking change?
    No

  • Preview / Steps to verify your work:
    Style is now beautifully applied.

BeautifulChannelParameterStyles

The Oscilloscope ChannelParameters and the Waveform SineWaveParameters have
both a global style, and a local style they need to be exported with. The use
of the withStyles function was previously incorrect, and as a result, neither
style was getting applied.
@orangecms orangecms merged commit d858cde into fossasia:development Apr 10, 2021
@cynthi8 cynthi8 deleted the fix-oscilloscope-styling branch April 12, 2021 19:45
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.

Oscilloscope channel parameters styles are not applied properly
2 participants