Skip to content

Dialog: modal props now mixed correctly #4045

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

Merged
dzearing merged 2 commits into from
Feb 21, 2018
Merged

Dialog: modal props now mixed correctly #4045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aa490e
Fixing Dialog/Modal default props.
dzearing Feb 21, 2018
c243297
Adding change file.
dzearing Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/fix-dialog-props_2018-02-21-03-49.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Dialog: default modal props now respective (Modal rendered with light background.)",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "dzearing@microsoft.com"
}
40 changes: 25 additions & 15 deletions packages/office-ui-fabric-react/src/components/Dialog/Dialog.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,30 @@ import {
getId
} from '../../Utilities';
import { IDialogProps } from './Dialog.types';
import { DialogType } from './DialogContent.types';
import { Modal } from '../../Modal';
import { DialogType, IDialogContentProps } from './DialogContent.types';
import { Modal, IModalProps } from '../../Modal';
import { withResponsiveMode } from '../../utilities/decorators/withResponsiveMode';
import * as stylesImport from './Dialog.scss';
const styles: any = stylesImport;

import { DialogContent } from './DialogContent';

const DefaultModalProps: IModalProps = {
isDarkOverlay: false,
isBlocking: false,
className: '',
containerClassName: ''
};

const DefaultDialogContentProps: IDialogContentProps = {
type: DialogType.normal,
className: '',
topButtonsProps: [],
};

@withResponsiveMode
export class DialogBase extends BaseComponent<IDialogProps, {}> {
public static defaultProps: IDialogProps = {
modalProps: {
isDarkOverlay: true,
isBlocking: false,
className: '',
containerClassName: ''
},
dialogContentProps: {
type: DialogType.normal,
className: '',
topButtonsProps: [],
},
hidden: true,
};

Expand Down Expand Up @@ -78,12 +80,20 @@ export class DialogBase extends BaseComponent<IDialogProps, {}> {
type,
contentClassName,
topButtonsProps,
dialogContentProps,
modalProps,
containerClassName,
hidden
} = this.props;

const modalProps = {
...DefaultModalProps,
...this.props.modalProps
};

const dialogContentProps: IDialogContentProps = {
...DefaultDialogContentProps,
...this.props.dialogContentProps
};

return (
<Modal
elementToFocusOnDismiss={ elementToFocusOnDismiss }
Expand Down