@nutui/nutui-react-taro 2.3.2 → 2.3.3

package/dist/esm/{cascader.taro-gspYp5PT.js → cascader.taro-DYMZD6ik.js}

@@ -4,12 +4,12 @@ var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
   return value;
 };
-import React__default, { useState, useEffect, isValidElement } from "react";
+import React__default, { useState, useImperativeHandle, useEffect, isValidElement } from "react";
 import classNames from "classnames";
 import { Loading, Checklist } from "@nutui/icons-react-taro";
 import { ScrollView } from "@tarojs/components";
 import { P as Popup } from "./popup.taro-2FdJu1kg.js";
-import { T as Tabs } from "./tabs.taro-HezOZhRs.js";
+import { T as Tabs } from "./tabs.taro-uXbRqGVo.js";
 import { C as ComponentDefaults } from "./typings-buMpDfSR.js";
 import { u as usePropsValue } from "./use-props-value-vKr0R0AX.js";
 const formatTree = (tree, parent, config) => tree.map((node) => {
@@ -143,7 +143,6 @@ const defaultProps = {
   activeColor: "",
   activeIcon: "checklist",
   popup: true,
-  visible: false,
   options: [],
   optionKey: { textKey: "text", valueKey: "value", childrenKey: "children" },
   format: {},
@@ -170,6 +169,20 @@ const InternalCascader = (props, ref) => {
     defaultValue,
     finalValue: defaultValue
   });
+  const [innerVisible, setInnerVisible] = usePropsValue({
+    value: props.visible,
+    defaultValue: void 0,
+    finalValue: false
+  });
+  const actions = {
+    open: () => {
+      setInnerVisible(true);
+    },
+    close: () => {
+      setInnerVisible(false);
+    }
+  };
+  useImperativeHandle(ref, () => actions);
   const [state] = useState({
     optionsData: [],
     panes: [
@@ -297,6 +310,7 @@ const InternalCascader = (props, ref) => {
     state.lazyLoadMap.delete(node);
   };
   const close = () => {
+    setInnerVisible(false);
     onClose && onClose();
   };
   const closePopup = () => {
@@ -419,7 +433,7 @@ const InternalCascader = (props, ref) => {
   };
   return React__default.createElement(React__default.Fragment, null, popup ? React__default.createElement(Popup, {
     ...popupProps,
-    visible,
+    visible: innerVisible,
     position: "bottom",
     style: { overflowY: "hidden" },
     round: true,

package/dist/esm/{countdown.taro-_7iZfeff.js → countdown.taro-rJngrZUZ.js}

@@ -1,6 +1,7 @@
 import React__default, { useState, useRef, useImperativeHandle, useEffect } from "react";
 import { u as useConfig } from "./configprovider.taro-_wngOo0k.js";
 import { C as ComponentDefaults } from "./typings-buMpDfSR.js";
+import { p as padZero } from "./pad-zero-iY-0-oys.js";
 const defaultProps = {
   ...ComponentDefaults,
   paused: false,
@@ -124,13 +125,6 @@ const InternalCountDown = (props, ref) => {
     }
     return formatCache;
   };
-  const padZero = (num, length = 2) => {
-    num += "";
-    while (num.length < length) {
-      num = `0${num}`;
-    }
-    return num.toString();
-  };
   const pause = () => {
     cancelAnimationFrame(stateRef.current.timer);
     stateRef.current.counting = false;

package/dist/esm/{datepicker.taro-a2BIZNUH.js → datepicker.taro-7xNSgNRT.js}

@@ -1,9 +1,13 @@
 import React__default, { useState, useEffect } from "react";
 import { View } from "@tarojs/components";
-import { P as Picker } from "./picker.taro-4lJuJ4rX.js";
+import { P as Picker } from "./picker.taro-pRzPNgyZ.js";
 import { u as useConfig } from "./configprovider.taro-_wngOo0k.js";
 import { u as usePropsValue } from "./use-props-value-vKr0R0AX.js";
 import { C as ComponentDefaults } from "./typings-buMpDfSR.js";
+import { p as padZero } from "./pad-zero-iY-0-oys.js";
+const isDate = (val) => {
+  return Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
+};
 const currentYear = (/* @__PURE__ */ new Date()).getFullYear();
 const defaultProps = {
   ...ComponentDefaults,
@@ -22,35 +26,27 @@ const DatePicker = (props) => {
     ...props
   };
   const { locale } = useConfig();
-  const datepickerLang = locale.datepicker;
+  const lang = locale.datepicker;
   const zhCNType = {
-    day: datepickerLang.day,
-    year: datepickerLang.year,
-    month: datepickerLang.month,
-    hour: datepickerLang.hour,
-    minute: datepickerLang.min,
-    seconds: datepickerLang.seconds
-  };
-  const [defaultValueOfPicker, setDefaultValueOfPicker] = useState([]);
-  const [options, setOptions] = useState([]);
-  const isDate = (val) => {
-    return Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
+    day: lang.day,
+    year: lang.year,
+    month: lang.month,
+    hour: lang.hour,
+    minute: lang.min,
+    seconds: lang.seconds
   };
+  const [pickerValue, setPickerValue] = useState([]);
+  const [pickerOptions, setPickerOptions] = useState([]);
   const formatValue = (value) => {
-    let cvalue = value;
-    if (!cvalue || cvalue && !isDate(cvalue)) {
-      cvalue = startDate;
+    if (!value || value && !isDate(value)) {
+      value = startDate;
     }
-    let timestmp = Math.max(cvalue.getTime(), startDate.getTime());
-    timestmp = Math.min(timestmp, endDate.getTime());
-    return timestmp;
+    return Math.min(Math.max(value.getTime(), startDate.getTime()), endDate.getTime());
   };
-  const [currentDate, setCurrentDate] = usePropsValue({
+  const [selectedDate, setSelectedDate] = usePropsValue({
     value: props.value && formatValue(props.value),
-    defaultValue: formatValue(props.defaultValue || null),
-    finalValue: 0,
-    onChange: (val) => {
-    }
+    defaultValue: props.defaultValue && formatValue(props.defaultValue),
+    finalValue: 0
   });
   function getMonthEndDay(year, month) {
     return new Date(year, month, 0).getDate();
@@ -91,12 +87,12 @@ const DatePicker = (props) => {
     };
   };
   const ranges = () => {
-    const curDate = new Date(currentDate);
-    if (!curDate)
+    const selected = new Date(selectedDate);
+    if (!selected)
       return [];
-    const { maxYear, maxDate, maxMonth, maxHour, maxMinute, maxSeconds } = getBoundary("max", curDate);
-    const { minYear, minDate, minMonth, minHour, minMinute, minSeconds } = getBoundary("min", curDate);
-    let result = [
+    const { maxYear, maxDate, maxMonth, maxHour, maxMinute, maxSeconds } = getBoundary("max", selected);
+    const { minYear, minDate, minMonth, minHour, minMinute, minSeconds } = getBoundary("min", selected);
+    const result = [
       {
         type: "year",
         range: [minYear, maxYear]
@@ -124,30 +120,24 @@ const DatePicker = (props) => {
     ];
     switch (type.toLocaleLowerCase()) {
       case "date":
-        result = result.slice(0, 3);
-        break;
+        return result.slice(0, 3);
       case "datetime":
-        result = result.slice(0, 5);
-        break;
+        return result.slice(0, 5);
       case "time":
-        result = result.slice(3, 6);
-        break;
+        return result.slice(3, 6);
       case "year-month":
-        result = result.slice(0, 2);
-        break;
+        return result.slice(0, 2);
       case "hour-minutes":
-        result = result.slice(3, 5);
-        break;
+        return result.slice(3, 5);
       case "month-day":
-        result = result.slice(1, 3);
-        break;
+        return result.slice(1, 3);
       case "datehour":
-        result = result.slice(0, 4);
-        break;
+        return result.slice(0, 4);
+      default:
+        return result;
     }
-    return result;
   };
-  const updateChooseValueCustmer = (selectedOptions, selectedValue, index) => {
+  const handlePickerChange = (selectedOptions, selectedValue, index) => {
     var _a;
     const rangeType = type.toLocaleLowerCase();
     if (["date", "datetime", "datehour", "month-day", "year-month"].includes(rangeType)) {
@@ -172,39 +162,29 @@ const DatePicker = (props) => {
       } else if (rangeType === "datehour") {
         date = new Date(year, month, day, Number(formatDate[3]));
       }
-      const isEqual = ((_a = new Date(currentDate)) == null ? void 0 : _a.getTime()) === (date == null ? void 0 : date.getTime());
-      date && isDate(date) && !isEqual && setCurrentDate(formatValue(date));
+      const isEqual = ((_a = new Date(selectedDate)) == null ? void 0 : _a.getTime()) === (date == null ? void 0 : date.getTime());
+      date && isDate(date) && !isEqual && setSelectedDate(formatValue(date));
     }
     props.onChange && props.onChange(selectedOptions, selectedValue, index);
   };
-  const padZero = (num, targetLength = 2) => {
-    let str = `${num}`;
-    while (str.length < targetLength) {
-      str = `0${str}`;
-    }
-    return str;
-  };
-  const formatterOption = (type2, value) => {
-    let fOption = null;
+  const formatOption = (type2, value) => {
     if (formatter) {
-      fOption = formatter(type2, {
+      return formatter(type2, {
         text: padZero(value, 2),
         value: padZero(value, 2)
       });
-    } else {
-      const padMin = padZero(value, 2);
-      const fatter = showChinese ? zhCNType[type2] : "";
-      fOption = { text: padMin + fatter, value: padMin };
     }
-    return fOption;
+    const padMin = padZero(value, 2);
+    const fatter = showChinese ? zhCNType[type2] : "";
+    return { text: padMin + fatter, value: padMin };
   };
-  const generateValue = (min, max, val, type2, columnIndex) => {
+  const generateColumn = (min, max, val, type2, columnIndex) => {
     var _a;
     let cmin = min;
     const arr = [];
     let index = 0;
     while (cmin <= max) {
-      arr.push(formatterOption(type2, cmin));
+      arr.push(formatOption(type2, cmin));
       if (type2 === "minute") {
         cmin += minuteStep;
       } else {
@@ -214,16 +194,16 @@ const DatePicker = (props) => {
         index++;
       }
     }
-    defaultValueOfPicker[columnIndex] = (_a = arr[index]) == null ? void 0 : _a.value;
-    setDefaultValueOfPicker([...defaultValueOfPicker]);
+    pickerValue[columnIndex] = (_a = arr[index]) == null ? void 0 : _a.value;
+    setPickerValue([...pickerValue]);
     if (props.filter && props.filter(type2, arr)) {
       return props.filter(type2, arr);
     }
     return arr;
   };
   const getDateIndex = (type2) => {
-    const date = new Date(currentDate);
-    if (!currentDate)
+    const date = new Date(selectedDate);
+    if (!selectedDate)
       return 0;
     if (type2 === "year") {
       return date.getFullYear();
@@ -247,16 +227,16 @@ const DatePicker = (props) => {
   };
   const columns = () => {
     const val = ranges().map((res, columnIndex) => {
-      return generateValue(res.range[0], res.range[1], getDateIndex(res.type), res.type, columnIndex);
+      return generateColumn(res.range[0], res.range[1], getDateIndex(res.type), res.type, columnIndex);
     });
     return val || [];
   };
   useEffect(() => {
-    if (currentDate) {
-      setOptions(columns());
+    if (selectedDate) {
+      setPickerOptions(columns());
     }
-  }, [currentDate, startDate, endDate]);
-  return React__default.createElement(View, { className: `nut-datepicker ${className}`, style, catchMove: true, ...rest }, options.length && React__default.createElement(Picker, { ...pickerProps, title, visible, options, onClose, onCancel, defaultValue: defaultValueOfPicker, onConfirm: (options2, value) => onConfirm && onConfirm(options2, value), onChange: (options2, value, index) => updateChooseValueCustmer(options2, value, index), threeDimensional }));
+  }, [selectedDate, startDate, endDate]);
+  return React__default.createElement(View, { className: `nut-datepicker ${className}`, style, catchMove: true, ...rest }, pickerOptions.length && React__default.createElement(Picker, { ...pickerProps, title, visible, options: pickerOptions, onClose, onCancel, value: pickerValue, onConfirm: (options, value) => onConfirm && onConfirm(options, value), onChange: (options, value, index) => handlePickerChange(options, value, index), threeDimensional }));
 };
 DatePicker.defaultProps = defaultProps;
 DatePicker.displayName = "NutDatePicker";