Skip to content

Moves label outside of DatePicker hit target #3832

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
lorejoh12 merged 8 commits into from
Feb 12, 2018
Merged

Moves label outside of DatePicker hit target #3832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1dadbd
Moves label outside of DatePicker input
martellaj Jan 29, 2018
a5be6fd
Adds change file
martellaj Jan 29, 2018
3098d9c
Fixes import statement
martellaj Feb 2, 2018
a6048d9
Adjusts snapshot for DatePicker test
martellaj Feb 7, 2018
1a4077d
Fixes DatePicker story maybe (can't test locally)
martellaj Feb 7, 2018
9a7081a
Reverts "Adjusts snapshot for DatePicker test"
martellaj Feb 7, 2018
3394ec9
Reverts "Fixes DatePicker story maybe (can't test locally)"
martellaj Feb 7, 2018
885cb13
Only renders Label component if label prop is provided
martellaj Feb 7, 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/joem-fix-datepicker-hit-target_2018-01-29-21-52.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": "Moves DatePicker label outside of hit target",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "joem@microsoft.com"
}
5 changes: 4 additions & 1 deletion packages/office-ui-fabric-react/src/components/DatePicker/DatePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { FirstWeekOfYear } from '../../utilities/dateValues/DateValues';
import { Callout } from '../../Callout';
import { DirectionalHint } from '../../common/DirectionalHint';
import { TextField } from '../../TextField';
import { Label } from '../../Label';
import {
autobind,
BaseComponent,
Expand Down Expand Up @@ -189,6 +190,9 @@ export class DatePicker extends BaseComponent<IDatePickerProps, IDatePickerState

return (
<div className={ css('ms-DatePicker', styles.root, className) } ref={ this._resolveRef('_root') }>
{ label && (
<Label required={ isRequired }>{ label }</Label>
) }
<div ref={ this._resolveRef('_datepicker') }>
<TextField
className={ styles.textField }
Expand All @@ -203,7 +207,6 @@ export class DatePicker extends BaseComponent<IDatePickerProps, IDatePickerState
onClick={ this._onTextFieldClick }
onChanged={ this._onTextFieldChanged }
errorMessage={ errorMessage }
label={ label }
placeholder={ placeholder }
borderless={ borderless }
iconProps={ {
Expand Down