Navigation Menu

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.

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(TimePicker): prop locale should works #15837

Merged
merged 1 commit into from Apr 4, 2019
Merged

Fix(TimePicker): prop locale should works #15837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 40 additions & 0 deletions components/time-picker/__tests__/__snapshots__/index.test.js.snap
View file
Open in desktop
Expand Up @@ -39,6 +39,46 @@ exports[`TimePicker not render clean icon when allowClear is false 1`] = `
</span>
`;

exports[`TimePicker prop locale should works 1`] = `
<span
class="ant-time-picker "
style=""
>
<input
class="ant-time-picker-input"
id=""
placeholder="Избери дата"
type="text"
value=""
/>
<span
class="ant-time-picker-icon"
>
<i
aria-label="icon: clock-circle"
class="anticon anticon-clock-circle ant-time-picker-clock-icon"
>
<svg
aria-hidden="true"
class=""
data-icon="clock-circle"
fill="currentColor"
height="1em"
viewBox="64 64 896 896"
width="1em"
>
<path
d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"
/>
<path
d="M686.7 638.6L544.1 535.5V288c0-4.4-3.6-8-8-8H488c-4.4 0-8 3.6-8 8v275.4c0 2.6 1.2 5 3.3 6.5l165.4 120.6c3.6 2.6 8.6 1.8 11.2-1.7l28.6-39c2.6-3.7 1.8-8.7-1.8-11.2z"
/>
</svg>
</i>
</span>
</span>
`;

exports[`TimePicker renders addon correctly 1`] = `
<div
class="ant-time-picker-panel-addon"
Expand Down
8 changes: 8 additions & 0 deletions components/time-picker/__tests__/index.test.js
View file
Open in desktop
Expand Up @@ -68,4 +68,12 @@ describe('TimePicker', () => {
<div className="test-clear-icon ant-time-picker-clear">test</div>,
);
});

it('prop locale should works', () => {
const locale = {
placeholder: 'Избери дата',
};
const wrapper = mount(<TimePicker open locale={locale} />);
expect(wrapper.render()).toMatchSnapshot();
});
});
13 changes: 11 additions & 2 deletions components/time-picker/index.tsx
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ import classNames from 'classnames';
import warning from '../_util/warning';
import LocaleReceiver from '../locale-provider/LocaleReceiver';
import { ConfigConsumer, ConfigConsumerProps } from '../config-provider';
import defaultLocale from './locale/en_US';
import enUS from './locale/en_US';
import interopDefault from '../_util/interopDefault';
import Icon from '../icon';

Expand Down Expand Up @@ -54,6 +54,7 @@ export interface TimePickerProps {
popupStyle?: React.CSSProperties;
suffixIcon?: React.ReactNode;
clearIcon?: React.ReactNode;
locale?: TimePickerLocale;
}

export interface TimePickerLocale {
Expand Down Expand Up @@ -176,6 +177,14 @@ class TimePicker extends React.Component<TimePickerProps, any> {
return <Icon type="close-circle" className={clearIconPrefixCls} theme="filled" />;
}

getDefaultLocale = () => {
const defaultLocale = {
...enUS,
...this.props.locale,
};
return defaultLocale;
};

renderTimePicker = (locale: TimePickerLocale) => (
<ConfigConsumer>
{({ getPopupContainer: getContextPopupContainer, getPrefixCls }: ConfigConsumerProps) => {
Expand Down Expand Up @@ -225,7 +234,7 @@ class TimePicker extends React.Component<TimePickerProps, any> {

render() {
return (
<LocaleReceiver componentName="TimePicker" defaultLocale={defaultLocale}>
<LocaleReceiver componentName="TimePicker" defaultLocale={this.getDefaultLocale()}>
{this.renderTimePicker}
</LocaleReceiver>
);
Expand Down