@nutui/nutui-react 3.0.0-beta.9 → 3.0.1

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

@@ -21,7 +21,7 @@
   left: calc(50% + (100% - var(--nutui-steps-base-line-width, 70%)) / 2);
   height: var(--nutui-steps-base-line-height, 1px);
   width: var(--nutui-steps-base-line-width, 70%);
-  background: var(--nutui-steps-base-line-background, var(--nutui-gray-5));
+  background: var(--nutui-steps-base-line-background, var(--nutui-color-text-help, #888b94));
 }
 .nut-step-icon {
   position: relative;
@@ -32,8 +32,8 @@
   height: var(--nutui-steps-base-icon-height, 25px);
   line-height: var(--nutui-steps-base-icon-line-height, 25px);
   font-size: var(--nutui-steps-base-icon-font-size, var(--nutui-font-size-s, 12px));
-  background-color: var(--nutui-steps-wait-icon-bg-color, var(--nutui-gray-5));
-  border-color: var(--nutui-steps-wait-icon-bg-color, var(--nutui-gray-5));
+  background-color: var(--nutui-steps-wait-icon-bg-color, var(--nutui-color-text-help, #888b94));
+  border-color: var(--nutui-steps-wait-icon-bg-color, var(--nutui-color-text-help, #888b94));
   color: var(--nutui-steps-wait-icon-color, #ffffff);
   z-index: 1;
 }
@@ -62,48 +62,48 @@
   display: block;
   margin-bottom: var(--nutui-steps-base-title-margin-bottom, 10px);
   font-size: var(--nutui-steps-base-title-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-steps-base-title-color, var(--nutui-gray-7));
+  color: var(--nutui-steps-base-title-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-step-description {
   display: block;
   font-size: var(--nutui-steps-base-description-font-size, var(--nutui-font-size-s, 12px));
-  color: var(--nutui-steps-base-description-color, var(--nutui-gray-6));
+  color: var(--nutui-steps-base-description-color, var(--nutui-color-text, #505259));
 }
 .nut-step:last-child .nut-step-line {
   display: none;
 }
 .nut-step.nut-step-process .nut-step-icon {
-  background-color: var(--nutui-steps-process-icon-bg-color, var(--nutui-brand-6));
-  border-color: var(--nutui-steps-process-icon-bg-color, var(--nutui-brand-6));
+  background-color: var(--nutui-steps-process-icon-bg-color, var(--nutui-color-primary, #ff0f23));
+  border-color: var(--nutui-steps-process-icon-bg-color, var(--nutui-color-primary, #ff0f23));
   color: var(--nutui-steps-process-icon-color, #ffffff);
 }
 .nut-step.nut-step-process .nut-step-title {
-  color: var(--nutui-steps-process-title-color, var(--nutui-brand-6));
+  color: var(--nutui-steps-process-title-color, var(--nutui-color-primary, #ff0f23));
   font-size: var(--nutui-steps-process-title-font-size, var(--nutui-font-size-base, 14px));
   font-weight: var(--nutui-steps-process-title-font-weight, var(--nutui-font-weight-bold, 600));
 }
 .nut-step.nut-step-process .nut-step-description {
-  color: var(--nutui-steps-process-description-color, var(--nutui-gray-6));
+  color: var(--nutui-steps-process-description-color, var(--nutui-color-text, #505259));
 }
 .nut-step.nut-step-wait .nut-step-title {
-  color: var(--nutui-steps-wait-title-color, var(--nutui-gray-7));
+  color: var(--nutui-steps-wait-title-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-step.nut-step-wait .nut-step-description {
-  color: var(--nutui-steps-wait-description-color, var(--nutui-gray-6));
+  color: var(--nutui-steps-wait-description-color, var(--nutui-color-text, #505259));
 }
 .nut-step.nut-step-finish .nut-step-icon {
   background-color: var(--nutui-steps-finish-icon-bg-color, #ffffff);
-  border-color: var(--nutui-steps-finish-icon-border-color, var(--nutui-steps-finish-icon-color, var(--nutui-brand-6)));
-  color: var(--nutui-steps-finish-icon-color, var(--nutui-brand-6));
+  border-color: var(--nutui-steps-finish-icon-border-color, var(--nutui-steps-finish-icon-color, var(--nutui-color-primary, #ff0f23)));
+  color: var(--nutui-steps-finish-icon-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-step.nut-step-finish .nut-step-line {
-  background: var(--nutui-steps-finish-line-background, var(--nutui-brand-6));
+  background: var(--nutui-steps-finish-line-background, var(--nutui-color-primary, #ff0f23));
 }
 .nut-step.nut-step-finish .nut-step-title {
-  color: var(--nutui-steps-finish-title-color, var(--nutui-brand-6));
+  color: var(--nutui-steps-finish-title-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-step.nut-step-finish .nut-step-description {
-  color: var(--nutui-steps-finish-description-color, var(--nutui-gray-6));
+  color: var(--nutui-steps-finish-description-color, var(--nutui-color-text, #505259));
 }
 
 .nut-steps-dot .nut-step-head {
@@ -120,11 +120,11 @@
   box-sizing: content-box;
 }
 .nut-steps-dot .nut-step-wait .nut-step-icon {
-  background-color: var(--nutui-steps-dot-wait-icon-bg-color, var(--nutui-steps-wait-icon-bg-color, var(--nutui-gray-5)));
+  background-color: var(--nutui-steps-dot-wait-icon-bg-color, var(--nutui-steps-wait-icon-bg-color, var(--nutui-color-text-help, #888b94)));
 }
 .nut-steps-dot .nut-step-finish .nut-step-icon {
   background-color: var(--nutui-steps-finish-icon-bg-color, #ffffff);
-  border-color: var(--nutui-steps-dot-finish-icon-bg-color, var(--nutui-steps-finish-icon-color, var(--nutui-brand-6)));
+  border-color: var(--nutui-steps-dot-finish-icon-bg-color, var(--nutui-steps-finish-icon-color, var(--nutui-color-primary, #ff0f23)));
 }
 .nut-steps-dot .nut-step-process .nut-step-icon {
   position: relative;
@@ -158,7 +158,7 @@
   display: inline-block;
   width: 1px;
   height: var(--nutui-steps-base-line-width, 70%);
-  background: var(--nutui-steps-base-line-background, var(--nutui-gray-5));
+  background: var(--nutui-steps-base-line-background, var(--nutui-color-text-help, #888b94));
   top: calc(var(--nutui-steps-base-icon-height, 25px) + (100% - var(--nutui-steps-base-line-width, 70%) - var(--nutui-steps-base-icon-margin-bottom, 12px)) / 2);
   left: calc(50% - 1px);
 }

package/dist/cjs/packages/sticky/sticky.js

@@ -18,8 +18,8 @@ var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _getscrollparent = require("../../utils/get-scroll-parent");
-var _useclientrect = require("../../utils/use-client-rect");
-var _usewatch = /*#__PURE__*/ _interop_require_default._(require("../../utils/use-watch"));
+var _useclientrect = require("../../hooks/use-client-rect");
+var _usewatch = /*#__PURE__*/ _interop_require_default._(require("../../hooks/use-watch"));
 var _typings = require("../../utils/typings");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     position: 'top',

package/dist/cjs/packages/swipe/swipe.js

@@ -15,8 +15,8 @@ var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
-var _usetouch = require("../../utils/use-touch");
-var _useclientrect = require("../../utils/use-client-rect");
+var _usetouch = require("../../hooks/use-touch");
+var _useclientrect = require("../../hooks/use-client-rect");
 function preventDefault(event, isStopPropagation) {
     if (typeof event.cancelable !== 'boolean' || event.cancelable) {
         event.preventDefault();

package/dist/cjs/packages/swiper/effects/focus.js

@@ -24,7 +24,7 @@ var _define_property = require("@swc/helpers/_/_define_property");
 var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _web = require("@react-spring/web");
-var _userefstate = require("../../../utils/use-ref-state");
+var _userefstate = require("../../../hooks/use-ref-state");
 var _configprovider = require("../../configprovider");
 var getPerSlidePosition = function getPerSlidePosition(index, position, loop, count) {
     var currentPosition = index * 100 + position;

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

@@ -18,20 +18,17 @@
   width: var(--nutui-indicator-dot-size, 3px);
   height: var(--nutui-indicator-dot-size, 3px);
   border-radius: 50%;
-  background-color: var(--nutui-gray-4);
-  margin: 0 var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
+  background-color: var(--nutui-color-border-disabled, #c2c4cc);
+  margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxs, 4px));
   opacity: 0.4;
 }
-.nut-indicator-dot:first-child, .nut-indicator-line:first-child {
+.nut-indicator-dot-0, .nut-indicator-line-0 {
   margin-left: 0px;
 }
-.nut-indicator-dot:last-child, .nut-indicator-line:last-child {
-  margin-right: 0px;
-}
 .nut-indicator-dot-active, .nut-indicator-line-active {
   width: var(--nutui-indicator-dot-active-size, 6px);
   border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
-  background: var(--nutui-indicator-color, var(--nutui-brand-6));
+  background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff0f23));
   opacity: 1;
 }
 .nut-indicator-fixed-width .nut-indicator-dot {
@@ -54,6 +51,9 @@
 .nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot-active {
   height: 6px;
 }
+.nut-indicator-vertical.nut-indicator-fixed-width.nut-indicator-fixed-width.nut-indicator-white .nut-indicator-dot-active {
+  height: 6px;
+}
 .nut-indicator-line {
   width: var(--nutui-indicator-dot-active-size, 6px);
   margin: 0;
@@ -62,7 +62,7 @@
 }
 .nut-indicator-line-active {
   transition: transform 0.3s ease-in-out;
-  background: var(--nutui-indicator-color, var(--nutui-brand-6));
+  background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff0f23));
 }
 
 .nut-indicator-track {
@@ -76,7 +76,7 @@
   height: 100%;
   box-sizing: border-box;
   border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
-  background-color: var(--nutui-gray-4);
+  background-color: var(--nutui-color-border-disabled, #c2c4cc);
   opacity: 0.4;
 }
 
@@ -84,7 +84,6 @@
   position: relative;
   box-sizing: content-box;
   background: rgba(255, 255, 255, 0.4);
-  border: 1px solid rgba(0, 0, 0, 0.06);
   opacity: 1;
 }
 .nut-indicator-white .nut-indicator-line {
@@ -110,14 +109,12 @@
   justify-content: center;
 }
 .nut-indicator-vertical .nut-indicator-dot {
-  margin: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px)) 0;
+  margin: 0px;
+  margin-top: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxs, 4px));
 }
-.nut-indicator-vertical .nut-indicator-dot:first-child {
+.nut-indicator-vertical .nut-indicator-dot-0 {
   margin-top: 0px;
 }
-.nut-indicator-vertical .nut-indicator-dot:last-child {
-  margin-bottom: 0px;
-}
 .nut-indicator-vertical .nut-indicator-dot-active {
   width: var(--nutui-indicator-dot-size, 3px);
   height: var(--nutui-indicator-dot-active-size, 6px);
@@ -127,14 +124,9 @@
   height: var(--nutui-indicator-dot-active-size, 6px);
 }
 
-[dir=rtl] .nut-indicator-dot:first-child,
-.nut-rtl .nut-indicator-dot:first-child {
-  margin-left: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
-  margin-right: 0px;
-}
-[dir=rtl] .nut-indicator-dot:last-child,
-.nut-rtl .nut-indicator-dot:last-child {
-  margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
+[dir=rtl] .nut-indicator-dot-0,
+.nut-rtl .nut-indicator-dot-0 {
+  margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxs, 4px));
   margin-left: 0px;
 }
 
@@ -142,9 +134,14 @@
   width: 100%;
   height: 100%;
   overflow: hidden;
-  touch-action: none;
   position: relative;
 }
+.nut-swiper-canmove-horizontal {
+  touch-action: pan-y;
+}
+.nut-swiper-canmove-vertical {
+  touch-action: pan-x;
+}
 .nut-swiper-indicator {
   display: flex;
   flex-direction: row;
@@ -171,15 +168,7 @@
   display: flex;
   position: relative;
 }
-.nut-swiper-inner-horizontal {
-  /* #ifndef rn */
-  transform: translateX(var(--swiper-offset));
-  /* #ifndef rn */
-}
 .nut-swiper-inner-vertical {
-  /* #ifndef rn */
-  transform: translateY(var(--swiper-offset));
-  /* #ifndef rn */
   flex-direction: column;
 }
 
@@ -199,9 +188,6 @@
 .nut-rtl .nut-swiper-indicator {
   left: auto;
   right: 50%;
-  /* #ifndef rn */
-  transform: translateX(50%);
-  /* #endif */
 }
 [dir=rtl] .nut-swiper-indicator-vertical,
 .nut-rtl .nut-swiper-indicator-vertical {

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

@@ -2,9 +2,16 @@
   width: 100%;
   height: 100%;
   overflow: hidden;
-  touch-action: none;
   position: relative;
 
+  &-canmove-horizontal {
+    touch-action: pan-y;
+  }
+
+  &-canmove-vertical {
+    touch-action: pan-x;
+  }
+
   &-indicator {
     display: flex;
     flex-direction: row;
@@ -26,21 +33,14 @@
     z-index: 1;
   }
 }
+
 .nut-swiper-inner {
   width: 100%;
   height: 100%;
   display: flex;
   position: relative;
-  &-horizontal {
-    /* #ifndef rn */
-    transform: translateX(var(--swiper-offset));
-    /* #ifndef rn */
-  }
 
   &-vertical {
-    /* #ifndef rn */
-    transform: translateY(var(--swiper-offset));
-    /* #ifndef rn */
     flex-direction: column;
   }
 }
@@ -62,10 +62,8 @@
   &-indicator {
     left: auto;
     right: 50%;
-    /* #ifndef rn */
-    transform: translateX(50%);
-    /* #endif */
   }
+
   &-indicator-vertical {
     left: auto;
     right: 12px;

package/dist/cjs/packages/swiper/swiper.js

@@ -18,7 +18,7 @@ var _react1 = require("@use-gesture/react");
 var _web = require("@react-spring/web");
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _indicator = /*#__PURE__*/ _interop_require_default._(require("../indicator"));
-var _userefstate = require("../../utils/use-ref-state");
+var _userefstate = require("../../hooks/use-ref-state");
 var _default = require("./effects/default");
 var _focus = require("./effects/focus");
 var defaultProps = {
@@ -196,11 +196,9 @@ var Swiper = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
                 -y
             ];
         },
-        triggerAllEvents: true,
         bounds: function bounds() {
             if (loop) return {};
             var slideSize = getSlideSize();
-            var swiperSize = getSwiperSize();
             if (isVertical) {
                 return {
                     top: 0,
@@ -212,8 +210,9 @@ var Swiper = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
                 right: (count - 1) * slideSize
             };
         },
-        preventDefault: true,
         rubberband: true,
+        triggerAllEvents: true,
+        preventScroll: isVertical,
         axis: isVertical ? 'y' : 'x',
         pointer: {
             touch: true
@@ -255,17 +254,15 @@ var Swiper = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
         }
     };
     var renderSlides = function renderSlides() {
+        var _obj;
         return /*#__PURE__*/ _react.default.createElement("div", {
             ref: stageRef,
-            className: (0, _classnames.default)('nut-swiper-inner', {
-                'nut-swiper-inner-vertical': isVertical,
-                'nut-swiper-inner-horizontal': !isVertical
-            }),
+            className: (0, _classnames.default)("".concat(classPrefix, "-inner"), (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-inner-vertical"), isVertical), (0, _define_property._)(_obj, "".concat(classPrefix, "-inner-horizontal"), !isVertical), _obj)),
             style: (0, _object_spread._)({}, props.slideSize ? (0, _define_property._)({}, isVertical ? 'height' : 'width', "".concat(props.slideSize, "px")) : {})
         }, renderEffect());
     };
     return /*#__PURE__*/ _react.default.createElement("div", (0, _object_spread._)({
-        className: (0, _classnames.default)('nut-swiper', className),
+        className: (0, _classnames.default)(classPrefix, "".concat(classPrefix, "-canmove-").concat(direction), className),
         style: style,
         ref: swiperRef
     }, bind()), renderSlides(), renderIndicator());

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

@@ -11,7 +11,7 @@
   min-width: var(--nutui-switch-width, 46px);
   height: var(--nutui-switch-height, 28px);
   line-height: var(--nutui-switch-line-height, 28px);
-  background-color: var(--nutui-switch-active-background-color, var(--nutui-brand-6));
+  background-color: var(--nutui-switch-active-background-color, var(--nutui-color-primary, #ff0f23));
   border-radius: var(--nutui-switch-border-radius, 50px);
   background-size: 100% 100%;
   background-repeat: no-repeat;
@@ -46,7 +46,7 @@
   left: calc(100% - var(--nutui-switch-height, 28px) + var(--nutui-switch-border-width, 2px));
 }
 .nut-switch-close {
-  background-color: var(--nutui-switch-inactive-background-color, var(--nutui-gray-4));
+  background-color: var(--nutui-switch-inactive-background-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-switch-close-line {
   width: calc((var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) * 2) / 2);
@@ -78,14 +78,14 @@
   margin: 0 calc(var(--nutui-switch-height, 28px) - var(--nutui-switch-border-width, 2px) + 3px) 0 7px;
 }
 .nut-switch-label-close-disabled {
-  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-gray-4));
+  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-switch-label-close-disabled .nut-icon {
-  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-gray-4));
+  color: var(--nutui-switch-inactive-disabled-label-text-color, var(--nutui-color-text-disabled, #c2c4cc));
 }
 .nut-switch-disabled {
-  background-color: var(--nutui-switch-active-disabled-background-color, var(--nutui-brand-3));
+  background-color: var(--nutui-switch-active-disabled-background-color, var(--nutui-color-primary-disabled-special, #ffadbe));
 }
 .nut-switch-disabled-close {
-  background-color: var(--nutui-switch-inactive-disabled-background-color, var(--nutui-gray-3));
+  background-color: var(--nutui-switch-inactive-disabled-background-color, var(--nutui-color-background, #f2f3f5));
 }

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

@@ -17,7 +17,7 @@ var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _typings = require("../../utils/typings");
-var _usepropsvalue = require("../../utils/use-props-value");
+var _usepropsvalue = require("../../hooks/use-props-value");
 var _configprovider = require("../configprovider");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     disabled: false,

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

@@ -11,7 +11,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  background: var(--nutui-badge-background-color, var(--nutui-brand-6));
+  background: var(--nutui-badge-background-color, var(--nutui-color-primary, #ff0f23));
   padding: var(--nutui-badge-icon-padding, 2px);
   text-align: center;
   z-index: var(--nutui-badge-z-index, 1);
@@ -48,7 +48,7 @@
   white-space: nowrap;
   font-weight: normal;
   vertical-align: middle;
-  background: var(--nutui-badge-background-color, var(--nutui-brand-6));
+  background: var(--nutui-badge-background-color, var(--nutui-color-primary, #ff0f23));
   z-index: 1;
 }
 .nut-badge-number {
@@ -93,10 +93,10 @@
 }
 .nut-badge-outline {
   background: #ffffff;
-  color: var(--nutui-badge-outline-color, var(--nutui-brand-6));
+  color: var(--nutui-badge-outline-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-badge-outline::after {
-  border: var(--nutui-badge-outline-border, 1px solid var(--nutui-brand-6));
+  border: var(--nutui-badge-outline-border, 1px solid var(--nutui-color-primary, #ff0f23));
 }
 
 .nut-tabbar-item {
@@ -107,7 +107,7 @@
   flex: 1;
   text-align: center;
   text-decoration: none;
-  color: var(--nutui-tabbar-inactive-color, var(--nutui-gray-7));
+  color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
   height: 100%;
 }
 .nut-tabbar-item-icon-box {
@@ -118,13 +118,21 @@
   position: relative;
 }
 .nut-tabbar-item-icon-box .nut-icon {
-  width: 24px;
-  height: 24px;
-  font-size: 24px;
+  width: 22px;
+  height: 22px;
+  font-size: 22px;
+  /* #ifdef harmony*/
+  color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
+  /* #endif*/
+  /* #ifndef harmony*/
+  color: inherit;
+  /* #endif*/
 }
 .nut-tabbar-item-icon-box-nav {
   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);
 }
 .nut-tabbar-item-icon-box-large {
@@ -134,19 +142,12 @@
   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-brand-6));
-}
-.nut-tabbar-item-active .nut-tabbar-item-icon-box {
-  /* #ifdef harmony*/
-  color: var(--nutui-tabbar-active-color, var(--nutui-brand-6));
-  /* #endif*/
-  /* #ifndef harmony*/
-  color: inherit;
-  /* #endif*/
+  color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
 }
-.nut-tabbar-item-active .nut-tabbar-item-icon-box .nut-icon {
+.nut-tabbar-item-active .nut-tabbar-item-icon-box,
+.nut-tabbar-item-active .nut-icon {
   /* #ifdef harmony*/
-  color: var(--nutui-tabbar-active-color, var(--nutui-brand-6));
+  color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
   /* #endif*/
   /* #ifndef harmony*/
   color: inherit;
@@ -164,7 +165,7 @@
   justify-content: center;
   align-items: center;
   box-sizing: border-box;
-  background: var(--nutui-gray-1);
+  background: var(--nutui-color-background-overlay, #ffffff);
 }
 .nut-tabbar-wrap {
   width: 100%;

package/dist/cjs/packages/tabbar/tabbar.js

@@ -16,7 +16,7 @@ var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _typings = require("../../utils/typings");
-var _usepropsvalue = require("../../utils/use-props-value");
+var _usepropsvalue = require("../../hooks/use-props-value");
 var _tabbaritem = /*#__PURE__*/ _interop_require_default._(require("../tabbaritem"));
 var _context = /*#__PURE__*/ _interop_require_default._(require("./context"));
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {

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

@@ -11,7 +11,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  background: var(--nutui-badge-background-color, var(--nutui-brand-6));
+  background: var(--nutui-badge-background-color, var(--nutui-color-primary, #ff0f23));
   padding: var(--nutui-badge-icon-padding, 2px);
   text-align: center;
   z-index: var(--nutui-badge-z-index, 1);
@@ -48,7 +48,7 @@
   white-space: nowrap;
   font-weight: normal;
   vertical-align: middle;
-  background: var(--nutui-badge-background-color, var(--nutui-brand-6));
+  background: var(--nutui-badge-background-color, var(--nutui-color-primary, #ff0f23));
   z-index: 1;
 }
 .nut-badge-number {
@@ -93,10 +93,10 @@
 }
 .nut-badge-outline {
   background: #ffffff;
-  color: var(--nutui-badge-outline-color, var(--nutui-brand-6));
+  color: var(--nutui-badge-outline-color, var(--nutui-color-primary, #ff0f23));
 }
 .nut-badge-outline::after {
-  border: var(--nutui-badge-outline-border, 1px solid var(--nutui-brand-6));
+  border: var(--nutui-badge-outline-border, 1px solid var(--nutui-color-primary, #ff0f23));
 }
 
 .nut-tabbar-item {
@@ -107,7 +107,7 @@
   flex: 1;
   text-align: center;
   text-decoration: none;
-  color: var(--nutui-tabbar-inactive-color, var(--nutui-gray-7));
+  color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
   height: 100%;
 }
 .nut-tabbar-item-icon-box {
@@ -118,13 +118,21 @@
   position: relative;
 }
 .nut-tabbar-item-icon-box .nut-icon {
-  width: 24px;
-  height: 24px;
-  font-size: 24px;
+  width: 22px;
+  height: 22px;
+  font-size: 22px;
+  /* #ifdef harmony*/
+  color: var(--nutui-tabbar-inactive-color, var(--nutui-color-title, #1a1a1a));
+  /* #endif*/
+  /* #ifndef harmony*/
+  color: inherit;
+  /* #endif*/
 }
 .nut-tabbar-item-icon-box-nav {
   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);
 }
 .nut-tabbar-item-icon-box-large {
@@ -134,19 +142,12 @@
   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-brand-6));
-}
-.nut-tabbar-item-active .nut-tabbar-item-icon-box {
-  /* #ifdef harmony*/
-  color: var(--nutui-tabbar-active-color, var(--nutui-brand-6));
-  /* #endif*/
-  /* #ifndef harmony*/
-  color: inherit;
-  /* #endif*/
+  color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
 }
-.nut-tabbar-item-active .nut-tabbar-item-icon-box .nut-icon {
+.nut-tabbar-item-active .nut-tabbar-item-icon-box,
+.nut-tabbar-item-active .nut-icon {
   /* #ifdef harmony*/
-  color: var(--nutui-tabbar-active-color, var(--nutui-brand-6));
+  color: var(--nutui-tabbar-active-color, var(--nutui-color-primary, #ff0f23));
   /* #endif*/
   /* #ifndef harmony*/
   color: inherit;

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

@@ -17,14 +17,22 @@
     position: relative;
 
     .nut-icon {
-      width: 24px;
-      height: 24px;
-      font-size: 24px;
+      width: 22px;
+      height: 22px;
+      font-size: 22px;
+      /* #ifdef harmony*/
+      color: $tabbar-inactive-color;
+      /* #endif*/
+      /* #ifndef harmony*/
+      color: inherit;
+      /* #endif*/
     }
 
     &-nav {
       display: block;
+      color: $color-text;
       font-size: $tabbar-text-font-size;
+      line-height: $tabbar-text-font-size;
       margin-top: $tabbar-text-margin-top;
     }
 
@@ -39,22 +47,14 @@
   &-active {
     color: $tabbar-active-color;
 
-    .nut-tabbar-item-icon-box {
+    .nut-tabbar-item-icon-box,
+    .nut-icon {
       /* #ifdef harmony*/
       color: $tabbar-active-color;
       /* #endif*/
       /* #ifndef harmony*/
       color: inherit;
       /* #endif*/
-
-      .nut-icon {
-        /* #ifdef harmony*/
-        color: $tabbar-active-color;
-        /* #endif*/
-        /* #ifndef harmony*/
-        color: inherit;
-        /* #endif*/
-      }
     }
   }
 }