acud 1.4.61 → 1.4.62-beta

package/es/carousel/carousel.d.ts

@@ -27,6 +27,8 @@ export interface CarouselProps {
     multiShift?: boolean;
     /** 指示器样式 */
     indicatorStyle?: React.CSSProperties;
+    /** 是否支持无限循环 */
+    infinite?: boolean;
 }
 declare const Carousel: React.FC<CarouselProps>;
 export default Carousel;

package/es/carousel/carousel.js

@@ -27,7 +27,9 @@ var Carousel = function Carousel(_ref) {
     showNumber = _ref$showNumber === void 0 ? 3 : _ref$showNumber,
     _ref$multiShift = _ref.multiShift,
     multiShift = _ref$multiShift === void 0 ? false : _ref$multiShift,
-    indicatorStyle = _ref.indicatorStyle;
+    indicatorStyle = _ref.indicatorStyle,
+    _ref$infinite = _ref.infinite,
+    infinite = _ref$infinite === void 0 ? true : _ref$infinite;
   var carouselRef = useRef();
   var timer = useRef();
   var _useState = useState(false),
@@ -55,52 +57,68 @@ var Carousel = function Carousel(_ref) {
   var length = Array.isArray(children) ? children.length : undefined;
   var next = useCallback(function () {
     // 向右滑动，最后一帧无缝滑动到第一帧使用的是额外添加的帧，滑动动画结束后，立刻切换到原始帧
-    if (currentKey === length + extraCount) {
-      setKey({
-        lastKey: currentKey,
-        currentKey: extraCount
-      });
-      setTimeout(function () {
-        // 重置掉自动轮播
-        clearTimeout(timer.current);
-        var nextKey = extraCount + (multiShift ? extraCount : 1);
+    if (infinite) {
+      if (currentKey === length + extraCount) {
         setKey({
-          lastKey: extraCount,
+          lastKey: currentKey,
+          currentKey: extraCount
+        });
+        setTimeout(function () {
+          // 重置掉自动轮播
+          clearTimeout(timer.current);
+          var nextKey = extraCount + (multiShift ? extraCount : 1);
+          setKey({
+            lastKey: extraCount,
+            currentKey: nextKey > length + extraCount ? length + extraCount : nextKey
+          });
+        }, 100);
+      } else {
+        var nextKey = currentKey + (multiShift ? extraCount : 1);
+        setKey({
+          lastKey: currentKey,
           currentKey: nextKey > length + extraCount ? length + extraCount : nextKey
         });
-      }, 100);
+      }
     } else {
-      var nextKey = currentKey + (multiShift ? extraCount : 1);
+      var _nextKey = currentKey + (multiShift ? extraCount : 1);
       setKey({
         lastKey: currentKey,
-        currentKey: nextKey > length + extraCount ? length + extraCount : nextKey
+        currentKey: _nextKey > length + extraCount ? length + extraCount : _nextKey
       });
     }
-  }, [currentKey, extraCount, length, multiShift]);
+  }, [currentKey, extraCount, length, multiShift, infinite]);
   // 向左滑动，第一帧无缝滑动到最后一帧使用的是额外添加的帧，滑动动画结束后，立刻切换到原始帧
   var prev = useCallback(function () {
-    if (currentKey === 0) {
-      setKey({
-        lastKey: currentKey,
-        currentKey: length
-      });
-      setTimeout(function () {
-        // 重置掉自动轮播
-        clearTimeout(timer.current);
-        var nextKey = length - (multiShift ? extraCount : 1);
+    if (infinite) {
+      if (currentKey === 0) {
         setKey({
-          lastKey: length,
-          currentKey: nextKey < 0 ? 0 : length - (multiShift ? extraCount : 1)
+          lastKey: currentKey,
+          currentKey: length
         });
-      });
+        setTimeout(function () {
+          // 重置掉自动轮播
+          clearTimeout(timer.current);
+          var nextKey = length - (multiShift ? extraCount : 1);
+          setKey({
+            lastKey: length,
+            currentKey: nextKey < 0 ? 0 : length - (multiShift ? extraCount : 1)
+          });
+        });
+      } else {
+        var nextKey = currentKey - (multiShift ? extraCount : 1);
+        setKey({
+          lastKey: currentKey,
+          currentKey: nextKey < 0 ? 0 : currentKey - (multiShift ? extraCount : 1)
+        });
+      }
     } else {
-      var nextKey = currentKey - (multiShift ? extraCount : 1);
+      var _nextKey2 = currentKey - (multiShift ? extraCount : 1);
       setKey({
         lastKey: currentKey,
-        currentKey: nextKey < 0 ? 0 : currentKey - (multiShift ? extraCount : 1)
+        currentKey: _nextKey2 < 0 ? 0 : _nextKey2
       });
     }
-  }, [currentKey, extraCount, length, multiShift]);
+  }, [currentKey, extraCount, length, multiShift, infinite]);
   // 监听是否hover热区，hover情况下不会自动轮播
   useEffect(function () {
     carouselRef.current.addEventListener('mouseover', function () {
@@ -152,6 +170,8 @@ var Carousel = function Carousel(_ref) {
     return (multi ? cardWidth + 8 : cardWidth) * (idx - currentKey);
   };
   var wrapperClassName = classNames(prefixCls, className, _defineProperty({}, "".concat(prefixCls, "-multi"), multi));
+  var isPrevDisabled = !infinite && currentKey === extraCount;
+  var isNextDisabled = !infinite && currentKey === length;
   return /*#__PURE__*/React.createElement("div", {
     ref: carouselRef,
     style: style,
@@ -159,7 +179,9 @@ var Carousel = function Carousel(_ref) {
   }, childrenIsArray ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(CarouselSwitch, {
     prefixCls: prefixCls,
     next: next,
-    prev: prev
+    prev: prev,
+    isPrevDisabled: isPrevDisabled,
+    isNextDisabled: isNextDisabled
   }), !multi && /*#__PURE__*/React.createElement(CarouselIndicator, {
     prefixCls: prefixCls,
     setKey: setKey,

package/es/carousel/style/index.css

@@ -35,6 +35,11 @@
 .acud-carousel-switch > span {
   cursor: pointer;
   pointer-events: visible;
+  opacity: 1;
+}
+.acud-carousel-switch > span.disabled {
+  cursor: not-allowed;
+  opacity: 0.5;
 }
 .acud-carousel-switch > span > .acudicon {
   display: block;

package/es/carousel/style/index.less

@@ -29,6 +29,11 @@
         > span {
             cursor: pointer;
             pointer-events: visible;
+            opacity: 1;
+            &.disabled {
+                cursor: not-allowed; 
+                opacity: 0.5;
+            }
             > .@{iconfont-css-prefix} {
                 .circle(@carousel-switch-size);
                 display: inline-block;

package/es/carousel/switch.d.ts

@@ -3,6 +3,8 @@ export interface CarouselSwitchProps {
     prefixCls: string;
     next: () => void;
     prev: () => void;
+    isPrevDisabled: boolean;
+    isNextDisabled: boolean;
 }
 declare const CarouselSwitch: React.FC<CarouselSwitchProps>;
 export default CarouselSwitch;

package/es/carousel/switch.js

@@ -1,19 +1,31 @@
-import React from 'react';
+import React, { useCallback } from 'react';
 import OutlinedRight from "acud-icon/es/icons/OutlinedRight";
 import OutlinedLeft from "acud-icon/es/icons/OutlinedLeft";
 ;
 var CarouselSwitch = function CarouselSwitch(_ref) {
   var prefixCls = _ref.prefixCls,
     next = _ref.next,
-    prev = _ref.prev;
+    prev = _ref.prev,
+    isPrevDisabled = _ref.isPrevDisabled,
+    isNextDisabled = _ref.isNextDisabled;
+  var handlePrevClick = useCallback(function () {
+    if (!isPrevDisabled) {
+      prev();
+    }
+  }, [isPrevDisabled, prev]);
+  var handleNextClick = useCallback(function () {
+    if (!isNextDisabled) {
+      next();
+    }
+  }, [isNextDisabled, next]);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-switch")
   }, /*#__PURE__*/React.createElement("span", {
-    className: "".concat(prefixCls, "-switch-left"),
-    onClick: prev
+    className: "".concat(prefixCls, "-switch-left ").concat(isPrevDisabled ? 'disabled' : ''),
+    onClick: handlePrevClick
   }, /*#__PURE__*/React.createElement(OutlinedLeft, null)), /*#__PURE__*/React.createElement("span", {
-    className: "".concat(prefixCls, "-switch-right"),
-    onClick: next
+    className: "".concat(prefixCls, "-switch-right ").concat(isNextDisabled ? 'disabled' : ''),
+    onClick: handleNextClick
   }, /*#__PURE__*/React.createElement(OutlinedRight, null)));
 };
 export default CarouselSwitch;

package/lib/carousel/carousel.d.ts

@@ -27,6 +27,8 @@ export interface CarouselProps {
     multiShift?: boolean;
     /** 指示器样式 */
     indicatorStyle?: React.CSSProperties;
+    /** 是否支持无限循环 */
+    infinite?: boolean;
 }
 declare const Carousel: React.FC<CarouselProps>;
 export default Carousel;

package/lib/carousel/carousel.js

@@ -37,7 +37,9 @@ var Carousel = function Carousel(_ref) {
     showNumber = _ref$showNumber === void 0 ? 3 : _ref$showNumber,
     _ref$multiShift = _ref.multiShift,
     multiShift = _ref$multiShift === void 0 ? false : _ref$multiShift,
-    indicatorStyle = _ref.indicatorStyle;
+    indicatorStyle = _ref.indicatorStyle,
+    _ref$infinite = _ref.infinite,
+    infinite = _ref$infinite === void 0 ? true : _ref$infinite;
   var carouselRef = (0, _react.useRef)();
   var timer = (0, _react.useRef)();
   var _useState = (0, _react.useState)(false),
@@ -65,52 +67,68 @@ var Carousel = function Carousel(_ref) {
   var length = Array.isArray(children) ? children.length : undefined;
   var next = (0, _react.useCallback)(function () {
     // 向右滑动，最后一帧无缝滑动到第一帧使用的是额外添加的帧，滑动动画结束后，立刻切换到原始帧
-    if (currentKey === length + extraCount) {
-      setKey({
-        lastKey: currentKey,
-        currentKey: extraCount
-      });
-      setTimeout(function () {
-        // 重置掉自动轮播
-        clearTimeout(timer.current);
-        var nextKey = extraCount + (multiShift ? extraCount : 1);
+    if (infinite) {
+      if (currentKey === length + extraCount) {
         setKey({
-          lastKey: extraCount,
+          lastKey: currentKey,
+          currentKey: extraCount
+        });
+        setTimeout(function () {
+          // 重置掉自动轮播
+          clearTimeout(timer.current);
+          var nextKey = extraCount + (multiShift ? extraCount : 1);
+          setKey({
+            lastKey: extraCount,
+            currentKey: nextKey > length + extraCount ? length + extraCount : nextKey
+          });
+        }, 100);
+      } else {
+        var nextKey = currentKey + (multiShift ? extraCount : 1);
+        setKey({
+          lastKey: currentKey,
           currentKey: nextKey > length + extraCount ? length + extraCount : nextKey
         });
-      }, 100);
+      }
     } else {
-      var nextKey = currentKey + (multiShift ? extraCount : 1);
+      var _nextKey = currentKey + (multiShift ? extraCount : 1);
       setKey({
         lastKey: currentKey,
-        currentKey: nextKey > length + extraCount ? length + extraCount : nextKey
+        currentKey: _nextKey > length + extraCount ? length + extraCount : _nextKey
       });
     }
-  }, [currentKey, extraCount, length, multiShift]);
+  }, [currentKey, extraCount, length, multiShift, infinite]);
   // 向左滑动，第一帧无缝滑动到最后一帧使用的是额外添加的帧，滑动动画结束后，立刻切换到原始帧
   var prev = (0, _react.useCallback)(function () {
-    if (currentKey === 0) {
-      setKey({
-        lastKey: currentKey,
-        currentKey: length
-      });
-      setTimeout(function () {
-        // 重置掉自动轮播
-        clearTimeout(timer.current);
-        var nextKey = length - (multiShift ? extraCount : 1);
+    if (infinite) {
+      if (currentKey === 0) {
         setKey({
-          lastKey: length,
-          currentKey: nextKey < 0 ? 0 : length - (multiShift ? extraCount : 1)
+          lastKey: currentKey,
+          currentKey: length
         });
-      });
+        setTimeout(function () {
+          // 重置掉自动轮播
+          clearTimeout(timer.current);
+          var nextKey = length - (multiShift ? extraCount : 1);
+          setKey({
+            lastKey: length,
+            currentKey: nextKey < 0 ? 0 : length - (multiShift ? extraCount : 1)
+          });
+        });
+      } else {
+        var nextKey = currentKey - (multiShift ? extraCount : 1);
+        setKey({
+          lastKey: currentKey,
+          currentKey: nextKey < 0 ? 0 : currentKey - (multiShift ? extraCount : 1)
+        });
+      }
     } else {
-      var nextKey = currentKey - (multiShift ? extraCount : 1);
+      var _nextKey2 = currentKey - (multiShift ? extraCount : 1);
       setKey({
         lastKey: currentKey,
-        currentKey: nextKey < 0 ? 0 : currentKey - (multiShift ? extraCount : 1)
+        currentKey: _nextKey2 < 0 ? 0 : _nextKey2
       });
     }
-  }, [currentKey, extraCount, length, multiShift]);
+  }, [currentKey, extraCount, length, multiShift, infinite]);
   // 监听是否hover热区，hover情况下不会自动轮播
   (0, _react.useEffect)(function () {
     carouselRef.current.addEventListener('mouseover', function () {
@@ -162,6 +180,8 @@ var Carousel = function Carousel(_ref) {
     return (multi ? cardWidth + 8 : cardWidth) * (idx - currentKey);
   };
   var wrapperClassName = (0, _classnames["default"])(prefixCls, className, (0, _defineProperty2["default"])({}, "".concat(prefixCls, "-multi"), multi));
+  var isPrevDisabled = !infinite && currentKey === extraCount;
+  var isNextDisabled = !infinite && currentKey === length;
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: carouselRef,
     style: style,
@@ -169,7 +189,9 @@ var Carousel = function Carousel(_ref) {
   }, childrenIsArray ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
     prefixCls: prefixCls,
     next: next,
-    prev: prev
+    prev: prev,
+    isPrevDisabled: isPrevDisabled,
+    isNextDisabled: isNextDisabled
   }), !multi && /*#__PURE__*/_react["default"].createElement(_indicator["default"], {
     prefixCls: prefixCls,
     setKey: setKey,

package/lib/carousel/style/index.css

@@ -35,6 +35,11 @@
 .acud-carousel-switch > span {
   cursor: pointer;
   pointer-events: visible;
+  opacity: 1;
+}
+.acud-carousel-switch > span.disabled {
+  cursor: not-allowed;
+  opacity: 0.5;
 }
 .acud-carousel-switch > span > .acudicon {
   display: block;

package/lib/carousel/style/index.less

@@ -29,6 +29,11 @@
         > span {
             cursor: pointer;
             pointer-events: visible;
+            opacity: 1;
+            &.disabled {
+                cursor: not-allowed; 
+                opacity: 0.5;
+            }
             > .@{iconfont-css-prefix} {
                 .circle(@carousel-switch-size);
                 display: inline-block;

package/lib/carousel/switch.d.ts

@@ -3,6 +3,8 @@ export interface CarouselSwitchProps {
     prefixCls: string;
     next: () => void;
     prev: () => void;
+    isPrevDisabled: boolean;
+    isNextDisabled: boolean;
 }
 declare const CarouselSwitch: React.FC<CarouselSwitchProps>;
 export default CarouselSwitch;

package/lib/carousel/switch.js

@@ -1,26 +1,41 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _OutlinedRight = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedRight"));
 var _OutlinedLeft = _interopRequireDefault(require("acud-icon/lib/icons/OutlinedLeft"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 ;
 var CarouselSwitch = function CarouselSwitch(_ref) {
   var prefixCls = _ref.prefixCls,
     next = _ref.next,
-    prev = _ref.prev;
+    prev = _ref.prev,
+    isPrevDisabled = _ref.isPrevDisabled,
+    isNextDisabled = _ref.isNextDisabled;
+  var handlePrevClick = (0, _react.useCallback)(function () {
+    if (!isPrevDisabled) {
+      prev();
+    }
+  }, [isPrevDisabled, prev]);
+  var handleNextClick = (0, _react.useCallback)(function () {
+    if (!isNextDisabled) {
+      next();
+    }
+  }, [isNextDisabled, next]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefixCls, "-switch")
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefixCls, "-switch-left"),
-    onClick: prev
+    className: "".concat(prefixCls, "-switch-left ").concat(isPrevDisabled ? 'disabled' : ''),
+    onClick: handlePrevClick
   }, /*#__PURE__*/_react["default"].createElement(_OutlinedLeft["default"], null)), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefixCls, "-switch-right"),
-    onClick: next
+    className: "".concat(prefixCls, "-switch-right ").concat(isNextDisabled ? 'disabled' : ''),
+    onClick: handleNextClick
   }, /*#__PURE__*/_react["default"].createElement(_OutlinedRight["default"], null)));
 };
 var _default = exports["default"] = CarouselSwitch;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "acud",
-    "version": "1.4.61",
+    "version": "1.4.62-beta", 
     "description": "acg react 组件库",
     "license": "ISC",
     "author": "acg",