Skip to content

fix: icons in month and quarter #86

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
merged 5 commits into from
Jun 16, 2020
Merged

fix: icons in month and quarter #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ca7066
feat: add icons on month and quarter
fireairforce Jun 16, 2020
b73c0ab
fix: key
fireairforce Jun 16, 2020
d62bc96
fix: key
fireairforce Jun 16, 2020
fa93ef1
feat: delete key
fireairforce Jun 16, 2020
213c157
delete key
fireairforce Jun 16, 2020
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
14 changes: 3 additions & 11 deletions src/panels/MonthPanel/MonthHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,13 @@ function MonthHeader<DateType>(props: MonthHeaderProps<DateType>) {

return (
<Header
{...props}
prefixCls={headerPrefixCls}
onSuperPrev={onPrevYear}
onSuperNext={onNextYear}
>
<button
type="button"
key="year"
onClick={onYearClick}
className={`${prefixCls}-year-btn`}
>
{generateConfig.locale.format(
locale.locale,
viewDate,
locale.yearFormat,
)}
<button type="button" onClick={onYearClick} className={`${prefixCls}-year-btn`}>
{generateConfig.locale.format(locale.locale, viewDate, locale.yearFormat)}
</button>
</Header>
);
Expand Down
10 changes: 7 additions & 3 deletions src/panels/QuarterPanel/QuarterHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,14 @@ function QuarterHeader<DateType>(props: QuarterHeaderProps<DateType>) {
}

const headerPrefixCls = `${prefixCls}-header`;

return (
<Header prefixCls={headerPrefixCls} onSuperPrev={onPrevYear} onSuperNext={onNextYear}>
<button type="button" key="year" onClick={onYearClick} className={`${prefixCls}-year-btn`}>
<Header
{...props}
prefixCls={headerPrefixCls}
onSuperPrev={onPrevYear}
onSuperNext={onNextYear}
>
<button type="button" onClick={onYearClick} className={`${prefixCls}-year-btn`}>
{generateConfig.locale.format(locale.locale, viewDate, locale.yearFormat)}
</button>
</Header>
Expand Down
19 changes: 3 additions & 16 deletions src/panels/YearPanel/YearHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,7 @@ export interface YearHeaderProps<DateType> {
}

function YearHeader<DateType>(props: YearHeaderProps<DateType>) {
const {
prefixCls,
generateConfig,
viewDate,
onPrevDecade,
onNextDecade,
onDecadeClick,
} = props;
const { prefixCls, generateConfig, viewDate, onPrevDecade, onNextDecade, onDecadeClick } = props;
const { hideHeader } = React.useContext(PanelContext);
if (hideHeader) {
return null;
Expand All @@ -32,8 +25,7 @@ function YearHeader<DateType>(props: YearHeaderProps<DateType>) {
const headerPrefixCls = `${prefixCls}-header`;

const yearNumber = generateConfig.getYear(viewDate);
const startYear =
Math.floor(yearNumber / YEAR_DECADE_COUNT) * YEAR_DECADE_COUNT;
const startYear = Math.floor(yearNumber / YEAR_DECADE_COUNT) * YEAR_DECADE_COUNT;
const endYear = startYear + YEAR_DECADE_COUNT - 1;

return (
Expand All @@ -43,12 +35,7 @@ function YearHeader<DateType>(props: YearHeaderProps<DateType>) {
onSuperPrev={onPrevDecade}
onSuperNext={onNextDecade}
>
<button
type="button"
key="year"
onClick={onDecadeClick}
className={`${prefixCls}-decade-btn`}
>
<button type="button" onClick={onDecadeClick} className={`${prefixCls}-decade-btn`}>
{startYear}-{endYear}
</button>
</Header>
Expand Down