@nutui/nutui-react 1.1.5-beta.0 → 1.1.5-beta.3

package/dist/esm/Address.js

@@ -2,8 +2,8 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 var _excluded = ["children", "type", "existAddress", "selectedIcon", "defaultIcon", "isShowCustomAddress", "customAndExistTitle", "onSelected", "onClose", "onSwitchModule"],
-    _excluded2 = ["children", "type", "height", "province", "city", "country", "town", "onNextArea", "onClose"],
-    _excluded3 = ["modelValue", "children", "type", "height", "customAddressTitle", "existAddress", "existAddressTitle", "province", "city", "country", "town", "isShowCustomAddress", "customAndExistTitle", "selectedIcon", "defaultIcon", "closeBtnIcon", "backBtnIcon", "onChange", "onSelected", "onClose", "closeMask", "switchModule", "style", "className"];
+    _excluded2 = ["children", "type", "height", "province", "city", "country", "town", "onNextArea", "onTabClick", "onClose"],
+    _excluded3 = ["modelValue", "children", "type", "height", "customAddressTitle", "existAddress", "existAddressTitle", "province", "city", "country", "town", "isShowCustomAddress", "customAndExistTitle", "selectedIcon", "defaultIcon", "closeBtnIcon", "backBtnIcon", "onChange", "onSelected", "onClose", "closeMask", "switchModule", "onTabChecked", "style", "className"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -132,6 +132,7 @@ var CustomRender = function CustomRender(props) {
       country = _defaultProps$1$props.country,
       town = _defaultProps$1$props.town,
       onNextArea = _defaultProps$1$props.onNextArea,
+      onTabClick = _defaultProps$1$props.onTabClick,
       onClose = _defaultProps$1$props.onClose,
       rest = _objectWithoutProperties(_defaultProps$1$props, _excluded2);
 
@@ -228,13 +229,11 @@ var CustomRender = function CustomRender(props) {
 
 
   var getTabName = function getTabName(item, index) {
-    if (item.name) return item.name;
-
-    if (tabIndex < index) {
+    if (tabIndex > index) {
       return item.name;
+    } else {
+      return locale.select;
     }
-
-    return locale.select;
   };
 
   var mapRef = {
@@ -279,13 +278,18 @@ var CustomRender = function CustomRender(props) {
       _loop(i);
     }
 
-    if (tabIndex < 3) {
-      setTabIndex(function () {
-        return tabIndex + 1;
-      });
-      lineAnimation(tabIndex + 1); // 切换下一个
+    if (tabIndex < 4) {
+      // 切换下一个
+      if (tabIndex === 3) {
+        calBack.next = '';
+      } else {
+        setTabIndex(function () {
+          return tabIndex + 1;
+        });
+        lineAnimation(tabIndex + 1);
+        calBack.next = tabName[tabIndex + 1];
+      }
 
-      calBack.next = tabName[tabIndex + 1];
       calBack.value = item;
       onNextArea && onNextArea(calBack);
     } else {
@@ -294,11 +298,13 @@ var CustomRender = function CustomRender(props) {
   }; // 切换地区Tab
 
 
-  var changeRegionTab = function changeRegionTab(item, index) {
+  var changeRegionTab = function changeRegionTab(item, index, key) {
     if (getTabName(item, index)) {
       setTabIndex(index);
       lineAnimation(index);
     }
+
+    onTabClick && onTabClick(key);
   };
 
   var handleElevatorItem = function handleElevatorItem(key, item) {
@@ -347,9 +353,9 @@ var CustomRender = function CustomRender(props) {
       key: index,
       ref: mapRef[key],
       onClick: function onClick() {
-        return changeRegionTab(selectedRegion[key], index);
+        return changeRegionTab(selectedRegion[key], index, key);
       }
-    }, React__default.createElement("div", null, getTabName(selectedRegion[key], index)));
+    }, index <= tabIndex && React__default.createElement("div", null, getTabName(selectedRegion[key], index)));
   }), React__default.createElement("div", {
     className: b('tab-line'),
     ref: regionLine,
@@ -428,6 +434,7 @@ var Address = function Address(props) {
       onClose = _defaultProps$props.onClose,
       closeMask = _defaultProps$props.closeMask,
       switchModule = _defaultProps$props.switchModule,
+      onTabChecked = _defaultProps$props.onTabChecked,
       style = _defaultProps$props.style,
       className = _defaultProps$props.className,
       rest = _objectWithoutProperties(_defaultProps$props, _excluded3);
@@ -607,6 +614,9 @@ var Address = function Address(props) {
     onNextArea: function onNextArea(cal) {
       nextAreaList && nextAreaList(cal);
     },
+    onTabClick: function onTabClick(type) {
+      onTabChecked && onTabChecked(type);
+    },
     onClose: handClose
   }), privateType === 'exist' && React__default.createElement(ExistRender, {
     type: privateType,

package/dist/esm/Button.js

@@ -7,7 +7,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import React__default, { useState, useEffect } from 'react';
+import React__default, { useCallback, useState, useEffect } from 'react';
 import Icon from './Icon.js';
 var defaultProps = {
   className: '',
@@ -42,33 +42,7 @@ var Button = function Button(props) {
       style = _defaultProps$props.style,
       rest = _objectWithoutProperties(_defaultProps$props, _excluded);
 
-  var _useState = useState(''),
-      _useState2 = _slicedToArray(_useState, 2),
-      btnName = _useState2[0],
-      setBtnName = _useState2[1];
-
-  var _useState3 = useState({}),
-      _useState4 = _slicedToArray(_useState3, 2),
-      btnStyle = _useState4[0],
-      setBtnStyle = _useState4[1];
-
-  useEffect(function () {
-    setBtnName(classes());
-    setBtnStyle(getStyle());
-  }, [className, color, shape, plain, loading, disabled, style, type, size, block, icon, children, onClick]);
-
-  var classes = function classes() {
-    var prefixCls = 'nut-button';
-    return "".concat(prefixCls, " ").concat(type ? "".concat(prefixCls, "--").concat(type) : '', "\n    ").concat(size ? "".concat(prefixCls, "--").concat(size) : '', "\n    ").concat(shape ? "".concat(prefixCls, "--").concat(shape) : '', "\n    ").concat(plain ? "".concat(prefixCls, "--plain") : '', "\n    ").concat(block ? "".concat(prefixCls, "--block") : '', "\n    ").concat(disabled ? "".concat(prefixCls, "--disabled") : '', "\n    ").concat(loading ? "".concat(prefixCls, "--loading") : '');
-  };
-
-  var handleClick = function handleClick(e) {
-    if (!loading && !disabled && onClick) {
-      onClick(e);
-    }
-  };
-
-  var getStyle = function getStyle() {
+  var getStyle = useCallback(function () {
     var style = {};
 
     if (color) {
@@ -86,6 +60,31 @@ var Button = function Button(props) {
     }
 
     return style;
+  }, [color, plain]);
+  var classes = useCallback(function () {
+    var prefixCls = 'nut-button';
+    return [prefixCls, "".concat(type ? "".concat(prefixCls, "--").concat(type) : ''), "".concat(size ? "".concat(prefixCls, "--").concat(size) : ''), "".concat(shape ? "".concat(prefixCls, "--").concat(shape) : ''), "".concat(plain ? "".concat(prefixCls, "--plain") : ''), "".concat(block ? "".concat(prefixCls, "--block") : ''), "".concat(disabled ? "".concat(prefixCls, "--disabled") : ''), "".concat(loading ? "".concat(prefixCls, "--loading") : '')].filter(Boolean).join(' ');
+  }, [block, disabled, loading, plain, shape, size, type]);
+
+  var _useState = useState(classes()),
+      _useState2 = _slicedToArray(_useState, 2),
+      btnName = _useState2[0],
+      setBtnName = _useState2[1];
+
+  var _useState3 = useState(getStyle()),
+      _useState4 = _slicedToArray(_useState3, 2),
+      btnStyle = _useState4[0],
+      setBtnStyle = _useState4[1];
+
+  useEffect(function () {
+    setBtnName(classes());
+    setBtnStyle(getStyle());
+  }, [className, color, shape, plain, loading, disabled, style, type, size, block, icon, children, onClick, classes, getStyle]);
+
+  var handleClick = function handleClick(e) {
+    if (!loading && !disabled && onClick) {
+      onClick(e);
+    }
   };
 
   return React__default.createElement("div", _objectSpread(_objectSpread({

package/dist/esm/Dialog.js

@@ -235,8 +235,8 @@ function confirm(config, renderFunc) {
 }
 
 var defaultProps = {
-  okText: '确定',
-  cancelText: '取消',
+  okText: '',
+  cancelText: '',
   mask: true,
   closeOnClickOverlay: true,
   noFooter: false,
@@ -297,7 +297,7 @@ var BaseDialog = function BaseDialog(props, ref) {
       onClick: function onClick() {
         return handleCancel();
       }
-    }, locale.cancel || cancelText), !noOkBtn && React__default.createElement(Button, {
+    }, cancelText || locale.cancel), !noOkBtn && React__default.createElement(Button, {
       size: "small",
       type: "primary",
       className: classNames('nut-dialog__footer-ok', {
@@ -307,7 +307,7 @@ var BaseDialog = function BaseDialog(props, ref) {
       onClick: function onClick() {
         return handleOk();
       }
-    }, locale.confirm || okText));
+    }, okText || locale.confirm));
     return footerContent;
   };
 

package/dist/esm/FixedNav.js

@@ -85,9 +85,10 @@ var FixedNav = function FixedNav(props) {
       },
       key: item.id || index
     }, React__default.createElement("img", {
-      src: item.icon
+      src: item.icon,
+      alt: ""
     }), React__default.createElement("div", {
-      className: "span"
+      className: "nut-fixednav__list-text"
     }, item.text), item.num && React__default.createElement("div", {
       className: "b"
     }, item.num));

package/dist/esm/Input.js

@@ -48,7 +48,7 @@ function formatNumber(value) {
 var defaultProps = {
   type: 'text',
   defaultValue: '',
-  placeholder: '请输入信息',
+  placeholder: '',
   label: '',
   requireShow: false,
   disabled: false,
@@ -59,7 +59,8 @@ var defaultProps = {
 };
 
 var Input = function Input(props) {
-  useConfig();
+  var _useConfig = useConfig(),
+      locale = _useConfig.locale;
 
   var _defaultProps$props = _objectSpread(_objectSpread({}, defaultProps), props),
       type = _defaultProps$props.type,
@@ -79,6 +80,7 @@ var Input = function Input(props) {
       focus = _defaultProps$props.focus,
       clear = _defaultProps$props.clear;
 
+  locale.placeholder = placeholder || locale.placeholder;
   var inputBem = cn('input');
 
   var _useState = useState(''),

package/dist/esm/Swiper.js

@@ -8,7 +8,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-import React__default, { useRef, useState, useEffect } from 'react';
+import React__default, { useRef, useState, useMemo, useEffect } from 'react';
 import classNames from 'classnames';
 import { D as DataContext } from './UserContext-b4181162.js';
 import { c as cn } from './bem-893ad28d.js';
@@ -60,7 +60,6 @@ var Swiper = React__default.forwardRef(function (props, ref) {
     size: 0
   });
 
-  var childsRefs = [];
   var isVertical = direction === 'vertical';
 
   var _useState = useState(null),
@@ -88,14 +87,19 @@ var Swiper = React__default.forwardRef(function (props, ref) {
       offset = _useState10[0],
       setOffset = _useState10[1];
 
-  var _useState11 = useState(false),
+  var _useState11 = useState([]),
       _useState12 = _slicedToArray(_useState11, 2),
-      ready = _useState12[0],
-      setReady = _useState12[1];
+      childOffset = _useState12[0],
+      setChildOffset = _useState12[1];
+
+  var _useState13 = useState(false),
+      _useState14 = _slicedToArray(_useState13, 2),
+      ready = _useState14[0],
+      setReady = _useState14[1];
 
   var size = isVertical ? height : width;
 
-  var _useState13 = useState({
+  var _useState15 = useState({
     startX: 0,
     startY: 0,
     deltaX: 0,
@@ -106,37 +110,26 @@ var Swiper = React__default.forwardRef(function (props, ref) {
     delta: 0,
     touchTime: 0
   }),
-      _useState14 = _slicedToArray(_useState13, 2),
-      touch = _useState14[0],
-      setTouch = _useState14[1];
-
-  var _useState15 = useState([]),
       _useState16 = _slicedToArray(_useState15, 2),
-      childs = _useState16[0],
-      setChilds = _useState16[1];
-
-  useState('');
-  var childCount = children.length;
-
-  for (var i = 0; i < childCount; i++) {
-    childsRefs.push(useRef(null));
-  }
-
-  var trackSize = childCount * Number(size);
-
-  var getChildren = function getChildren() {
-    var childs = [];
-    React__default.Children.toArray(children).forEach(function (child, index) {
-      if (child.type && child.type.displayName === 'NutSwiperItem') {
-        childs.push(React__default.cloneElement(child, {
-          ref: childsRefs[index],
-          key: "item_".concat(index)
-        }));
-      }
+      touch = _useState16[0],
+      setTouch = _useState16[1];
+
+  var _useMemo = useMemo(function () {
+    var childCount = 0;
+    var childs = React__default.Children.map(props.children, function (child) {
+      if (!React__default.isValidElement(child)) return null;
+      childCount++;
+      return child;
     });
-    return childs;
-  }; // 父组件参数传入子组件item
+    return {
+      childs: childs,
+      childCount: childCount
+    };
+  }, [props.children]),
+      childs = _useMemo.childs,
+      childCount = _useMemo.childCount;
 
+  var trackSize = childCount * Number(size); // 父组件参数传入子组件item
 
   var parent = {
     propSwiper: propSwiper,
@@ -256,13 +249,15 @@ var Swiper = React__default.forwardRef(function (props, ref) {
     if (props.loop) {
       if (Array.isArray(children) && children[0] && targetOffset !== minOffset) {
         var rightBound = targetOffset < minOffset;
-        childsRefs[0].current.changeOffset(rightBound ? trackSize : 0);
+        childOffset[0] = rightBound ? trackSize : 0;
       }
 
       if (Array.isArray(children) && children[childCount - 1] && targetOffset !== 0) {
         var leftBound = targetOffset > 0;
-        childsRefs[childCount - 1].current.changeOffset(leftBound ? -trackSize : 0);
+        childOffset[childCount - 1] = leftBound ? -trackSize : 0;
       }
+
+      setChildOffset(childOffset);
     }
 
     if (isEmit && active !== targetActive) {
@@ -471,7 +466,8 @@ var Swiper = React__default.forwardRef(function (props, ref) {
     };
   }, [ready]);
   useEffect(function () {
-    setChilds(getChildren());
+    stopAutoPlay();
+    autoplay();
   }, [children]);
   useEffect(function () {
     init();
@@ -487,6 +483,27 @@ var Swiper = React__default.forwardRef(function (props, ref) {
       target.removeEventListener('touchend', onTouchEnd, false);
     };
   });
+
+  var style = function style(index) {
+    var style = {};
+
+    var _direction = propSwiper.direction || direction;
+
+    var _size = size;
+
+    if (_size) {
+      style[_direction === 'horizontal' ? 'width' : 'height'] = "".concat(_size, "px");
+    }
+
+    var offset = childOffset[index];
+
+    if (offset) {
+      style.transform = "translate3D".concat(_direction === 'horizontal' ? "(".concat(offset, "px,0,0)") : "(0,".concat(offset, "px,0)"));
+    }
+
+    return style;
+  };
+
   React__default.useImperativeHandle(ref, function () {
     return {
       to: to,
@@ -502,9 +519,15 @@ var Swiper = React__default.forwardRef(function (props, ref) {
   }, rest), React__default.createElement("div", {
     className: contentClass,
     ref: innerRef
-  }, childs), propSwiper.paginationVisible && !('pageContent' in propSwiper) ? React__default.createElement("div", {
+  }, React__default.Children.map(childs, function (child, index) {
+    return React__default.createElement("div", {
+      className: b('item-wrapper'),
+      style: style(index),
+      key: index
+    }, child);
+  })), propSwiper.paginationVisible && !('pageContent' in propSwiper) ? React__default.createElement("div", {
     className: classNames((_classNames2 = {}, _defineProperty(_classNames2, "".concat(b('pagination')), true), _defineProperty(_classNames2, "".concat(b('pagination-vertical')), isVertical), _classNames2))
-  }, childs.map(function (item, index) {
+  }, React__default.Children.map(childs, function (item, index) {
     return React__default.createElement("i", {
       style: {
         backgroundColor: (active + childCount) % childCount === index ? propSwiper.paginationColor : '#ddd'

package/dist/esm/SwiperItem.js

@@ -47,10 +47,6 @@ var SwiperItem = React__default.forwardRef(function (props, ref) {
       style[_direction === 'horizontal' ? 'width' : 'height'] = "".concat(_size, "px");
     }
 
-    if (offset) {
-      style.transform = "translate3D".concat(_direction === 'horizontal' ? "(".concat(offset, "px,0,0)") : "(0,".concat(offset, "px,0)"));
-    }
-
     return style;
   };
 

package/dist/locales/base.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.1.5-beta.0 Thu Jun 16 2022 10:02:02 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.1.5-beta.3 Tue Jun 28 2022 11:43:21 GMT+0800 (China Standard Time)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/en-US.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.1.5-beta.0 Thu Jun 16 2022 10:02:02 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.1.5-beta.3 Tue Jun 28 2022 11:43:21 GMT+0800 (China Standard Time)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-CN.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.1.5-beta.0 Thu Jun 16 2022 10:02:02 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.1.5-beta.3 Tue Jun 28 2022 11:43:21 GMT+0800 (China Standard Time)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */

package/dist/locales/zh-TW.js

@@ -1,5 +1,5 @@
 /*!
-* @nutui/nutui-react v1.1.5-beta.0 Thu Jun 16 2022 10:02:02 GMT+0800 (China Standard Time)
+* @nutui/nutui-react v1.1.5-beta.3 Tue Jun 28 2022 11:43:21 GMT+0800 (China Standard Time)
 * (c) 2022 @jdf2e.
 * Released under the MIT License.
 */