@nutui/nutui-react-taro 3.0.15 → 3.0.17-beta.0

package/dist/es/packages/noticebar/noticebar.js

@@ -3,8 +3,9 @@ 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 _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, { useEffect, useMemo, useRef, useState, useCallback } from "react";
 import { View } from "@tarojs/components";
 import { Close, Notice } from "@nutui/icons-react-taro";
 import classNames from "classnames";
@@ -47,9 +48,10 @@ export var NoticeBar = function(props) {
     var _useState8 = _sliced_to_array(useState(null), 2), isCanScroll = _useState8[0], SetIsCanScroll = _useState8[1];
     var isVertical = direction === 'vertical';
     var _useState9 = _sliced_to_array(useState(null), 2), rect = _useState9[0], setRect = _useState9[1];
-    var active = 0;
+    var activeRef = useRef(0);
     var _useState10 = _sliced_to_array(useState(false), 2), ready = _useState10[0], setReady = _useState10[1];
     var container = useRef(null);
+    var _useState11 = _sliced_to_array(useState(false), 2), isContainerReady = _useState11[0], setIsContainerReady = _useState11[1];
     var innerRef = useRef(null);
     var swiperRef = useRef({
         moving: false,
@@ -59,8 +61,8 @@ export var NoticeBar = function(props) {
         offset: 0,
         size: 0
     });
-    var _useState11 = _sliced_to_array(useState([]), 2), childOffset = _useState11[0], setChildOffset = _useState11[1];
-    var _useState12 = _sliced_to_array(useState(0), 2), offset = _useState12[0], setOffset = _useState12[1];
+    var _useState12 = _sliced_to_array(useState([]), 2), childOffset = _useState12[0], setChildOffset = _useState12[1];
+    var _useState13 = _sliced_to_array(useState(0), 2), offset = _useState13[0], setOffset = _useState13[1];
     var _useMemo = useMemo(function() {
         var childCount = 0;
         var childs = React.Children.map(children, function(child) {
@@ -100,7 +102,9 @@ export var NoticeBar = function(props) {
             // 销毁事件
             clearInterval(timer);
         };
-    }, []);
+    }, [
+        childs
+    ]);
     useEffect(function() {
         initScrollWrap(content);
     }, [
@@ -219,7 +223,7 @@ export var NoticeBar = function(props) {
     };
     // 垂直自定义滚动方式
     var init = function() {
-        var active = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : +0;
+        var activeIndex = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : 0;
         if (!(container === null || container === void 0 ? void 0 : container.current)) return;
         setTimeout(/*#__PURE__*/ _async_to_generator(function() {
             var rects, _active, _height, targetOffset;
@@ -232,17 +236,18 @@ export var NoticeBar = function(props) {
                         ];
                     case 1:
                         rects = _state.sent();
-                        _active = Math.max(Math.min(childCount - 1, active), 0);
+                        _active = Math.max(Math.min(childCount - 1, activeIndex), 0);
                         _height = rects === null || rects === void 0 ? void 0 : rects.height;
                         trackSize = childCount * Number(_height);
                         targetOffset = getOffset(_active);
-                        swiperRef.current.moving = true;
-                        if (ready) {
-                            swiperRef.current.moving = false;
-                        }
-                        active = _active;
+                        activeRef.current = _active;
                         setRect(rects);
                         setOffset(targetOffset);
+                        setChildOffset(new Array(childCount).fill(0));
+                        // 关闭动画并立即设置样式
+                        swiperRef.current.moving = true;
+                        setStyle(targetOffset, rects);
+                        swiperRef.current.moving = false;
                         setReady(true);
                         return [
                             2
@@ -253,7 +258,6 @@ export var NoticeBar = function(props) {
     };
     useEffect(function() {
         if (ready) {
-            stopAutoPlay();
             autoplay();
         }
         return function() {
@@ -263,18 +267,19 @@ export var NoticeBar = function(props) {
         ready
     ]);
     useEffect(function() {
-        if (isVertical && children) {
-            init();
+        if (isVertical && children && isContainerReady) {
             stopAutoPlay();
-            autoplay();
+            setReady(false);
+            init();
         }
     }, [
         children,
-        container === null || container === void 0 ? void 0 : container.current
+        isContainerReady
     ]);
     // 清除定时器
     var stopAutoPlay = function() {
         clearTimeout(swiperRef.current.autoplayTimer);
+        swiperRef.current.moving = false;
         swiperRef.current.autoplayTimer = null;
     };
     // 定时轮播
@@ -293,23 +298,26 @@ export var NoticeBar = function(props) {
         var targetActive = getActive(pace);
         // 父级容器偏移量
         var targetOffset = getOffset(targetActive, offset);
-        // 如果循环，调整开头结尾图片位置
-        if (Array.isArray(children) && children[0] && targetOffset !== minOffset) {
-            var rightBound = targetOffset < minOffset;
-            childOffset[0] = rightBound ? trackSize : 0;
-        }
-        if (Array.isArray(children) && children[childCount - 1] && targetOffset !== 0) {
-            var leftBound = targetOffset > 0;
-            childOffset[childCount - 1] = leftBound ? -trackSize : 0;
-        }
-        setChildOffset(childOffset);
-        active = targetActive;
+        // 循环滚动，调整开头结尾图片位置
+        setChildOffset(function(prevChildOffset) {
+            var newChildOffset = _to_consumable_array(prevChildOffset);
+            if (Array.isArray(children) && children[0] && targetOffset !== minOffset) {
+                var rightBound = targetOffset < minOffset;
+                newChildOffset[0] = rightBound ? trackSize : 0;
+            }
+            if (Array.isArray(children) && children[childCount - 1] && targetOffset !== 0) {
+                var leftBound = targetOffset > 0;
+                newChildOffset[childCount - 1] = leftBound ? -trackSize : 0;
+            }
+            return newChildOffset;
+        });
+        activeRef.current = targetActive;
         setOffset(targetOffset);
-        getStyle(targetOffset);
+        setStyle(targetOffset);
     };
     // 下一页
     var next = function() {
-        resettPosition();
+        resetPosition();
         requestFrame(function() {
             requestFrame(function() {
                 swiperRef.current.moving = false;
@@ -322,16 +330,16 @@ export var NoticeBar = function(props) {
     var handleItemClick = function(event, value) {
         onItemClick && onItemClick(event, value);
     };
-    var getStyle = function() {
-        var moveOffset = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : offset;
+    var setStyle = function() {
+        var moveOffset = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : offset, currentRect = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : rect;
         var target = innerRef.current;
         if (!target) {
             return;
         }
         var _offset = 0;
-        // 容器高度-元素高度
-        var val = ((rect === null || rect === void 0 ? void 0 : rect.height) || 0) - height;
-        _offset = moveOffset + Number(active === childCount - 1 && val / 2);
+        var containerHeight = (currentRect === null || currentRect === void 0 ? void 0 : currentRect.height) || height;
+        var val = containerHeight - Number(height);
+        _offset = moveOffset + Number(activeRef.current === childCount - 1 && val / 2);
         target.style.transitionDuration = "".concat(swiperRef.current.moving ? 0 : duration, "ms");
         target.style.height = "".concat(Number(height) * (childCount + 1), "px");
         target.style.transform = "translate3D(0,".concat(_offset, "px,0)");
@@ -351,11 +359,12 @@ export var NoticeBar = function(props) {
     };
     // 确定当前active 元素
     var getActive = function(pace) {
+        var currentActive = activeRef.current;
         if (pace) {
-            var _active = active + pace;
+            var _active = currentActive + pace;
             return range(_active, -1, childCount);
         }
-        return active;
+        return currentActive;
     };
     // 计算位移
     var getOffset = function(active) {
@@ -373,14 +382,15 @@ export var NoticeBar = function(props) {
         return Math.min(Math.max(num, min), max);
     };
     // 重置首尾位置信息
-    var resettPosition = function() {
+    var resetPosition = function() {
+        var currentActive = activeRef.current;
         swiperRef.current.moving = true;
-        if (active <= -1) {
+        if (currentActive <= -1) {
             move({
                 pace: childCount
             });
         }
-        if (active >= childCount) {
+        if (currentActive >= childCount) {
             move({
                 pace: -childCount
             });
@@ -394,6 +404,20 @@ export var NoticeBar = function(props) {
             stopAutoPlay();
         };
     }, []);
+    var hasVerticalContent = useMemo(function() {
+        if (!isVertical) return false;
+        if (children) return (childs === null || childs === void 0 ? void 0 : childs.length) > 0;
+        return (list === null || list === void 0 ? void 0 : list.length) > 0;
+    }, [
+        isVertical,
+        childs,
+        list,
+        children
+    ]);
+    var containerRefCallback = useCallback(function(ref) {
+        container.current = ref;
+        setIsContainerReady(true);
+    }, []);
     return (
         /*#__PURE__*/ React.createElement(View, {
             className: cls,
@@ -419,10 +443,10 @@ export var NoticeBar = function(props) {
             onClick: onClickIcon
         }, rightIcon || /*#__PURE__*/ React.createElement(Close, {
             size: 12
-        })) : null) : null, showNoticeBar && scrollList.current.length > 0 && isVertical ? /*#__PURE__*/ React.createElement(View, {
+        })) : null) : null, showNoticeBar && hasVerticalContent && isVertical ? /*#__PURE__*/ React.createElement(View, {
             className: "nut-noticebar-vertical",
             style: barStyle,
-            ref: container,
+            ref: containerRefCallback,
             onClick: handleClick
         }, leftIcon ? /*#__PURE__*/ React.createElement(View, {
             className: "nut-noticebar-box-left-icon"

package/dist/es/packages/pulltorefresh/pulltorefresh.js

@@ -166,7 +166,7 @@ export var PullToRefresh = function(p) {
     return /*#__PURE__*/ React.createElement(View, {
         className: classes,
         style: props.style,
-        catchMove: true,
+        catchMove: props.catchMove,
         onTouchStart: handleTouchStart,
         onTouchMove: handleTouchMove,
         onTouchEnd: handleTouchEnd

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

@@ -2,7 +2,7 @@ import React from 'react';
 import SwiperItem from "../swiperitem/index";
 import { TaroSwiperProps } from "../../types";
 export type { TaroSwiperProps as SwiperProps } from "../../types";
-type CompoundedComponent = React.ForwardRefExoticComponent<Partial<TaroSwiperProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'> & React.RefAttributes<any>> & {
+type CompoundedComponent = React.ForwardRefExoticComponent<Partial<TaroSwiperProps> & React.RefAttributes<any>> & {
     Item: typeof SwiperItem;
 };
 declare const InnerSwiper: CompoundedComponent;

package/dist/es/packages/swiper/swiper.js

@@ -3,7 +3,7 @@ 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 React, { Children, useImperativeHandle, useMemo, useState } from "react";
+import React, { Children, useImperativeHandle, useMemo, useState, useEffect } from "react";
 import { Swiper as TaroSwiper, SwiperItem as TSwiperItem, View } from "@tarojs/components";
 import classNames from "classnames";
 import Indicator from "../indicator/index";
@@ -48,6 +48,12 @@ export var Swiper = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     }, [
         children
     ]);
+    useEffect(function() {
+        setInnerValue(current || defaultValue);
+    }, [
+        defaultValue,
+        current
+    ]);
     var renderIndicator = function() {
         if (/*#__PURE__*/ React.isValidElement(indicator)) return indicator;
         if (indicator || indicatorDots) {

package/dist/es/types/spec/calendar/base.d.ts

@@ -4,6 +4,8 @@ import { BaseProps } from '../../base/props';
 export interface CalendarDay {
     day: SimpleValue;
     type: string;
+    month?: SimpleValue;
+    year?: SimpleValue;
 }
 export interface CalendarMonthInfo {
     curData: string[] | string;
@@ -121,7 +123,7 @@ export interface BaseCalendar {
     /**
     * 点击/选择后触发
     */
-    onDayClick: (data: string) => void
+    onDayClick: (data: string[]) => void
     /**
     * 年月子标题到达顶部时触发
     */

package/dist/es/types/spec/imagepreview/h5.d.ts

@@ -1,3 +1,6 @@
 import { BaseImagePreview } from './base';
-export interface WebImagePreviewProps extends BaseImagePreview {
+import { WebSwiperProps } from "../../../types";
+type props = BaseImagePreview & Omit<WebSwiperProps, 'autoPlay' | 'indicator'>;
+export interface WebImagePreviewProps extends Omit<props, 'autoplay'> {
 }
+export {};

package/dist/es/types/spec/imagepreview/taro.d.ts

@@ -1,5 +1,8 @@
 import { BaseImagePreview } from './base';
-export interface TaroImagePreviewProps extends Omit<BaseImagePreview, 'autoPlay'> {
+import { TaroSwiperProps } from "../../../types";
+type props = Omit<BaseImagePreview, 'autoPlay'> & Omit<TaroSwiperProps, 'autoPlay' | 'autoplay' | 'indicator'>;
+export interface TaroImagePreviewProps extends props {
     autoPlay: boolean;
     showMenuByLongpress: boolean;
 }
+export {};

package/dist/es/types/spec/pulltorefresh/taro.d.ts

@@ -1,4 +1,5 @@
 import { BasePullToRefresh } from './base';
 export interface TaroPullToRefreshProps extends BasePullToRefresh {
     scrollTop: number;
+    catchMove: boolean;
 }

package/dist/es/utils/date.d.ts

@@ -60,6 +60,6 @@ export declare const getDaysStatus: (type: string, year: number, month: number)
 export declare const getPreMonthDates: (type: string, year: number, month: number, firstDayOfWeek: number) => {
     day: number;
     type: string;
-    preYear: number;
-    preMonth: number;
+    year: number;
+    month: number;
 }[];

package/dist/es/utils/date.js

@@ -229,8 +229,8 @@ export var getPreMonthDates = function(type, year, month, firstDayOfWeek) {
         return {
             day: k + 1,
             type: type,
-            preYear: preYear,
-            preMonth: preMonth
+            year: preYear,
+            month: preMonth
         };
     });
     return months.slice(preDates - days);