@nutui/nutui-react-taro 3.0.0-beta.5 → 3.0.0-beta.7

package/dist/es/packages/countdown/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-countdown {
   display: var(--nutui-countdown-display, flex);
   flex-direction: row;
@@ -10,26 +14,44 @@
   align-items: center;
   justify-content: center;
   height: var(--nutui-countdown-height, 16px);
+  box-sizing: border-box;
   font-weight: var(--nutui-countdown-font-weight, var(--nutui-font-weight, 400));
   font-size: var(--nutui-countdown-font-size, var(--nutui-font-size-xs, 11px));
+  line-height: calc(var(--nutui-countdown-font-size, var(--nutui-font-size-xs, 11px)) + 2px);
+  font-family: "JD";
 }
 .nut-countdown-number, .nut-countdown-number-primary {
+  position: relative;
   min-width: var(--nutui-countdown-width, 16px);
   padding: var(--nutui-countdown-number-padding, 0 0);
   border-radius: var(--nutui-countdown-number-border-radius, var(--nutui-radius-xxs, 2px));
   margin: var(--nutui-countdown-number-margin, 0 1px);
   text-align: center;
 }
+.nut-countdown-number::after, .nut-countdown-number-primary::after {
+  content: "";
+  position: absolute;
+  top: -50%;
+  bottom: -50%;
+  left: -50%;
+  right: -50%;
+  transform: scale(0.5);
+  border-radius: calc(var(--nutui-countdown-number-border-radius, var(--nutui-radius-xxs, 2px)) * 2);
+}
 .nut-countdown-number {
-  border: 1px solid var(--nutui-countdown-number-border-color, var(--nutui-color-primary-light-pressed, #ffebf1));
   background-color: var(--nutui-countdown-number-background-color, var(--nutui-color-background-overlay, #ffffff));
   color: var(--nutui-countdown-number-color, var(--nutui-color-primary, #ff0f23));
 }
+.nut-countdown-number::after {
+  border: 1px solid var(--nutui-countdown-number-border-color, var(--nutui-color-primary-specialdisabled, #ffadbe));
+}
 .nut-countdown-number-primary {
-  border: 1px solid var(--nutui-countdown-number-primary-border-color, var(--nutui-color-primary, #ff0f23));
   background-color: var(--nutui-countdown-number-primary-background-color, var(--nutui-color-primary, #ff0f23));
   color: var(--nutui-countdown-number-primary-color, var(--nutui-color-primary-text, #ffffff));
 }
+.nut-countdown-number-primary::after {
+  border: 1px solid var(--nutui-countdown-number-primary-border-color, var(--nutui-color-primary, #ff0f23));
+}
 .nut-countdown-number-text {
   border: 0;
   background-color: transparent;

package/dist/es/packages/countup/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-countup-list {
   display: inline-flex;
   height: var(--nutui-countup-height, 32px);

package/dist/es/packages/datepicker/style/style.css

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -146,9 +150,6 @@
   bottom: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 300px;
-  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;

package/dist/es/packages/dialog/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-button {
   position: relative;
   display: flex;

package/dist/es/packages/divider/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-divider {
   display: flex;
   align-items: center;

package/dist/es/packages/drag/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-drag {
   position: fixed;
   z-index: 9997 !important;

package/dist/es/packages/elevator/elevator.d.ts

@@ -2,51 +2,15 @@ import React, { FunctionComponent } from 'react';
 import { BasicComponent } from "../../utils/typings";
 export declare const elevatorContext: React.Context<ElevatorData>;
 export interface ElevatorProps extends BasicComponent {
-    /**
-    * 电梯区域的高度
-    * @default 200px
-    */
-    height: number | string
-    /**
-    * 索引 key 值
-    * @default title
-    */
-    floorKey: string
-    /**
-    * 索引列表
-    * @default [{id: 0, name: ''}]
-    */
-    list: any[]
-    /**
-    * 索引是否吸顶
-    * @default false
-    */
-    sticky: boolean
-    /**
-    * 右侧锚点的上下间距
-    * @default 23
-    */
-    spaceHeight: number
-    /**
-    * 左侧索引的高度
-    * @default 35
-    */
-    titleHeight: number
-    /**
-    * 展示右侧导航
-    * @default true
-    */
-    showKeys: boolean
-    /**
-    * 点击内容
-    * @default false
-    */
-    onItemClick: (key: string, item: ElevatorData) => void
-    /**
-    * 点击索引
-    * @default false
-    */
-    onIndexClick: (key: string) => void
+    height: number | string;
+    floorKey: string;
+    list: any[];
+    sticky: boolean;
+    spaceHeight: number;
+    titleHeight: number;
+    showKeys: boolean;
+    onItemClick: (key: string, item: ElevatorData) => void;
+    onIndexClick: (key: string) => void;
 }
 interface ElevatorData {
     name: string;

package/dist/es/packages/elevator/elevator.js

@@ -4,11 +4,13 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
-import React, { useRef, useEffect, useState, createContext } from "react";
+import React, { useEffect, useRef, useState, createContext, useMemo } from "react";
 import Taro, { nextTick, createSelectorQuery } from "@tarojs/taro";
-import { ScrollView, View } from "@tarojs/components";
+import { ScrollView, View, Text } from "@tarojs/components";
 import classNames from "classnames";
 import { ComponentDefaults } from "../../utils/typings";
+import { harmony } from "../../utils/platform-taro";
+import useUuid from "../../utils/use-uuid";
 export var elevatorContext = /*#__PURE__*/ createContext({});
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     height: '200px',
@@ -35,6 +37,7 @@ export var Elevator = function(props) {
         "onIndexClick",
         "children"
     ]);
+    var uuid = useUuid();
     var classPrefix = 'nut-elevator';
     var listview = useRef(null);
     var initData = {
@@ -69,7 +72,7 @@ export var Elevator = function(props) {
         state.current.listHeight.push(height);
         for(var i = 0; i < state.current.listGroup.length; i++){
             var query = createSelectorQuery();
-            query.selectAll(".".concat(className, " .nut-elevator-item-").concat(i)).boundingClientRect();
+            query.selectAll(".".concat(classPrefix, "-").concat(uuid, " .nut-elevator-item-").concat(i)).boundingClientRect();
             // eslint-disable-next-line no-loop-func
             query.exec(function(res) {
                 if (res[0][0]) height += res[0][0].height;
@@ -102,7 +105,7 @@ export var Elevator = function(props) {
         var firstTouch = e.touches[0];
         touchState.current.y2 = firstTouch.pageY;
         var delta = (touchState.current.y2 - touchState.current.y1) / spaceHeight || 0;
-        var cacheIndex = state.current.anchorIndex + Math.floor(delta);
+        var cacheIndex = state.current.anchorIndex + Math.round(delta);
         setCodeIndex(cacheIndex);
         scrollTo(cacheIndex);
     };
@@ -129,7 +132,7 @@ export var Elevator = function(props) {
     };
     var setListGroup = function() {
         if (listview.current) {
-            createSelectorQuery().selectAll(".".concat(className, " .nut-elevator-list-item")).node(function(el) {
+            createSelectorQuery().selectAll(".".concat(classPrefix, "-").concat(uuid, " .nut-elevator-list-item")).node(function(el) {
                 state.current.listGroup = _to_consumable_array(Object.keys(el));
                 calculateHeight();
             }).exec();
@@ -156,6 +159,14 @@ export var Elevator = function(props) {
             }
         }
     };
+    var getWrapStyle = useMemo(function() {
+        var calcHeight = Number.isNaN(+height) ? height : "".concat(height, "px");
+        return {
+            height: harmony() ? Number(height) : calcHeight
+        };
+    }, [
+        height
+    ]);
     useEffect(function() {
         if (listview.current) {
             nextTick(function() {
@@ -167,13 +178,11 @@ export var Elevator = function(props) {
     ]);
     var _obj;
     return /*#__PURE__*/ React.createElement("div", _object_spread({
-        className: "".concat(classPrefix, " ").concat(className),
+        className: "".concat(classPrefix, " ").concat(className, " ").concat(classPrefix, "-").concat(uuid),
         style: style
     }, rest), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-list"),
-        style: {
-            height: Number.isNaN(+height) ? height : "".concat(height, "px")
-        }
+        style: getWrapStyle
     }, /*#__PURE__*/ React.createElement(ScrollView, {
         scrollTop: scrollTop,
         scrollY: true,
@@ -209,17 +218,7 @@ export var Elevator = function(props) {
     }, list[codeIndex][floorKey]) : null, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-bars")
     }, /*#__PURE__*/ React.createElement(View, {
-        className: "".concat(classPrefix, "-bars-inner"),
-        onTouchStart: function(event) {
-            return touchStart(event);
-        },
-        onTouchMove: function(event) {
-            return touchMove(event);
-        },
-        onTouchEnd: touchEnd,
-        style: {
-            touchAction: 'pan-y'
-        }
+        className: "".concat(classPrefix, "-bars-inner")
     }, list.map(function(item, index) {
         var _obj;
         return /*#__PURE__*/ React.createElement(View, {
@@ -228,11 +227,21 @@ export var Elevator = function(props) {
             key: index,
             onClick: function() {
                 return handleClickIndex(item[floorKey]);
+            },
+            onTouchStart: function(event) {
+                return touchStart(event);
+            },
+            onTouchMove: function(event) {
+                return touchMove(event);
+            },
+            onTouchEnd: touchEnd,
+            style: {
+                touchAction: 'pan-y'
             }
         }, item[floorKey]);
     })))) : null, sticky && scrollY > 0 ? /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-list-fixed")
-    }, /*#__PURE__*/ React.createElement("span", {
+    }, /*#__PURE__*/ React.createElement(Text, {
         className: "".concat(classPrefix, "-list-fixed-title")
     }, list[codeIndex][floorKey])) : null);
 };

package/dist/es/packages/elevator/style/elevator.scss

@@ -51,6 +51,8 @@
     }
 
     &-fixed {
+      display: flex;
+      align-items: center;
       width: 100%;
       position: absolute;
       top: 0;
@@ -58,13 +60,14 @@
       z-index: 1;
       padding: $elevator-list-item-padding;
       height: $elevator-list-item-code-height;
-      line-height: $elevator-list-item-code-line-height;
-      font-size: $elevator-list-item-code-font-size;
-      color: $elevator-list-fixed-color;
-      font-weight: $elevator-list-item-code-font-weight;
       background-color: $elevator-list-fixed-bg-color;
       box-sizing: border-box;
       box-shadow: $elevator-list-fixed-box-shadow;
+      &-title {
+        font-size: $elevator-list-item-code-font-size;
+        color: $elevator-list-fixed-color;
+        font-weight: $elevator-list-item-code-font-weight;
+      }
     }
   }
 

package/dist/es/packages/elevator/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-elevator {
   width: 100%;
   display: block;
@@ -46,6 +50,8 @@
   color: var(--nutui-color-primary, #ff0f23);
 }
 .nut-elevator-list-fixed {
+  display: flex;
+  align-items: center;
   width: 100%;
   position: absolute;
   top: 0;
@@ -53,14 +59,15 @@
   z-index: 1;
   padding: var(--nutui-elevator-list-item-padding, 0 20px);
   height: var(--nutui-elevator-list-item-code-height, 35px);
-  line-height: var(--nutui-elevator-list-item-code-line-height, 35px);
-  font-size: var(--nutui-elevator-list-item-code-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-elevator-list-fixed-color, var(--nutui-color-primary, #ff0f23));
-  font-weight: var(--nutui-elevator-list-item-code-font-weight, var(--nutui-font-weight-bold, 600));
   background-color: var(--nutui-elevator-list-fixed-bg-color, #ffffff);
   box-sizing: border-box;
   box-shadow: var(--nutui-elevator-list-fixed-box-shadow, 0 0 10px #eee);
 }
+.nut-elevator-list-fixed-title {
+  font-size: var(--nutui-elevator-list-item-code-font-size, var(--nutui-font-size-base, 14px));
+  color: var(--nutui-elevator-list-fixed-color, var(--nutui-color-primary, #ff0f23));
+  font-weight: var(--nutui-elevator-list-item-code-font-weight, var(--nutui-font-weight-bold, 600));
+}
 .nut-elevator-code-current {
   position: absolute;
   right: var(--nutui-elevator-list-item-code-current-right, 60px);

package/dist/es/packages/ellipsis/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-ellipsis {
   display: flex;
 }

package/dist/es/packages/empty/empty.js

@@ -65,7 +65,7 @@ export var Empty = function(props) {
     }, title) : title, typeof description === 'string' ? /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-description")
     }, description) : description, actions.length ? /*#__PURE__*/ React.createElement(View, {
-        className: "".concat(classPrefix, "-actions")
+        className: "".concat(classPrefix, "-actions-").concat(size)
     }, actions.map(function(action, index) {
         var text = action.text, rest = _object_without_properties(action, [
             "text"

package/dist/es/packages/empty/style/empty.scss

@@ -32,20 +32,24 @@
 
   &-title {
     margin-top: $empty-title-margin-top;
+    font-weight: $font-weight-bold;
     margin-bottom: $empty-title-margin-bottom;
     color: $color-title;
-    font-size: $font-size-base;
+    font-size: $font-size-l;
     line-height: $empty-title-line-height;
   }
 
   &-description {
-    margin-top: $empty-description-margin-top;
-    color: $color-text-help;
+    color: $color-text;
     font-size: $font-size-s;
     line-height: $empty-description-line-height;
   }
-
-  &-actions {
+  &-actions-base {
+    display: flex;
+    flex-direction: row;
+    margin-top: 24px;
+  }
+  &-actions-small {
     display: flex;
     flex-direction: row;
     margin-top: 16px;

package/dist/es/packages/empty/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-empty {
   box-sizing: border-box;
   width: 100%;
@@ -28,18 +32,23 @@
 }
 .nut-empty-title {
   margin-top: var(--nutui-empty-title-margin-top, 0px);
-  margin-bottom: var(--nutui-empty-title-margin-bottom, 8px);
+  font-weight: var(--nutui-font-weight-bold, 600);
+  margin-bottom: var(--nutui-empty-title-margin-bottom, 12px);
   color: var(--nutui-color-title, #1a1a1a);
-  font-size: var(--nutui-font-size-base, 14px);
-  line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-font-size-l, 16px);
+  line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-l, 16px));
 }
 .nut-empty-description {
-  margin-top: var(--nutui-empty-description-margin-top, 0px);
-  color: var(--nutui-color-text-help, #888b94);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-font-size-s, 12px);
-  line-height: var(--nutui-empty-description-line-height, 1.2);
+  line-height: var(--nutui-empty-description-line-height, 1);
 }
-.nut-empty-actions {
+.nut-empty-actions-base {
+  display: flex;
+  flex-direction: row;
+  margin-top: 24px;
+}
+.nut-empty-actions-small {
   display: flex;
   flex-direction: row;
   margin-top: 16px;

package/dist/es/packages/fixednav/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;

package/dist/es/packages/form/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-cell-group {
   display: block;
 }

package/dist/es/packages/formitem/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-form-item {
   display: flex;
 }

package/dist/es/packages/grid/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-grid-item {
   display: flex;
   flex-direction: column;

package/dist/es/packages/griditem/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-grid-item {
   display: flex;
   flex-direction: column;

package/dist/es/packages/hoverbutton/hoverbutton.js

@@ -9,6 +9,7 @@ import { useRtl } from "../configprovider/index";
 import HoverButtonItem from "../hoverbuttonitem/index";
 import SafeArea from "../safearea/index";
 import pxTransform from "../../utils/px-transform";
+import { UI_BOTTOM_DISTANCE } from "./utils";
 var defaultProps = _object_spread({}, ComponentDefaults);
 var classPrefix = 'nut-hoverbutton';
 export var HoverButton = function(props) {
@@ -16,7 +17,7 @@ export var HoverButton = function(props) {
     var rtl = useRtl();
     var baseStyle = _object_spread({}, style);
     if (tabbarHeight) {
-        baseStyle.bottom = pxTransform(tabbarHeight + 16);
+        baseStyle.bottom = pxTransform(tabbarHeight + UI_BOTTOM_DISTANCE);
     }
     if (typeof zIndex !== 'undefined') {
         baseStyle.zIndex = zIndex;

package/dist/es/packages/hoverbutton/style/style.css

@@ -1,45 +1,70 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-hoverbutton-item-container {
   width: 40px;
   height: 40px;
   border-radius: 20px;
-  border: 1px solid var(--nutui-hoverbutton-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-gray-1, #ffffff));
+  border: 1px solid var(--nutui-hoverbutton-item-border-color, rgba(0, 0, 0, 0.12));
+  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-white-12));
 }
 .nut-hoverbutton-item-container:active, .nut-hoverbutton-item-container-active {
-  background-color: var(--nutui-hoverbutton-item-background-active, var(--nutui-gray-3, #f6f6f6));
+  background-color: var(--nutui-hoverbutton-item-background-active, rgba(247, 248, 252, 0.9));
 }
 .nut-hoverbutton-item-container-harmony {
-  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-item-container-harmony:last-child {
   margin-bottom: 0;
 }
+.nut-hoverbutton-item-container-icontext {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.nut-hoverbutton-item-container-icontext .nut-icon {
+  display: block;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
 .nut-hoverbutton-item-icon {
   width: 20px;
   height: 20px;
   margin: 9px;
-  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
-  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
+  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-hoverbutton-item-icon .nut-icon {
   display: block;
   width: 20px;
   height: 20px;
+  font-size: 20px;
 }
 .nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
-  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
-  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
+  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
+  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
+}
+.nut-hoverbutton-item-text-icon {
+  width: 14px;
+  height: 5px;
+}
+.nut-hoverbutton-item-text {
+  font-size: 10px;
+  margin-top: 5px;
+  line-height: 9px;
 }
 
 .nut-hoverbutton {
   display: flex;
   flex-direction: column;
-  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-container {
   position: fixed;
-  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
-  bottom: var(--nutui-hoverbutton-position-bottom, 48px);
+  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
+  bottom: var(--nutui-hoverbutton-position-bottom, 60px);
   z-index: 10;
 }
 .nut-hoverbutton-container-rn {
@@ -49,5 +74,5 @@
 [dir=rtl] .nut-hoverbutton-container,
 .nut-hoverbutton-container-rtl {
   right: auto;
-  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
+  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
 }

package/dist/es/packages/hoverbutton/utils.d.ts

@@ -0,0 +1 @@
+export declare const UI_BOTTOM_DISTANCE = 60;

package/dist/es/packages/hoverbutton/utils.js

@@ -0,0 +1 @@
+export var UI_BOTTOM_DISTANCE = 60;

package/dist/es/packages/hoverbuttonitem/hoverbuttonitem.js

@@ -2,11 +2,12 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-import React, { useState, useMemo } from "react";
+import React, { useMemo, useState } from "react";
 import classNames from "classnames";
 import { View } from "@tarojs/components";
 import { ComponentDefaults } from "../../utils/typings";
 import { harmony, harmonyAndRn } from "../../utils/platform-taro";
+import { getIcon } from "./utils";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     icon: null,
     onClick: function(value) {}
@@ -15,7 +16,7 @@ var classPrefix = 'nut-hoverbutton-item';
 var isHarmony = harmony();
 var isNative = harmonyAndRn();
 export var HoverButtonItem = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
+    var _$_object_spread = _object_spread({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick, children = _$_object_spread.children;
     var _useState = _sliced_to_array(useState(false), 2), isTouchStart = _useState[0], setTouchStart = _useState[1];
     // @TODO 待添加暗黑模式及样式变量功能
     var nativeProps = useMemo(function() {
@@ -34,22 +35,29 @@ export var HoverButtonItem = function(props) {
     var handleActiveEnd = function(event) {
         isNative && setTouchStart(false);
     };
+    var renderBody = function() {
+        if (icon && !children) return /*#__PURE__*/ React.createElement(View, {
+            className: "".concat(classPrefix, "-icon")
+        }, getIcon(icon));
+        if (icon && children) {
+            return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(View, {
+                className: classNames(_define_property({}, "".concat(classPrefix, "-text-icon"), true))
+            }), getIcon(icon), /*#__PURE__*/ React.createElement(View, {
+                className: classNames(_define_property({}, "".concat(classPrefix, "-text"), true))
+            }, children));
+        }
+    };
     var _obj;
     return /*#__PURE__*/ React.createElement(View, {
         className: classNames([
             "".concat(classPrefix, "-container"),
             className
-        ], (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-container-active"), isNative && isTouchStart), _define_property(_obj, "".concat(classPrefix, "-container-harmony"), isHarmony), _obj)),
+        ], (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-container-active"), isNative && isTouchStart), _define_property(_obj, "".concat(classPrefix, "-container-harmony"), isHarmony), _define_property(_obj, "".concat(classPrefix, "-container-icontext"), icon && children), _obj)),
         style: style,
         onTouchStart: handleActiveStart,
         onTouchEnd: handleActiveEnd,
         onTouchCancel: handleActiveEnd,
         onClick: handleClick
-    }, /*#__PURE__*/ React.createElement(View, {
-        className: "".concat(classPrefix, "-icon")
-    }, /*#__PURE__*/ React.cloneElement(icon, _object_spread({
-        className: 'nut-icon',
-        size: 20
-    }, nativeProps))));
+    }, renderBody());
 };
 HoverButtonItem.displayName = 'NutHoverButtonItem';