@nutui/nutui-react 3.0.0-beta.8 → 3.0.0

package/dist/es/packages/datepicker/datepicker.js

@@ -1,16 +1,15 @@
-import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import React, { useState, useEffect } from "react";
+import React, { useState, useEffect, useImperativeHandle } from "react";
 import Picker from "../picker";
 import { useConfig } from "../configprovider";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 import { ComponentDefaults } from "../../utils/typings";
 import { isDate } from "../../utils/is-date";
-import { padZero } from "../../utils/pad-zero";
+import { formatValue, generateDatePickerRanges, generatePickerColumnWithCallback, getDatePartValue, handlePickerValueChange } from "./utils";
 var currentYear = new Date().getFullYear();
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     visible: false,
@@ -22,11 +21,8 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     startDate: new Date(currentYear - 10, 0, 1),
     endDate: new Date(currentYear + 10, 11, 31)
 });
-export var DatePicker = function(props) {
-    var getMonthEndDay = function getMonthEndDay(year, month) {
-        return new Date(year, month, 0).getDate();
-    };
-    var _ref = _object_spread({}, defaultProps, props), startDate = _ref.startDate, endDate = _ref.endDate, type = _ref.type, showChinese = _ref.showChinese, minuteStep = _ref.minuteStep, visible = _ref.visible, title = _ref.title, defaultValue = _ref.defaultValue, _ref_pickerProps = _ref.pickerProps, pickerProps = _ref_pickerProps === void 0 ? {} : _ref_pickerProps, formatter = _ref.formatter, onClose = _ref.onClose, onCancel = _ref.onCancel, onConfirm = _ref.onConfirm, filter = _ref.filter, onChange = _ref.onChange, threeDimensional = _ref.threeDimensional, className = _ref.className, style = _ref.style, rest = _object_without_properties(_ref, [
+var InternalPicker = function(props, ref) {
+    var _ref = _object_spread({}, defaultProps, props), startDate = _ref.startDate, endDate = _ref.endDate, type = _ref.type, showChinese = _ref.showChinese, minuteStep = _ref.minuteStep, visible = _ref.visible, title = _ref.title, defaultValue = _ref.defaultValue, _ref_pickerProps = _ref.pickerProps, pickerProps = _ref_pickerProps === void 0 ? {} : _ref_pickerProps, formatter = _ref.formatter, onClose = _ref.onClose, onCancel = _ref.onCancel, onConfirm = _ref.onConfirm, filter = _ref.filter, onChange = _ref.onChange, threeDimensional = _ref.threeDimensional, className = _ref.className, style = _ref.style, children = _ref.children, rest = _object_without_properties(_ref, [
         "startDate",
         "endDate",
         "type",
@@ -44,7 +40,8 @@ export var DatePicker = function(props) {
         "onChange",
         "threeDimensional",
         "className",
-        "style"
+        "style",
+        "children"
     ]);
     var locale = useConfig().locale;
     var lang = locale.datepicker;
@@ -58,120 +55,34 @@ export var DatePicker = function(props) {
     };
     var _useState = _sliced_to_array(useState([]), 2), pickerValue = _useState[0], setPickerValue = _useState[1];
     var _useState1 = _sliced_to_array(useState([]), 2), pickerOptions = _useState1[0], setPickerOptions = _useState1[1];
-    var formatValue = function(value) {
-        if (!value || value && !isDate(value)) {
-            value = startDate;
-        }
-        return Math.min(Math.max(value.getTime(), startDate.getTime()), endDate.getTime());
-    };
     var _usePropsValue = _sliced_to_array(usePropsValue({
-        value: props.value && formatValue(props.value),
-        defaultValue: props.defaultValue && formatValue(props.defaultValue),
+        value: props.value && formatValue(props.value, startDate, endDate),
+        defaultValue: props.defaultValue && formatValue(props.defaultValue, startDate, endDate),
         finalValue: 0
     }), 2), selectedDate = _usePropsValue[0], setSelectedDate = _usePropsValue[1];
-    var getBoundary = function(type, value) {
-        var boundary = type === 'min' ? startDate : endDate;
-        var year = boundary.getFullYear();
-        var month = 1;
-        var date = 1;
-        var hour = 0;
-        var minute = 0;
-        if (type === 'max') {
-            month = 12;
-            date = getMonthEndDay(value.getFullYear(), value.getMonth() + 1);
-            hour = 23;
-            minute = 59;
-        }
-        var seconds = minute;
-        if (value.getFullYear() === year) {
-            month = boundary.getMonth() + 1;
-            if (value.getMonth() + 1 === month) {
-                date = boundary.getDate();
-                if (value.getDate() === date) {
-                    hour = boundary.getHours();
-                    if (value.getHours() === hour) {
-                        minute = boundary.getMinutes();
-                    }
-                }
-            }
-        }
-        var _obj;
-        return _obj = {}, _define_property(_obj, "".concat(type, "Year"), year), _define_property(_obj, "".concat(type, "Month"), month), _define_property(_obj, "".concat(type, "Date"), date), _define_property(_obj, "".concat(type, "Hour"), hour), _define_property(_obj, "".concat(type, "Minute"), minute), _define_property(_obj, "".concat(type, "Seconds"), seconds), _obj;
-    };
-    var ranges = function() {
-        var selected = new Date(selectedDate);
-        if (!selected) return [];
-        var _getBoundary = getBoundary('max', selected), maxYear = _getBoundary.maxYear, maxDate = _getBoundary.maxDate, maxMonth = _getBoundary.maxMonth, maxHour = _getBoundary.maxHour, maxMinute = _getBoundary.maxMinute, maxSeconds = _getBoundary.maxSeconds;
-        var _getBoundary1 = getBoundary('min', selected), minYear = _getBoundary1.minYear, minDate = _getBoundary1.minDate, minMonth = _getBoundary1.minMonth, minHour = _getBoundary1.minHour, minMinute = _getBoundary1.minMinute, minSeconds = _getBoundary1.minSeconds;
-        var result = [
-            {
-                type: 'year',
-                range: [
-                    minYear,
-                    maxYear
-                ]
-            },
-            {
-                type: 'month',
-                range: [
-                    minMonth,
-                    maxMonth
-                ]
-            },
-            {
-                type: 'day',
-                range: [
-                    minDate,
-                    maxDate
-                ]
-            },
-            {
-                type: 'hour',
-                range: [
-                    minHour,
-                    maxHour
-                ]
-            },
-            {
-                type: 'minute',
-                range: [
-                    minMinute,
-                    maxMinute
-                ]
-            },
-            {
-                type: 'seconds',
-                range: [
-                    minSeconds,
-                    maxSeconds
-                ]
-            }
-        ];
-        switch(type.toLocaleLowerCase()){
-            case 'date':
-                return result.slice(0, 3);
-            case 'datetime':
-                return result.slice(0, 5);
-            case 'time':
-                return result.slice(3, 6);
-            case 'year-month':
-                return result.slice(0, 2);
-            case 'hour-minutes':
-                return result.slice(3, 5);
-            case 'month-day':
-                return result.slice(1, 3);
-            case 'datehour':
-                return result.slice(0, 4);
-            default:
-                return result;
+    var _useState2 = _sliced_to_array(useState(selectedDate), 2), innerDate = _useState2[0], setInnerDate = _useState2[1];
+    var _usePropsValue1 = _sliced_to_array(usePropsValue({
+        value: props.visible,
+        defaultValue: false,
+        finalValue: false
+    }), 2), innerVisible = _usePropsValue1[0], setInnerVisible = _usePropsValue1[1];
+    var actions = {
+        open: function() {
+            setInnerVisible(true);
+        },
+        close: function() {
+            setInnerVisible(false);
         }
     };
-    var compareDateChange = function(currentDate, newDate, selectedOptions, index) {
+    useImperativeHandle(ref, function() {
+        return actions;
+    });
+    var handleDateComparison = function(newDate, selectedOptions, index) {
         var _this;
-        var isEqual = ((_this = new Date(currentDate)) === null || _this === void 0 ? void 0 : _this.getTime()) === (newDate === null || newDate === void 0 ? void 0 : newDate.getTime());
+        var isEqual = ((_this = new Date(innerDate)) === null || _this === void 0 ? void 0 : _this.getTime()) === (newDate === null || newDate === void 0 ? void 0 : newDate.getTime());
         if (newDate && isDate(newDate)) {
             if (!isEqual) {
-                setSelectedDate(formatValue(newDate));
+                setInnerDate(formatValue(newDate, startDate, endDate));
             }
             onChange === null || onChange === void 0 ? void 0 : onChange(selectedOptions, [
                 String(newDate.getFullYear()),
@@ -180,138 +91,76 @@ export var DatePicker = function(props) {
             ], index);
         }
     };
-    var handlePickerChange = function(selectedOptions, selectedValue, index) {
-        var rangeType = type.toLocaleLowerCase();
-        if ([
-            'date',
-            'datetime',
-            'datehour',
-            'month-day',
-            'year-month'
-        ].includes(rangeType)) {
-            var formatDate = [];
-            selectedValue.forEach(function(item) {
-                formatDate.push(item);
-            });
-            if (rangeType === 'month-day' && formatDate.length < 3) {
-                formatDate.unshift(new Date(defaultValue || startDate || endDate).getFullYear());
-            }
-            if (rangeType === 'year-month' && formatDate.length < 3) {
-                formatDate.push(new Date(defaultValue || startDate || endDate).getDate());
-            }
-            var year = Number(formatDate[0]);
-            var month = Number(formatDate[1]) - 1;
-            var day = Math.min(Number(formatDate[2]), getMonthEndDay(Number(formatDate[0]), Number(formatDate[1])));
-            var date = null;
-            if (rangeType === 'date' || rangeType === 'month-day' || rangeType === 'year-month') {
-                date = new Date(year, month, day);
-            } else if (rangeType === 'datetime') {
-                date = new Date(year, month, day, Number(formatDate[3]), Number(formatDate[4]));
-            } else if (rangeType === 'datehour') {
-                date = new Date(year, month, day, Number(formatDate[3]));
+    var handleConfirmDateComparison = function(newDate) {
+        if (newDate && isDate(newDate)) {
+            var _this;
+            var isEqual = ((_this = new Date(selectedDate)) === null || _this === void 0 ? void 0 : _this.getTime()) === (newDate === null || newDate === void 0 ? void 0 : newDate.getTime());
+            if (!isEqual) {
+                setSelectedDate(formatValue(newDate, startDate, endDate));
             }
-            compareDateChange(selectedDate, date, selectedOptions, index);
-        } else {
-            // 'hour-minutes' 'time'
-            var _selectedValue = _sliced_to_array(selectedValue, 3), hour = _selectedValue[0], minute = _selectedValue[1], seconds = _selectedValue[2];
-            var currentDate = new Date(selectedDate);
-            var year1 = currentDate.getFullYear();
-            var month1 = currentDate.getMonth();
-            var day1 = currentDate.getDate();
-            var date1 = new Date(year1, month1, day1, Number(hour), Number(minute), rangeType === 'time' ? Number(seconds) : 0);
-            compareDateChange(selectedDate, date1, selectedOptions, index);
         }
     };
-    var formatOption = function(type, value) {
-        if (formatter) {
-            return formatter(type, {
-                text: padZero(value, 2),
-                value: padZero(value, 2)
-            });
-        }
-        var padMin = padZero(value, 2);
-        var fatter = showChinese ? zhCNType[type] : '';
-        return {
-            text: padMin + fatter,
-            value: padMin
-        };
+    var handleCancel = function() {
+        setInnerDate(selectedDate);
+        onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     };
-    var generateColumn = function(min, max, val, type, columnIndex) {
-        var _arr_index;
-        var cmin = min;
-        var arr = [];
-        var index = 0;
-        while(cmin <= max){
-            arr.push(formatOption(type, cmin));
-            if (type === 'minute') {
-                cmin += minuteStep;
-            } else {
-                cmin++;
-            }
-            if (cmin <= Number(val)) {
-                index++;
-            }
-        }
-        pickerValue[columnIndex] = (_arr_index = arr[index]) === null || _arr_index === void 0 ? void 0 : _arr_index.value;
-        setPickerValue(_to_consumable_array(pickerValue));
-        if (filter === null || filter === void 0 ? void 0 : filter(type, arr)) {
-            return filter === null || filter === void 0 ? void 0 : filter(type, arr);
-        }
-        return arr;
+    var handleClose = function() {
+        setInnerVisible(false);
+        onClose === null || onClose === void 0 ? void 0 : onClose();
     };
-    var getDateIndex = function(type) {
-        var date = new Date(selectedDate);
-        if (!selectedDate) return 0;
-        if (type === 'year') {
-            return date.getFullYear();
-        }
-        if (type === 'month') {
-            return date.getMonth() + 1;
-        }
-        if (type === 'day') {
-            return date.getDate();
-        }
-        if (type === 'hour') {
-            return date.getHours();
-        }
-        if (type === 'minute') {
-            return date.getMinutes();
-        }
-        if (type === 'seconds') {
-            return date.getSeconds();
-        }
-        return 0;
+    var handleConfirm = function(options, value) {
+        handlePickerValueChange(options, value, 0, type, defaultValue || startDate || endDate, handleConfirmDateComparison);
+        onConfirm === null || onConfirm === void 0 ? void 0 : onConfirm(options, value);
     };
-    var columns = function() {
-        var val = ranges().map(function(res, columnIndex) {
-            return generateColumn(res.range[0], res.range[1], getDateIndex(res.type), res.type, columnIndex);
+    var handleChange = function(selectedOptions, selectedValue, index) {
+        innerVisible && handlePickerValueChange(selectedOptions, selectedValue, index, type, defaultValue || startDate || endDate, handleDateComparison);
+    };
+    var generatePickerColumns = function() {
+        var dateRanges = generateDatePickerRanges(type, innerDate, startDate, endDate);
+        var columns = dateRanges.map(function(rangeConfig, columnIndex) {
+            var columnType = rangeConfig.type, range = rangeConfig.range;
+            var selectedValue = getDatePartValue(columnType, innerDate);
+            var pickerColumn = generatePickerColumnWithCallback(range[0], range[1], selectedValue, columnType, minuteStep, function(selectedIndex, options) {
+                var _options_selectedIndex;
+                pickerValue[columnIndex] = (_options_selectedIndex = options[selectedIndex]) === null || _options_selectedIndex === void 0 ? void 0 : _options_selectedIndex.value;
+                setPickerValue(_to_consumable_array(pickerValue));
+            }, showChinese, zhCNType, formatter);
+            if (filter === null || filter === void 0 ? void 0 : filter(columnType, pickerColumn)) {
+                return filter(columnType, pickerColumn);
+            }
+            return pickerColumn;
         });
-        return val || [];
+        return columns || [];
     };
     useEffect(function() {
-        setPickerOptions(columns());
+        setInnerDate(selectedDate);
+    }, [
+        selectedDate
+    ]);
+    useEffect(function() {
+        setPickerOptions(generatePickerColumns());
     }, [
-        selectedDate,
+        innerDate,
         startDate,
         endDate
     ]);
-    return /*#__PURE__*/ React.createElement("div", _object_spread({
+    return /*#__PURE__*/ React.createElement(React.Fragment, null, typeof children === 'function' && children(selectedDate), /*#__PURE__*/ React.createElement("div", _object_spread({
         className: "nut-datepicker ".concat(className),
         style: style
-    }, rest), pickerOptions.length > 0 && /*#__PURE__*/ React.createElement(Picker, _object_spread_props(_object_spread({}, pickerProps), {
+    }, rest), pickerOptions.length && /*#__PURE__*/ React.createElement(Picker, _object_spread_props(_object_spread({}, pickerProps), {
         title: title,
-        visible: visible,
-        options: pickerOptions,
-        onClose: onClose,
-        onCancel: onCancel,
+        visible: innerVisible,
         value: pickerValue,
-        onConfirm: function(options, value) {
-            return onConfirm && onConfirm(options, value);
-        },
-        onChange: function(options, value, index) {
-            return handlePickerChange(options, value, index);
+        options: pickerOptions,
+        onClose: handleClose,
+        onCancel: handleCancel,
+        onConfirm: handleConfirm,
+        onChange: function(param) {
+            var value = param.value, index = param.index, selectedOptions = param.selectedOptions;
+            handleChange(selectedOptions, value, index);
         },
         threeDimensional: threeDimensional
-    })));
+    }))));
 };
-DatePicker.displayName = 'NutDatePicker';
+var DatePicker = /*#__PURE__*/ React.forwardRef(InternalPicker);
+export default DatePicker;

package/dist/es/packages/datepicker/index.d.ts

@@ -1,3 +1,3 @@
-import { DatePicker } from './datepicker';
-export type { DatePickerProps } from './datepicker';
+import DatePicker from './datepicker';
+export type { DatePickerProps } from './types';
 export default DatePicker;

package/dist/es/packages/datepicker/index.js

@@ -1,2 +1,2 @@
-import { DatePicker } from "./datepicker";
+import DatePicker from "./datepicker";
 export default DatePicker;