Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
3631438
no message
kellygorr Aug 8, 2017
906bc1d
no message
kellygorr Aug 9, 2017
e75fde7
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 9, 2017
02be081
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 9, 2017
da53506
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 10, 2017
b06128a
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 14, 2017
ba0595e
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 15, 2017
3bf19ac
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 15, 2017
f7fe642
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 16, 2017
9466042
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 17, 2017
6939e5e
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 21, 2017
e2f64ec
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 22, 2017
232cc47
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 23, 2017
07db711
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 23, 2017
d9bbd3a
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 25, 2017
4332d2b
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 25, 2017
43c404e
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 28, 2017
92c3b1f
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 28, 2017
5b39aa7
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Aug 31, 2017
844947f
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 1, 2017
e4e4b0f
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 5, 2017
538ebd4
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 7, 2017
4a9ee13
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 7, 2017
0d75ba3
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 11, 2017
6939ec7
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 12, 2017
c939d02
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 12, 2017
44e56cb
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 12, 2017
a27df45
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 13, 2017
308d8ba
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 14, 2017
a12c9be
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 14, 2017
aea6e66
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 14, 2017
4672ace
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 19, 2017
4b03dc4
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 19, 2017
fb6b0d2
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 21, 2017
4d688e6
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 22, 2017
dee5b3e
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 22, 2017
ce2c260
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 25, 2017
241e075
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 26, 2017
8982806
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 27, 2017
0c75736
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 27, 2017
5dc034d
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 28, 2017
d1cea45
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Sep 28, 2017
7b9ff13
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Oct 3, 2017
cde278e
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Oct 4, 2017
0924dfc
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Oct 5, 2017
a16084c
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Oct 9, 2017
6cfda6a
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Oct 10, 2017
c2c1e1c
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Oct 17, 2017
35bacde
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Oct 20, 2017
4aa0c12
Merge branch 'master' of https://github.com/kellygorr/office-ui-fabri…
kellygorr Oct 20, 2017
e6ccfe5
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Nov 14, 2017
8d8fc40
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Nov 15, 2017
8edc107
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Nov 16, 2017
a1cbff2
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Nov 27, 2017
32d5b5a
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Nov 28, 2017
741dbc1
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Nov 30, 2017
a232c95
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Dec 4, 2017
1ed209e
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Dec 6, 2017
1b9ff81
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Dec 18, 2017
8dc335c
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Dec 22, 2017
9c1eafb
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Jan 10, 2018
c5c2f4d
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Feb 8, 2018
b0ad5e7
Merge branch 'master' of https://github.com/officedev/office-ui-fabri…
kellygorr Feb 21, 2018
17f4ccd
Added callback for menu dismiss and added example
kellygorr Feb 21, 2018
f365403
Change file
kellygorr 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
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "DatePicker-onAfterMenuDismiss callback created",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "kegorr@microsoft.com"
}
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,13 @@ export class DatePicker extends BaseComponent<IDatePickerProps, IDatePickerState
}
}

public componentDidUpdate(prevProps: IDatePickerProps, prevState: IDatePickerState) {
// If DatePicker's menu (Calendar) is closed, run onAfterMenuDismiss
if (this.props.onAfterMenuDismiss && prevState.isDatePickerShown && !this.state.isDatePickerShown) {
this.props.onAfterMenuDismiss();
}
}

public render() {
const {
firstDayOfWeek,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ export interface IDatePickerProps extends React.Props<DatePicker> {
* The initially highlighted date in the calendar picker
*/
initialPickerDate?: Date;

/**
* Callback that runs after DatePicker's menu (Calendar) is closed
*/
onAfterMenuDismiss?: () => void;
}

export interface IDatePickerStrings {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,14 @@ export class DatePickerBasicExample extends React.Component<{}, IDatePickerBasic

return (
<div>
<DatePicker firstDayOfWeek={ firstDayOfWeek } strings={ DayPickerStrings } placeholder='Select a date...' />
<DatePicker
firstDayOfWeek={ firstDayOfWeek }
strings={ DayPickerStrings }
placeholder='Select a date...'
// tslint:disable:jsx-no-lambda
onAfterMenuDismiss={ () => console.log('onAfterMenuDismiss called') }
// tslint:enable:jsx-no-lambda
/>
<Dropdown
label='Select the first day of the week'
options={ [
Expand Down