pixuireactcomponents 1.5.10 → 1.5.11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.5.10",
+    "version": "1.5.11",
     "description": "pixui react components",
     "main": "index.js",
     "scripts": {

package/src/components/react/app/carousel/Carousel.js

@@ -68,29 +68,25 @@ export function Carousel(props) {
         : 0.3 : _p;
     // console.log('children', children.length);
     var safeNext = function () {
-        // console.log('safeNext1', canClickSwitch.current, isMoving.current);
-        if (!canClickSwitch.current || isMoving.current)
+        if (!canClickSwitch.current)
             return;
-        // console.log('safeNext2');
         canClickSwitch.current = false;
         if (safeNextHandle.current)
             clearTimeout(safeNextHandle.current);
         safeNextHandle.current = setTimeout(function () {
             canClickSwitch.current = true;
-        }, 1000);
+        }, 1100);
         handleNext();
     };
     var safePrev = function () {
-        // console.log('safePrev1', canClickSwitch.current, isMoving.current);
-        if (!canClickSwitch.current || isMoving.current)
+        if (!canClickSwitch.current)
             return;
-        // console.log('safePrev2');
         canClickSwitch.current = false;
         if (safePrevHandle.current)
             clearTimeout(safePrevHandle.current);
         safePrevHandle.current = setTimeout(function () {
             canClickSwitch.current = true;
-        }, 1000);
+        }, 1100);
         handlePrev();
     };
     useImperativeHandle(props.cRef, function () { return ({
@@ -98,7 +94,7 @@ export function Carousel(props) {
         handlePrev: safePrev,
         setShowIndex: setShowIndex,
     }); });
-    var duration = switchDuration < 1000 ? 1000 : switchDuration;
+    var duration = switchDuration < 1100 ? 1100 : switchDuration;
     var _q = useState(defaultIndex), showIndex = _q[0], setShowIndex = _q[1];
     //轮播元素正在滚动
     var isMoving = useRef(false);
@@ -106,8 +102,6 @@ export function Carousel(props) {
     var isMouseDown = useRef(false);
     var mouseDownX = useRef(0);
     var mouseDownY = useRef(0);
-    var lastAniFinishTime = useRef(0);
-    var isSideAniPlaying = useRef(false);
     //pixui在 onTransitionEnd 之后马上触发 transform 会丢onTransitionEnd
     var canClickSwitch = useRef(true);
     var handleNextRef = useRef(function () { });
@@ -173,7 +167,7 @@ export function Carousel(props) {
         };
     }, []);
     var handlePrev = function () {
-        if (isMoving.current || isMouseDown.current)
+        if (isMoving.current)
             return;
         isMoving.current = true;
         if (showIndex === 0) {
@@ -186,40 +180,20 @@ export function Carousel(props) {
     var handleNext = function () {
         if (!loop && showIndex == carouselItems.length - 2)
             return;
-        if (isMoving.current || isMouseDown.current)
+        if (isMoving.current)
             return;
         isMoving.current = true;
         setShowIndex(showIndex + 1);
     };
     var handleTransitionEnd = function () {
-        var now = Date.now();
-        // console.log(
-        //     'handleTransitionEnd ? isSideAniPlaying',
-        //     isSideAniPlaying.current,
-        //     'time',
-        //     now - lastAniFinishTime.current,
-        //     'showTransition',
-        //     showTransition
-        // );
-        if (!isSideAniPlaying.current && Math.abs(now - lastAniFinishTime.current) < 800) {
-            //pixui bug 重复触发handleTransitionEnd
-            return;
-        }
-        lastAniFinishTime.current = now;
         //判断前后补位元素准备跳转
         //在动画结束以后关掉，否则用鼠标拖动的时候不能补充剩下的offset
         if (isLastCarouseItem() || isFirstCarouseLastItem()) {
             setShowTransition(false);
-            isSideAniPlaying.current = true;
-            // console.log('handleTransitionEnd 1');
-        }
-        else {
-            // console.log('handleTransitionEnd 3');
-            isMoving.current = false;
-            isSideAniPlaying.current = false;
         }
+        isMoving.current = false;
         //触发onSlideChange
-        if (!isLastCarouseItem() && !isFirstCarouseLastItem() && onSlideChange && !isSideAniPlaying.current)
+        if (!isLastCarouseItem() && !isFirstCarouseLastItem() && onSlideChange && showTransition)
             onSlideChange(showIndex - 1);
         // 处理首尾特殊case
         if (isLastCarouseItem()) {
@@ -318,7 +292,7 @@ export function Carousel(props) {
                         display: 'flex',
                         width: isVertical ? compWidth : compWidth * carouselItems.length + 'px',
                         height: isVertical ? compHeight * carouselItems.length : compHeight + 'px',
-                        transition: "transform ".concat(showTransition ? '0.5s' : '0s', " ease 0s"),
+                        transition: "transform ".concat(showTransition ? '0.4s' : '0s', " ease 0s"),
                         transform: isVertical
                             ? "translate(0px, ".concat(offset + gestureoffset[1], "px)")
                             : "translate(".concat(offset + gestureoffset[0], "px, 0px)"),