DatePicker MergeStyles step 2 - Converts scss to js styles #5362
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "changes": [ | ||
| { | ||
| "packageName": "office-ui-fabric-react", | ||
| "comment": "DatePicker MergeStyles step 2 - Converts scss to js styles", | ||
| "type": "minor" | ||
| } | ||
| ], | ||
| "packageName": "office-ui-fabric-react", | ||
| "email": "v-jescla@microsoft.com" | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,75 @@ | ||
| import { IDatePickerStyleProps, IDatePickerStyles } from './DatePicker.types'; | ||
| import { IStyle, normalize, getGlobalClassNames } from '../../Styling'; | ||
|
|
||
| const GlobalClassNames = { | ||
| root: 'ms-DatePicker', | ||
|
|
||
| textField: 'ms-TextField', | ||
|
Collaborator
There was a problem hiding this comment. duplicate - 'ms-TextField' comes from the TextField component root, so when they combine you render two 'ms-TextField' s - the scss implementation didn't have a class for this element just styles.
Contributor
There was a problem hiding this comment. Yeah, this className should be removed |
||
| eventWithLabel: 'ms-DatePicker-event--with-label', | ||
| eventWithoutLabel: 'ms-DatePicker-event--without-label' | ||
| }; | ||
|
|
||
| export const styles = (props: IDatePickerStyleProps): IDatePickerStyles => { | ||
| const { className, theme } = props; | ||
| const { palette, fonts } = theme; | ||
| const classNames = getGlobalClassNames(GlobalClassNames, theme); | ||
|
|
||
| const DatePickerEvent: IStyle = { | ||
| color: palette.neutralSecondary, | ||
| fontSize: fonts.medium.fontSize, | ||
| lineHeight: '18px', | ||
| pointerEvents: 'none', | ||
| position: 'absolute', | ||
| right: '9px' | ||
| }; | ||
|
|
||
| return { | ||
| root: [classNames.root, normalize, {}, className], | ||
| textField: [ | ||
| classNames.textField, | ||
| { | ||
| position: 'relative', | ||
| selectors: { | ||
| '& input[readonly]': { | ||
| cursor: 'pointer' | ||
| }, | ||
| input: { | ||
| selectors: { | ||
| '::-ms-clear': { | ||
| display: 'none' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| className | ||
| ], | ||
| eventWithLabel: [ | ||
| classNames.eventWithLabel, | ||
| DatePickerEvent, | ||
| { | ||
| bottom: '5px', | ||
| selectors: { | ||
| ':not(.msDatePickerDisabled)': { | ||
| pointerEvents: 'initial', | ||
| cursor: 'pointer' | ||
| } | ||
| } | ||
| }, | ||
| className | ||
|
Contributor
There was a problem hiding this comment. Shouldn't className only be on root? I don't see it mixed in with other class names in old code
Collaborator
There was a problem hiding this comment. Yes, the standard className prop is a custom class name just for the root, not all elements. |
||
| ], | ||
| eventWithoutLabel: [ | ||
| classNames.eventWithoutLabel, | ||
| DatePickerEvent, | ||
| { | ||
| top: '7px', | ||
| selectors: { | ||
| ':not(.msDatePickerDisabled)': { | ||
| pointerEvents: 'initial', | ||
| cursor: 'pointer' | ||
| } | ||
| } | ||
| }, | ||
| className | ||
| ] | ||
| }; | ||
| }; | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| import { styled } from '../../Utilities'; | ||
| import { IDatePickerProps, IDatePickerStyleProps, IDatePickerStyles } from './DatePicker.types'; | ||
| import { DatePickerBase } from './DatePicker.base'; | ||
| import { styles } from './DatePicker.styles'; | ||
|
|
||
| /** | ||
| * DatePicker description | ||
| */ | ||
| export const DatePicker = styled<IDatePickerProps, IDatePickerStyleProps, IDatePickerStyles>( | ||
| DatePickerBase, | ||
| styles, | ||
| undefined, | ||
| { scope: 'DatePicker' } | ||
| ); |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cssimport should be removed - there's a completely redundant call on line 213 that shouldn't have been there in the first place (its 'concatenating' just one class with nothing else