Skip to content

Dialog: modal props now mixed correctly#4045

Merged
dzearing merged 2 commits intomicrosoft:masterfrom
dzearing:fix-dialog-props
Feb 21, 2018
Merged

Dialog: modal props now mixed correctly#4045
dzearing merged 2 commits intomicrosoft:masterfrom
dzearing:fix-dialog-props

Conversation

@dzearing
Copy link
Copy Markdown
Member

There was a bug in Dialog where "defaults" would be easily overwritten for modalProps and dialogContentProps.

This change now mixes the user provided values in with defaults. This means we respect the default white overlay for Modal.

@dzearing
Copy link
Copy Markdown
Member Author

@betrue-final-final @lynamemi Here you go. :)

@betrue-final-final
Copy link
Copy Markdown
Member

I can just abandon my PR now?

@dzearing
Copy link
Copy Markdown
Member Author

@betrue-final-final Yup, I abandoned it for you already ;)

@dzearing dzearing merged commit 4bf9946 into microsoft:master Feb 21, 2018
@dzearing dzearing deleted the fix-dialog-props branch February 21, 2018 04:40
@lynamemi
Copy link
Copy Markdown
Collaborator

Yay, thank you! :)

Markionium added a commit to Markionium/office-ui-fabric-react that referenced this pull request Feb 21, 2018
* master:
  Applying package updates.
  Features/disabled link pointer events (microsoft#4020)
  Image SCSS to MergeStyles Part 1: File Structure (microsoft#4037)
  Nav SCSS to MergeStyles Part 1: File Structure (microsoft#4036)
  Dialog: modal props now mixed correctly (microsoft#4045)
  Rating type (microsoft#4046)
  Dialog: Converting to mergeStyles part 1 - file structure. (microsoft#4042)
  ScrollablePane SCSS to MergeStyles Part 2: Style Conversion (microsoft#4010)
  Spin Button and Checkbox: Added Support for aria-setsize and aria-posinset (microsoft#4006)
  SwatchColorPicker: Improve keyboarding/mouse experience (microsoft#4035)
  Enable jsx key (microsoft#4017)
  make onShouldVirtualize work for grouped list (microsoft#4021)
  ResizeGroup SCSS to MergeStyles Part 1: File Structure (microsoft#4022)
  Misc changes from 6.0 branch (microsoft#4031)
  Enable prefer-const tslint flag (microsoft#4018)
Markionium added a commit to Markionium/office-ui-fabric-react that referenced this pull request Feb 21, 2018
* origin:
  Applying package updates.
  Features/disabled link pointer events (microsoft#4020)
  Image SCSS to MergeStyles Part 1: File Structure (microsoft#4037)
  Nav SCSS to MergeStyles Part 1: File Structure (microsoft#4036)
  Dialog: modal props now mixed correctly (microsoft#4045)
  Rating type (microsoft#4046)
  Dialog: Converting to mergeStyles part 1 - file structure. (microsoft#4042)
  ScrollablePane SCSS to MergeStyles Part 2: Style Conversion (microsoft#4010)
  Spin Button and Checkbox: Added Support for aria-setsize and aria-posinset (microsoft#4006)
  SwatchColorPicker: Improve keyboarding/mouse experience (microsoft#4035)
  Enable jsx key (microsoft#4017)
  make onShouldVirtualize work for grouped list (microsoft#4021)
  ResizeGroup SCSS to MergeStyles Part 1: File Structure (microsoft#4022)
  Misc changes from 6.0 branch (microsoft#4031)
  Enable prefer-const tslint flag (microsoft#4018)
@microsoft microsoft locked as resolved and limited conversation to collaborators Aug 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants