Skip to content

Commit

Permalink
init test case
Browse files Browse the repository at this point in the history
  • Loading branch information
zombieJ committed Nov 26, 2019
1 parent 388ed05 commit 50194ce
Show file tree
Hide file tree
Showing 9 changed files with 103 additions and 817 deletions.
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
},
"devDependencies": {
"@types/classnames": "^2.2.9",
"@types/enzyme": "^3.10.3",
"@types/jest": "^24.0.23",
"@types/react": "^16.9.2",
"@types/react-dom": "^16.9.0",
"@umijs/fabric": "^1.1.10",
Expand Down
3 changes: 1 addition & 2 deletions src/Picker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
* - allowEmpty
* - selectable
*
* TODO:
* Fixed click to auto select one value with disabled logic
* Tips: Should add faq about `datetime` mode with `defaultValue`
*/

import * as React from 'react';
Expand Down
14 changes: 13 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
export default {};
import Picker, { PickerProps } from './Picker';
import PickerPanel, { PickerPanelProps } from './PickerPanel';
import RangePicker, { RangePickerProps } from './RangePicker';

export {
PickerPanel,
RangePicker,
PickerProps,
PickerPanelProps,
RangePickerProps,
};

export default Picker;
16 changes: 16 additions & 0 deletions src/panels/DatetimePanel/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export interface DatetimePanelProps<DateType>
> {
disabledTime?: DisabledTime<DateType>;
showTime?: boolean | SharedTimeProps<DateType>;
defaultValue?: DateType;
}

const ACTIVE_PANEL = tuple('date', 'time');
Expand All @@ -24,6 +25,7 @@ function DatetimePanel<DateType>(props: DatetimePanelProps<DateType>) {
operationRef,
generateConfig,
value,
defaultValue,
disabledTime,
showTime,
onSelect,
Expand Down Expand Up @@ -94,6 +96,7 @@ function DatetimePanel<DateType>(props: DatetimePanelProps<DateType>) {
let selectedDate = date;

if (source === 'date' && !value && timeProps.defaultValue) {
// Date with time defaultValue
selectedDate = generateConfig.setHour(
selectedDate,
generateConfig.getHour(timeProps.defaultValue),
Expand All @@ -106,6 +109,19 @@ function DatetimePanel<DateType>(props: DatetimePanelProps<DateType>) {
selectedDate,
generateConfig.getSecond(timeProps.defaultValue),
);
} else if (source === 'time' && !value && defaultValue) {
selectedDate = generateConfig.setYear(
selectedDate,
generateConfig.getYear(defaultValue),
);
selectedDate = generateConfig.setMonth(
selectedDate,
generateConfig.getMonth(defaultValue),
);
selectedDate = generateConfig.setDate(
selectedDate,
generateConfig.getDate(defaultValue),
);
}

if (onSelect) {
Expand Down
4 changes: 2 additions & 2 deletions src/panels/DecadePanel/DecadeBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export interface YearBodyProps<DateType> {
onSelect: (value: DateType) => void;
}

function YearBody<DateType>({
function DecadeBody<DateType>({
prefixCls,
viewDate,
generateConfig,
Expand Down Expand Up @@ -85,4 +85,4 @@ function YearBody<DateType>({
);
}

export default YearBody;
export default DecadeBody;
4 changes: 2 additions & 2 deletions src/panels/DecadePanel/DecadeHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export interface YearHeaderProps<DateType> {
onNextDecades: () => void;
}

function YearHeader<DateType>(props: YearHeaderProps<DateType>) {
function DecadeHeader<DateType>(props: YearHeaderProps<DateType>) {
const {
prefixCls,
generateConfig,
Expand All @@ -38,4 +38,4 @@ function YearHeader<DateType>(props: YearHeaderProps<DateType>) {
);
}

export default YearHeader;
export default DecadeHeader;
Loading

1 comment on commit 50194ce

@vercel
Copy link

@vercel vercel bot commented on 50194ce Nov 26, 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.