@nutui/nutui-react-taro 2.0.0-alpha.9 → 2.0.0-beta.2

package/dist/esm/{datepicker.taro-65dbeceb.js → datepicker.taro-604222f0.js}

@@ -1,33 +1,27 @@
-import React, { useState, useRef, useEffect } from "react";
+import React, { useState, useEffect } from "react";
 import { View } from "@tarojs/components";
-import { P as Picker } from "./picker.taro-0570ec32.js";
-import { u as useConfig } from "./configprovider.taro-25758d9f.js";
+import { P as Picker } from "./picker.taro-86564e14.js";
+import { u as useConfig } from "./configprovider.taro-a7f3bcfd.js";
+import { u as usePropsValue } from "./use-props-value-7ac1b1b5.js";
+import { C as ComponentDefaults } from "./typings-11d83a22.js";
 const currentYear = (/* @__PURE__ */ new Date()).getFullYear();
 const defaultProps = {
-  modelValue: null,
+  ...ComponentDefaults,
   visible: false,
   title: "",
   type: "date",
-  isShowChinese: false,
+  showChinese: false,
   threeDimensional: true,
   minuteStep: 1,
-  minDate: new Date(currentYear - 10, 0, 1),
-  maxDate: new Date(currentYear + 10, 11, 31)
+  startDate: new Date(currentYear - 10, 0, 1),
+  endDate: new Date(currentYear + 10, 11, 31)
 };
 const DatePicker = (props) => {
-  const { minDate, maxDate, type, isShowChinese, minuteStep, modelValue, visible, title, formatter, onCloseDatePicker, onConfirmDatePicker, filter, onChange, threeDimensional, className, style, ...rest } = {
+  const { startDate, endDate, type, showChinese, minuteStep, visible, title, defaultValue, formatter, onClose, onConfirm, filter, onChange, threeDimensional, className, style, ...rest } = {
     ...defaultProps,
     ...props
   };
   const { locale } = useConfig();
-  const [show, setShow] = useState(false);
-  const [currentDate, setCurrentDate] = useState(modelValue);
-  const [defaultValue, setDefaultValue] = useState([]);
-  const [options, setListData] = useState([]);
-  const pickerRef = useRef(null);
-  const isDate = (val) => {
-    return Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
-  };
   const datepickerLang = locale.datepicker;
   const zhCNType = {
     day: datepickerLang.day,
@@ -37,20 +31,32 @@ const DatePicker = (props) => {
     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());
+  };
   const formatValue = (value) => {
     let cvalue = value;
     if (!cvalue || cvalue && !isDate(cvalue)) {
-      cvalue = minDate;
+      cvalue = startDate;
     }
-    let timestmp = Math.max(cvalue.getTime(), minDate.getTime());
-    timestmp = Math.min(timestmp, maxDate.getTime());
+    let timestmp = Math.max(cvalue.getTime(), startDate.getTime());
+    timestmp = Math.min(timestmp, endDate.getTime());
     return new Date(timestmp);
   };
+  const [currentDate, setCurrentDate] = usePropsValue({
+    value: props.value && formatValue(props.value),
+    defaultValue: formatValue(props.defaultValue || null),
+    finalValue: null,
+    onChange: (val) => {
+    }
+  });
   function getMonthEndDay(year, month) {
     return new Date(year, month, 0).getDate();
   }
   const getBoundary = (type2, value) => {
-    const boundary = type2 === "min" ? minDate : maxDate;
+    const boundary = type2 === "min" ? startDate : endDate;
     const year = boundary.getFullYear();
     let month = 1;
     let date = 1;
@@ -84,12 +90,12 @@ const DatePicker = (props) => {
       [`${type2}Seconds`]: seconds
     };
   };
-  const ranges = (date) => {
-    const curDate = date || currentDate;
+  const ranges = () => {
+    const curDate = currentDate;
     if (!curDate)
       return [];
-    const { maxYear, maxDate: maxDate2, maxMonth, maxHour, maxMinute, maxSeconds } = getBoundary("max", curDate);
-    const { minYear, minDate: minDate2, minMonth, minHour, minMinute, minSeconds } = getBoundary("min", curDate);
+    const { maxYear, maxDate, maxMonth, maxHour, maxMinute, maxSeconds } = getBoundary("max", curDate);
+    const { minYear, minDate, minMonth, minHour, minMinute, minSeconds } = getBoundary("min", curDate);
     let result = [
       {
         type: "year",
@@ -101,7 +107,7 @@ const DatePicker = (props) => {
       },
       {
         type: "day",
-        range: [minDate2, maxDate2]
+        range: [minDate, maxDate]
       },
       {
         type: "hour",
@@ -141,17 +147,17 @@ const DatePicker = (props) => {
     }
     return result;
   };
-  const updateChooseValueCustmer = (cacheValueData, selectedValue, index) => {
+  const updateChooseValueCustmer = (selectedOptions, selectedValue, index) => {
     if (["date", "datetime", "datehour", "month-day", "year-month"].includes(type.toLocaleLowerCase())) {
       const formatDate = [];
       selectedValue.forEach((item) => {
         formatDate.push(item);
       });
       if (type.toLocaleLowerCase() === "month-day" && formatDate.length < 3) {
-        formatDate.unshift(new Date(modelValue || minDate || maxDate).getFullYear());
+        formatDate.unshift(new Date(defaultValue || startDate || endDate).getFullYear());
       }
       if (type.toLocaleLowerCase() === "year-month" && formatDate.length < 3) {
-        formatDate.push(new Date(modelValue || minDate || maxDate).getDate());
+        formatDate.push(new Date(defaultValue || startDate || endDate).getDate());
       }
       const year = Number(formatDate[0]);
       const month = Number(formatDate[1]) - 1;
@@ -167,7 +173,7 @@ const DatePicker = (props) => {
       const isEqual = (currentDate == null ? void 0 : currentDate.getTime()) === (date == null ? void 0 : date.getTime());
       date && isDate(date) && !isEqual && setCurrentDate(formatValue(date));
     }
-    props.onChange && props.onChange(cacheValueData, selectedValue, index);
+    props.onChange && props.onChange(selectedOptions, selectedValue, index);
   };
   const padZero = (num, targetLength = 2) => {
     let str = `${num}`;
@@ -185,12 +191,13 @@ const DatePicker = (props) => {
       });
     } else {
       const padMin = padZero(value, 2);
-      const fatter = isShowChinese ? zhCNType[type2] : "";
+      const fatter = showChinese ? zhCNType[type2] : "";
       fOption = { text: padMin + fatter, value: padMin };
     }
     return fOption;
   };
   const generateValue = (min, max, val, type2, columnIndex) => {
+    var _a;
     let cmin = min;
     const arr = [];
     let index = 0;
@@ -205,8 +212,8 @@ const DatePicker = (props) => {
         index++;
       }
     }
-    defaultValue[columnIndex] = arr[index].value;
-    setDefaultValue([...defaultValue]);
+    defaultValueOfPicker[columnIndex] = (_a = arr[index]) == null ? void 0 : _a.value;
+    setDefaultValueOfPicker([...defaultValueOfPicker]);
     if (props.filter && props.filter(type2, arr)) {
       return props.filter(type2, arr);
     }
@@ -231,27 +238,18 @@ const DatePicker = (props) => {
     }
     return d;
   };
-  const columns = (date) => {
-    const val = ranges(date).map((res, columnIndex) => {
+  const columns = () => {
+    const val = ranges().map((res, columnIndex) => {
       return generateValue(res.range[0], res.range[1], getDateIndex(res.type), res.type, columnIndex);
     });
     return val || [];
   };
-  useEffect(() => {
-    setCurrentDate(formatValue(modelValue));
-  }, []);
-  useEffect(() => {
-    setCurrentDate(formatValue(modelValue));
-  }, [modelValue]);
-  useEffect(() => {
-    setShow(visible);
-  }, [visible]);
   useEffect(() => {
     if (currentDate) {
-      setListData(columns());
+      setOptions(columns());
     }
-  }, [currentDate]);
-  return React.createElement(View, { className: `nut-datepicker ${className || ""}`, style, catchMove: true, ...rest }, options.length > 0 && React.createElement(Picker, { title, visible: show, options, onClose: onCloseDatePicker, defaultValue, onConfirm: (options2, values) => onConfirmDatePicker && onConfirmDatePicker(options2, values), onChange: (list, value, index) => updateChooseValueCustmer(list, value, index), threeDimensional, ref: pickerRef }));
+  }, []);
+  return React.createElement(View, { className: `nut-datepicker ${className}`, style, catchMove: true, ...rest }, options.length && React.createElement(Picker, { title, visible, options, onClose, defaultValue: defaultValueOfPicker, onConfirm: (options2, value) => onConfirm && onConfirm(options2, value), onChange: (options2, value, index) => updateChooseValueCustmer(options2, value, index), threeDimensional }));
 };
 DatePicker.defaultProps = defaultProps;
 DatePicker.displayName = "NutDatePicker";

package/dist/esm/{dialog.taro-290eb9a6.js → dialog.taro-2c2ca662.js}

@@ -1,11 +1,11 @@
 import React, { forwardRef } from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
-import { B as Button } from "./button.taro-01eae688.js";
+import { B as Button } from "./button.taro-60dfd83e.js";
 import { CSSTransition } from "react-transition-group";
 import { d as defaultOverlayProps, O as Overlay } from "./overlay.taro-75012bd3.js";
 import { C as ComponentDefaults } from "./typings-11d83a22.js";
-import { u as useConfig } from "./configprovider.taro-25758d9f.js";
+import { u as useConfig } from "./configprovider.taro-a7f3bcfd.js";
 const Content = (props) => {
   const { visible, title, footer, footerDirection, onClick, children } = props;
   const classPrefix = "nut-dialog";

package/dist/esm/{elevator.taro-df8fde9d.js → elevator.taro-459f7322.js}

@@ -16,7 +16,7 @@ const defaultProps = {
   className: "weapp-elevator"
 };
 const Elevator = (props) => {
-  const { height, floorKey, list, sticky, spaceHeight, titleHeight, showKeys, className, style, onClickItem, onClickIndex, children, ...rest } = {
+  const { height, floorKey, list, sticky, spaceHeight, titleHeight, showKeys, className, style, onItemClick, onIndexClick, children, ...rest } = {
     ...defaultProps,
     ...props
   };
@@ -106,12 +106,12 @@ const Elevator = (props) => {
     scrollTo(index);
   };
   const handleClickItem = (key, item) => {
-    onClickItem && onClickItem(key, item);
+    onItemClick && onItemClick(key, item);
     setCurrentData(item);
     setCurrentKey(key);
   };
   const handleClickIndex = (key) => {
-    onClickIndex && onClickIndex(key);
+    onIndexClick && onIndexClick(key);
   };
   const setListGroup = () => {
     if (listview.current) {

package/dist/esm/{ellipsis.taro-f9688dd7.js → ellipsis.taro-5653d0b2.js}

@@ -1,8 +1,8 @@
-import React, { useState, useRef, useEffect } from "react";
+import React, { useRef, useState, useEffect } from "react";
 import { useReady, nextTick, createSelectorQuery } from "@tarojs/taro";
-import { g as getRectByTaro } from "./use-client-rect-f317804e.js";
-import { C as ComponentDefaults } from "./typings-11d83a22.js";
 import classNames from "classnames";
+import { g as getRectByTaro } from "./use-client-rect-2bb6c562.js";
+import { C as ComponentDefaults } from "./typings-11d83a22.js";
 const defaultProps = {
   ...ComponentDefaults,
   content: "",
@@ -11,13 +11,14 @@ const defaultProps = {
   expandText: "",
   collapseText: "",
   symbol: "...",
-  lineHeight: "20"
+  lineHeight: "20",
+  width: "auto"
 };
 const classPrefix = `nut-ellipsis`;
 const Ellipsis = (props) => {
   var _a, _b, _c, _d;
-  const { children, content, direction, rows, className, expandText, collapseText, symbol, lineHeight, onClick, onChange, ...rest } = { ...defaultProps, ...props };
-  let maxHeight = 0;
+  const { children, content, direction, rows, className, expandText, collapseText, symbol, lineHeight, width, onClick, onChange, ...rest } = { ...defaultProps, ...props };
+  const maxHeight = useRef(0);
   const [exceeded, setExceeded] = useState(false);
   const [expanded, setExpanded] = useState(false);
   const ellipsis = useRef({
@@ -28,8 +29,8 @@ const Ellipsis = (props) => {
   const rootContain = useRef(null);
   const symbolContain = useRef(null);
   const [contentCopy, setContentCopy] = useState(content);
-  let lineH = 0;
-  let originHeight = 0;
+  const lineH = useRef(0);
+  const originHeight = useRef(0);
   const refRandomId = Math.random().toString(36).slice(-8);
   const widthRef = useRef("auto");
   let widthBase = [14, 10, 7, 8.4, 10];
@@ -38,7 +39,7 @@ const Ellipsis = (props) => {
   const digitReg = /^[0-9]+$/;
   const letterUpperReg = /^[A-Z]+$/;
   const letterLowerReg = /^[a-z]+$/;
-  const classes = classNames(classPrefix, className);
+  const classes = classNames(classPrefix, className, width ? `${classPrefix}-width` : "");
   const init = () => {
     setExceeded(false);
     setExpanded(false);
@@ -49,7 +50,7 @@ const Ellipsis = (props) => {
     });
   };
   useReady(() => init());
-  useEffect(() => init(), [content]);
+  useEffect(() => init(), [content, lineH.current, maxHeight.current, originHeight.current]);
   const getSymbolInfo = async () => {
     const refe = await getRectByTaro(symbolContain == null ? void 0 : symbolContain.current);
     symbolTextWidth = refe.width ? Math.ceil(refe.width) : Math.ceil(widthBase[0] * 0.7921);
@@ -75,9 +76,9 @@ const Ellipsis = (props) => {
     }, (res) => {
       if (!res)
         return;
-      lineH = pxToNumber(res.lineHeight === "normal" ? lineHeight : res.lineHeight);
-      maxHeight = Math.floor(lineH * (Number(rows) + 0.5) + pxToNumber(res.paddingTop) + pxToNumber(res.paddingBottom));
-      originHeight = pxToNumber(res.height);
+      lineH.current = pxToNumber(res.lineHeight === "normal" ? lineHeight : res.lineHeight);
+      maxHeight.current = Math.floor(lineH.current * (Number(rows) + 0.5) + pxToNumber(res.paddingTop) + pxToNumber(res.paddingBottom));
+      originHeight.current = pxToNumber(res.height);
       widthRef.current = res.width;
       const bsize = pxToNumber(res.fontSize);
       widthBase = [
@@ -92,10 +93,10 @@ const Ellipsis = (props) => {
   };
   const calcEllipse = async () => {
     const refe = await getRectByTaro(rootContain.current);
-    if (refe.height <= maxHeight) {
+    if (refe.height <= maxHeight.current) {
       setExceeded(false);
     } else {
-      const rowNum = Math.floor(content.length / (originHeight / lineH - 1));
+      const rowNum = Math.floor(content.length / (originHeight.current / lineH.current - 1));
       if (direction === "middle") {
         const end = content.length;
         ellipsis.current.leading = tailorContent(0, rowNum * (Number(rows) + 0.5), "end");
@@ -116,7 +117,7 @@ const Ellipsis = (props) => {
   const verifyEllipsis = async () => {
     var _a2, _b2, _c2, _d2, _e, _f;
     const refe = await getRectByTaro(rootContain.current);
-    if (refe && refe.height && refe.height > maxHeight) {
+    if (refe && refe.height && refe.height > maxHeight.current) {
       if (direction === "end") {
         ellipsis.current.leading = (_c2 = (_a2 = ellipsis.current) == null ? void 0 : _a2.leading) == null ? void 0 : _c2.slice(0, ((_b2 = ellipsis.current) == null ? void 0 : _b2.leading.length) - 1);
       } else {
@@ -199,13 +200,17 @@ const Ellipsis = (props) => {
       React.createElement(
         "div",
         null,
-        !exceeded ? React.createElement("div", { className: "nut-ellipsis-wordbreak" }, content) : null,
+        !exceeded ? React.createElement("div", { className: "nut-ellipsis-wordbreak", style: {
+          width: `${!Number.isNaN(Number(width)) ? `${width}px` : "auto"}`
+        } }, content) : null,
         exceeded && !expanded ? React.createElement(
           React.Fragment,
           null,
           React.createElement(
             "div",
-            { className: "nut-ellipsis-wordbreak" },
+            { className: "nut-ellipsis-wordbreak", style: {
+              width: `${!Number.isNaN(Number(width)) ? `${width}px` : "auto"}`
+            } },
             (_a = ellipsis.current) == null ? void 0 : _a.leading,
             ((_b = ellipsis.current) == null ? void 0 : _b.leading) && symbol,
             expandText ? React.createElement("span", { className: "nut-ellipsis-text", onClick: (e) => {
@@ -219,7 +224,9 @@ const Ellipsis = (props) => {
         exceeded && expanded ? React.createElement(
           React.Fragment,
           null,
-          content,
+          React.createElement("div", { style: {
+            width: `${!Number.isNaN(Number(width)) ? `${width}px` : "auto"}`
+          } }, content),
           expandText ? React.createElement("span", { className: "nut-ellipsis-text", onClick: (e) => {
             e.stopPropagation();
             clickHandle(2);

package/dist/esm/{empty.taro-ca792f57.js → empty.taro-a670f621.js}

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import { u as useConfig } from "./configprovider.taro-25758d9f.js";
+import { u as useConfig } from "./configprovider.taro-a7f3bcfd.js";
 import { C as ComponentDefaults } from "./typings-11d83a22.js";
 const defaultStatus = {
   empty: "https://static-ftcms.jd.com/p/files/61a9e3183985005b3958672b.png",

package/dist/esm/{fixednav.taro-28e5f776.js → fixednav.taro-c905d63e.js}

@@ -2,7 +2,7 @@ import React from "react";
 import classNames from "classnames";
 import { Left } from "@nutui/icons-react-taro";
 import { O as Overlay } from "./overlay.taro-75012bd3.js";
-import { u as useConfig } from "./configprovider.taro-25758d9f.js";
+import { u as useConfig } from "./configprovider.taro-a7f3bcfd.js";
 import { C as ComponentDefaults } from "./typings-11d83a22.js";
 const defaultProps = {
   ...ComponentDefaults,
@@ -25,7 +25,7 @@ const FixedNav = (props) => {
     active: visible
   }, type, className, classPrefix);
   const handleClick = (item, event) => {
-    onSelect(event, item);
+    onSelect(item, event);
   };
   const onUpdateValue = (value = !visible) => {
     onChange(value);