Skip to content

fix(DatePicker): readOnlyTextField styles should win over default TextField's #28891

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
sopranopillow merged 8 commits into from
Aug 17, 2023
Merged

fix(DatePicker): readOnlyTextField styles should win over default TextField's #28891

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
84a7623
fix(DatePicker): Add more specificity to user provided readOnlyTextFi…
sopranopillow Aug 16, 2023
5f01708
change files
sopranopillow Aug 16, 2023
e146ab1
update import
sopranopillow Aug 16, 2023
48f528d
merge classes instead of adding specificity
sopranopillow Aug 17, 2023
0f28311
update comment
sopranopillow Aug 17, 2023
69005b1
update snapshots
sopranopillow Aug 17, 2023
55f4efc
Update packages/react/src/components/DatePicker/DatePicker.base.tsx
sopranopillow Aug 17, 2023
29a81b8
Merge branch 'master' into datepicker-specificty
sopranopillow Aug 17, 2023
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-43bf83e2-d32b-45f7-a346-1c6ea8947614.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix(DatePicker): readOnlyTextField styles should win over textfield's default styles.",
"packageName": "@fluentui/react",
"email": "esteban.230@hotmail.com",
"dependentChangeType": "patch"
}
6 changes: 5 additions & 1 deletion packages/react/src/components/DatePicker/DatePicker.base.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
import { Calendar } from '../../Calendar';
import { FirstWeekOfYear, getDatePartHashValue, compareDatePart, DayOfWeek } from '@fluentui/date-time-utilities';
import { Callout, DirectionalHint } from '../../Callout';
import { mergeStyles } from '../../Styling';
import { TextField } from '../../TextField';
import { FocusTrapZone } from '../../FocusTrapZone';
import { useId, useAsync, useControllableValue } from '@fluentui/react-hooks';
Expand Down Expand Up @@ -420,11 +421,14 @@ export const DatePickerBase: React.FunctionComponent<IDatePickerProps> = React.f

const renderReadOnlyInput: ITextFieldProps['onRenderInput'] = inputProps => {
const divProps = getNativeProps(inputProps!, divProperties);
// Need to merge styles so the provided styles win over the default ones. This is due to the classnames having the
// same specificity.
const readOnlyTextFieldClassName = mergeStyles(divProps.className, classNames.readOnlyTextField);

// Talkback on Android treats readonly inputs as disabled, so swipe gestures to open the Calendar
// don't register. Workaround is rendering a div with role="combobox" (passed in via TextField props).
return (
<div {...divProps} className={css(divProps.className, classNames.readOnlyTextField)} tabIndex={tabIndex || 0}>
<div {...divProps} className={readOnlyTextFieldClassName} tabIndex={tabIndex || 0}>
{formattedDate || (
// Putting the placeholder in a separate span fixes specificity issues for the text color
<span className={classNames.readOnlyPlaceholder}>{placeholder}</span>
Expand Down
22 changes: 8 additions & 14 deletions packages/react/src/components/DatePicker/__snapshots__/DatePicker.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,15 +331,19 @@ exports[`DatePicker renders DatePicker with value correctly 1`] = `
box-shadow: none;
box-sizing: border-box;
color: #323130;
cursor: pointer;
font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif;
font-size: 14px;
font-weight: 400;
height: 32px;
line-height: 30px;
margin-bottom: 0px;
margin-left: 0px;
margin-right: 0px;
margin-top: 0px;
min-width: 0px;
outline: 0px;
overflow: hidden;
padding-bottom: 0;
padding-left: 8px;
padding-right: 24px;
Expand Down Expand Up @@ -384,13 +388,6 @@ exports[`DatePicker renders DatePicker with value correctly 1`] = `
@media screen and (-ms-high-contrast: active), screen and (forced-colors: active){&::-ms-input-placeholder {
color: GrayText;
}
{
cursor: pointer;
height: 32px;
line-height: 30px;
overflow: hidden;
text-overflow: ellipsis;
}
data-is-focusable={true}
id="DatePicker0-label"
onBlur={[Function]}
Expand Down Expand Up @@ -564,15 +561,19 @@ exports[`DatePicker renders default DatePicker correctly 1`] = `
box-shadow: none;
box-sizing: border-box;
color: #323130;
cursor: pointer;
font-family: 'Segoe UI', 'Segoe UI Web (West European)', 'Segoe UI', -apple-system, BlinkMacSystemFont, 'Roboto', 'Helvetica Neue', sans-serif;
font-size: 14px;
font-weight: 400;
height: 32px;
line-height: 30px;
margin-bottom: 0px;
margin-left: 0px;
margin-right: 0px;
margin-top: 0px;
min-width: 0px;
outline: 0px;
overflow: hidden;
padding-bottom: 0;
padding-left: 8px;
padding-right: 24px;
Expand Down Expand Up @@ -617,13 +618,6 @@ exports[`DatePicker renders default DatePicker correctly 1`] = `
@media screen and (-ms-high-contrast: active), screen and (forced-colors: active){&::-ms-input-placeholder {
color: GrayText;
}
{
cursor: pointer;
height: 32px;
line-height: 30px;
overflow: hidden;
text-overflow: ellipsis;
}
data-is-focusable={true}
id="DatePicker0-label"
onBlur={[Function]}
Expand Down