Skip to content

Commit db9b6f9

Browse files
committed
Merge branch 'develop'
2 parents 59b5535 + 6855a15 commit db9b6f9

File tree

20 files changed

+1011
-645
lines changed

20 files changed

+1011
-645
lines changed

.npmignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
/src
22
/screenshot
33
/coverage
4+
/test
45
/website
56
/plugins/all
67
/plugins/all.js
78
rollup.config.js
89
.github
9-
.gitignore
10+
.gitignore
11+
.babelrc
12+
.jest.config.json

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,12 @@ export default function Example() {
366366
<td style="text-align:center">false</td>
367367
<td>both</td>
368368
</tr>
369+
<tr>
370+
<td>shadow</td>
371+
<td style="text-align:center">Boolean</td>
372+
<td style="text-align:center">true</td>
373+
<td>both</td>
374+
</tr>
369375
<tr>
370376
<td>containerClassName</td>
371377
<td style="text-align:center">String</td>

index.d.ts

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
declare module "react-multi-date-picker" {
2-
import React from "react";
2+
import React, { HTMLAttributes } from "react";
33
import DateObject from "react-date-object";
44

55
interface CalendarProps {
@@ -58,15 +58,6 @@ declare module "react-multi-date-picker" {
5858
* <DatePicker format="MM-DD-YYYY HH:mm:ss" />
5959
*/
6060
format?: string;
61-
/**
62-
* Enable it if you want to use time picker.
63-
* @example
64-
* <Calendar timePicker />
65-
*
66-
* <DatePicker timePicker />
67-
*/
68-
timePicker?: boolean;
69-
onlyTimePicker?: boolean;
7061
onlyMonthPicker?: boolean;
7162
onlyYearPicker?: boolean;
7263
/**
@@ -192,13 +183,12 @@ declare module "react-multi-date-picker" {
192183
selectedDate: DateObject | DateObject[];
193184
currentMonth: object;
194185
isSameDate(arg1: DateObject, arg2: DateObject): boolean;
195-
}): object | void;
186+
}): HTMLAttributes<HTMLSpanElement> | void;
196187
disableMonthPicker?: boolean;
197188
disableYearPicker?: boolean;
198189
/**
199190
* @example
200191
* <DatePicker
201-
* timePicker
202192
* format="Date:YYYY/MM/DD, Time:HH:mm:ss"
203193
* formattingIgnoreList={["Date", "Time"]}
204194
* />
@@ -272,6 +262,7 @@ declare module "react-multi-date-picker" {
272262
disabled?: boolean;
273263
hideMonth?: boolean;
274264
hideYear?: boolean;
265+
shadow?: boolean;
275266
}
276267

277268
interface DatePickerProps {
@@ -454,7 +445,8 @@ declare module "react-multi-date-picker/plugins/date_panel" {
454445
import React, { HTMLAttributes } from "react";
455446
import DateObject from "react-date-object";
456447

457-
interface DatePanelProps extends HTMLAttributes<HTMLDivElement> {
448+
interface DatePanelProps
449+
extends Omit<HTMLAttributes<HTMLDivElement>, "children"> {
458450
position?: string;
459451
disabled?: boolean;
460452
eachDaysInRange?: boolean;
@@ -474,7 +466,8 @@ declare module "react-multi-date-picker/plugins/date_panel" {
474466
declare module "react-multi-date-picker/plugins/date_picker_header" {
475467
import React, { HTMLAttributes } from "react";
476468

477-
interface DatePickerHeaderProps extends HTMLAttributes<HTMLDivElement> {
469+
interface DatePickerHeaderProps
470+
extends Omit<HTMLAttributes<HTMLDivElement>, "children"> {
478471
position?: string;
479472
disabled?: boolean;
480473
size?: string;
@@ -491,7 +484,8 @@ declare module "react-multi-date-picker/plugins/date_picker_header" {
491484
declare module "react-multi-date-picker/plugins/multi_colors" {
492485
import React, { HTMLAttributes } from "react";
493486

494-
interface MultiColorsProps extends HTMLAttributes<HTMLDivElement> {
487+
interface MultiColorsProps
488+
extends Omit<HTMLAttributes<HTMLDivElement>, "children"> {
495489
position?: string;
496490
disabled?: boolean;
497491
colors?: string[];
@@ -507,7 +501,8 @@ declare module "react-multi-date-picker/plugins/multi_colors" {
507501
declare module "react-multi-date-picker/plugins/settings" {
508502
import React, { HTMLAttributes } from "react";
509503

510-
interface SettingsProps extends HTMLAttributes<HTMLDivElement> {
504+
interface SettingsProps
505+
extends Omit<HTMLAttributes<HTMLDivElement>, "children"> {
511506
position?: string;
512507
disabled?: boolean;
513508
calendars?: string[];
@@ -566,7 +561,8 @@ declare module "react-multi-date-picker/plugins/settings" {
566561
declare module "react-multi-date-picker/plugins/toolbar" {
567562
import React, { HTMLAttributes } from "react";
568563

569-
interface ToolbarProps extends HTMLAttributes<HTMLDivElement> {
564+
interface ToolbarProps
565+
extends Omit<HTMLAttributes<HTMLDivElement>, "children"> {
570566
position?: string;
571567
disabled?: boolean;
572568
className?: string;
@@ -592,7 +588,8 @@ declare module "react-multi-date-picker/plugins/weekends" {
592588
declare module "react-multi-date-picker/plugins/time_picker" {
593589
import React, { HTMLAttributes } from "react";
594590

595-
interface TimePickerProps extends HTMLAttributes<HTMLDivElement> {
591+
interface TimePickerProps
592+
extends Omit<HTMLAttributes<HTMLDivElement>, "children"> {
596593
position?: string;
597594
disabled?: boolean;
598595
hideSeconds?: boolean;

0 commit comments

Comments
 (0)