pixuireactcomponents 1.5.3 → 1.5.4

package/package.json

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

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

@@ -68,8 +68,10 @@ export function Carousel(props) {
         : 0.3 : _p;
     // console.log('children', children.length);
     var safeNext = function () {
-        if (!canClickSwitch.current)
+        // console.log('safeNext1', canClickSwitch.current, isMoving.current);
+        if (!canClickSwitch.current || isMoving.current)
             return;
+        // console.log('safeNext2');
         canClickSwitch.current = false;
         if (safeNextHandle.current)
             clearTimeout(safeNextHandle.current);
@@ -79,8 +81,10 @@ export function Carousel(props) {
         handleNext();
     };
     var safePrev = function () {
-        if (!canClickSwitch.current)
+        // console.log('safePrev1', canClickSwitch.current, isMoving.current);
+        if (!canClickSwitch.current || isMoving.current)
             return;
+        // console.log('safePrev2');
         canClickSwitch.current = false;
         if (safePrevHandle.current)
             clearTimeout(safePrevHandle.current);
@@ -102,6 +106,8 @@ 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 () { });
@@ -167,7 +173,7 @@ export function Carousel(props) {
         };
     }, []);
     var handlePrev = function () {
-        if (isMoving.current)
+        if (isMoving.current || isMouseDown.current)
             return;
         isMoving.current = true;
         if (showIndex === 0) {
@@ -180,18 +186,38 @@ export function Carousel(props) {
     var handleNext = function () {
         if (!loop && showIndex == carouselItems.length - 2)
             return;
-        if (isMoving.current)
+        if (isMoving.current || isMouseDown.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 && showTransition)
             onSlideChange(showIndex - 1);