@nutui/nutui-react-taro 3.0.5 → 3.0.7

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

@@ -52,6 +52,9 @@
   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";
 }
@@ -77,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;
@@ -97,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*/
@@ -123,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));

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

@@ -5,25 +5,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: #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: #1a1a1a;
   /* #endif*/
@@ -31,23 +22,32 @@
   color: inherit;
   /* #endif*/
 }
-.nut-tabbar-item-icon-box-nav {
+.nut-tabbar-item-text {
   display: block;
   color: #505259;
-  font-size: 11px;
-  line-height: 11px;
-  margin-top: 3px;
+  font-size: 10px;
+  line-height: 10px;
+  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: 16px;
   margin-top: 0;
-  line-height: 20px;
+  line-height: 16px;
   font-weight: 400;
 }
 .nut-tabbar-item-active {
   color: #ff0f23;
 }
-.nut-tabbar-item-active .nut-tabbar-item-icon-box {
+.nut-tabbar-item-active .nut-tabbar-item-text {
   /* #ifdef harmony*/
   color: #ff0f23;
   /* #endif*/

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

@@ -1,45 +1,48 @@
 .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: $tabbar-inactive-color;
   height: 100%;
 
-  &-icon-box {
-    padding: 0px;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    position: relative;
+  .nut-icon {
+    width: 24px;
+    height: 24px;
+    font-size: 24px;
+    /* #ifdef harmony*/
+    color: $tabbar-inactive-color;
+    /* #endif*/
+    /* #ifndef harmony*/
+    color: inherit;
+    /* #endif*/
+  }
 
-    .nut-icon {
-      width: 22px;
-      height: 22px;
-      font-size: 22px;
-      /* #ifdef harmony*/
-      color: $tabbar-inactive-color;
-      /* #endif*/
-      /* #ifndef harmony*/
-      color: inherit;
-      /* #endif*/
-    }
+  &-text {
+    display: block;
+    color: $color-text;
+    font-size: $tabbar-text-font-size;
+    line-height: $tabbar-text-font-size;
+    margin-top: $tabbar-text-margin-top;
+  }
 
-    &-nav {
-      display: block;
-      color: $color-text;
-      font-size: $tabbar-text-font-size;
-      line-height: $tabbar-text-font-size;
-      margin-top: $tabbar-text-margin-top;
+  .nut-image {
+    &-default {
+      width: 38px;
+      height: 38px;
+      border-radius: 38px;
     }
+  }
+
+  &-large {
+    justify-content: center;
+    padding: 0;
 
-    &-large {
+    .nut-tabbar-item-text {
       font-size: $tabbar-text-large-font-size;
       margin-top: 0;
-      line-height: $tabbar-text-line-height;
+      line-height: $tabbar-text-large-font-size;
       font-weight: $tabbar-text-large-font-weight;
     }
   }
@@ -47,7 +50,7 @@
   &-active {
     color: $tabbar-active-color;
 
-    .nut-tabbar-item-icon-box,
+    .nut-tabbar-item-text,
     .nut-icon {
       /* #ifdef harmony*/
       color: $tabbar-active-color;

package/dist/cjs/packages/tabbaritem/tabbaritem.js

@@ -20,7 +20,6 @@ var _components = require("@tarojs/components");
 var _typings = require("../../utils/typings");
 var _index = /*#__PURE__*/ _interop_require_default._(require("../badge/index"));
 var _context = /*#__PURE__*/ _interop_require_default._(require("../tabbar/context"));
-var _addcolorforharmony = /*#__PURE__*/ _interop_require_default._(require("../../utils/add-color-for-harmony"));
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     title: '',
     icon: null,
@@ -28,11 +27,12 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     dot: false,
     max: 99,
     top: '0',
-    right: '0'
+    right: '0',
+    direction: 'vertical'
 });
 var TabbarItem = function TabbarItem(props) {
     var ctx = (0, _react.useContext)(_context.default);
-    var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, style = _ref.style, title = _ref.title, icon = _ref.icon, value = _ref.value, dot = _ref.dot, max = _ref.max, top = _ref.top, right = _ref.right, index = _ref.index, rest = (0, _object_without_properties._)(_ref, [
+    var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, style = _ref.style, title = _ref.title, icon = _ref.icon, value = _ref.value, dot = _ref.dot, max = _ref.max, top = _ref.top, right = _ref.right, index = _ref.index, direction = _ref.direction, onActiveClick = _ref.onActiveClick, rest = (0, _object_without_properties._)(_ref, [
         "className",
         "style",
         "title",
@@ -42,15 +42,19 @@ var TabbarItem = function TabbarItem(props) {
         "max",
         "top",
         "right",
-        "index"
+        "index",
+        "direction",
+        "onActiveClick"
     ]);
     var active = index === (ctx === null || ctx === void 0 ? void 0 : ctx.selectIndex);
     var classPrefix = 'nut-tabbar-item';
-    var tabbarItemClass = (0, _classnames.default)(classPrefix, (0, _define_property._)({}, "".concat(classPrefix, "-active"), active), className);
-    var boxPrefix = "".concat(classPrefix, "-icon-box");
-    var titleClass = (0, _classnames.default)(boxPrefix, "".concat(boxPrefix, "-nav"), (0, _define_property._)({}, "".concat(boxPrefix, "-large"), !icon));
+    var _obj;
+    var tabbarItemClass = (0, _classnames.default)(classPrefix, (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-active"), active), (0, _define_property._)(_obj, "".concat(classPrefix, "-large"), !icon || !title), _obj), className);
+    var renderNodeWithActive = function renderNodeWithActive(node) {
+        return node && typeof node === 'function' ? node(active) : node;
+    };
     var badgeProps = {
-        value: value,
+        value: renderNodeWithActive(value),
         dot: dot,
         max: max,
         top: top,
@@ -59,11 +63,33 @@ var TabbarItem = function TabbarItem(props) {
     };
     var renderTitleText = function renderTitleText() {
         return title && /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: titleClass,
+            className: "".concat(classPrefix, "-text"),
             style: {
                 color: active ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor
             }
-        }, title);
+        }, renderNodeWithActive(title));
+    };
+    var renderTitle = function renderTitle() {
+        return /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread._)({
+            size: "normal"
+        }, badgeProps), renderTitleText());
+    };
+    var renderIcon = function renderIcon() {
+        var distIcon = renderNodeWithActive(icon);
+        // 鸿蒙差异处理，需要手动给icon一个color
+        return /*#__PURE__*/ _react.default.isValidElement(distIcon) ? /*#__PURE__*/ _react.default.cloneElement(distIcon, (0, _object_spread_props._)((0, _object_spread._)({}, distIcon.props), {
+            color: active ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor
+        })) : null;
+    };
+    var renderIconAndTitle = function renderIconAndTitle() {
+        return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_index.default, (0, _object_spread_props._)((0, _object_spread._)({
+            size: "normal"
+        }, badgeProps), {
+            top: 3
+        }), renderIcon()), renderTitleText());
+    };
+    var renderDualItem = function renderDualItem() {
+        return dot ? null : /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderIcon(), renderTitleText(), /*#__PURE__*/ _react.default.createElement(_index.default, badgeProps));
     };
     return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
         className: tabbarItemClass,
@@ -71,9 +97,7 @@ var TabbarItem = function TabbarItem(props) {
             color: active ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor
         }, style),
         onClick: function onClick() {
-            return ctx === null || ctx === void 0 ? void 0 : ctx.handleClick(index);
+            return active ? onActiveClick === null || onActiveClick === void 0 ? void 0 : onActiveClick() : ctx === null || ctx === void 0 ? void 0 : ctx.handleClick(index);
         }
-    }, rest), icon ? /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement(_index.default, badgeProps, /*#__PURE__*/ _react.default.createElement(_components.View, {
-        className: boxPrefix
-    }, (0, _addcolorforharmony.default)(icon, active ? ctx === null || ctx === void 0 ? void 0 : ctx.activeColor : ctx === null || ctx === void 0 ? void 0 : ctx.inactiveColor))), renderTitleText()) : /*#__PURE__*/ _react.default.createElement(_index.default, badgeProps, renderTitleText()));
+    }, rest), direction === 'horizontal' && !dot ? renderDualItem() : /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, icon && renderIconAndTitle(), !icon && renderTitle()));
 };

