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

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

@@ -4,59 +4,136 @@
 /* #endif */
 .nut-indicator {
   display: flex;
-  flex-direction: row;
   width: auto;
+  flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  justify-content: center;
 }
-.nut-indicator-dot {
+.nut-indicator-fixed-width {
+  width: 21px;
+}
+.nut-indicator-dot, .nut-indicator-line {
   display: inline-block;
   vertical-align: middle;
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-size, 4px);
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-size, 3px);
   border-radius: 50%;
-  background-color: var(--nutui-indicator-dot-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
-  margin: 0 var(--nutui-indicator-dot-margin, 2px);
+  background-color: var(--nutui-gray-4);
+  margin: 0 var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
+  opacity: 0.4;
 }
-.nut-indicator-dot:first-child {
+.nut-indicator-dot:first-child, .nut-indicator-line:first-child {
   margin-left: 0px;
 }
-.nut-indicator-dot:last-child {
+.nut-indicator-dot:last-child, .nut-indicator-line:last-child {
   margin-right: 0px;
 }
-.nut-indicator-active {
-  width: var(--nutui-indicator-dot-active-size, 8px);
-  border-radius: var(--nutui-indicator-border-radius, 2px);
-  background: var(--nutui-indicator-color, var(--nutui-color-primary, #ff0f23));
+.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));
+  opacity: 1;
+}
+.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-fixed-width .nut-indicator-dot-active {
+  width: 6px;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width {
+  justify-content: flex-start;
+  height: 21px;
+  width: auto;
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot {
+  width: 3px;
+  height: 12px;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+}
+.nut-indicator-vertical.nut-indicator-fixed-width .nut-indicator-dot-active {
+  height: 6px;
+}
+.nut-indicator-line {
+  width: var(--nutui-indicator-dot-active-size, 6px);
+  margin: 0;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: transparent;
+}
+.nut-indicator-line-active {
+  transition: transform 0.3s ease-in-out;
+  background: var(--nutui-indicator-color, var(--nutui-brand-6));
 }
+
+.nut-indicator-track {
+  position: relative;
+}
+.nut-indicator-track:after {
+  display: block;
+  content: " ";
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  border-radius: var(--nutui-indicator-border-radius, var(--nutui-radius-xxs, 2px));
+  background-color: var(--nutui-gray-4);
+  opacity: 0.4;
+}
+
+.nut-indicator-white .nut-indicator-dot, .nut-indicator-white .nut-indicator-line {
+  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 {
+  opacity: 0;
+}
+.nut-indicator-white .nut-indicator-line-active {
+  opacity: 1;
+  background: rgb(255, 255, 255);
+}
+.nut-indicator-white .nut-indicator-dot-active {
+  background: rgb(255, 255, 255);
+}
+
+.nut-indicator-track.nut-indicator-white:after {
+  border: 1px solid rgba(0, 0, 0, 0.06);
+  background: rgba(255, 255, 255, 0.4);
+}
+
 .nut-indicator-vertical {
   display: flex;
   flex-direction: column;
   align-items: center;
   justify-content: center;
 }
-.nut-indicator-vertical-dot {
-  margin: var(--nutui-indicator-dot-margin, 2px) 0;
+.nut-indicator-vertical .nut-indicator-dot {
+  margin: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px)) 0;
 }
-.nut-indicator-vertical-dot:first-child {
+.nut-indicator-vertical .nut-indicator-dot:first-child {
   margin-top: 0px;
 }
-.nut-indicator-vertical-dot:last-child {
+.nut-indicator-vertical .nut-indicator-dot:last-child {
   margin-bottom: 0px;
 }
-.nut-indicator-vertical-active {
-  width: var(--nutui-indicator-dot-size, 4px);
-  height: var(--nutui-indicator-dot-active-size, 8px);
+.nut-indicator-vertical .nut-indicator-dot-active {
+  width: var(--nutui-indicator-dot-size, 3px);
+  height: var(--nutui-indicator-dot-active-size, 6px);
+}
+.nut-indicator-vertical.nut-indicator-track .nut-indicator-line {
+  width: var(--nutui-indicator-dot-size, 3px);
+  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, 2px);
+  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, 2px);
+  margin-right: var(--nutui-indicator-dot-margin, var(--nutui-spacing-xxxs, 2px));
   margin-left: 0px;
 }

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

@@ -33,7 +33,6 @@
     justify-content: center;
     width: 100%;
     padding-top: 6px;
-    font-size: $font-size-s;
     color: $infiniteloading-color;
     text-align: center;
 
@@ -41,6 +40,7 @@
       display: flex;
       justify-content: center;
       align-items: center;
+      font-size: $font-size-xxs;
 
       &-icons {
         margin-right: 8px;

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

@@ -13,7 +13,7 @@
   width: 100%;
   overflow: hidden;
   font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-infiniteloading-color, var(--nutui-color-text-help, #888b94));
+  color: var(--nutui-infiniteloading-color, var(--nutui-gray-5));
 }
 .nut-infiniteloading .nut-infinite-top-tips {
   width: 100%;
@@ -34,20 +34,20 @@
   justify-content: center;
   width: 100%;
   padding-top: 6px;
-  font-size: var(--nutui-font-size-s, 12px);
-  color: var(--nutui-infiniteloading-color, var(--nutui-color-text-help, #888b94));
+  color: var(--nutui-infiniteloading-color, var(--nutui-gray-5));
   text-align: center;
 }
 .nut-infiniteloading .nut-infinite-bottom-tips {
   display: flex;
   justify-content: center;
   align-items: center;
+  font-size: var(--nutui-font-size-xxs, 10px);
 }
 .nut-infiniteloading .nut-infinite-bottom-tips-icons {
   margin-right: 8px;
 }
 .nut-infiniteloading-primary {
-  background-color: var(--nutui-color-primary, #ff0f23);
+  background-color: var(--nutui-brand-6);
 }
 .nut-infiniteloading-primary .nut-infinite-bottom,
 .nut-infiniteloading-primary .nut-infinite-top {

package/dist/cjs/packages/input/input.d.ts

@@ -19,6 +19,7 @@ export interface InputProps extends BasicComponent {
     formatTrigger: InputFormatTrigger;
     autoFocus: boolean;
     confirmType: InputConfirmType;
+    plain: boolean;
     formatter?: (value: string) => void;
     onChange?: (value: string) => void;
     onBlur?: (value: string) => void;

package/dist/cjs/packages/input/input.js

@@ -32,12 +32,13 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     clearable: false,
     clearIcon: null,
     formatTrigger: 'onChange',
-    autoFocus: false
+    autoFocus: false,
+    plain: false
 });
 var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
     var rtl = (0, _configprovider.useRtl)();
     var locale = (0, _configprovider.useConfig)().locale;
-    var _ref = (0, _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, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, defaultValue = _ref.defaultValue, _value = _ref.value, onCompositionStart = _ref.onCompositionStart, onCompositionEnd = _ref.onCompositionEnd, rest = (0, _object_without_properties._)(_ref, [
+    var _ref = (0, _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, onClear = _ref.onClear, formatter = _ref.formatter, onClick = _ref.onClick, confirmType = _ref.confirmType, plain = _ref.plain, defaultValue = _ref.defaultValue, _value = _ref.value, onCompositionStart = _ref.onCompositionStart, onCompositionEnd = _ref.onCompositionEnd, rest = (0, _object_without_properties._)(_ref, [
         "type",
         "name",
         "placeholder",
@@ -57,6 +58,7 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         "formatter",
         "onClick",
         "confirmType",
+        "plain",
         "defaultValue",
         "value",
         "onCompositionStart",
@@ -93,7 +95,9 @@ var Input = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
         var classPrefix = 'nut-input';
         return [
             classPrefix,
-            "".concat(disabled ? "".concat(classPrefix, "-disabled") : '')
+            disabled ? "".concat(classPrefix, "-disabled") : '',
+            readOnly ? "".concat(classPrefix, "-readonly") : '',
+            plain ? "".concat(classPrefix, "-plain") : "".concat(classPrefix, "-container")
         ].filter(Boolean).join(' ');
     }, [
         disabled

package/dist/cjs/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-font-size;
   padding: 0;
   border: 0;
   outline: 0 none;
@@ -31,23 +37,28 @@
 
 /* #ifndef rn */
 .nut-input-native::placeholder {
-  color: #757575;
+  color: $color-text-help;
 }
-
 /* #endif */
 
+.nut-input-readonly {
+  .nut-input-native {
+    color: $color-text-help;
+  }
+}
+
 .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/cjs/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-gray-4);
+  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-gray-1));
+  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-black-3));
 }
 
 .nut-input-native {
   flex: 1;
-  color: var(--nutui-input-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-gray-7);
   font-size: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
+  line-height: var(--nutui-input-font-size, var(--nutui-font-size-base, 14px));
   padding: 0;
   border: 0;
   outline: 0 none;
@@ -34,21 +40,21 @@
 
 /* #ifndef rn */
 .nut-input-native::placeholder {
-  color: #757575;
+  color: var(--nutui-gray-5);
 }
 
 /* #endif */
+.nut-input-readonly .nut-input-native {
+  color: var(--nutui-gray-5);
+}
+
 .nut-input-disabled {
-  color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc)) !important;
+  color: var(--nutui-gray-4) !important;
 }
 .nut-input-disabled input:disabled {
-  color: var(--nutui-input-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-gray-4);
   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-gray-4);
 }

package/dist/cjs/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/cjs/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-gray-3);
   border-radius: var(--nutui-inputnumber-input-border-radius, 4px);
   overflow: hidden;
 }
@@ -20,15 +20,15 @@
   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);
+  color: var(--nutui-gray-6);
   cursor: pointer;
 }
 .nut-inputnumber-icon-disabled {
-  color: var(--nutui-color-text-disabled, #c2c4cc);
+  color: var(--nutui-gray-4);
   cursor: not-allowed;
 }
 .nut-inputnumber-input {
@@ -43,17 +43,17 @@
   border: var(--nutui-inputnumber-input-border, 0);
   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));
+  color: var(--nutui-gray-6);
+  background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-gray-3));
 }
 .nut-inputnumber-input-disabled {
-  color: var(--nutui-color-text-disabled, #c2c4cc);
+  color: var(--nutui-gray-4);
 }
 .nut-inputnumber-input::-webkit-outer-spin-button, .nut-inputnumber-input::-webkit-inner-spin-button {
   appearance: none;
 }
 .nut-inputnumber-input-disabled {
-  color: var(--nutui-color-text-disabled, #c2c4cc);
+  color: var(--nutui-gray-4);
 }
 .nut-inputnumber-icon-minus {
   --nut-icon-width: 16px;

package/dist/cjs/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/cjs/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/cjs/packages/loading/loading.js

@@ -9,13 +9,16 @@ Object.defineProperty(exports, "Loading", {
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _object_without_properties = require("@swc/helpers/_/_object_without_properties");
-var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
+var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _iconsreact = require("@nutui/icons-react");
+var _lottie = /*#__PURE__*/ _interop_require_default._(require("../lottie"));
 var _typings = require("../../utils/typings");
+var _mergeprops = require("../../utils/merge-props");
 // 方便以后扩展设置为键值对形式
 var loadingMap = {
     circular: _iconsreact.Loading1,
@@ -24,27 +27,57 @@ var loadingMap = {
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     // 对比一下,个人感觉还是Loading1比较好看一些,所以用它作为了默认的loading图标
     type: 'circular',
-    direction: 'horizontal'
+    direction: 'horizontal',
+    lottieProps: {}
 });
-var Loading = function Loading(props) {
-    var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, style = _ref.style, children = _ref.children, direction = _ref.direction, icon = _ref.icon, rest = (0, _object_without_properties._)(_ref, [
+var defaultLottieProps = {
+    loop: true,
+    autoplay: true
+};
+var Loading = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
+    var _ref = (0, _object_spread._)({}, defaultProps, props), className = _ref.className, style = _ref.style, children = _ref.children, direction = _ref.direction, icon = _ref.icon, lottieProps = _ref.lottieProps, rest = (0, _object_without_properties._)(_ref, [
         "className",
         "style",
         "children",
         "direction",
-        "icon"
+        "icon",
+        "lottieProps"
     ]);
+    var loadingLottieRef = (0, _react.useRef)(null);
+    // @ts-ignore
+    // const loadingLottieRef: React.MutableRefObject<LottieProps | null> =
+    //   useRef()
+    var mergedLottieProps = (0, _mergeprops.mergeProps)(defaultLottieProps, lottieProps);
+    _react.default.useImperativeHandle(ref, function() {
+        return loadingLottieRef;
+    });
     var classPrefix = 'nut-loading';
-    var CurLoadingIcon = loadingMap[rest.type] || _iconsreact.Loading1;
+    var getLoadingIcon = function getLoadingIcon() {
+        if (!rest.jsonData) {
+            console.warn('Lottie animation requires jsonData prop');
+        }
+        if (rest.type === 'lottie') {
+            return /*#__PURE__*/ _react.default.createElement(_lottie.default, (0, _object_spread_props._)((0, _object_spread._)({}, mergedLottieProps), {
+                ref: loadingLottieRef,
+                source: rest.jsonData
+            }));
+        }
+        var LoadingIcon = loadingMap[rest.type] || _iconsreact.Loading1;
+        return /*#__PURE__*/ _react.default.createElement(LoadingIcon, {
+            className: "".concat(classPrefix, "-icon")
+        });
+    };
+    var iconboxClassName = function iconboxClassName() {
+        if (rest.type === 'lottie') return "".concat(classPrefix, "-lottie-box");
+        return "".concat(classPrefix, "-icon-box");
+    };
     return /*#__PURE__*/ _react.default.createElement("div", {
         className: (0, _classnames.default)(classPrefix, direction === 'vertical' ? "".concat(classPrefix, "-vertical") : '', className),
         style: style
     }, /*#__PURE__*/ _react.default.createElement("div", {
-        className: "".concat(classPrefix, "-icon-box")
-    }, icon || /*#__PURE__*/ _react.default.createElement(CurLoadingIcon, {
-        className: "".concat(classPrefix, "-icon")
-    })), children ? /*#__PURE__*/ _react.default.createElement("div", {
+        className: iconboxClassName()
+    }, icon || getLoadingIcon()), children ? /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-text")
-    }, children) : '');
-};
+    }, children) : null);
+});
 Loading.displayName = 'NutLoading';

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

