@nutui/nutui-react-taro 3.0.0-beta.1 → 3.0.0-beta.10

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-input {
   position: relative;
   display: flex;
@@ -5,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;
@@ -30,17 +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));
+  -webkit-text-fill-color: var(--nutui-gray-4);
 }

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

@@ -9,7 +9,7 @@ import { Input as TaroInput, View, Text } from "@tarojs/components";
 import { Minus, Plus } from "@nutui/icons-react-taro";
 import { usePropsValue } from "../../utils/use-props-value";
 import { ComponentDefaults } from "../../utils/typings";
-import { harmony, harmonyAndRn, rn } from "../../utils/platform-taro";
+import { harmonyAndRn, rn } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     disabled: false,
     readOnly: false,
@@ -50,7 +50,6 @@ export var InputNumber = function(props) {
     ]);
     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);

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

@@ -1,8 +1,13 @@
 .nut-inputnumber {
-  display: flex;
+  display: inline-flex;
+  width: calc(
+    2 * #{$inputnumber-input-margin} + 2 * #{$inputnumber-button-width} + #{$inputnumber-input-width}
+  );
   flex-direction: row;
   align-items: center;
-
+  background-color: $color-background;
+  border-radius: $inputnumber-input-border-radius;
+  overflow: hidden;
   &-minus,
   &-add {
     display: flex;
@@ -11,21 +16,18 @@
     width: $inputnumber-button-width;
     height: $inputnumber-button-height;
     background-color: $inputnumber-button-background-color;
-    border-radius: $inputnumber-button-border-radius;
+    .nut-icon {
+      --nut-icon-width: 10px;
+      --nut-icon-height: 10px;
+    }
   }
 
   &-icon {
-    color: $inputnumber-icon-color;
-    /*  #ifdef rn harmony  */
-    font-size: 14px;
-    /*  #endif  */
-    /*  #ifndef  rn harmony  */
-    font-size: $inputnumber-icon-size;
-    /*  #endif */
+    color: $color-text;
     cursor: pointer;
 
     &-disabled {
-      color: $inputnumber-disabled-color;
+      color: $color-text-disabled;
       cursor: not-allowed;
     }
   }
@@ -35,16 +37,17 @@
     justify-content: center;
     align-items: center;
     width: $inputnumber-input-width;
+    font-size: $inputnumber-input-font-size;
     height: $inputnumber-input-height;
     text-align: center;
     outline: none;
     border: $inputnumber-input-border;
-    border-radius: $inputnumber-input-border-radius;
-    margin: $inputnumber-input-margin;
-    color: $inputnumber-input-font-color;
+    margin-left: $inputnumber-input-margin;
+    margin-right: $inputnumber-input-margin;
+    color: $color-text;
     background-color: $inputnumber-input-background-color;
     &-disabled {
-      color: $inputnumber-disabled-color;
+      color: $color-text-disabled;
     }
     &::-webkit-outer-spin-button,
     &::-webkit-inner-spin-button {
@@ -53,7 +56,7 @@
   }
 
   &-input-disabled {
-    color: $inputnumber-disabled-color;
+    color: $color-text-disabled;
   }
 
   &-icon-minus {

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

@@ -1,53 +1,59 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-inputnumber {
-  display: flex;
+  display: inline-flex;
+  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-gray-3);
+  border-radius: var(--nutui-inputnumber-input-border-radius, 4px);
+  overflow: hidden;
 }
 .nut-inputnumber-minus, .nut-inputnumber-add {
   display: flex;
   justify-content: center;
   align-items: center;
-  width: var(--nutui-inputnumber-button-width, 14px);
-  height: var(--nutui-inputnumber-button-height, 24px);
+  width: var(--nutui-inputnumber-button-width, 20px);
+  height: var(--nutui-inputnumber-button-height, 20px);
   background-color: var(--nutui-inputnumber-button-background-color, transparent);
-  border-radius: var(--nutui-inputnumber-button-border-radius, 16px);
+}
+.nut-inputnumber-minus .nut-icon, .nut-inputnumber-add .nut-icon {
+  --nut-icon-width: 10px;
+  --nut-icon-height: 10px;
 }
 .nut-inputnumber-icon {
-  color: var(--nutui-inputnumber-icon-color, var(--nutui-color-text, #505259));
-  /*  #ifdef rn harmony  */
-  font-size: 14px;
-  /*  #endif  */
-  /*  #ifndef  rn harmony  */
-  font-size: var(--nutui-inputnumber-icon-size, 8px);
-  /*  #endif */
+  color: var(--nutui-gray-6);
   cursor: pointer;
 }
 .nut-inputnumber-icon-disabled {
-  color: var(--nutui-inputnumber-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-gray-4);
   cursor: not-allowed;
 }
 .nut-inputnumber-input {
   display: flex;
   justify-content: center;
   align-items: center;
-  width: var(--nutui-inputnumber-input-width, 60px);
-  height: var(--nutui-inputnumber-input-height, 24px);
+  width: var(--nutui-inputnumber-input-width, 26px);
+  font-size: var(--nutui-inputnumber-input-font-size, var(--nutui-font-size-s, 12px));
+  height: var(--nutui-inputnumber-input-height, 20px);
   text-align: center;
   outline: none;
   border: var(--nutui-inputnumber-input-border, 0);
-  border-radius: var(--nutui-inputnumber-input-border-radius, 6px);
-  margin: var(--nutui-inputnumber-input-margin, 0);
-  color: var(--nutui-inputnumber-input-font-color, var(--nutui-color-title, #1a1a1a));
-  background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-color-background, #f5f6fa));
+  margin-left: var(--nutui-inputnumber-input-margin, 0px);
+  margin-right: var(--nutui-inputnumber-input-margin, 0px);
+  color: var(--nutui-gray-6);
+  background-color: var(--nutui-inputnumber-input-background-color, var(--nutui-gray-3));
 }
 .nut-inputnumber-input-disabled {
-  color: var(--nutui-inputnumber-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-inputnumber-disabled-color, var(--nutui-color-text-disabled, #c2c4cc));
+  color: var(--nutui-gray-4);
 }
 .nut-inputnumber-icon-minus {
   --nut-icon-width: 16px;

package/dist/es/packages/layout/style/style.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,22 +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 {
-    /**
-    * loading图标的样式
-    * @default circular
-    */
-    type: LoadingType
-    /**
-    * loading图标和文字的排列方式
-    * @default horizontal
-    */
-    direction: LoadingDirection
-    /**
-    * 自定义loading的图标
-    * @default -
-    */
-    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

@@ -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/es/packages/loading/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-loading {
   display: inline-flex;
   flex-direction: row;
@@ -14,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/es/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/es/packages/loading/types.js

@@ -0,0 +1 @@
+export { };

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

@@ -0,0 +1,4 @@
+import { ComponentType } from 'react';
+import { LottieProps } from './types';
+declare const Lottie: ComponentType<Partial<LottieProps>>;
+export default Lottie;

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

@@ -0,0 +1,12 @@
+import { Lottie as LottieWeb } from "./web";
+import { Lottie as LottieMp } from "./mp";
+var implementation;
+if (process.env.TARO_ENV === 'h5') {
+    implementation = LottieWeb;
+} else if (process.env.TARO_ENV === 'weapp') {
+    implementation = LottieMp;
+} else {
+    throw new Error("不支持的 TARO_ENV: ".concat(process.env.TARO_ENV));
+}
+var Lottie = implementation;
+export default Lottie;

package/dist/es/packages/lottie/mp.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import { LottieProps } from './types';
+export declare const Lottie: React.ForwardRefExoticComponent<Omit<LottieProps, "ref"> & React.RefAttributes<unknown>>;

package/dist/es/packages/lottie/mp.js

@@ -0,0 +1,64 @@
+import React, { useImperativeHandle, useRef } from "react";
+import { createSelectorQuery, getSystemInfoSync, useReady, useUnload } from "@tarojs/taro";
+import { Canvas } from "@tarojs/components";
+import lottie from "lottie-miniprogram";
+import useUuid from "../../utils/use-uuid";
+export var Lottie = /*#__PURE__*/ React.forwardRef(function(props, ref) {
+    var uuid = useUuid();
+    var id = "nutLottie-".concat(uuid);
+    var animation = useRef();
+    var inited = useRef(false);
+    var source = props.source, _props_loop = props.loop, loop = _props_loop === void 0 ? true : _props_loop, _props_autoPlay = props.autoPlay, autoPlay = _props_autoPlay === void 0 ? true : _props_autoPlay, onComplete = props.onComplete, style = props.style, _props_speed = props.speed, speed = _props_speed === void 0 ? 1 : _props_speed;
+    var setSpeed = function() {
+        if (animation.current) {
+            animation.current.setSpeed(Math.abs(speed));
+            animation.current.setDirection(speed > 0 ? 1 : -1);
+        }
+    };
+    useImperativeHandle(ref, function() {
+        return animation.current || {};
+    });
+    var dpr = useRef(getSystemInfoSync().pixelRatio);
+    useReady(function() {
+        createSelectorQuery().select("#".concat(id)).fields({
+            node: true,
+            size: true
+        }, function(res) {
+            try {
+                var canvas = res.node;
+                var context = canvas.getContext('2d');
+                // scale canvas to adapt dpr
+                if (style && style.width !== undefined && style.height !== undefined) {
+                    canvas.width = parseFloat(style.width.toString()) * dpr.current;
+                    canvas.height = parseFloat(style.height.toString()) * dpr.current;
+                    context.scale(dpr.current, dpr.current);
+                }
+                lottie.setup(canvas);
+                animation.current = lottie.loadAnimation({
+                    animationData: source,
+                    loop: loop,
+                    autoplay: autoPlay,
+                    rendererSettings: {
+                        context: context
+                    }
+                });
+                onComplete && animation.current.addEventListener('complete', onComplete);
+                setSpeed();
+                inited.current = true;
+            } catch (error) {
+                console.error(error);
+            }
+        }).exec();
+    });
+    useUnload(function() {
+        onComplete && animation.current && animation.current.removeEventListener('complete', onComplete);
+        animation.current && animation.current.destroy();
+    });
+    return /*#__PURE__*/ React.createElement(Canvas, {
+        id: id,
+        "canvas-id": id,
+        type: "2d",
+        style: style
+    });
+});
+Lottie.displayName = 'NutLottie';

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

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

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

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

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

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

package/dist/es/packages/lottie/types.d.ts

@@ -0,0 +1,11 @@
+import React from 'react';
+import { LottieOptions } from 'lottie-react';
+import { BasicComponent } from "../../utils/typings";
+export interface LottieProps extends Omit<LottieOptions, 'animationData'>, BasicComponent {
+    style: React.CSSProperties;
+    source: NonNullable<unknown>;
+    loop: boolean | number;
+    autoPlay: boolean;
+    initialSegment: [number, number];
+    speed: number;
+}

package/dist/es/packages/lottie/types.js

@@ -0,0 +1 @@
+import React from "react";

package/dist/es/packages/lottie/web.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import { LottieProps } from './types';
+export declare const Lottie: React.ForwardRefExoticComponent<Omit<Partial<LottieProps>, "ref"> & React.RefAttributes<unknown>>;

package/dist/es/packages/lottie/web.js

@@ -0,0 +1,22 @@
+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 LottieReact from "lottie-react";
+import React, { useImperativeHandle, useRef } from "react";
+export var Lottie = /*#__PURE__*/ React.forwardRef(function(props, ref) {
+    var loadingLottieRef = useRef(null);
+    var style = props.style, source = props.source, autoPlay = props.autoPlay, rest = _object_without_properties(props, [
+        "style",
+        "source",
+        "autoPlay"
+    ]);
+    useImperativeHandle(ref, function() {
+        return loadingLottieRef.current;
+    });
+    return /*#__PURE__*/ React.createElement(LottieReact, _object_spread_props(_object_spread({}, rest), {
+        lottieRef: loadingLottieRef,
+        animationData: source,
+        style: style
+    }));
+});
+Lottie.displayName = 'NutLottie';