@nutui/nutui-react 3.0.4 → 3.0.6

package/dist/cjs/packages/skeleton/style/style.css

@@ -2,176 +2,30 @@
 /* #endif */
 /* #ifndef harmony */
 /* #endif */
-.nut-image {
-  display: block;
-  position: relative;
-}
-.nut-image-default {
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-.nut-image.nut-image-round {
-  border-radius: 50%;
-  overflow: hidden;
-}
-.nut-image-loading {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  background: var(--nutui-color-background, #f2f3f5);
-  background-size: 100% 100%;
-}
-.nut-image-error {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  background: var(--nutui-color-background, #f2f3f5);
-  background-size: 100% 100%;
-}
-
-[dir=rtl] .nut-image .nut-img-loading,
-.nut-rtl .nut-image .nut-img-loading {
-  left: auto;
-  right: 0;
-}
-[dir=rtl] .nut-image .nut-img-error,
-.nut-rtl .nut-image .nut-img-error {
-  left: auto;
-  right: 0;
-}
-
-.nut-avatar-group {
-  display: flex;
-  flex-direction: row;
-  flex: 0 0 auto;
-}
-.nut-avatar-group-avatar,
-.nut-avatar-group .nut-avatar {
-  border: 1px solid #fff;
-  margin-left: -8px;
-}
-.nut-avatar-group-avatar:not(:first-of-type),
-.nut-avatar-group .nut-avatar:not(:first-of-type) {
-  margin-left: -8px;
-}
-
-[dir=rtl] .nut-avatar-group .nut-avatar:not(:first-of-type),
-.nut-rtl .nut-avatar-group .nut-avatar:not(:first-of-type) {
-  margin-left: 0;
-  margin-right: -8px;
-}
-
-.nut-avatar {
-  position: relative;
-  flex: 0 0 auto;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: var(--nutui-avatar-normal-width, 40px);
-  height: var(--nutui-avatar-normal-height, 40px);
-}
-.nut-avatar-round {
-  border-radius: 999px;
-  overflow: hidden;
-}
-.nut-avatar-square {
-  border-radius: var(--nutui-avatar-square, 5px);
-}
-.nut-avatar-first-child {
-  margin-left: 0;
-  margin-right: 0;
-}
-.nut-avatar-img {
-  width: 100%;
-  height: 100%;
-  flex-shrink: 0;
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  background-position: center center;
-}
-.nut-avatar-icon {
-  background-size: 100% 100%;
-}
-.nut-avatar-text {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.nut-avatar-large {
-  width: var(--nutui-avatar-large-width, 60px);
-  height: var(--nutui-avatar-large-height, 60px);
-}
-.nut-avatar-large-img {
-  width: var(--nutui-avatar-large-width, 60px);
-  height: var(--nutui-avatar-large-height, 60px);
-}
-.nut-avatar-large-icon {
-  width: var(--nutui-avatar-large-width, 60px);
-  height: var(--nutui-avatar-large-height, 60px);
-}
-.nut-avatar-large-text {
-  width: var(--nutui-avatar-large-width, 60px);
-  height: var(--nutui-avatar-large-height, 60px);
-}
-.nut-avatar-small {
-  width: var(--nutui-avatar-small-width, 32px);
-  height: var(--nutui-avatar-small-height, 32px);
-}
-.nut-avatar-small-text {
-  width: var(--nutui-avatar-small-width, 32px);
-  height: var(--nutui-avatar-small-height, 32px);
-}
-
 .nut-skeleton {
-  display: inline-block;
-  position: relative;
-  overflow: hidden;
-  vertical-align: middle;
-  width: 100%;
+  line-height: 0px;
+  font-size: 0px;
 }
 .nut-skeleton-content {
-  display: flex;
-  flex-direction: row;
-}
-.nut-skeleton-content-avatar {
-  margin-right: 20px;
-  background: var(--nutui-skeleton-background, var(--nutui-color-background, #f2f3f5)) !important;
-}
-.nut-skeleton-content-block {
+  position: relative;
+  display: inline-flex;
   width: var(--nutui-skeleton-line-width, 100%);
-  height: var(--nutui-skeleton-line-height, 15px);
-  background: var(--nutui-skeleton-background, var(--nutui-color-background, #f2f3f5));
-  margin-top: 10px;
-  border-radius: var(--nutui-skeleton-line-border-radius, 0);
+  background: var(--nutui-skeleton-background, var(--nutui-color-background-sunken, #f7f8fc));
+  border-radius: var(--nutui-skeleton-line-border-radius, var(--nutui-radius-xs, 4px));
+  overflow: hidden;
 }
-.nut-skeleton-content-line {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
+.nut-skeleton-content-normal {
+  height: var(--nutui-skeleton-line-normal-height, 24px);
 }
-.nut-skeleton-content-line .nut-skeleton-content-block:last-child {
-  width: 70%;
+.nut-skeleton-content-large {
+  height: var(--nutui-skeleton-line-large-height, 32px);
 }
-.nut-skeleton-content-title {
-  width: 30%;
-  height: var(--nutui-skeleton-line-height, 15px);
-  background: var(--nutui-skeleton-background, var(--nutui-color-background, #f2f3f5));
+.nut-skeleton-content-small {
+  height: var(--nutui-skeleton-line-small-height, 16px);
+  margin-top: 8px;
 }
-.nut-skeleton-content-block-last-child {
-  width: 55%;
+.nut-skeleton-content-small-0 {
+  margin-top: 0;
 }
 .nut-skeleton-animation {
   position: absolute;
@@ -180,33 +34,36 @@
   width: 100%;
   height: 100%;
   z-index: 1;
-  animation: nut-skeleton 2s ease-in-out 0s infinite;
+  background: linear-gradient(90deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.02) 50%, rgba(0, 0, 0, 0) 100%);
+  animation-name: nut-skeleton;
+  animation-delay: 0s;
+  animation-duration: 0.6s;
+  animation-direction: normal;
+  animation-fill-mode: both;
+  animation-play-state: running;
+  animation-iteration-count: 1;
+  animation-timing-function: linear;
 }
 @keyframes nut-skeleton {
-  0% {
-    background-position-x: -500px;
+  from {
+    transform: translateX(-100%);
   }
   to {
-    background-position-x: calc(500px + 100%);
+    transform: translateX(100%);
   }
 }
 
-[dir=rtl] .nut-skeleton-content .nut-avatar,
-.nut-rtl .nut-skeleton-content .nut-avatar {
-  margin-right: 0;
-  margin-left: 20px;
-}
 [dir=rtl] .nut-skeleton-animation,
 .nut-rtl .nut-skeleton-animation {
   left: auto;
   right: 0;
-  animation: nut-skeleton-rtl 2s ease-in-out 0s infinite;
+  animation: nut-skeleton-rtl 2s linear 0s infinite;
 }
 @keyframes nut-skeleton-rtl {
-  0% {
-    background-position-x: calc(500px + 100%);
+  from {
+    transform: translateX(100%);
   }
   to {
-    background-position-x: -500px;
+    transform: translateX(-100%);
   }
 }

package/dist/cjs/packages/switch/style/style.css

@@ -45,6 +45,11 @@
 .nut-switch-button-close-rtl {
   left: calc(100% - var(--nutui-switch-height, 28px) + var(--nutui-switch-border-width, 2px));
 }
+.nut-switch-button .nut-icon {
+  width: calc((var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
+  height: calc((var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
+  color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ffadbe));
+}
 .nut-switch-close {
   background-color: var(--nutui-switch-inactive-background-color, var(--nutui-color-text-disabled, #c2c4cc));
 }

package/dist/cjs/packages/switch/style/switch.scss

@@ -40,6 +40,11 @@
         left: calc(100% - $switch-height + $switch-border-width);
       }
     }
+    .nut-icon {
+      width: calc(($switch-height - $switch-border-width * 2) / 2);
+      height: calc(($switch-height - $switch-border-width * 2) / 2);
+      color: $switch-active-disabled-background-color;
+    }
   }
 
   &-close {

package/dist/cjs/packages/switch/switch.js

@@ -9,28 +9,32 @@ Object.defineProperty(exports, "Switch", {
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 var _define_property = require("@swc/helpers/_/_define_property");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
-var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
+var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
+var _iconsreact = require("@nutui/icons-react");
 var _typings = require("../../utils/typings");
 var _usepropsvalue = require("../../hooks/use-props-value");
 var _configprovider = require("../configprovider");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     disabled: false,
     activeText: '',
-    inactiveText: ''
+    inactiveText: '',
+    loadingIcon: /*#__PURE__*/ _react.default.createElement(_iconsreact.Loading1, null)
 });
 var Switch = function Switch(props) {
-    var _ref = (0, _object_spread._)({}, defaultProps, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, className = _ref.className, style = _ref.style, onChange = _ref.onChange, rest = (0, _object_without_properties._)(_ref, [
+    var _ref = (0, _object_spread._)({}, defaultProps, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, loadingIcon = _ref.loadingIcon, className = _ref.className, style = _ref.style, onChange = _ref.onChange, rest = (0, _object_without_properties._)(_ref, [
         "checked",
         "defaultChecked",
         "disabled",
         "activeText",
         "inactiveText",
+        "loadingIcon",
         "className",
         "style",
         "onChange"
@@ -41,6 +45,12 @@ var Switch = function Switch(props) {
         value: checked,
         defaultValue: defaultChecked
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
+    (0, _react.useEffect)(function() {
+        changing && setChanging(false);
+    }, [
+        value
+    ]);
+    var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), changing = _useState[0], setChanging = _useState[1];
     var classes = function classes() {
         var _obj;
         return (0, _classnames.default)([
@@ -49,17 +59,18 @@ var Switch = function Switch(props) {
             (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-close"), !value), (0, _define_property._)(_obj, "".concat(classPrefix, "-disabled"), disabled), (0, _define_property._)(_obj, "".concat(classPrefix, "-disabled-close"), disabled && !value), _obj)
         ]);
     };
-    var onClick = function onClick(event) {
-        if (disabled) return;
-        onChange && onChange(!value, event);
+    var onClick = function onClick() {
+        if (disabled || changing) return;
+        if (props.onChange) {
+            setChanging(true);
+            props.onChange(!value);
+        }
         setValue(!value);
     };
     var _obj, _obj1;
     return /*#__PURE__*/ _react.default.createElement("div", (0, _object_spread._)({
         className: classes(),
-        onClick: function onClick1(e) {
-            return onClick(e);
-        },
+        onClick: onClick,
         style: style
     }, rest), /*#__PURE__*/ _react.default.createElement("div", {
         className: (0, _classnames.default)([
@@ -71,9 +82,9 @@ var Switch = function Switch(props) {
             ],
             (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-button-open-rtl"), rtl && value), (0, _define_property._)(_obj, "".concat(classPrefix, "-button-close-rtl"), rtl && !value), _obj)
         ])
-    }, !value && !activeText && /*#__PURE__*/ _react.default.createElement("div", {
+    }, changing && loadingIcon ? /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, loadingIcon) : /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, !value && !activeText && /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-close-line")
-    })), activeText && /*#__PURE__*/ _react.default.createElement("div", {
+    }))), activeText && /*#__PURE__*/ _react.default.createElement("div", {
         className: (0, _classnames.default)("".concat(classPrefix, "-label"), (_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-open"), value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-close"), !value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-open-rtl"), rtl && value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-close-rtl"), rtl && !value), (0, _define_property._)(_obj1, "".concat(classPrefix, "-label-close-disabled"), disabled && !value), _obj1))
     }, value ? activeText : inactiveText));
 };

package/dist/cjs/packages/tabbar/style/style.css

@@ -5,6 +5,8 @@
 .nut-badge {
   position: relative;
   display: inline-flex;
+  vertical-align: middle;
+  box-sizing: content-box;
   width: auto;
 }
 .nut-badge-icon {
@@ -37,13 +39,12 @@
 }
 .nut-badge-sup {
   display: inline-flex;
-  justify-content: center;
-  height: var(--nutui-badge-height, 14px);
+  text-align: center;
   min-width: var(--nutui-badge-min-width, 6px);
   padding: var(--nutui-badge-padding, 1px 4px);
   box-sizing: border-box;
   color: var(--nutui-badge-color, #ffffff);
-  font-size: var(--nutui-badge-font-size, var(--nutui-font-size-xxs, 10px));
+  font-size: var(--nutui-badge-font-size, var(--nutui-font-size-xxxs, 9px));
   line-height: 12px;
   white-space: nowrap;
   font-weight: normal;
@@ -51,14 +52,11 @@
   background: var(--nutui-badge-background-color, var(--nutui-color-primary, #ff0f23));
   z-index: 1;
 }
+.nut-badge-disabled {
+  background: var(--nutui-badge-background-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+}
 .nut-badge-number {
   font-family: "JD";
-  /* #ifdef harmony */
-  line-height: 12px;
-  /* #endif */
-  /* #ifndef harmony */
-  line-height: 13px;
-  /* #endif */
 }
 .nut-badge-one {
   height: var(--nutui-badge-height, 14px);
@@ -82,14 +80,14 @@
   height: var(--nutui-badge-dot-width, 6px);
 }
 .nut-badge-dot-small {
-  min-width: var(--nutui-badge-dot-width, 4px);
-  width: var(--nutui-badge-dot-width, 4px);
-  height: var(--nutui-badge-dot-width, 4px);
+  min-width: var(--nutui-badge-dot-small-width, 4px);
+  width: var(--nutui-badge-dot-small-width, 4px);
+  height: var(--nutui-badge-dot-small-width, 4px);
 }
 .nut-badge-dot-large {
-  min-width: var(--nutui-badge-dot-width, 8px);
-  width: var(--nutui-badge-dot-width, 8px);
-  height: var(--nutui-badge-dot-width, 8px);
+  min-width: var(--nutui-badge-dot-large-width, 8px);
+  width: var(--nutui-badge-dot-large-width, 8px);
+  height: var(--nutui-badge-dot-large-width, 8px);
 }
 .nut-badge-outline {
   background: #ffffff;
@@ -102,25 +100,16 @@
 .nut-tabbar-item {
   display: flex;
   flex-direction: column;
-  justify-content: center;
   align-items: center;
   flex: 1;
-  text-align: center;
-  text-decoration: none;
+  padding: 6px 0 2px;
   color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
   height: 100%;
 }
-.nut-tabbar-item-icon-box {
-  padding: 0px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  position: relative;
-}
-.nut-tabbar-item-icon-box .nut-icon {
-  width: 22px;
-  height: 22px;
-  font-size: 22px;
+.nut-tabbar-item .nut-icon {
+  width: 24px;
+  height: 24px;
+  font-size: 24px;
   /* #ifdef harmony*/
   color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
   /* #endif*/
@@ -128,23 +117,32 @@
   color: inherit;
   /* #endif*/
 }
-.nut-tabbar-item-icon-box-nav {
+.nut-tabbar-item-text {
   display: block;
   color: var(--nutui-color-text, #505259);
-  font-size: var(--nutui-tabbar-text-font-size, var(--nutui-font-size-xs, 11px));
-  line-height: var(--nutui-tabbar-text-font-size, var(--nutui-font-size-xs, 11px));
-  margin-top: var(--nutui-tabbar-text-margin-top, 3px);
+  font-size: var(--nutui-tabbar-text-font-size, var(--nutui-font-size-xxs, 10px));
+  line-height: var(--nutui-tabbar-text-font-size, var(--nutui-font-size-xxs, 10px));
+  margin-top: var(--nutui-tabbar-text-margin-top, 4px);
+}
+.nut-tabbar-item .nut-image-default {
+  width: 38px;
+  height: 38px;
+  border-radius: 38px;
+}
+.nut-tabbar-item-large {
+  justify-content: center;
+  padding: 0;
 }
-.nut-tabbar-item-icon-box-large {
+.nut-tabbar-item-large .nut-tabbar-item-text {
   font-size: var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-l, 16px));
   margin-top: 0;
-  line-height: var(--nutui-tabbar-text-line-height, 20px);
+  line-height: var(--nutui-tabbar-text-large-font-size, var(--nutui-font-size-l, 16px));
   font-weight: var(--nutui-tabbar-text-large-font-weight, var(--nutui-font-weight, 400));
 }
 .nut-tabbar-item-active {
   color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
 }
-.nut-tabbar-item-active .nut-tabbar-item-icon-box,
+.nut-tabbar-item-active .nut-tabbar-item-text,
 .nut-tabbar-item-active .nut-icon {
   /* #ifdef harmony*/
   color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
@@ -157,38 +155,44 @@
 .nut-tabbar {
   border: 0px;
   box-shadow: var(--nutui-tabbar-box-shadow, none);
-  border-bottom: var(--nutui-tabbar-border-bottom, 1px solid #eee);
-  border-top: var(--nutui-tabbar-border-top, 1px solid #eee);
+  border-bottom: var(--nutui-tabbar-border-bottom, 0);
+  border-top: var(--nutui-tabbar-border-top, 0);
   width: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  box-sizing: border-box;
   background: var(--nutui-color-background-overlay, #ffffff);
 }
 .nut-tabbar-wrap {
-  width: 100%;
-  height: var(--nutui-tabbar-height, 50px);
+  height: var(--nutui-tabbar-height, 46px);
   display: flex;
+}
+.nut-tabbar-wrap-3 {
+  padding: 0 16px;
+}
+.nut-tabbar-wrap-2 {
+  padding: 0 32px;
+}
+.nut-tabbar-wrap-horizontal {
+  align-items: center;
+}
+.nut-tabbar-wrap-horizontal .nut-tabbar-item {
   flex-direction: row;
   justify-content: center;
-  align-items: center;
 }
-.nut-tabbar:last-child {
-  border-right: 0;
+.nut-tabbar-wrap-horizontal .nut-tabbar-item .nut-icon {
+  width: 20px;
+  height: 20px;
+}
+.nut-tabbar-wrap-horizontal .nut-tabbar-item .nut-tabbar-item-text {
+  margin: 0 4px 0 6px;
+  font-size: 14px;
+}
+.nut-tabbar-wrap-horizontal .nut-tabbar-item .nut-badge-sup::after {
+  border: 0;
 }
 .nut-tabbar-fixed {
   position: fixed;
   bottom: 0px;
   left: 0px;
 }
-.nut-tabbar-safe-area {
-  display: block;
-  width: 100%;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-}
 
 [dir=rtl] .nut-tabbar:last-child,
 .nut-rtl .nut-tabbar:last-child {

package/dist/cjs/packages/tabbar/style/tabbar.scss

@@ -4,24 +4,40 @@
   border-bottom: $tabbar-border-bottom;
   border-top: $tabbar-border-top;
   width: 100%;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  box-sizing: border-box;
   background: $color-background-overlay;
 
   &-wrap {
-    width: 100%;
     height: $tabbar-height;
     display: flex;
-    flex-direction: row;
-    justify-content: center;
-    align-items: center;
-  }
 
-  &:last-child {
-    border-right: 0;
+    &-3 {
+      padding: 0 16px;
+    }
+
+    &-2 {
+      padding: 0 32px;
+    }
+
+    &-horizontal {
+      align-items: center;
+      .nut-tabbar-item {
+        flex-direction: row;
+        justify-content: center;
+        .nut-icon {
+          width: 20px;
+          height: 20px;
+        }
+        .nut-tabbar-item-text {
+          margin: 0 4px 0 6px;
+          font-size: 14px;
+        }
+        .nut-badge-sup {
+          &::after {
+            border: 0;
+          }
+        }
+      }
+    }
   }
 
   &-fixed {
@@ -29,13 +45,6 @@
     bottom: 0px;
     left: 0px;
   }
-
-  &-safe-area {
-    display: block;
-    width: 100%;
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
-  }
 }
 
 [dir='rtl'] .nut-tabbar,