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

Jump to bottom

fix: withThemeStyles order refactor #388

Merged
merged 21 commits into from
Nov 7, 2023
Merged

fix: withThemeStyles order refactor #388

merged 21 commits into from
Nov 7, 2023

Conversation

joshhowenstine
Copy link
Contributor

Description

Adjustments to fix some inconsistencies with the style merge order according to these rules

theming-property-table

References

JIRA TICKET

Testing

TBA

@joshhowenstine joshhowenstine added the WIP In progress but could use an initial review label Oct 17, 2023
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Passed.

4 similar comments
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Passed.

@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Passed.

@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Passed.

@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Passed.

@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Failed.

1 similar comment
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Failed.

@joshhowenstine joshhowenstine changed the title Fix/with theme styles order refactor fix: withThemeStyles order refactor Oct 31, 2023
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Failed.

1 similar comment
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Failed.

@joshhowenstine joshhowenstine added refactor BUG Something isn't working and removed WIP In progress but could use an initial review labels Oct 31, 2023
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Failed.

@joshhowenstine joshhowenstine force-pushed the fix/with-theme-styles-order-refactor branch from dec28ca to 07e1d4a Compare October 31, 2023 21:18
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Failed.

@joshhowenstine joshhowenstine added the WIP In progress but could use an initial review label Nov 1, 2023
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Passed.

@joshhowenstine joshhowenstine force-pushed the fix/with-theme-styles-order-refactor branch from 9a69570 to 4269305 Compare November 2, 2023 20:37
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Passed.

@joshhowenstine
Copy link
Contributor Author

The componentConfig seems to work as expected with nested tones/modes, but that doesn't seem to be the case for in-line styles.

For example, this works:

window.CONTEXT.updateTheme({
  componentConfig: {
    Tile: {
      style: {
        mode: {
          focused: {
            radius: 100
          }
        }
      }
    }
  }
});

but this doesn't in Tile.stories.js:

{
  type: Tile,
  style: {
    mode: {
      focused: {
        radius: 100
      }
    }
  }
}

Fixed in most recent

@joshhowenstine
fix: Update rules for withThemeStyles merge order
6cea22b
@joshhowenstine
fix: add deprecation notice for styleConfig. Add comments
d6ea0c6
@joshhowenstine
fix: small code linting issue
0bc1afe
@joshhowenstine
test: add unit tests
1a766c3
@joshhowenstine
test: write unit tests for withThemeStyles utils
6e84fe9
@joshhowenstine
test: add more unit tests to withThemeStyles utils
f92f08e
@joshhowenstine
test: fix withThemeStyles util tests
55cae79
@joshhowenstine
test: fix unit tests for withThemeStyles utils
4dffe07
@joshhowenstine
test: update unit tests for withThemeStyles utils
3b942ee
@joshhowenstine
fix: bug in withThemeStyles utils
153eedf
@joshhowenstine
fix: update linting errors
8d08f2e
@joshhowenstine
feat: add ability for themes to interact with component props
7631c7b
@joshhowenstine
fix: update deep merge to accomidate styles for componentConfig sub p…
30e492f 
…roperties
@joshhowenstine
fix: updates ability to set props from componentConfig and adds unit …
a321d98 
…tests
@joshhowenstine
fix: reference to componentLevelStyle
0a160d7
@joshhowenstine
fix: bug in generateStyle
9b1bc56
@joshhowenstine
fix: add support for custom modes and tones
fc1a49b
@joshhowenstine
fix: add custom mode support
3546e12
@joshhowenstine
fix: remove commented code
15a08e7
@joshhowenstine
fix: update formatting
8a42fb0
@joshhowenstine
fix: update snapshots
b0e62f6
@joshhowenstine joshhowenstine force-pushed the fix/with-theme-styles-order-refactor branch from 9022ad4 to b0e62f6 Compare November 7, 2023 16:01
@svc-lightning-ui-components
Copy link
Collaborator

Test Execution Failed.

@erautenberg erautenberg merged commit 3e34026 into develop Nov 7, 2023
5 checks passed
@erautenberg erautenberg deleted the fix/with-theme-styles-order-refactor branch November 7, 2023 18:31
svc-lightning-ui-components pushed a commit that referenced this pull request Nov 7, 2023
@semantic-release-bot
chore(release): 2.15.1 [skip ci]
8bd2197 
# [@lightningjs/ui-components-v2.15.1](https://github.com/rdkcentral/Lightning-UI-Components/compare/@lightningjs/ui-components-v2.15.0...@lightningjs/ui-components-v2.15.1) (2023-11-07)

### Bug Fixes

* **Button:** ensure height will be honored if set in or outside styles ([#399](#399)) ([2a78f28](2a78f28))
* withThemeStyles order refactor ([#388](#388)) ([3e34026](3e34026))
@svc-lightning-ui-components
Copy link
Collaborator

🎉 This PR is included in version @lightningjs/ui-components-v2.15.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arwehrman arwehrman arwehrman approved these changes

@erautenberg erautenberg erautenberg approved these changes

@anthony9187 anthony9187 Awaiting requested review from anthony9187 anthony9187 is a code owner

@ImCoolNowRight ImCoolNowRight Awaiting requested review from ImCoolNowRight ImCoolNowRight is a code owner

@THoj13 THoj13 Awaiting requested review from THoj13

@jazzyw jazzyw Awaiting requested review from jazzyw

@soumyaloka soumyaloka Awaiting requested review from soumyaloka soumyaloka is a code owner

@slhay28 slhay28 Awaiting requested review from slhay28

Assignees
No one assigned
Labels
BUG Something isn't working refactor released WIP In progress but could use an initial review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@joshhowenstine @svc-lightning-ui-components @erautenberg @arwehrman