package/dist/cjs/packages/tabpane/tabpane.js

@@ -24,7 +24,7 @@ var TabPane = function TabPane(props) {
     var classes = (0, _classnames.default)(classPrefix, {
         active: !disabled && props.active
     }, autoHeightClassName, className);
-    return children && /*#__PURE__*/ _react.default.createElement(_components.View, {
+    return children ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: classes
-    }, !disabled && children);
+    }, !disabled && children) : null;
 };

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

@@ -60,7 +60,7 @@
 
 .nut-popup {
   position: fixed;
-  min-height: 46%;
+  min-height: 26%;
   max-height: 100%;
   background-color: var(--nutui-overlay-content-bg-color, var(--nutui-color-background-overlay, #ffffff));
   -webkit-overflow-scrolling: touch;
@@ -198,12 +198,12 @@
     transform: scale(0.8);
   }
 }
-.nut-popup-slide-default-enter-active {
+.nut-popup-slide-none-enter-active {
   animation-fill-mode: both;
   animation-name: popup-scale-fade-in;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
 }
-.nut-popup-slide-default-exit-active {
+.nut-popup-slide-none-exit-active {
   animation-fill-mode: both;
   animation-name: popup-scale-fade-out;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
@@ -330,7 +330,7 @@
   animation-name: popup-slide-left-exit;
   animation-duration: var(--nutui-popup-animation-duration, 0.3s);
 }
-.nut-popup-slide-default-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
+.nut-popup-slide-none-exit-done.nut-popup, .nut-popup-slide-center-exit-done.nut-popup, .nut-popup-slide-left-exit-done.nut-popup, .nut-popup-slide-right-exit-done.nut-popup, .nut-popup-slide-top-exit-done.nut-popup, .nut-popup-slide-bottom-exit-done.nut-popup {
   display: none;
 }
 .nut-popup .nut-overflow-hidden {