Skip to content

Commit

Permalink
update style
Browse files Browse the repository at this point in the history
  • Loading branch information
zombieJ committed Nov 25, 2019
1 parent f5abc29 commit 319f00b
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 9 deletions.
14 changes: 13 additions & 1 deletion assets/index.less
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
&-time-panel {
display: flex;
flex-direction: column;
width: 250px;

// Header
&-header {
Expand Down Expand Up @@ -85,6 +84,14 @@
}
}

// ================== Year & Month Panel ==================
&-year-panel,
&-month-panel {
&-cell-inner {
width: 100px;
}
}

// ====================== Week Panel ======================
&-week-panel {
&-row {
Expand All @@ -101,6 +108,11 @@
}
}

&-cell,
&-cell-inner {
width: 20px;
}

&-cell-week {
font-size: 12px;
color: #999;
Expand Down
27 changes: 22 additions & 5 deletions examples/calendar.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,29 @@
import React from 'react';
import moment, { Moment } from 'moment';
import { Moment } from 'moment';
import Picker from '../src/Picker';
import PickerPanel from '../src/PickerPanel';
import momentGenerateConfig from '../src/generate/moment';
import zhCN from '../src/locale/zh_CN';
import '../assets/index.less';

function dateRender(date: Moment) {
return <div style={{ width: 80, height: 80 }}>{date.date()}</div>;
}

export default () => (
<div>
<PickerPanel locale={zhCN} generateConfig={momentGenerateConfig} />
</div>
);
<div>
<PickerPanel<Moment>
locale={zhCN}
generateConfig={momentGenerateConfig}
dateRender={dateRender}
/>

<br />

<Picker<Moment>
locale={zhCN}
generateConfig={momentGenerateConfig}
dateRender={dateRender}
/>
</div>
);
2 changes: 2 additions & 0 deletions src/Picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { isEqual } from './utils/dateUtil';
import { toArray } from './utils/miscUtil';
import PanelContext, { ContextOperationRefProps } from './PanelContext';
import { SharedTimeProps } from './panels/TimePanel';
import { DateRender } from './panels/DatePanel/DateBody';

export interface PickerProps<DateType> {
prefixCls?: string;
Expand All @@ -27,6 +28,7 @@ export interface PickerProps<DateType> {
format?: string | string[];
mode?: PanelMode;
clearIcon?: React.ReactNode;
dateRender?: DateRender<DateType>;
onChange?: (value: DateType | null, dateString: string) => void;
onOpenChange?: (open: boolean) => void;

Expand Down
2 changes: 2 additions & 0 deletions src/PickerPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { GenerateConfig } from './generate';
import { Locale, PanelMode, PanelRefProps, GetNextMode } from './interface';
import { isEqual } from './utils/dateUtil';
import PanelContext from './PanelContext';
import { DateRender } from './panels/DatePanel/DateBody';

export interface PickerPanelProps<DateType> {
className?: string;
Expand All @@ -27,6 +28,7 @@ export interface PickerPanelProps<DateType> {
mode?: PanelMode;
showTime?: boolean | SharedTimeProps;
tabIndex?: number;
dateRender?: DateRender<DateType>;
onSelect?: (value: DateType) => void;
onChange?: (value: DateType) => void;
onPanelChange?: (value: DateType, mode: PanelMode) => void;
Expand Down
10 changes: 7 additions & 3 deletions src/panels/DatePanel/DateBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,13 @@ function DateBody<DateType>({
),
})}
>
<div className={`${datePrefixCls}-inner`}>
{generateConfig.getDate(currentDate)}
</div>
{dateRender ? (
dateRender(currentDate, today)
) : (
<div className={`${datePrefixCls}-inner`}>
{generateConfig.getDate(currentDate)}
</div>
)}
</td>,
);
}
Expand Down

1 comment on commit 319f00b

@vercel
Copy link

@vercel vercel bot commented on 319f00b Nov 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.