@@ -21,9 +21,15 @@
       font-size: $loading-icon-size;
     }
   }
+  .nut-loading-lottie-box {
+    width: 56px;
+    height: 56px;
+    border-radius: $radius-base;
+    background: $loading-lottie-background;
+  }
 
   .nut-loading-text {
-    padding: 8px;
+    padding-top: $spacing-base;
     color: $loading-color;
     font-size: $loading-font-size;
   }

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

@@ -18,14 +18,20 @@
   animation: nut-loading-rotation 1s infinite linear;
 }
 .nut-loading .nut-loading-icon-box .nut-loading-icon {
-  color: var(--nutui-loading-icon-color, var(--nutui-color-text-help, #888b94));
+  color: var(--nutui-loading-icon-color, var(--nutui-gray-5));
   width: var(--nutui-loading-icon-size, var(--nutui-font-size-s, 12px));
   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));
+  padding-top: var(--nutui-spacing-base, 8px);
+  color: var(--nutui-loading-color, var(--nutui-gray-5));
   font-size: var(--nutui-loading-font-size, var(--nutui-font-size-s, 12px));
 }
 

package/dist/cjs/packages/loading/types.d.ts

@@ -0,0 +1,13 @@
+import { ReactNode } from 'react';
+import { LottieProps } from '../lottie/types';
+import { BasicComponent } from "../../utils/typings";
+export type LoadingRef = any;
+export type LoadingType = 'spinner' | 'circular' | 'lottie';
+export type LoadingDirection = 'horizontal' | 'vertical';
+export interface LoadingProps extends BasicComponent {
+    type: LoadingType;
+    jsonData: any;
+    lottieProps: Partial<LottieProps>;
+    direction: LoadingDirection;
+    icon?: ReactNode;
+}

package/dist/cjs/packages/loading/types.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});

package/dist/cjs/packages/lottie/index.d.ts

@@ -0,0 +1,3 @@
+import { Lottie } from './web';
+export type { LottieProps } from './types';
+export default Lottie;

package/dist/cjs/packages/lottie/index.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "default", {
+    enumerable: true,
+    get: function() {
+        return _default;
+    }
+});
+var _web = require("./web");
+var _default = _web.Lottie;

package/dist/cjs/packages/lottie/style/css.js

@@ -0,0 +1 @@
+import './style.css'

package/dist/cjs/packages/lottie/style/index.js

@@ -0,0 +1 @@
+import './lottie.scss';

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

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