rsuite 5.0.0-beta.7 → 5.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +52 -0
- package/DatePicker/styles/index.less +6 -2
- package/Grid/styles/index.less +1 -2
- package/IconButton/styles/index.less +1 -1
- package/MultiCascader/styles/index.less +3 -0
- package/README.md +17 -11
- package/Sidenav/styles/index.less +99 -37
- package/Table/styles/index.less +8 -0
- package/Uploader/styles/index.less +10 -0
- package/cjs/@types/common.d.ts +2 -1
- package/cjs/Animation/Collapse.js +8 -8
- package/cjs/AutoComplete/AutoComplete.js +10 -14
- package/cjs/Badge/Badge.js +6 -10
- package/cjs/Breadcrumb/Breadcrumb.js +8 -12
- package/cjs/Breadcrumb/BreadcrumbItem.js +4 -8
- package/cjs/Button/Button.js +6 -10
- package/cjs/ButtonGroup/ButtonGroup.js +6 -10
- package/cjs/Calendar/Calendar.js +4 -8
- package/cjs/Calendar/CalendarPanel.js +6 -10
- package/cjs/Calendar/Header.js +4 -8
- package/cjs/Calendar/MonthDropdown.js +10 -14
- package/cjs/Calendar/MonthDropdownItem.js +6 -10
- package/cjs/Calendar/Table.js +6 -10
- package/cjs/Calendar/TableHeaderRow.js +4 -7
- package/cjs/Calendar/TableRow.js +7 -11
- package/cjs/Calendar/TimeDropdown.js +4 -8
- package/cjs/Calendar/View.js +4 -8
- package/cjs/Carousel/Carousel.js +10 -14
- package/cjs/Cascader/Cascader.js +28 -26
- package/cjs/Cascader/DropdownMenu.js +19 -21
- package/cjs/CheckPicker/CheckPicker.js +33 -29
- package/cjs/CheckTreePicker/CheckTreeNode.js +4 -6
- package/cjs/CheckTreePicker/CheckTreePicker.js +47 -35
- package/cjs/Checkbox/Checkbox.js +8 -13
- package/cjs/CheckboxGroup/CheckboxGroup.d.ts +1 -12
- package/cjs/CheckboxGroup/CheckboxGroup.js +7 -13
- package/cjs/CheckboxGroup/CheckboxGroupContext.d.ts +13 -0
- package/cjs/CheckboxGroup/CheckboxGroupContext.js +12 -0
- package/cjs/CheckboxGroup/index.d.ts +4 -3
- package/cjs/CheckboxGroup/index.js +6 -4
- package/cjs/Col/Col.js +3 -2
- package/cjs/Container/Container.js +4 -7
- package/cjs/DatePicker/DatePicker.js +23 -20
- package/cjs/DatePicker/Toolbar.js +4 -8
- package/cjs/DateRangePicker/Calendar.d.ts +2 -1
- package/cjs/DateRangePicker/Calendar.js +15 -16
- package/cjs/DateRangePicker/DateRangePicker.d.ts +1 -1
- package/cjs/DateRangePicker/DateRangePicker.js +93 -73
- package/cjs/DateRangePicker/utils.d.ts +1 -1
- package/cjs/DateRangePicker/utils.js +9 -5
- package/cjs/Divider/Divider.js +4 -8
- package/cjs/Drawer/Drawer.js +8 -10
- package/cjs/Dropdown/Dropdown.js +39 -30
- package/cjs/Dropdown/DropdownContext.d.ts +4 -1
- package/cjs/Dropdown/DropdownItem.js +35 -12
- package/cjs/Dropdown/DropdownMenu.js +2 -6
- package/cjs/Dropdown/DropdownState.d.ts +37 -0
- package/cjs/Dropdown/DropdownState.js +66 -0
- package/cjs/Dropdown/DropdownToggle.js +4 -8
- package/cjs/FlexboxGrid/FlexboxGrid.js +8 -12
- package/cjs/FlexboxGrid/FlexboxGridItem.js +8 -12
- package/cjs/Form/Form.js +12 -16
- package/cjs/IconButton/IconButton.js +4 -8
- package/cjs/Input/Input.js +6 -10
- package/cjs/InputNumber/InputNumber.js +14 -18
- package/cjs/InputPicker/InputAutosize.js +2 -4
- package/cjs/InputPicker/InputPicker.js +32 -30
- package/cjs/List/List.js +12 -16
- package/cjs/List/ListItem.js +6 -10
- package/cjs/Loader/Loader.js +6 -10
- package/cjs/Menu/Menu.d.ts +0 -1
- package/cjs/Menu/Menu.js +3 -5
- package/cjs/Menu/MenuItem.js +1 -1
- package/cjs/Message/Message.js +8 -12
- package/cjs/Modal/Modal.d.ts +1 -10
- package/cjs/Modal/Modal.js +35 -27
- package/cjs/Modal/ModalBody.js +6 -10
- package/cjs/Modal/ModalContext.d.ts +12 -0
- package/cjs/Modal/ModalContext.js +12 -0
- package/cjs/Modal/ModalDialog.js +8 -8
- package/cjs/Modal/ModalHeader.js +8 -12
- package/cjs/Modal/ModalTitle.d.ts +3 -2
- package/cjs/Modal/ModalTitle.js +43 -4
- package/cjs/MultiCascader/DropdownMenu.js +21 -23
- package/cjs/MultiCascader/MultiCascader.js +34 -32
- package/cjs/Nav/Nav.js +6 -10
- package/cjs/Navbar/Navbar.js +6 -9
- package/cjs/Notification/Notification.js +6 -10
- package/cjs/Overlay/Modal.js +11 -18
- package/cjs/Overlay/Overlay.js +2 -5
- package/cjs/Overlay/OverlayTrigger.js +9 -9
- package/cjs/Overlay/Position.js +4 -8
- package/cjs/Pagination/Pagination.js +10 -13
- package/cjs/Pagination/PaginationButton.js +4 -8
- package/cjs/Pagination/PaginationGroup.js +11 -12
- package/cjs/Panel/Panel.js +6 -10
- package/cjs/PanelGroup/PanelGroup.js +4 -8
- package/cjs/Picker/DropdownMenu.js +2 -3
- package/cjs/Picker/DropdownMenuGroup.js +4 -8
- package/cjs/Picker/DropdownMenuItem.js +4 -8
- package/cjs/Picker/PickerToggle.js +7 -9
- package/cjs/Picker/propTypes.d.ts +2 -16
- package/cjs/Picker/propTypes.js +4 -17
- package/cjs/Picker/utils.js +13 -8
- package/cjs/Placeholder/PlaceholderGraph.js +6 -10
- package/cjs/Placeholder/PlaceholderGrid.js +12 -16
- package/cjs/Placeholder/PlaceholderParagraph.js +10 -14
- package/cjs/Popover/Popover.js +4 -8
- package/cjs/Progress/ProgressCircle.js +18 -22
- package/cjs/Progress/ProgressLine.js +8 -12
- package/cjs/Radio/Radio.js +6 -11
- package/cjs/RadioGroup/RadioGroup.js +6 -9
- package/cjs/RangeSlider/RangeSlider.js +17 -20
- package/cjs/Rate/Character.js +4 -7
- package/cjs/Rate/Rate.js +14 -18
- package/cjs/Ripple/Ripple.js +4 -8
- package/cjs/SelectPicker/SelectPicker.d.ts +1 -3
- package/cjs/SelectPicker/SelectPicker.js +31 -28
- package/cjs/Sidebar/Sidebar.js +6 -10
- package/cjs/Sidenav/Sidenav.js +8 -11
- package/cjs/Sidenav/SidenavDropdown.d.ts +6 -1
- package/cjs/Sidenav/SidenavDropdown.js +25 -20
- package/cjs/Sidenav/SidenavDropdownCollapse.js +2 -6
- package/cjs/Sidenav/SidenavDropdownItem.js +4 -8
- package/cjs/Sidenav/SidenavDropdownMenu.js +4 -8
- package/cjs/Sidenav/SidenavItem.js +4 -12
- package/cjs/Sidenav/SidenavToggle.js +4 -8
- package/cjs/Slider/Graduated.js +4 -8
- package/cjs/Slider/Handle.d.ts +2 -0
- package/cjs/Slider/Handle.js +23 -12
- package/cjs/Slider/Input.d.ts +3 -0
- package/cjs/Slider/Input.js +35 -0
- package/cjs/Slider/Mark.js +4 -8
- package/cjs/Slider/ProgressBar.js +4 -8
- package/cjs/Slider/Slider.d.ts +0 -3
- package/cjs/Slider/Slider.js +14 -22
- package/cjs/Steps/StepItem.js +4 -7
- package/cjs/Steps/Steps.js +8 -12
- package/cjs/Table/Table.d.ts +7 -7
- package/cjs/Table/Table.js +5 -5
- package/cjs/TagInput/index.js +4 -6
- package/cjs/TagPicker/index.d.ts +1 -1
- package/cjs/TagPicker/index.js +4 -6
- package/cjs/Timeline/Timeline.js +6 -11
- package/cjs/Timeline/TimelineItem.js +4 -8
- package/cjs/Toggle/Toggle.js +4 -8
- package/cjs/Tooltip/Tooltip.js +4 -8
- package/cjs/Tree/Tree.d.ts +6 -0
- package/cjs/TreePicker/TreeNode.js +4 -6
- package/cjs/TreePicker/TreePicker.js +38 -29
- package/cjs/Uploader/UploadFileItem.d.ts +2 -0
- package/cjs/Uploader/UploadFileItem.js +47 -35
- package/cjs/Uploader/UploadTrigger.js +4 -8
- package/cjs/Uploader/Uploader.d.ts +2 -0
- package/cjs/Uploader/Uploader.js +28 -29
- package/cjs/toaster/ToastContainer.js +6 -10
- package/cjs/utils/createComponent.d.ts +1 -2
- package/cjs/utils/createComponent.js +10 -13
- package/cjs/utils/dateUtils.d.ts +1 -0
- package/cjs/utils/dateUtils.js +5 -1
- package/cjs/utils/previewFile.d.ts +1 -0
- package/cjs/utils/previewFile.js +11 -0
- package/cjs/utils/useInternalId.d.ts +4 -0
- package/cjs/utils/useInternalId.js +24 -0
- package/cjs/utils/useUniqueId.d.ts +4 -2
- package/cjs/utils/useUniqueId.js +5 -3
- package/dist/rsuite-rtl.css +164 -75
- package/dist/rsuite-rtl.min.css +1 -1
- package/dist/rsuite-rtl.min.css.map +1 -1
- package/dist/rsuite.css +164 -75
- package/dist/rsuite.js +377 -377
- package/dist/rsuite.min.css +1 -1
- package/dist/rsuite.min.css.map +1 -1
- package/dist/rsuite.min.js +1 -1
- package/dist/rsuite.min.js.map +1 -1
- package/esm/@types/common.d.ts +2 -1
- package/esm/Animation/Collapse.js +8 -8
- package/esm/AutoComplete/AutoComplete.js +11 -14
- package/esm/Badge/Badge.js +6 -9
- package/esm/Breadcrumb/Breadcrumb.js +8 -11
- package/esm/Breadcrumb/BreadcrumbItem.js +4 -7
- package/esm/Button/Button.js +6 -9
- package/esm/ButtonGroup/ButtonGroup.js +6 -9
- package/esm/Calendar/Calendar.js +4 -7
- package/esm/Calendar/CalendarPanel.js +6 -9
- package/esm/Calendar/Header.js +4 -7
- package/esm/Calendar/MonthDropdown.js +10 -13
- package/esm/Calendar/MonthDropdownItem.js +6 -9
- package/esm/Calendar/Table.js +6 -9
- package/esm/Calendar/TableHeaderRow.js +4 -7
- package/esm/Calendar/TableRow.js +7 -10
- package/esm/Calendar/TimeDropdown.js +4 -7
- package/esm/Calendar/View.js +4 -7
- package/esm/Carousel/Carousel.js +10 -13
- package/esm/Cascader/Cascader.js +28 -26
- package/esm/Cascader/DropdownMenu.js +19 -21
- package/esm/CheckPicker/CheckPicker.js +33 -29
- package/esm/CheckTreePicker/CheckTreeNode.js +4 -6
- package/esm/CheckTreePicker/CheckTreePicker.js +47 -37
- package/esm/Checkbox/Checkbox.js +8 -12
- package/esm/CheckboxGroup/CheckboxGroup.d.ts +1 -12
- package/esm/CheckboxGroup/CheckboxGroup.js +5 -8
- package/esm/CheckboxGroup/CheckboxGroupContext.d.ts +13 -0
- package/esm/CheckboxGroup/CheckboxGroupContext.js +2 -0
- package/esm/CheckboxGroup/index.d.ts +4 -3
- package/esm/CheckboxGroup/index.js +2 -2
- package/esm/Col/Col.js +3 -2
- package/esm/Container/Container.js +4 -7
- package/esm/DatePicker/DatePicker.js +23 -21
- package/esm/DatePicker/Toolbar.js +5 -8
- package/esm/DateRangePicker/Calendar.d.ts +2 -1
- package/esm/DateRangePicker/Calendar.js +15 -15
- package/esm/DateRangePicker/DateRangePicker.d.ts +1 -1
- package/esm/DateRangePicker/DateRangePicker.js +62 -43
- package/esm/DateRangePicker/utils.d.ts +1 -1
- package/esm/DateRangePicker/utils.js +7 -3
- package/esm/Divider/Divider.js +4 -7
- package/esm/Drawer/Drawer.js +8 -9
- package/esm/Dropdown/Dropdown.js +39 -31
- package/esm/Dropdown/DropdownContext.d.ts +4 -1
- package/esm/Dropdown/DropdownItem.js +35 -14
- package/esm/Dropdown/DropdownMenu.js +3 -6
- package/esm/Dropdown/DropdownState.d.ts +37 -0
- package/esm/Dropdown/DropdownState.js +55 -0
- package/esm/Dropdown/DropdownToggle.js +4 -7
- package/esm/FlexboxGrid/FlexboxGrid.js +8 -11
- package/esm/FlexboxGrid/FlexboxGridItem.js +8 -11
- package/esm/Form/Form.js +12 -15
- package/esm/IconButton/IconButton.js +4 -7
- package/esm/Input/Input.js +6 -9
- package/esm/InputNumber/InputNumber.js +14 -17
- package/esm/InputPicker/InputAutosize.js +2 -4
- package/esm/InputPicker/InputPicker.js +32 -30
- package/esm/List/List.js +12 -15
- package/esm/List/ListItem.js +6 -9
- package/esm/Loader/Loader.js +6 -9
- package/esm/Menu/Menu.d.ts +0 -1
- package/esm/Menu/Menu.js +3 -5
- package/esm/Menu/MenuItem.js +1 -1
- package/esm/Message/Message.js +8 -11
- package/esm/Modal/Modal.d.ts +1 -10
- package/esm/Modal/Modal.js +31 -21
- package/esm/Modal/ModalBody.js +5 -8
- package/esm/Modal/ModalContext.d.ts +12 -0
- package/esm/Modal/ModalContext.js +2 -0
- package/esm/Modal/ModalDialog.js +8 -8
- package/esm/Modal/ModalHeader.js +7 -10
- package/esm/Modal/ModalTitle.d.ts +3 -2
- package/esm/Modal/ModalTitle.js +35 -4
- package/esm/MultiCascader/DropdownMenu.js +21 -23
- package/esm/MultiCascader/MultiCascader.js +34 -32
- package/esm/Nav/Nav.js +6 -9
- package/esm/Navbar/Navbar.js +6 -9
- package/esm/Notification/Notification.js +6 -9
- package/esm/Overlay/Modal.js +11 -18
- package/esm/Overlay/Overlay.js +2 -5
- package/esm/Overlay/OverlayTrigger.js +9 -9
- package/esm/Overlay/Position.js +4 -7
- package/esm/Pagination/Pagination.js +10 -13
- package/esm/Pagination/PaginationButton.js +4 -7
- package/esm/Pagination/PaginationGroup.js +10 -11
- package/esm/Panel/Panel.js +6 -9
- package/esm/PanelGroup/PanelGroup.js +4 -7
- package/esm/Picker/DropdownMenu.js +2 -3
- package/esm/Picker/DropdownMenuGroup.js +4 -7
- package/esm/Picker/DropdownMenuItem.js +4 -7
- package/esm/Picker/PickerToggle.js +7 -9
- package/esm/Picker/propTypes.d.ts +2 -16
- package/esm/Picker/propTypes.js +2 -13
- package/esm/Picker/utils.js +13 -8
- package/esm/Placeholder/PlaceholderGraph.js +6 -9
- package/esm/Placeholder/PlaceholderGrid.js +12 -15
- package/esm/Placeholder/PlaceholderParagraph.js +10 -13
- package/esm/Popover/Popover.js +4 -7
- package/esm/Progress/ProgressCircle.js +18 -21
- package/esm/Progress/ProgressLine.js +8 -11
- package/esm/Radio/Radio.js +6 -10
- package/esm/RadioGroup/RadioGroup.js +6 -9
- package/esm/RangeSlider/RangeSlider.js +17 -20
- package/esm/Rate/Character.js +4 -7
- package/esm/Rate/Rate.js +14 -17
- package/esm/Ripple/Ripple.js +4 -7
- package/esm/SelectPicker/SelectPicker.d.ts +1 -3
- package/esm/SelectPicker/SelectPicker.js +31 -28
- package/esm/Sidebar/Sidebar.js +6 -9
- package/esm/Sidenav/Sidenav.js +8 -11
- package/esm/Sidenav/SidenavDropdown.d.ts +6 -1
- package/esm/Sidenav/SidenavDropdown.js +24 -19
- package/esm/Sidenav/SidenavDropdownCollapse.js +2 -5
- package/esm/Sidenav/SidenavDropdownItem.js +5 -8
- package/esm/Sidenav/SidenavDropdownMenu.js +5 -8
- package/esm/Sidenav/SidenavItem.js +4 -10
- package/esm/Sidenav/SidenavToggle.js +4 -7
- package/esm/Slider/Graduated.js +4 -7
- package/esm/Slider/Handle.d.ts +2 -0
- package/esm/Slider/Handle.js +23 -12
- package/esm/Slider/Input.d.ts +3 -0
- package/esm/Slider/Input.js +23 -0
- package/esm/Slider/Mark.js +4 -7
- package/esm/Slider/ProgressBar.js +4 -7
- package/esm/Slider/Slider.d.ts +0 -3
- package/esm/Slider/Slider.js +14 -22
- package/esm/Steps/StepItem.js +4 -7
- package/esm/Steps/Steps.js +8 -11
- package/esm/Table/Table.d.ts +7 -7
- package/esm/Table/Table.js +5 -5
- package/esm/TagInput/index.js +4 -6
- package/esm/TagPicker/index.d.ts +1 -1
- package/esm/TagPicker/index.js +4 -6
- package/esm/Timeline/Timeline.js +6 -10
- package/esm/Timeline/TimelineItem.js +4 -7
- package/esm/Toggle/Toggle.js +5 -8
- package/esm/Tooltip/Tooltip.js +4 -7
- package/esm/Tree/Tree.d.ts +6 -0
- package/esm/TreePicker/TreeNode.js +4 -6
- package/esm/TreePicker/TreePicker.js +38 -31
- package/esm/Uploader/UploadFileItem.d.ts +2 -0
- package/esm/Uploader/UploadFileItem.js +47 -35
- package/esm/Uploader/UploadTrigger.js +4 -7
- package/esm/Uploader/Uploader.d.ts +2 -0
- package/esm/Uploader/Uploader.js +28 -28
- package/esm/toaster/ToastContainer.js +6 -9
- package/esm/utils/createComponent.d.ts +1 -2
- package/esm/utils/createComponent.js +10 -13
- package/esm/utils/dateUtils.d.ts +1 -0
- package/esm/utils/dateUtils.js +1 -0
- package/esm/utils/previewFile.d.ts +1 -0
- package/esm/utils/previewFile.js +9 -0
- package/esm/utils/useInternalId.d.ts +4 -0
- package/esm/utils/useInternalId.js +16 -0
- package/esm/utils/useUniqueId.d.ts +4 -2
- package/esm/utils/useUniqueId.js +5 -3
- package/package.json +4 -4
- package/styles/color-modes/dark.less +16 -0
- package/styles/color-modes/high-contrast.less +17 -0
- package/styles/color-modes/light.less +16 -0
- package/styles/variables.less +3 -1
|
@@ -13,7 +13,8 @@ export interface CalendarProps extends WithAsProps, Omit<CalendarCoreProps, Omit
|
|
|
13
13
|
isoWeek?: boolean;
|
|
14
14
|
limitEndYear?: number;
|
|
15
15
|
locale?: DatePickerLocale;
|
|
16
|
-
onChangeCalendarDate?: (index: number,
|
|
16
|
+
onChangeCalendarDate?: (index: number, date: Date) => void;
|
|
17
|
+
onChangeCalendarTime?: (index: number, date: Date) => void;
|
|
17
18
|
onMouseMove?: (date: Date) => void;
|
|
18
19
|
onSelect?: (date: Date, event?: React.SyntheticEvent<any>) => void;
|
|
19
20
|
showOneCalendar?: boolean;
|
|
@@ -21,24 +21,23 @@ var _Calendar = _interopRequireWildcard(require("../Calendar/Calendar"));
|
|
|
21
21
|
|
|
22
22
|
var _utils = require("../utils");
|
|
23
23
|
|
|
24
|
-
var defaultProps = {
|
|
25
|
-
as: _Calendar.default,
|
|
26
|
-
calendarDate: [new Date(), (0, _dateUtils.addMonths)(new Date(), 1)],
|
|
27
|
-
format: 'yyyy-MM-dd',
|
|
28
|
-
index: 0,
|
|
29
|
-
value: []
|
|
30
|
-
};
|
|
31
|
-
|
|
32
24
|
var Calendar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
33
|
-
var
|
|
34
|
-
|
|
25
|
+
var _props$as = props.as,
|
|
26
|
+
Component = _props$as === void 0 ? _Calendar.default : _props$as,
|
|
27
|
+
_props$calendarDate = props.calendarDate,
|
|
28
|
+
calendarDate = _props$calendarDate === void 0 ? [new Date(), (0, _dateUtils.addMonths)(new Date(), 1)] : _props$calendarDate,
|
|
29
|
+
_props$format = props.format,
|
|
30
|
+
format = _props$format === void 0 ? 'yyyy-MM-dd' : _props$format,
|
|
35
31
|
disabledDate = props.disabledDate,
|
|
36
|
-
index = props.index,
|
|
32
|
+
_props$index = props.index,
|
|
33
|
+
index = _props$index === void 0 ? 0 : _props$index,
|
|
37
34
|
limitEndYear = props.limitEndYear,
|
|
38
35
|
onChangeCalendarDate = props.onChangeCalendarDate,
|
|
36
|
+
onChangeCalendarTime = props.onChangeCalendarTime,
|
|
39
37
|
showOneCalendar = props.showOneCalendar,
|
|
40
|
-
value = props.value,
|
|
41
|
-
|
|
38
|
+
_props$value = props.value,
|
|
39
|
+
value = _props$value === void 0 ? [] : _props$value,
|
|
40
|
+
rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "calendarDate", "format", "disabledDate", "index", "limitEndYear", "onChangeCalendarDate", "onChangeCalendarTime", "showOneCalendar", "value"]);
|
|
42
41
|
|
|
43
42
|
var _useState = (0, _react.useState)(),
|
|
44
43
|
calendarState = _useState[0],
|
|
@@ -55,8 +54,8 @@ var Calendar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
55
54
|
setCalendarState(undefined);
|
|
56
55
|
}, [index, onChangeCalendarDate]);
|
|
57
56
|
var handleChangePageTime = (0, _react.useCallback)(function (nextPageDate) {
|
|
58
|
-
|
|
59
|
-
}, [index,
|
|
57
|
+
onChangeCalendarTime(index, nextPageDate);
|
|
58
|
+
}, [index, onChangeCalendarTime]);
|
|
60
59
|
var toggleMonthDropdown = (0, _react.useCallback)(function () {
|
|
61
60
|
setCalendarState(calendarState === _Calendar.CalendarState.DROP_MONTH ? undefined : _Calendar.CalendarState.DROP_MONTH);
|
|
62
61
|
}, [calendarState]);
|
|
@@ -112,6 +111,7 @@ var Calendar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
112
111
|
return !after;
|
|
113
112
|
}, [calendarDate, disabledDate, index, showOneCalendar, value]);
|
|
114
113
|
return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({}, rest, {
|
|
114
|
+
format: format,
|
|
115
115
|
calendarState: calendarState,
|
|
116
116
|
dateRange: value,
|
|
117
117
|
disabledBackward: disabledBackward(),
|
|
@@ -132,7 +132,6 @@ var Calendar = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
132
132
|
});
|
|
133
133
|
|
|
134
134
|
Calendar.displayName = 'DateRangePicker.Calendar';
|
|
135
|
-
Calendar.defaultProps = defaultProps;
|
|
136
135
|
Calendar.propTypes = {
|
|
137
136
|
value: _propTypes.default.arrayOf(_propTypes.default.instanceOf(Date)),
|
|
138
137
|
hoverValue: _propTypes.default.arrayOf(_propTypes.default.instanceOf(Date)),
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { PickerComponent } from '../Picker';
|
|
3
2
|
import { FormControlBaseProps, PickerBaseProps } from '../@types/common';
|
|
3
|
+
import { PickerComponent } from '../Picker';
|
|
4
4
|
import { DisabledDateFunction, RangeType, ValueType } from './types';
|
|
5
5
|
export interface DateRangePickerProps extends PickerBaseProps, FormControlBaseProps<ValueType> {
|
|
6
6
|
/** Configure shortcut options */
|
|
@@ -7,78 +7,76 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
|
|
|
7
7
|
exports.__esModule = true;
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
|
|
10
|
-
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
11
|
-
|
|
12
10
|
var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
|
|
13
11
|
|
|
14
|
-
var
|
|
12
|
+
var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
|
|
15
13
|
|
|
16
|
-
var
|
|
14
|
+
var _Calendar = _interopRequireDefault(require("@rsuite/icons/legacy/Calendar"));
|
|
15
|
+
|
|
16
|
+
var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
|
|
17
17
|
|
|
18
18
|
var _omit = _interopRequireDefault(require("lodash/omit"));
|
|
19
19
|
|
|
20
|
-
var
|
|
20
|
+
var _partial = _interopRequireDefault(require("lodash/partial"));
|
|
21
21
|
|
|
22
|
-
var
|
|
22
|
+
var _pick = _interopRequireDefault(require("lodash/pick"));
|
|
23
23
|
|
|
24
|
-
var
|
|
24
|
+
var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
25
25
|
|
|
26
|
-
var
|
|
26
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
27
27
|
|
|
28
28
|
var _CustomProvider = require("../CustomProvider");
|
|
29
29
|
|
|
30
30
|
var _Toolbar = _interopRequireDefault(require("../DatePicker/Toolbar"));
|
|
31
31
|
|
|
32
|
-
var
|
|
32
|
+
var _Picker = require("../Picker");
|
|
33
33
|
|
|
34
|
-
var _utils = require("
|
|
34
|
+
var _utils = require("../utils");
|
|
35
35
|
|
|
36
|
-
var
|
|
36
|
+
var _dateUtils = require("../utils/dateUtils");
|
|
37
37
|
|
|
38
|
-
var
|
|
38
|
+
var _Calendar2 = _interopRequireDefault(require("./Calendar"));
|
|
39
39
|
|
|
40
|
-
var
|
|
40
|
+
var disabledDateUtils = _interopRequireWildcard(require("./disabledDateUtils"));
|
|
41
41
|
|
|
42
|
-
var
|
|
43
|
-
|
|
44
|
-
var defaultProps = (0, _extends2.default)({}, _Picker.pickerDefaultProps, {
|
|
45
|
-
as: 'div',
|
|
46
|
-
classPrefix: 'picker',
|
|
47
|
-
cleanable: true,
|
|
48
|
-
placement: 'bottomStart',
|
|
49
|
-
appearance: 'default',
|
|
50
|
-
format: 'yyyy-MM-dd',
|
|
51
|
-
limitEndYear: 1000,
|
|
52
|
-
placeholder: '',
|
|
53
|
-
showOneCalendar: false,
|
|
54
|
-
character: ' ~ '
|
|
55
|
-
});
|
|
42
|
+
var _utils2 = require("./utils");
|
|
56
43
|
|
|
57
44
|
var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
58
45
|
var _ref, _merge;
|
|
59
46
|
|
|
60
|
-
var
|
|
61
|
-
|
|
47
|
+
var _props$as = props.as,
|
|
48
|
+
Component = _props$as === void 0 ? 'div' : _props$as,
|
|
49
|
+
_props$classPrefix = props.classPrefix,
|
|
50
|
+
classPrefix = _props$classPrefix === void 0 ? 'picker' : _props$classPrefix,
|
|
62
51
|
className = props.className,
|
|
63
|
-
|
|
64
|
-
|
|
52
|
+
_props$appearance = props.appearance,
|
|
53
|
+
appearance = _props$appearance === void 0 ? 'default' : _props$appearance,
|
|
54
|
+
_props$cleanable = props.cleanable,
|
|
55
|
+
cleanable = _props$cleanable === void 0 ? true : _props$cleanable,
|
|
56
|
+
_props$character = props.character,
|
|
57
|
+
character = _props$character === void 0 ? ' ~ ' : _props$character,
|
|
65
58
|
defaultCalendarValue = props.defaultCalendarValue,
|
|
66
59
|
defaultValue = props.defaultValue,
|
|
67
60
|
disabled = props.disabled,
|
|
68
61
|
disabledDateProp = props.disabledDate,
|
|
69
|
-
|
|
62
|
+
_props$format = props.format,
|
|
63
|
+
formatStr = _props$format === void 0 ? 'yyyy-MM-dd' : _props$format,
|
|
70
64
|
hoverRange = props.hoverRange,
|
|
71
65
|
isoWeek = props.isoWeek,
|
|
72
|
-
limitEndYear = props.limitEndYear,
|
|
66
|
+
_props$limitEndYear = props.limitEndYear,
|
|
67
|
+
limitEndYear = _props$limitEndYear === void 0 ? 1000 : _props$limitEndYear,
|
|
73
68
|
overrideLocale = props.locale,
|
|
74
69
|
menuClassName = props.menuClassName,
|
|
75
70
|
menuStyle = props.menuStyle,
|
|
76
71
|
oneTap = props.oneTap,
|
|
77
|
-
placeholder = props.placeholder,
|
|
78
|
-
|
|
72
|
+
_props$placeholder = props.placeholder,
|
|
73
|
+
placeholder = _props$placeholder === void 0 ? '' : _props$placeholder,
|
|
74
|
+
_props$placement = props.placement,
|
|
75
|
+
placement = _props$placement === void 0 ? 'bottomStart' : _props$placement,
|
|
79
76
|
ranges = props.ranges,
|
|
80
77
|
renderValue = props.renderValue,
|
|
81
|
-
|
|
78
|
+
_props$showOneCalenda = props.showOneCalendar,
|
|
79
|
+
showOneCalendar = _props$showOneCalenda === void 0 ? false : _props$showOneCalenda,
|
|
82
80
|
showWeekNumbers = props.showWeekNumbers,
|
|
83
81
|
style = props.style,
|
|
84
82
|
toggleAs = props.toggleAs,
|
|
@@ -92,19 +90,20 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
92
90
|
onOk = props.onOk,
|
|
93
91
|
onOpen = props.onOpen,
|
|
94
92
|
onSelect = props.onSelect,
|
|
95
|
-
rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "style", "toggleAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect"]);
|
|
93
|
+
rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "classPrefix", "className", "appearance", "cleanable", "character", "defaultCalendarValue", "defaultValue", "disabled", "disabledDate", "format", "hoverRange", "isoWeek", "limitEndYear", "locale", "menuClassName", "menuStyle", "oneTap", "placeholder", "placement", "ranges", "renderValue", "showOneCalendar", "showWeekNumbers", "style", "toggleAs", "value", "onChange", "onClean", "onClose", "onEnter", "onEntered", "onExited", "onOk", "onOpen", "onSelect"]);
|
|
96
94
|
|
|
97
|
-
var _useClassNames = (0,
|
|
95
|
+
var _useClassNames = (0, _utils.useClassNames)(classPrefix),
|
|
98
96
|
merge = _useClassNames.merge,
|
|
99
97
|
prefix = _useClassNames.prefix;
|
|
100
98
|
|
|
101
|
-
var _useCustom = (0,
|
|
99
|
+
var _useCustom = (0, _utils.useCustom)('DateRangePicker', overrideLocale),
|
|
102
100
|
locale = _useCustom.locale,
|
|
103
|
-
formatDate = _useCustom.formatDate
|
|
101
|
+
formatDate = _useCustom.formatDate,
|
|
102
|
+
parseDate = _useCustom.parseDate;
|
|
104
103
|
|
|
105
104
|
var rangeFormatStr = "" + formatStr + character + formatStr;
|
|
106
105
|
|
|
107
|
-
var _useControlled = (0,
|
|
106
|
+
var _useControlled = (0, _utils.useControlled)(valueProp, defaultValue !== null && defaultValue !== void 0 ? defaultValue : []),
|
|
108
107
|
value = _useControlled[0],
|
|
109
108
|
setValue = _useControlled[1];
|
|
110
109
|
/**
|
|
@@ -135,7 +134,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
135
134
|
setHoverValue = _useState2[1]; // The displayed calendar panel is rendered based on this value.
|
|
136
135
|
|
|
137
136
|
|
|
138
|
-
var _useState3 = (0, _react.useState)((0,
|
|
137
|
+
var _useState3 = (0, _react.useState)((0, _utils2.getCalendarDate)({
|
|
139
138
|
value: valueProp !== null && valueProp !== void 0 ? valueProp : defaultCalendarValue
|
|
140
139
|
})),
|
|
141
140
|
calendarDate = _useState3[0],
|
|
@@ -158,7 +157,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
158
157
|
*/
|
|
159
158
|
|
|
160
159
|
var updateCalendarDate = (0, _react.useCallback)(function (value) {
|
|
161
|
-
setCalendarDate((0,
|
|
160
|
+
setCalendarDate((0, _utils2.getCalendarDate)({
|
|
162
161
|
value: value
|
|
163
162
|
}));
|
|
164
163
|
}, []); // if valueProp changed then update selectValue/hoverValue
|
|
@@ -227,11 +226,11 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
227
226
|
var hoverRangeFunc = hoverRange;
|
|
228
227
|
|
|
229
228
|
if (hoverRange === 'week') {
|
|
230
|
-
hoverRangeFunc = (0, _partial.default)(
|
|
229
|
+
hoverRangeFunc = (0, _partial.default)(_utils2.getWeekHoverRange, isoWeek);
|
|
231
230
|
}
|
|
232
231
|
|
|
233
232
|
if (hoverRangeFunc === 'month') {
|
|
234
|
-
hoverRangeFunc =
|
|
233
|
+
hoverRangeFunc = _utils2.getMonthHoverRange;
|
|
235
234
|
}
|
|
236
235
|
|
|
237
236
|
if (typeof hoverRangeFunc !== 'function') {
|
|
@@ -245,7 +244,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
245
244
|
return [];
|
|
246
245
|
}
|
|
247
246
|
|
|
248
|
-
if (
|
|
247
|
+
if (_utils.DateUtils.isAfter(hoverValues[0], hoverValues[1])) {
|
|
249
248
|
hoverValues.reverse();
|
|
250
249
|
}
|
|
251
250
|
|
|
@@ -259,7 +258,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
259
258
|
var nextValue = !(0, _isUndefined.default)(nextSelectValue) ? nextSelectValue : selectValue;
|
|
260
259
|
setSelectValue(nextValue || []);
|
|
261
260
|
|
|
262
|
-
if (!(0,
|
|
261
|
+
if (!(0, _utils2.isSameRange)(nextValue, value, formatStr)) {
|
|
263
262
|
setValue(nextValue);
|
|
264
263
|
onChange === null || onChange === void 0 ? void 0 : onChange(nextValue, event);
|
|
265
264
|
} // `closeOverlay` default value is `true`
|
|
@@ -268,7 +267,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
268
267
|
if (closeOverlay !== false) {
|
|
269
268
|
handleCloseDropdown();
|
|
270
269
|
}
|
|
271
|
-
}, [handleCloseDropdown, onChange, selectValue,
|
|
270
|
+
}, [formatStr, handleCloseDropdown, onChange, selectValue, setValue, value]);
|
|
272
271
|
/**
|
|
273
272
|
* Select the date range. If oneTap is not set, you need to click twice to select the start time and end time.
|
|
274
273
|
* The MouseMove event is called between the first click and the second click to update the selection state.
|
|
@@ -282,7 +281,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
282
281
|
if (hoverRange) {
|
|
283
282
|
var nextHoverValue = [selectRangeValueRef.current[0], hoverRangeValue[1]];
|
|
284
283
|
|
|
285
|
-
if (
|
|
284
|
+
if (_utils.DateUtils.isBefore(hoverRangeValue[0], selectRangeValueRef.current[0])) {
|
|
286
285
|
nextHoverValue[0] = hoverRangeValue[0];
|
|
287
286
|
nextHoverValue[1] = selectRangeValueRef.current[1];
|
|
288
287
|
}
|
|
@@ -304,7 +303,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
304
303
|
var noHoverRangeValid = hoverRangeValue.length !== 2; // in `oneTap` mode
|
|
305
304
|
|
|
306
305
|
if (hasDoneSelect.current && oneTap) {
|
|
307
|
-
handleValueUpdate(event, noHoverRangeValid ? [(0,
|
|
306
|
+
handleValueUpdate(event, noHoverRangeValid ? [(0, _utils2.setTimingMargin)(date), (0, _utils2.setTimingMargin)(date, 'right')] : hoverRangeValue);
|
|
308
307
|
hasDoneSelect.current = false;
|
|
309
308
|
return;
|
|
310
309
|
} // no preset hover range can use
|
|
@@ -329,7 +328,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
329
328
|
} // If user have completed the selection, then sort
|
|
330
329
|
|
|
331
330
|
|
|
332
|
-
if (nextSelectValue.length === 2 &&
|
|
331
|
+
if (nextSelectValue.length === 2 && _utils.DateUtils.isAfter(nextSelectValue[0], nextSelectValue[1])) {
|
|
333
332
|
nextSelectValue.reverse();
|
|
334
333
|
}
|
|
335
334
|
|
|
@@ -357,6 +356,20 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
357
356
|
nextCalendarDate[index] = date;
|
|
358
357
|
updateCalendarDate(nextCalendarDate);
|
|
359
358
|
}, [calendarDate, updateCalendarDate]);
|
|
359
|
+
var handleChangeCalendarTime = (0, _react.useCallback)(function (index, date) {
|
|
360
|
+
setSelectValue(function (prev) {
|
|
361
|
+
var next = [].concat(prev);
|
|
362
|
+
var clonedDate = new Date(date.valueOf()); // if next[index] is not empty, only update the time after aligning the year, month and day
|
|
363
|
+
|
|
364
|
+
if (next[index]) {
|
|
365
|
+
clonedDate.setFullYear(next[index].getFullYear(), next[index].getMonth(), next[index].getDate());
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
next[index] = clonedDate;
|
|
369
|
+
return next;
|
|
370
|
+
});
|
|
371
|
+
handleChangeCalendarDate(index, date);
|
|
372
|
+
}, [handleChangeCalendarDate]);
|
|
360
373
|
/**
|
|
361
374
|
* Toolbar operation callback function
|
|
362
375
|
*/
|
|
@@ -381,21 +394,25 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
381
394
|
var rangeValue = value.split(character); // isMatch('01/11/2020', 'MM/dd/yyyy') ==> true
|
|
382
395
|
// isMatch('2020-11-01', 'MM/dd/yyyy') ==> false
|
|
383
396
|
|
|
384
|
-
if (!
|
|
397
|
+
if (!_utils.DateUtils.isMatch(rangeValue[0], formatStr, {
|
|
398
|
+
locale: locale.dateLocale
|
|
399
|
+
}) || !_utils.DateUtils.isMatch(rangeValue[1], formatStr, {
|
|
400
|
+
locale: locale.dateLocale
|
|
401
|
+
})) {
|
|
385
402
|
setInputState('Error');
|
|
386
403
|
return;
|
|
387
404
|
}
|
|
388
405
|
|
|
389
|
-
var startDate =
|
|
390
|
-
var endDate =
|
|
406
|
+
var startDate = parseDate(rangeValue[0], formatStr);
|
|
407
|
+
var endDate = parseDate(rangeValue[1], formatStr);
|
|
391
408
|
var selectValue = [startDate, endDate];
|
|
392
409
|
|
|
393
|
-
if (!
|
|
410
|
+
if (!_utils.DateUtils.isValid(startDate) || !_utils.DateUtils.isValid(endDate)) {
|
|
394
411
|
setInputState('Error');
|
|
395
412
|
return;
|
|
396
413
|
}
|
|
397
414
|
|
|
398
|
-
if (disabledDate(startDate, selectValue, true,
|
|
415
|
+
if (disabledDate(startDate, selectValue, true, _utils.DATERANGE_DISABLED_TARGET.CALENDAR)) {
|
|
399
416
|
setInputState('Error');
|
|
400
417
|
return;
|
|
401
418
|
}
|
|
@@ -424,7 +441,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
424
441
|
endData = value[1];
|
|
425
442
|
nextCalendarDate = [_startDate, (0, _dateUtils.isSameMonth)(_startDate, endData) ? (0, _dateUtils.addMonths)(endData, 1) : endData];
|
|
426
443
|
} else {
|
|
427
|
-
nextCalendarDate = (0,
|
|
444
|
+
nextCalendarDate = (0, _utils2.getCalendarDate)({
|
|
428
445
|
value: defaultCalendarValue
|
|
429
446
|
});
|
|
430
447
|
}
|
|
@@ -450,12 +467,12 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
450
467
|
var nextSelectValue = [selectStartDate, selectEndDate]; // If the date is between the start and the end
|
|
451
468
|
// the button is disabled
|
|
452
469
|
|
|
453
|
-
while (
|
|
470
|
+
while (_utils.DateUtils.isBefore(start, end) || _utils.DateUtils.isSameDay(start, end)) {
|
|
454
471
|
if (disabledDate(start, nextSelectValue, hasDoneSelect.current, type)) {
|
|
455
472
|
return true;
|
|
456
473
|
}
|
|
457
474
|
|
|
458
|
-
start =
|
|
475
|
+
start = _utils.DateUtils.addDays(start, 1);
|
|
459
476
|
}
|
|
460
477
|
|
|
461
478
|
return false;
|
|
@@ -468,7 +485,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
468
485
|
return true;
|
|
469
486
|
}
|
|
470
487
|
|
|
471
|
-
return disabledByBetween(start, end,
|
|
488
|
+
return disabledByBetween(start, end, _utils.DATERANGE_DISABLED_TARGET.TOOLBAR_BUTTON_OK);
|
|
472
489
|
}, [disabledByBetween, selectValue]);
|
|
473
490
|
var disabledShortcutButton = (0, _react.useCallback)(function (value) {
|
|
474
491
|
if (value === void 0) {
|
|
@@ -483,7 +500,7 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
483
500
|
return true;
|
|
484
501
|
}
|
|
485
502
|
|
|
486
|
-
return disabledByBetween(start, end,
|
|
503
|
+
return disabledByBetween(start, end, _utils.DATERANGE_DISABLED_TARGET.TOOLBAR_SHORTCUT);
|
|
487
504
|
}, [disabledByBetween]);
|
|
488
505
|
var handleDisabledDate = (0, _react.useCallback)(function (date, values, type) {
|
|
489
506
|
return disabledDate(date, values, hasDoneSelect.current, type);
|
|
@@ -519,12 +536,13 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
519
536
|
showWeekNumbers: showWeekNumbers,
|
|
520
537
|
value: selectValue,
|
|
521
538
|
onChangeCalendarDate: handleChangeCalendarDate,
|
|
539
|
+
onChangeCalendarTime: handleChangeCalendarTime,
|
|
522
540
|
onMouseMove: handleMouseMove,
|
|
523
541
|
onSelect: handleSelectValueChange
|
|
524
542
|
};
|
|
525
543
|
return /*#__PURE__*/_react.default.createElement(_Picker.PickerOverlay, {
|
|
526
544
|
className: classes,
|
|
527
|
-
ref: (0,
|
|
545
|
+
ref: (0, _utils.mergeRefs)(overlayRef, speakerRef),
|
|
528
546
|
target: triggerRef,
|
|
529
547
|
style: styles
|
|
530
548
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
@@ -535,9 +553,9 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
535
553
|
className: prefix('daterange-header')
|
|
536
554
|
}, getDisplayString(selectValue)), /*#__PURE__*/_react.default.createElement("div", {
|
|
537
555
|
className: prefix("daterange-calendar-" + (showOneCalendar ? 'single' : 'group'))
|
|
538
|
-
}, /*#__PURE__*/_react.default.createElement(
|
|
556
|
+
}, /*#__PURE__*/_react.default.createElement(_Calendar2.default, (0, _extends2.default)({
|
|
539
557
|
index: 0
|
|
540
|
-
}, panelProps)), !showOneCalendar && /*#__PURE__*/_react.default.createElement(
|
|
558
|
+
}, panelProps)), !showOneCalendar && /*#__PURE__*/_react.default.createElement(_Calendar2.default, (0, _extends2.default)({
|
|
541
559
|
index: 1
|
|
542
560
|
}, panelProps)))), /*#__PURE__*/_react.default.createElement(_Toolbar.default, {
|
|
543
561
|
locale: locale,
|
|
@@ -554,8 +572,10 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
554
572
|
var hasValue = value && value.length > 1;
|
|
555
573
|
|
|
556
574
|
var _usePickerClassName = (0, _Picker.usePickerClassName)((0, _extends2.default)({}, props, {
|
|
575
|
+
classPrefix: classPrefix,
|
|
557
576
|
name: 'daterange',
|
|
558
|
-
hasValue: hasValue
|
|
577
|
+
hasValue: hasValue,
|
|
578
|
+
cleanable: cleanable
|
|
559
579
|
})),
|
|
560
580
|
classes = _usePickerClassName[0],
|
|
561
581
|
usedClassNamePropKeys = _usePickerClassName[1];
|
|
@@ -564,30 +584,31 @@ var DateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (props, re
|
|
|
564
584
|
pickerProps: (0, _pick.default)(props, _Picker.pickTriggerPropKeys),
|
|
565
585
|
ref: triggerRef,
|
|
566
586
|
placement: placement,
|
|
567
|
-
onEnter: (0,
|
|
568
|
-
onEntered: (0,
|
|
569
|
-
onExited: (0,
|
|
587
|
+
onEnter: (0, _utils.createChainedFunction)(handleEnter, onEnter),
|
|
588
|
+
onEntered: (0, _utils.createChainedFunction)(handleEntered, onEntered),
|
|
589
|
+
onExited: (0, _utils.createChainedFunction)(handleExited, onExited),
|
|
570
590
|
speaker: renderDropdownMenu
|
|
571
591
|
}, /*#__PURE__*/_react.default.createElement(Component, {
|
|
572
592
|
ref: rootRef,
|
|
573
593
|
className: merge(className, classes, (_merge = {}, _merge[prefix('error')] = inputState === 'Error', _merge)),
|
|
574
594
|
style: style
|
|
575
|
-
}, /*#__PURE__*/_react.default.createElement(_Picker.PickerToggle, (0, _extends2.default)({}, (0, _omit.default)(rest, [].concat(_Picker.omitTriggerPropKeys, usedClassNamePropKeys,
|
|
595
|
+
}, /*#__PURE__*/_react.default.createElement(_Picker.PickerToggle, (0, _extends2.default)({}, (0, _omit.default)(rest, [].concat(_Picker.omitTriggerPropKeys, usedClassNamePropKeys, _utils.DateUtils.calendarOnlyProps)), {
|
|
576
596
|
as: toggleAs,
|
|
577
597
|
ref: targetRef,
|
|
598
|
+
appearance: appearance,
|
|
578
599
|
input: true,
|
|
579
|
-
inputMask:
|
|
600
|
+
inputMask: _utils.DateUtils.getDateMask(rangeFormatStr),
|
|
580
601
|
inputValue: value ? getDisplayString(value, true) : '',
|
|
581
602
|
inputPlaceholder: typeof placeholder === 'string' && placeholder ? placeholder : rangeFormatStr,
|
|
582
603
|
onInputChange: handleInputChange,
|
|
583
604
|
onInputBlur: handleInputBlur,
|
|
584
605
|
onKeyDown: onPickerKeyDown,
|
|
585
|
-
onClean: (0,
|
|
606
|
+
onClean: (0, _utils.createChainedFunction)(handleClean, onClean),
|
|
586
607
|
cleanable: cleanable && !disabled,
|
|
587
608
|
hasValue: hasValue,
|
|
588
609
|
active: isPickerToggleActive,
|
|
589
610
|
placement: placement,
|
|
590
|
-
caretComponent:
|
|
611
|
+
caretComponent: _Calendar.default,
|
|
591
612
|
disabled: disabled
|
|
592
613
|
}), getDisplayString())));
|
|
593
614
|
});
|
|
@@ -601,7 +622,6 @@ DateRangePicker.before = disabledDateUtils.before;
|
|
|
601
622
|
DateRangePicker.beforeToday = disabledDateUtils.beforeToday;
|
|
602
623
|
DateRangePicker.combine = disabledDateUtils.combine;
|
|
603
624
|
DateRangePicker.displayName = 'DateRangePicker';
|
|
604
|
-
DateRangePicker.defaultProps = defaultProps;
|
|
605
625
|
DateRangePicker.propTypes = (0, _extends2.default)({}, _Picker.pickerPropTypes, {
|
|
606
626
|
ranges: _propTypes.default.array,
|
|
607
627
|
value: _propTypes.default.arrayOf(_propTypes.default.instanceOf(Date)),
|
|
@@ -4,6 +4,6 @@ export declare function getCalendarDate({ value }: {
|
|
|
4
4
|
value?: ValueType;
|
|
5
5
|
}): ValueType;
|
|
6
6
|
export declare const getDefaultRanges: () => RangeType[];
|
|
7
|
-
export declare const
|
|
7
|
+
export declare const isSameRange: (source: ValueType, dest: ValueType, format: string) => boolean;
|
|
8
8
|
export declare const getMonthHoverRange: (date: Date) => ValueType;
|
|
9
9
|
export declare const getWeekHoverRange: (isoWeek: boolean, date: Date) => ValueType;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
exports.__esModule = true;
|
|
4
4
|
exports.getCalendarDate = getCalendarDate;
|
|
5
|
-
exports.getWeekHoverRange = exports.getMonthHoverRange = exports.
|
|
5
|
+
exports.getWeekHoverRange = exports.getMonthHoverRange = exports.isSameRange = exports.getDefaultRanges = exports.setTimingMargin = void 0;
|
|
6
6
|
|
|
7
7
|
var _utils = require("../utils");
|
|
8
8
|
|
|
@@ -51,13 +51,17 @@ var getDefaultRanges = function getDefaultRanges() {
|
|
|
51
51
|
|
|
52
52
|
exports.getDefaultRanges = getDefaultRanges;
|
|
53
53
|
|
|
54
|
-
var
|
|
55
|
-
var
|
|
54
|
+
var isSameRange = function isSameRange(source, dest, format) {
|
|
55
|
+
var result = _utils.DateUtils.isSameDay(source === null || source === void 0 ? void 0 : source[0], dest === null || dest === void 0 ? void 0 : dest[0]) && _utils.DateUtils.isSameDay(source === null || source === void 0 ? void 0 : source[1], dest === null || dest === void 0 ? void 0 : dest[1]);
|
|
56
56
|
|
|
57
|
-
|
|
57
|
+
if (_utils.DateUtils.shouldTime(format)) {
|
|
58
|
+
result && (result = _utils.DateUtils.isSameSecond(source === null || source === void 0 ? void 0 : source[0], dest === null || dest === void 0 ? void 0 : dest[0]) && _utils.DateUtils.isSameSecond(source === null || source === void 0 ? void 0 : source[1], dest === null || dest === void 0 ? void 0 : dest[1]));
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
return result;
|
|
58
62
|
};
|
|
59
63
|
|
|
60
|
-
exports.
|
|
64
|
+
exports.isSameRange = isSameRange;
|
|
61
65
|
|
|
62
66
|
var getMonthHoverRange = function getMonthHoverRange(date) {
|
|
63
67
|
return [_utils.DateUtils.startOfMonth(date), _utils.DateUtils.endOfMonth(date)];
|
package/cjs/Divider/Divider.js
CHANGED
|
@@ -15,15 +15,12 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
15
15
|
|
|
16
16
|
var _utils = require("../utils");
|
|
17
17
|
|
|
18
|
-
var defaultProps = {
|
|
19
|
-
classPrefix: 'divider',
|
|
20
|
-
as: 'div'
|
|
21
|
-
};
|
|
22
|
-
|
|
23
18
|
var Divider = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
24
|
-
var
|
|
19
|
+
var _props$as = props.as,
|
|
20
|
+
Component = _props$as === void 0 ? 'div' : _props$as,
|
|
25
21
|
className = props.className,
|
|
26
|
-
classPrefix = props.classPrefix,
|
|
22
|
+
_props$classPrefix = props.classPrefix,
|
|
23
|
+
classPrefix = _props$classPrefix === void 0 ? 'divider' : _props$classPrefix,
|
|
27
24
|
children = props.children,
|
|
28
25
|
vertical = props.vertical,
|
|
29
26
|
rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["as", "className", "classPrefix", "children", "vertical"]);
|
|
@@ -48,7 +45,6 @@ var Divider = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
48
45
|
});
|
|
49
46
|
|
|
50
47
|
Divider.displayName = 'Divider';
|
|
51
|
-
Divider.defaultProps = defaultProps;
|
|
52
48
|
Divider.propTypes = {
|
|
53
49
|
as: _propTypes.default.elementType,
|
|
54
50
|
className: _propTypes.default.string,
|
package/cjs/Drawer/Drawer.js
CHANGED
|
@@ -21,12 +21,6 @@ var _utils = require("../utils");
|
|
|
21
21
|
|
|
22
22
|
var _deprecateComponent = _interopRequireDefault(require("../utils/deprecateComponent"));
|
|
23
23
|
|
|
24
|
-
var defaultProps = {
|
|
25
|
-
classPrefix: 'drawer',
|
|
26
|
-
placement: 'right',
|
|
27
|
-
animation: _Slide.default
|
|
28
|
-
};
|
|
29
|
-
|
|
30
24
|
var DrawerBody = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
31
25
|
return /*#__PURE__*/_react.default.createElement(_Modal.default.Body, (0, _extends2.default)({
|
|
32
26
|
classPrefix: "drawer-body"
|
|
@@ -69,9 +63,13 @@ var DrawerTitle = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
69
63
|
|
|
70
64
|
var Drawer = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
71
65
|
var className = props.className,
|
|
72
|
-
placement = props.placement,
|
|
73
|
-
|
|
74
|
-
|
|
66
|
+
_props$placement = props.placement,
|
|
67
|
+
placement = _props$placement === void 0 ? 'right' : _props$placement,
|
|
68
|
+
_props$classPrefix = props.classPrefix,
|
|
69
|
+
classPrefix = _props$classPrefix === void 0 ? 'drawer' : _props$classPrefix,
|
|
70
|
+
_props$animation = props.animation,
|
|
71
|
+
animation = _props$animation === void 0 ? _Slide.default : _props$animation,
|
|
72
|
+
rest = (0, _objectWithoutPropertiesLoose2.default)(props, ["className", "placement", "classPrefix", "animation"]);
|
|
75
73
|
|
|
76
74
|
var _useClassNames = (0, _utils.useClassNames)(classPrefix),
|
|
77
75
|
merge = _useClassNames.merge,
|
|
@@ -86,6 +84,7 @@ var Drawer = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
|
|
|
86
84
|
drawer: true,
|
|
87
85
|
classPrefix: classPrefix,
|
|
88
86
|
className: classes,
|
|
87
|
+
animation: animation,
|
|
89
88
|
animationProps: animationProps
|
|
90
89
|
}));
|
|
91
90
|
});
|
|
@@ -101,7 +100,6 @@ Drawer.Actions = DrawerActions;
|
|
|
101
100
|
Drawer.Footer = (0, _deprecateComponent.default)(DrawerFooter, '<Drawer.Footer> has been deprecated, use <Drawer.Actions> instead.');
|
|
102
101
|
Drawer.Title = DrawerTitle;
|
|
103
102
|
Drawer.displayName = 'Drawer';
|
|
104
|
-
Drawer.defaultProps = defaultProps;
|
|
105
103
|
Drawer.propTypes = {
|
|
106
104
|
classPrefix: _propTypes.default.string,
|
|
107
105
|
placement: _propTypes.default.oneOf(['top', 'right', 'bottom', 'left']),
|