Flatten styles array #437
Merged
Flatten styles array #437
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LarsDenBakker
force-pushed
the
flatten-styles
branch
from
279bb38
to
0a51f5d
Compare
LarsDenBakker
force-pushed
the
flatten-styles
branch
from
0a51f5d
to
800b363
Compare
|
See my comments on #429 |
sorvell
requested changes
Jan 12, 2019
src/lit-element.ts
Outdated
| @@ -22,6 +22,28 @@ export {html, svg, TemplateResult, SVGTemplateResult} from 'lit-html/lit-html'; | |||
| import {supportsAdoptingStyleSheets, CSSResult} from './lib/css-tag.js'; | |||
| export * from './lib/css-tag.js'; | |||
|
|
|||
| export interface LitElementStyles extends Array<CSSResult | CSSResult[] | LitElementStyles> {} | |||
There was a problem hiding this comment.
Let's also address #429 (comment) by allowing this to be a single CSSResult. This way static get styles can be a single CSSResult and then any form of composition (sharing some "style modules" or some super class styles) is similar, e.g. static get styles() { return [super.styles, sharedStyles]; }.
If we do this, then flattenStyles needs to handle the case where the input is a non-array and we'll obviously need to test that.
There was a problem hiding this comment.
Good suggestion, added it in :)
sorvell
approved these changes
Jan 14, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #429
Flattens styles array before deduplication.
Recursive types are a bit funky, I had to use an interface as instructed here: https://github.com/unional/typescript-guidelines/blob/master/pages/advance-types/recursive-types.md
I'm using Array.prototype.flat when supported, otherwise there is a minimal implementation.
I had to enable esnext typings for Array.prototype.flat support.