Skip to content
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

Jump to bottom

fix(datepicker): make touch UI work well on mobile #3853

Merged
merged 11 commits into from
Apr 14, 2017
Merged

fix(datepicker): make touch UI work well on mobile #3853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f57526a
add keyboard support, break some tests
mmalerba Mar 16, 2017
9963560
add tests
mmalerba Mar 17, 2017
5557f53
some finishing touches
mmalerba Mar 17, 2017
4cf8db1
addressed some comments
mmalerba Mar 23, 2017
7449e5e
separate md-datepicker-content into own component
mmalerba Mar 24, 2017
da1f523
addressed comments
mmalerba Apr 13, 2017
8019855
fix(datepicker): make touch UI work well on mobile
mmalerba Mar 30, 2017
c1f9716
use vmin instead of media queries + vw, vh
mmalerba Mar 30, 2017
f6fb9f0
fix non-touch styles
mmalerba Mar 30, 2017
396bcfd
fix lint error about vmin
mmalerba Apr 14, 2017
e51fc4b
addressed comments
mmalerba Apr 14, 2017
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
1 change: 1 addition & 0 deletions src/lib/datepicker/calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ $mat-calendar-weekday-table-font-size: 11px !default;

.mat-calendar-body {
padding: $mat-calendar-padding;
outline: none;
}

.mat-calendar-controls {
Expand Down
2 changes: 0 additions & 2 deletions src/lib/datepicker/datepicker-content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<md-calendar cdkTrapFocus
[id]="datepicker.id"
[class.mat-datepicker-content-touch]="datepicker.touchUi"
[class.mat-datepicker-content-non-touch]="!datepicker.touchUi"
[startAt]="datepicker.startAt"
[minDate]="datepicker._minDate"
[maxDate]="datepicker._maxDate"
Expand Down
43 changes: 34 additions & 9 deletions src/lib/datepicker/datepicker-content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,46 @@
@import '../core/style/elevation';


$md-datepicker-touch-calendar-cell-size: 60px;
$md-datepicker-non-touch-calendar-cell-size: 40px;
$md-datepicker-calendar-padding: 8px;

$md-datepicker-touch-calendar-width:
$md-datepicker-touch-calendar-cell-size * 7 + $md-datepicker-calendar-padding * 2;
$md-datepicker-non-touch-calendar-cell-size: 40px;
$md-datepicker-non-touch-calendar-width:
$md-datepicker-non-touch-calendar-cell-size * 7 + $md-datepicker-calendar-padding * 2;

// Ideally the calendar would have a constant aspect ratio, no matter its size, and we would base
// these measurements off the aspect ratio. Unfortunately, the aspect ratio does change a little as
// the calendar grows, since some of the elements have pixel-based sizes. These numbers have been
// chosen to minimize extra whitespace at larger sizes, while still ensuring we won't need
// scrollbars at smaller sizes.
$md-datepicker-touch-width: 67vmin;
$md-datepicker-touch-height: 80vmin;
$md-datepicker-touch-min-width: 253px;
$md-datepicker-touch-min-height: 300px;
$md-datepicker-touch-max-width: 778px;
$md-datepicker-touch-max-height: 800px;

.mat-datepicker-content-touch {
width: $md-datepicker-touch-calendar-width;
}

.mat-datepicker-content-non-touch {
.mat-calendar {
width: $md-datepicker-non-touch-calendar-width;
@include mat-elevation(8);
}

.mat-datepicker-content-touch {
display: block;
// make sure the dialog scrolls rather than being cropped on ludicrously small screens
max-height: 80vh;
overflow: auto;

// TODO(mmalerba): hack to offset the padding of the dialog. Can be removed when we switch away
// from using dialog.
margin: -24px;

.mat-calendar {
width: $md-datepicker-touch-width;
height: $md-datepicker-touch-height;
min-width: $md-datepicker-touch-min-width;
min-height: $md-datepicker-touch-min-height;
max-width: $md-datepicker-touch-max-width;
max-height: $md-datepicker-touch-max-height;
@include mat-elevation(0);
}
}
4 changes: 4 additions & 0 deletions src/lib/datepicker/datepicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ let datepickerUid = 0;
selector: 'md-datepicker-content',
templateUrl: 'datepicker-content.html',
styleUrls: ['datepicker-content.css'],
host: {
'class': 'mat-datepicker-content',
'[class.mat-datepicker-content-touch]': 'datepicker.touchUi',
},
encapsulation: ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
})
Expand Down
2 changes: 1 addition & 1 deletion stylelint-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

"unit-case": "lower",
"unit-no-unknown": true,
"unit-whitelist": ["px", "%", "deg", "ms", "em", "vh", "vw"],
"unit-whitelist": ["px", "%", "deg", "ms", "em", "vh", "vw", "vmin"],

"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",
Expand Down