Merge styles order #4664
Merged
Merge styles order #4664
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
… head in which they're inserted.)
MLoughry
reviewed
Apr 24, 2018
| this._rules.push(rule); | ||
| break; | ||
| const { injectionMode } = this._config; | ||
| const element = injectionMode !== InjectionMode.none ? this._getStyleElement() : undefined; |
There was a problem hiding this comment.
Nit: this nesting of a switch inside an if-else is not very readable to me. Any reason not to just have a switch covering all states?
There was a problem hiding this comment.
It was because the "else" statement applies to all states. If there is no element created, because say, document is not available, cache the rules in the array for later use.
cliffkoh
previously approved these changes
Apr 25, 2018
|
|
||
| try { | ||
| // tslint:disable-next-line:no-any | ||
| (sheet as any).insertRule(rule, (sheet as any).cssRules.length); |
There was a problem hiding this comment.
Cast to CSSStyleSheet instead as to any.
cliffkoh
approved these changes
Apr 25, 2018
Markionium
added a commit
to Markionium/office-ui-fabric-react
that referenced
this pull request
Apr 26, 2018
* master: (42 commits) Applying package updates. ProgressIndicator: Finish conversion to mergeStyles (microsoft#4595) Fix props validation for Breadcrumb (microsoft#4666) No unused vars part of ts (microsoft#4670) Picker/Autofill: fixes several minor bugs. (microsoft#4569) Fix Calendar component PREV/NEXT month, year, and "Go to today" handlers firing twice (microsoft#4662) Applying package updates. Merge styles order (microsoft#4664) Fabric component: revert class change and make it backwards compatible (microsoft#4671) Addressing Issue microsoft#3707 - OverflowSet: Add the ability to set aria-label (microsoft#4667) Fix input type for Tile ARIA label prop (microsoft#4668) Fix theme slots for DetailsList header colors (microsoft#4658) Applying package updates. Jolore/calendar updates (microsoft#4643) Remove wordWrap setting. (microsoft#4657) Pivot: convert to mergeStyles - part 1 (microsoft#4656) Use the `data-is-scrollable` attribute on the correct ScrollablePane div (microsoft#4602) Applying package updates. Remove unused iconClassName prop from Nav.types (microsoft#4634) Jest snapshots: classes in animations should autoexpand. (microsoft#4647) ...
Markionium
added a commit
to Markionium/office-ui-fabric-react
that referenced
this pull request
Apr 26, 2018
* master: (34 commits) Applying package updates. ProgressIndicator: Finish conversion to mergeStyles (microsoft#4595) Fix props validation for Breadcrumb (microsoft#4666) No unused vars part of ts (microsoft#4670) Picker/Autofill: fixes several minor bugs. (microsoft#4569) Fix Calendar component PREV/NEXT month, year, and "Go to today" handlers firing twice (microsoft#4662) Applying package updates. Merge styles order (microsoft#4664) Fabric component: revert class change and make it backwards compatible (microsoft#4671) Addressing Issue microsoft#3707 - OverflowSet: Add the ability to set aria-label (microsoft#4667) Fix input type for Tile ARIA label prop (microsoft#4668) Fix theme slots for DetailsList header colors (microsoft#4658) Applying package updates. Jolore/calendar updates (microsoft#4643) Remove wordWrap setting. (microsoft#4657) Pivot: convert to mergeStyles - part 1 (microsoft#4656) Use the `data-is-scrollable` attribute on the correct ScrollablePane div (microsoft#4602) Applying package updates. Remove unused iconClassName prop from Nav.types (microsoft#4634) Jest snapshots: classes in animations should autoexpand. (microsoft#4647) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This change addresses 2 issues;
When inserting new
styleelements, we now insert them after the last merge-styles style element created, rather than at the end of head. This leads to more predictable selector specificity, in case you add a css stylesheet override at the end.When in
appendChildinjection mode, we now batch up rules to insert, rather than creating a style element per rule.