Skip to content

Commit ab82480

Browse files
Merge pull request #1505 from davidlygagnon/fix_year_picker_width
SLDSDatePicker bug fix: Fixing issue where year picker doesn't show years correctly
2 parents 4c61ceb + 2882f39 commit ab82480

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed

components/date-picker/__tests__/__snapshots__/datepicker.snapshot-test.jsx.snap

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ exports[`Datepicker
7575
>
7676
<div
7777
className="slds-datepicker__filter--month slds-grid slds-grid--align-spread slds-grow"
78+
style={
79+
Object {
80+
"flex": 1.75,
81+
}
82+
}
7883
>
7984
<div
8085
className="slds-align-middle"
@@ -922,6 +927,11 @@ exports[`Datepicker
922927
>
923928
<div
924929
className="slds-datepicker__filter--month slds-grid slds-grid--align-spread slds-grow"
930+
style={
931+
Object {
932+
"flex": 1.75,
933+
}
934+
}
925935
>
926936
<div
927937
className="slds-align-middle"
@@ -1767,6 +1777,11 @@ exports[`Datepicker Default DOM Snapshot 1`] = `
17671777
>
17681778
<div
17691779
className="slds-datepicker__filter--month slds-grid slds-grid--align-spread slds-grow"
1780+
style={
1781+
Object {
1782+
"flex": 1.75,
1783+
}
1784+
}
17701785
>
17711786
<div
17721787
className="slds-align-middle"
@@ -2560,7 +2575,7 @@ exports[`Datepicker Default HTML Snapshot 1`] = `
25602575
<div class=\\"slds-datepicker slds-dropdown slds-dropdown--left\\">
25612576
<div class=\\"\\" aria-hidden=\\"false\\" data-selection=\\"single\\">
25622577
<div class=\\"slds-datepicker__filter slds-grid\\">
2563-
<div class=\\"slds-datepicker__filter--month slds-grid slds-grid--align-spread slds-grow\\">
2578+
<div class=\\"slds-datepicker__filter--month slds-grid slds-grid--align-spread slds-grow\\" style=\\"flex:1.75;\\">
25642579
<div class=\\"slds-align-middle\\"><button class=\\"slds-button slds-button--icon-container\\" type=\\"button\\"><svg aria-hidden=\\"true\\" class=\\"slds-button__icon\\"><use xlink:href=\\"/assets/icons/utility-sprite/svg/symbols.svg#left\\"></use></svg><span class=\\"slds-assistive-text\\">Previous month</span></button></div>
25652580
<h2
25662581
id=\\"sample-datepicker-month\\" class=\\"slds-align-middle\\" aria-live=\\"assertive\\" aria-atomic=\\"true\\">July <span class=\\"slds-assistive-text\\">2014</span></h2>

components/date-picker/private/navigation.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ const DatepickerMonthNavigation = createReactClass({
9191
render () {
9292
return (
9393
<div className="slds-datepicker__filter slds-grid">
94-
<div className="slds-datepicker__filter--month slds-grid slds-grid--align-spread slds-grow">
94+
<div
95+
className="slds-datepicker__filter--month slds-grid slds-grid--align-spread slds-grow"
96+
style={{ flex: 1.75 }}
97+
>
9598
<div className="slds-align-middle">
9699
<Button
97100
assistiveText={{ icon: this.props.assistiveTextPreviousMonth }}

components/date-picker/private/year-picklist.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const DatepickerYearSelector = createReactClass({
4343
const opts = [];
4444

4545
for (let year = fromYear; year < toYear; year += 1) {
46-
opts.push({ label: `${year}`, value: year, id: opts.length });
46+
opts.push({ label: `${year}`, value: year, id: String(opts.length) });
4747
}
4848
return opts;
4949
},
@@ -73,6 +73,7 @@ const DatepickerYearSelector = createReactClass({
7373
<div className="slds-form-element slds-align-content-center">
7474
<Combobox
7575
className="slds-shrink-none"
76+
classNameMenu="slds-datepicker"
7677
events={{
7778
onSelect: this.handleSelect,
7879
}}

0 commit comments

Comments
 (0)