@nutui/nutui-react-taro 3.0.0-beta.8 → 3.0.0

package/dist/es/packages/input/input.js

@@ -9,7 +9,7 @@ import Taro, { ENV_TYPE, getEnv } from "@tarojs/taro";
 import { formatNumber } from "./utils";
 import { useConfig, useRtl } from "../configprovider/index";
 import { ComponentDefaults } from "../../utils/typings";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     type: 'text',
     name: '',
@@ -23,12 +23,13 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     clearable: false,
     clearIcon: null,
     formatTrigger: 'onChange',
-    autoFocus: false
+    autoFocus: false,
+    plain: false
 });
 export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
     var rtl = useRtl();
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps, props), type = _ref.type, name = _ref.name, placeholder = _ref.placeholder, align = _ref.align, disabled = _ref.disabled, readOnly = _ref.readOnly, maxLength = _ref.maxLength, clearable = _ref.clearable, clearIcon = _ref.clearIcon, formatTrigger = _ref.formatTrigger, autoFocus = _ref.autoFocus, style = _ref.style, className = _ref.className, onChange = _ref.onChange, onFocus = _ref.onFocus, onBlur = _ref.onBlur, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, defaultValue = _ref.defaultValue, _value = _ref.value, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), type = _ref.type, name = _ref.name, placeholder = _ref.placeholder, align = _ref.align, disabled = _ref.disabled, readOnly = _ref.readOnly, maxLength = _ref.maxLength, clearable = _ref.clearable, clearIcon = _ref.clearIcon, formatTrigger = _ref.formatTrigger, autoFocus = _ref.autoFocus, style = _ref.style, className = _ref.className, plain = _ref.plain, onChange = _ref.onChange, onFocus = _ref.onFocus, onBlur = _ref.onBlur, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, defaultValue = _ref.defaultValue, _value = _ref.value, rest = _object_without_properties(_ref, [
         "type",
         "name",
         "placeholder",
@@ -42,6 +43,7 @@ export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
         "autoFocus",
         "style",
         "className",
+        "plain",
         "onChange",
         "onFocus",
         "onBlur",
@@ -82,7 +84,9 @@ export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
         var classPrefix = 'nut-input';
         return [
             classPrefix,
-            "".concat(disabled ? "".concat(classPrefix, "-disabled") : '')
+            "".concat(disabled ? "".concat(classPrefix, "-disabled") : ''),
+            readOnly ? "".concat(classPrefix, "-readonly") : '',
+            "".concat(plain ? "".concat(classPrefix, "-plain") : "".concat(classPrefix, "-container"))
         ].filter(Boolean).join(' ');
     }, [
         disabled
@@ -94,19 +98,13 @@ export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
     var updateValue = function(value) {
         var trigger = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 'onChange';
         var val = value;
-        if (type === 'number') {
-            val = formatNumber(val, false, true);
-        }
-        if (type === 'digit') {
-            val = formatNumber(val, true, true);
-        }
-        if (formatter && trigger === formatTrigger) {
-            val = formatter(val);
-        }
+        if (type === 'number') val = formatNumber(val, false, true);
+        if (type === 'digit') val = formatNumber(val, true, true);
+        if (formatter && trigger === formatTrigger) val = formatter(val);
         setValue(val);
-        var eventHandler = props[trigger];
-        if (eventHandler && typeof eventHandler === 'function' && trigger !== 'onChange') {
-            eventHandler(val);
+        if (trigger !== 'onChange') {
+            var eventHandler = props[trigger];
+            eventHandler === null || eventHandler === void 0 ? void 0 : eventHandler(val);
         }
         forceUpdate();
     };
@@ -120,29 +118,32 @@ export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
         }
         setActive(true);
     };
-    var handleInput = function(value) {
-        updateValue(value, 'onChange');
+    var handleInput = function(event) {
+        updateValue((event.detail || event.currentTarget).value, 'onChange');
     };
     var handleBlur = function(event) {
         var val = Taro.getEnv() === 'WEB' ? event.target.value : value;
         updateValue(val, 'onBlur');
         setTimeout(function() {
-            setActive(false);
+            return setActive(false);
         }, 200);
     };
     var inputType = function(type) {
         if (getEnv() === ENV_TYPE.WEB) {
-            if (type === 'digit') {
-                return 'text';
-            }
-            if (type === 'number') {
-                return 'tel';
-            }
+            if (type === 'digit') return 'text';
+            if (type === 'number') return 'tel';
         } else if (type === 'password') {
             return 'text';
         }
         return type;
     };
+    var getTextAlign = function() {
+        if (rtl) {
+            if (align === 'right') return 'left';
+            if (align === 'left') return 'right';
+        }
+        return align;
+    };
     return /*#__PURE__*/ React.createElement(View, {
         className: "".concat(inputClass(), "  ").concat(className || ''),
         style: style,
@@ -153,10 +154,7 @@ export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
         name: name,
         className: "nut-input-native",
         ref: inputRef,
-        style: {
-            // eslint-disable-next-line no-nested-ternary
-            textAlign: rtl ? align === 'right' ? 'left' : align === 'left' ? 'right' : 'center' : align
-        },
+        style: getTextAlign(),
         type: inputType(type),
         password: type === 'password',
         maxlength: maxLength,
@@ -167,9 +165,7 @@ export var Input = /*#__PURE__*/ forwardRef(function(props, ref) {
         confirmType: confirmType,
         onBlur: handleBlur,
         onFocus: handleFocus,
-        onInput: function(e) {
-            handleInput((e.detail || e.currentTarget).value);
-        }
+        onInput: handleInput
     })), /*#__PURE__*/ React.createElement(View, {
         style: {
             display: clearable && !readOnly && active && value.length > 0 ? 'flex' : 'none',

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

@@ -5,23 +5,29 @@
   flex-wrap: nowrap;
   flex: 1;
   align-items: center;
-  padding: $input-padding;
-  line-height: 24px;
   font-size: $input-font-size;
   box-sizing: border-box;
-  border-radius: $input-border-radius;
-  background-color: $input-background-color;
-  border-bottom: $input-border-bottom-width solid $input-border-bottom;
 
   .nut-icon {
-    color: #c8c9cc;
+    color: $color-text-disabled;
+    width: 14px;
+    height: 14px;
+    font-size: 14px;
+  }
+  &-container {
+    height: 38px;
+    padding: $input-padding;
+    background-color: $input-background-color;
+    border-radius: $input-border-radius;
+    border-bottom: $input-border-bottom-width solid $input-border-bottom;
   }
 }
 
 .nut-input-native {
   flex: 1;
-  color: $input-color;
+  color: $color-title;
   font-size: $input-font-size;
+  line-height: $input-lineheight;
   padding: 0;
   border: 0;
   outline: 0 none;
@@ -29,25 +35,24 @@
   background-color: transparent;
 }
 
-/* #ifndef rn */
-.nut-input-native::placeholder {
-  color: #757575;
+.nut-input-readonly {
+  .nut-input-native {
+    color: $color-text-help;
+  }
 }
 
-/* #endif */
-
 .nut-input-disabled {
-  color: $input-disabled-color !important;
+  color: $color-text-disabled !important;
 
   input:disabled {
-    color: $input-disabled-color;
+    color: $color-text-disabled;
     cursor: not-allowed;
     background: none;
     opacity: 1;
-    -webkit-text-fill-color: $input-disabled-color;
+    -webkit-text-fill-color: $color-text-disabled;
   }
 }
 
 .nut-input-clear {
-  flex: 0;
+  // flex: 0;
 }

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

@@ -9,22 +9,28 @@
   flex-wrap: nowrap;
   flex: 1;
   align-items: center;
-  padding: var(--nutui-input-padding, 10px 25px);
-  line-height: 24px;
   font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
   box-sizing: border-box;
-  border-radius: var(--nutui-input-border-radius, 0);
-  background-color: var(--nutui-input-background-color, var(--nutui-color-background-overlay, #ffffff));
-  border-bottom: var(--nutui-input-border-bottom-width, 0px) solid var(--nutui-input-border-bottom, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 .nut-input .nut-icon {
-  color: #c8c9cc;
+  color: var(--nutui-color-text-disabled, #c2c4cc);
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
+.nut-input-container {
+  height: 38px;
+  padding: var(--nutui-input-padding, 12px);
+  background-color: var(--nutui-input-background-color, var(--nutui-color-background-overlay, #ffffff));
+  border-radius: var(--nutui-input-border-radius, var(--nutui-radius-s, 6px));
+  border-bottom: var(--nutui-input-border-bottom-width, 0px) solid var(--nutui-input-border-bottom, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
 }
 
 .nut-input-native {
   flex: 1;
-  color: var(--nutui-input-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-color-title, #1a1a1a);
   font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
+  line-height: var(--nutui-input-lineheight, var(--nutui-font-size-l, 16px));
   padding: 0;
   border: 0;
   outline: 0 none;
@@ -32,23 +38,17 @@
   background-color: transparent;
 }
 
-/* #ifndef rn */
-.nut-input-native::placeholder {
-  color: #757575;
+.nut-input-readonly .nut-input-native {
+  color: var(--nutui-color-text-help, #888b94);
 }
 
-/* #endif */
 .nut-input-disabled {
-  color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
+  color: var(--nutui-color-text-disabled, #c2c4cc) !important;
 }
 .nut-input-disabled input:disabled {
-  color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-color-text-disabled, #c2c4cc);
   cursor: not-allowed;
   background: none;
   opacity: 1;
-  -webkit-text-fill-color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
-}
-
-.nut-input-clear {
-  flex: 0;
+  -webkit-text-fill-color: var(--nutui-color-text-disabled, #c2c4cc);
 }

package/dist/es/packages/input/style/style.harmony.css

@@ -0,0 +1,54 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-input {
+  position: relative;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  flex: 1;
+  align-items: center;
+  font-size: 14px;
+  box-sizing: border-box;
+}
+.nut-input .nut-icon {
+  color: #c2c4cc;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
+.nut-input-container {
+  height: 38px;
+  padding: 12px;
+  background-color: #ffffff;
+  border-radius: 6px;
+  border-bottom: 0px solid rgba(0, 0, 0, 0.06);
+}
+
+.nut-input-native {
+  flex: 1;
+  color: #1a1a1a;
+  font-size: 14px;
+  line-height: 16px;
+  padding: 0;
+  border: 0;
+  outline: 0 none;
+  text-decoration: none;
+  background-color: transparent;
+}
+
+.nut-input-readonly .nut-input-native {
+  color: #888b94;
+}
+
+.nut-input-disabled {
+  color: #c2c4cc !important;
+}
+.nut-input-disabled input:disabled {
+  color: #c2c4cc;
+  cursor: not-allowed;
+  background: none;
+  opacity: 1;
+  -webkit-text-fill-color: #c2c4cc;
+}

package/dist/es/packages/inputnumber/inputnumber.js

@@ -5,11 +5,11 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import React, { useEffect, useRef, useState } from "react";
 import classNames from "classnames";
-import { Input as TaroInput, View, Text } from "@tarojs/components";
+import { View, Text } from "@tarojs/components";
 import { Minus, Plus } from "@nutui/icons-react-taro";
-import { usePropsValue } from "../../utils/use-props-value";
+import { usePropsValue } from "../../hooks/use-props-value";
 import { ComponentDefaults } from "../../utils/typings";
-import { harmonyAndRn, rn } from "../../utils/platform-taro";
+import { harmony } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     disabled: false,
     readOnly: false,
@@ -48,8 +48,7 @@ export var InputNumber = function(props) {
         "onFocus",
         "onChange"
     ]);
-    var isRnAndHarmony = harmonyAndRn();
-    var isRn = rn();
+    var isHarmony = harmony();
     var classes = classNames(classPrefix, className);
     var _useState = _sliced_to_array(useState(false), 2), focused = _useState[0], setFocused = _useState[1];
     var inputRef = useRef(null);
@@ -196,20 +195,11 @@ export var InputNumber = function(props) {
     }, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-minus"),
         onClick: handleReduce
-    }, isRnAndHarmony ? /*#__PURE__*/ React.createElement(Text, {
+    }, isHarmony ? /*#__PURE__*/ React.createElement(Text, {
         className: classNames("".concat(classPrefix, "-icon ").concat(classPrefix, "-icon-minus"), _define_property({}, "".concat(classPrefix, "-icon-disabled"), shadowValue === min || disabled))
     }, "-") : /*#__PURE__*/ React.createElement(Minus, {
         className: classNames("".concat(classPrefix, "-icon ").concat(classPrefix, "-icon-minus"), _define_property({}, "".concat(classPrefix, "-icon-disabled"), shadowValue === min || disabled))
-    })), isRn ? /*#__PURE__*/ React.createElement(TaroInput, {
-        className: classNames("".concat(classPrefix, "-input"), _define_property({}, "".concat(classPrefix, "-input-disabled"), disabled)),
-        type: type,
-        ref: inputRef,
-        disabled: disabled || readOnly,
-        value: inputValue,
-        onInput: handleInputChange,
-        onBlur: handleBlur,
-        onFocus: handleFocus
-    }) : /*#__PURE__*/ React.createElement("input", {
+    })), /*#__PURE__*/ React.createElement("input", {
         className: classNames("".concat(classPrefix, "-input"), _define_property({}, "".concat(classPrefix, "-input-disabled"), disabled)),
         type: type,
         ref: inputRef,
@@ -223,7 +213,7 @@ export var InputNumber = function(props) {
     }), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-add"),
         onClick: handlePlus
-    }, isRnAndHarmony ? /*#__PURE__*/ React.createElement(Text, {
+    }, isHarmony ? /*#__PURE__*/ React.createElement(Text, {
         className: classNames("".concat(classPrefix, "-icon ").concat(classPrefix, "-icon-plus"), _define_property({}, "".concat(classPrefix, "-icon-disabled"), shadowValue === max || disabled))
     }, "+") : /*#__PURE__*/ React.createElement(Plus, {
         className: classNames("".concat(classPrefix, "-icon ").concat(classPrefix, "-icon-plus"), _define_property({}, "".concat(classPrefix, "-icon-disabled"), shadowValue === max || disabled))

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

@@ -17,8 +17,8 @@
     height: $inputnumber-button-height;
     background-color: $inputnumber-button-background-color;
     .nut-icon {
-      --nut-icon-width: 20px;
-      --nut-icon-height: 20px;
+      --nut-icon-width: 10px;
+      --nut-icon-height: 10px;
     }
   }
 

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

@@ -7,7 +7,7 @@
   width: calc(2 * var(--nutui-inputnumber-input-margin, 0px) + 2 * var(--nutui-inputnumber-button-width, 20px) + var(--nutui-inputnumber-input-width, 26px));
   flex-direction: row;
   align-items: center;
-  background-color: var(--nutui-color-background, #f5f6fa);
+  background-color: var(--nutui-color-background, #f2f3f5);
   border-radius: var(--nutui-inputnumber-input-border-radius, 4px);
   overflow: hidden;
 }
@@ -20,8 +20,8 @@
   background-color: var(--nutui-inputnumber-button-background-color, transparent);
 }
 .nut-inputnumber-minus .nut-icon, .nut-inputnumber-add .nut-icon {
-  --nut-icon-width: 20px;
-  --nut-icon-height: 20px;
+  --nut-icon-width: 10px;
+  --nut-icon-height: 10px;
 }
 .nut-inputnumber-icon {
   color: var(--nutui-color-text, #505259);
@@ -44,7 +44,7 @@
   margin-left: var(--nutui-inputnumber-input-margin, 0px);
   margin-right: var(--nutui-inputnumber-input-margin, 0px);
   color: var(--nutui-color-text, #505259);
-  background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-color-background, #f5f6fa));
+  background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-color-background, #f2f3f5));
 }
 .nut-inputnumber-input-disabled {
   color: var(--nutui-color-text-disabled, #c2c4cc);

package/dist/es/packages/inputnumber/style/style.harmony.css

@@ -0,0 +1,61 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-inputnumber {
+  display: inline-flex;
+  width: calc(2 * 0px + 2 * 20px + 26px);
+  flex-direction: row;
+  align-items: center;
+  background-color: #f2f3f5;
+  border-radius: 4px;
+  overflow: hidden;
+}
+.nut-inputnumber-minus {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 20px;
+  height: 20px;
+  background-color: transparent;
+}
+.nut-inputnumber-add {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 20px;
+  height: 20px;
+  background-color: transparent;
+}
+.nut-inputnumber-icon {
+  color: #505259;
+  cursor: pointer;
+}
+.nut-inputnumber-icon-disabled {
+  color: #c2c4cc;
+  cursor: not-allowed;
+}
+.nut-inputnumber-input {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 26px;
+  font-size: 12px;
+  height: 20px;
+  text-align: center;
+  outline: none;
+  border: 0;
+  margin-left: 0px;
+  margin-right: 0px;
+  color: #505259;
+  background-color: #f2f3f5;
+}
+.nut-inputnumber-input-disabled {
+  color: #c2c4cc;
+}
+.nut-inputnumber-input::-webkit-outer-spin-button, .nut-inputnumber-input::-webkit-inner-spin-button {
+  appearance: none;
+}
+.nut-inputnumber-input-disabled {
+  color: #c2c4cc;
+}

package/dist/es/packages/layout/style/style.harmony.css

@@ -0,0 +1,4 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */

package/dist/es/packages/loading/index.d.ts

@@ -1,3 +1,3 @@
 import { Loading } from "./loading";
-export type { LoadingProps, LoadingType, LoadingDirection, } from "./loading";
+export type { LoadingProps, LoadingType, LoadingDirection } from './types';
 export default Loading;

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

@@ -1,10 +1,3 @@
-import React, { FunctionComponent, ReactNode } from 'react';
-import { BasicComponent } from "../../utils/typings";
-export type LoadingType = 'spinner' | 'circular';
-export type LoadingDirection = 'horizontal' | 'vertical';
-export interface LoadingProps extends BasicComponent {
-    type: LoadingType;
-    direction: LoadingDirection;
-    icon?: ReactNode;
-}
-export declare const Loading: FunctionComponent<Partial<LoadingProps> & React.HTMLAttributes<HTMLDivElement>>;
+import React from 'react';
+import { LoadingProps } from './types';
+export declare const Loading: React.ForwardRefExoticComponent<Partial<LoadingProps> & React.RefAttributes<any>>;

package/dist/es/packages/loading/loading.js

@@ -1,11 +1,13 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
-import React from "react";
+import React, { useRef } from "react";
 import classNames from "classnames";
 import { Loading as IconLoading, Loading1 as IconLoading1 } from "@nutui/icons-react-taro";
 import { View } from "@tarojs/components";
+import Lottie from "../lottie/index";
 import { ComponentDefaults } from "../../utils/typings";
+import { mergeProps } from "../../utils/merge-props";
 // 方便以后扩展设置为键值对形式
 var loadingMap = {
     circular: IconLoading1,
@@ -14,27 +16,53 @@ var loadingMap = {
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     // 对比一下,个人感觉还是Loading1比较好看一些,所以用它作为了默认的loading图标
     type: 'circular',
-    direction: 'horizontal'
+    direction: 'horizontal',
+    lottieProps: {}
 });
-export var Loading = function(props) {
-    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, children = _ref.children, direction = _ref.direction, icon = _ref.icon, rest = _object_without_properties(_ref, [
+var defaultLottieProps = {
+    loop: true,
+    autoplay: true
+};
+export var Loading = /*#__PURE__*/ React.forwardRef(function(props, ref) {
+    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, children = _ref.children, direction = _ref.direction, icon = _ref.icon, lottieProps = _ref.lottieProps, rest = _object_without_properties(_ref, [
         "className",
         "style",
         "children",
         "direction",
-        "icon"
+        "icon",
+        "lottieProps"
     ]);
+    // @ts-ignore
+    var loadingLottieRef = useRef();
+    var mergedLottieProps = mergeProps(defaultLottieProps, lottieProps);
+    React.useImperativeHandle(ref, function() {
+        return loadingLottieRef;
+    });
     var classPrefix = 'nut-loading';
-    var CurLoadingIcon = loadingMap[rest.type] || IconLoading1;
+    var getLoadingIcon = function() {
+        if (rest.type === 'lottie' && rest.jsonData) {
+            return /*#__PURE__*/ React.createElement(Lottie, _object_spread_props(_object_spread({}, mergedLottieProps), {
+                // @ts-ignore
+                ref: loadingLottieRef,
+                source: rest.jsonData
+            }));
+        }
+        var LoadingIcon = loadingMap[rest.type] || IconLoading1;
+        return /*#__PURE__*/ React.createElement(LoadingIcon, {
+            className: "".concat(classPrefix, "-icon")
+        });
+    };
+    var iconboxClassName = function() {
+        if (rest.type === 'lottie') return "".concat(classPrefix, "-lottie-box");
+        return "".concat(classPrefix, "-icon-box");
+    };
     return /*#__PURE__*/ React.createElement(View, {
         className: classNames(classPrefix, direction === 'vertical' ? "".concat(classPrefix, "-vertical") : '', className),
         style: style
     }, /*#__PURE__*/ React.createElement(View, {
-        className: "".concat(classPrefix, "-icon-box")
-    }, icon || /*#__PURE__*/ React.createElement(CurLoadingIcon, {
-        className: "".concat(classPrefix, "-icon")
-    })), children ? /*#__PURE__*/ React.createElement(View, {
+        className: iconboxClassName()
+    }, icon || getLoadingIcon()), children ? /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-text")
-    }, children) : '');
-};
+    }, children) : null);
+});
 Loading.displayName = 'NutLoading';

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

@@ -4,7 +4,7 @@
   align-items: center;
   justify-content: center;
 
-  &.nut-loading-vertical {
+  &-vertical {
     flex-direction: column;
   }
 
@@ -22,11 +22,23 @@
     }
   }
 
+  .nut-loading-lottie-box {
+    width: 56px;
+    height: 56px;
+    border-radius: $radius-base;
+    background: $loading-lottie-background;
+  }
+
   .nut-loading-text {
-    padding: 8px;
     color: $loading-color;
     font-size: $loading-font-size;
   }
+
+  &-vertical {
+    .nut-loading-text {
+      padding-top: $spacing-base;
+    }
+  }
 }
 
 @keyframes nut-loading-rotation {

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

@@ -8,7 +8,7 @@
   align-items: center;
   justify-content: center;
 }
-.nut-loading.nut-loading-vertical {
+.nut-loading-vertical {
   flex-direction: column;
 }
 .nut-loading .nut-loading-icon-box {
@@ -23,11 +23,19 @@
   height: var(--nutui-loading-icon-size, var(--nutui-font-size-s, 12px));
   font-size: var(--nutui-loading-icon-size, var(--nutui-font-size-s, 12px));
 }
+.nut-loading .nut-loading-lottie-box {
+  width: 56px;
+  height: 56px;
+  border-radius: var(--nutui-radius-base, 8px);
+  background: var(--nutui-loading-lottie-background, rgba(0, 0, 0, 0.06));
+}
 .nut-loading .nut-loading-text {
-  padding: 8px;
   color: var(--nutui-loading-color, var(--nutui-color-text-help, #888b94));
   font-size: var(--nutui-loading-font-size, var(--nutui-font-size-s, 12px));
 }
+.nut-loading-vertical .nut-loading-text {
+  padding-top: var(--nutui-spacing-base, 8px);
+}
 
 @keyframes nut-loading-rotation {
   0% {